Create a plural-only English translation. Use it to pluralize the Follow

Stream and Flow Graph hint statistics.

svn path=/trunk/; revision=53326

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index cb7c2ba05100d3eb8fbb02c59c046f945bda5334..159ed80fe6e03ccf7881e29b7cd83f2b6d374853 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -227,7 +227,7 @@ Function .onInit
 
   MessageBox MB_YESNOCANCEL|MB_ICONQUESTION \
     "$OLD_DISPLAYNAME is already installed.\
-    $\n$\nWould you like to uninstall it first?" \
+     $\n$\nWould you like to uninstall it first?" \
       /SD IDYES \
       IDYES prep_uninstaller \
       IDNO done

diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi
index 50538ac646762b7cd78fbad3f7c6944d5f6b6b2b..38ae7ebb65829506a3d22751817a53b421a3c232 100755 (executable)
--- a/packaging/portableapps/win32/WiresharkPortable.nsi
+++ b/packaging/portableapps/win32/WiresharkPortable.nsi
@@ -213,16 +213,16 @@ Section "Main"
        EnvironmentVariables:
                ; set the U3 environment variables
                StrCpy $PDRIVE $EXEDIR 2
-               System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_SERIAL", "0000060414068917").r0'
+               ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_SERIAL", "0000060414068917").r0'
                System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_PATH", "$PDRIVE").r0'
-               System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DOCUMENT_PATH", "$PDRIVE\Documents").r0'     
-               System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR", "Wireshark Developers").r0'
+               ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DOCUMENT_PATH", "$PDRIVE\Documents").r0'    
+               ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR", "Wireshark Developers").r0'
                System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_PRODUCT", "PortableApps").r0'
-               System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR_ID", "0000").r0'
+               ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR_ID", "0000").r0'
                System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_APP_DATA_PATH", "$EXEDIR\Data").r0'
                System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_HOST_EXEC_PATH", "$EXEDIR\App\Wireshark").r0'
                System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_EXEC_PATH", "$EXEDIR\App\Wireshark").r0'
-               System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_VERSION", "1.0").r0'
+               ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_VERSION", "1.0").r0'
                System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_LANGUAGE", "1033").r0'
                StrCmp $SECONDARYLAUNCH "true" LaunchAndExit
 

diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 7269d7abe636eb1e1dc08976bbd382106a4843f0..c4ba1fc528c2830b9c37a54d1c44c6ee082dffa4 100644 (file)
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -194,6 +194,7 @@ set(QTSHARK_QRC
 
 set(QTSHARK_TS
        qtshark_de.ts
+       qtshark_en.ts # lupdate -pluralonly
        qtshark_fr.ts
        qtshark_zh_CN.ts
 )

diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
index beac38ac597b59342335b6e799ddf41e93075fb9..7ca3cc991efd02d42170183c44074211fca9ff4f 100644 (file)
--- a/ui/qt/Makefile.common
+++ b/ui/qt/Makefile.common
@@ -203,20 +203,23 @@ QRC_FILES = \
 
 #
 # .ts files.
+# qtshark_en should be pluralonly.
 #
 TS_FILES = \
+       qtshark_de.ts \
+       qtshark_en.ts \
        qtshark_fr.ts \
-       qtshark_zh_CN.ts \
-       qtshark_de.ts
+       qtshark_zh_CN.ts
 
 #
 # .qm files.
 #
 # Should be auto-generated ?
 QM_FILES = \
+       qtshark_de.qm \
+       qtshark_en.qm \
        qtshark_fr.qm \
-       qtshark_zh_CN.qm \
-       qtshark_de.qm
+       qtshark_zh_CN.qm
 
 #
 # The .rcc.cpp files generated from them.

diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index 83abfe558e3c5cd823639411ea0848e0e109c6ba..c7ba7da1e9342dd95f9c19608f9f7490b3ad1c0c 100644 (file)
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -438,10 +438,12 @@ RESOURCES += \
     welcome.qrc \
 
 
+# qtshark_en should be pluralonly.
 TRANSLATIONS = \
         qtshark_de.ts \
-        qtshark_zh_CN.ts \
-        qtshark_fr.ts
+        qtshark_en.ts \
+        qtshark_fr.ts \
+        qtshark_zh_CN.ts
 
 ICON = ../../packaging/macosx/Resources/Wireshark.icns
 

diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 1590afc06419c0fd2d6d140b903208f7e3e3e4a1..b1126f49d1b323098558c9f6ec2549c03c1101f1 100644 (file)
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -136,8 +136,9 @@ void FollowStreamDialog::fillHintLabel(int text_pos)
         hint = QString("Packet %1. ").arg(pkt);
     }
 
-    hint.append(QString("%1 client pkts, %2 server pkts, %3 turns.")
-                .arg(client_packet_count_).arg(server_packet_count_).arg(turns_));
+    hint += tr("%Ln client pkt(s), ", "", client_packet_count_)
+            + tr("%Ln server pkt(s), ", "", server_packet_count_)
+            + tr("%Ln turn(s).", "", turns_);
 
     if (pkt > 0) {
         hint.append(QString(" Click to select."));

diff --git a/ui/qt/i18n.qrc b/ui/qt/i18n.qrc
index 48eed8f2650e18aa4cc744c5687f869182623c97..e5bafa310d8c7940e16f13275b8b537d143b0f4b 100644 (file)
--- a/ui/qt/i18n.qrc
+++ b/ui/qt/i18n.qrc
@@ -22,7 +22,8 @@
 <RCC>
     <qresource prefix="/i18n">
         <file>qtshark_de.qm</file>
-        <file>qtshark_zh_CN.qm</file>
+        <file>qtshark_en.qm</file>
         <file>qtshark_fr.qm</file>
+        <file>qtshark_zh_CN.qm</file>
     </qresource>
 </RCC>

diff --git a/ui/qt/qtshark_en.qm b/ui/qt/qtshark_en.qm
new file mode 100755 (executable)
index 0000000..fc4bf1e
Binary files /dev/null and b/ui/qt/qtshark_en.qm differ

diff --git a/ui/qt/qtshark_en.ts b/ui/qt/qtshark_en.ts
new file mode 100755 (executable)
index 0000000..6b4b312
--- /dev/null
+++ b/ui/qt/qtshark_en.ts
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en">
+<context>
+    <name>FollowStreamDialog</name>
+    <message numerus="yes">
+        <location filename="follow_stream_dialog.cpp" line="139"/>
+        <source>%Ln client pkt(s), </source>
+        <translation>
+            <numerusform>%Ln client pkt, </numerusform>
+            <numerusform>%Ln client pkts, </numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="follow_stream_dialog.cpp" line="140"/>
+        <source>%Ln server pkt(s), </source>
+        <translation>
+            <numerusform>%Ln server pkt, </numerusform>
+            <numerusform>%Ln server pkts, </numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="follow_stream_dialog.cpp" line="141"/>
+        <source>%Ln turn(s).</source>
+        <translation>
+            <numerusform>%Ln turn.</numerusform>
+            <numerusform>%Ln turns.</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>SequenceDialog</name>
+    <message numerus="yes">
+        <location filename="sequence_dialog.cpp" line="284"/>
+        <source>%Ln node(s)</source>
+        <translation>
+            <numerusform>%Ln node</numerusform>
+            <numerusform>%Ln nodes</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="sequence_dialog.cpp" line="285"/>
+        <source>%Ln item(s)</source>
+        <translation>
+            <numerusform>%Ln item</numerusform>
+            <numerusform>%Ln items</numerusform>
+        </translation>
+    </message>
+</context>
+</TS>

diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index dfb954e12473b09a2a85cb2502b572d9e138a376..f814e1c5bd194d99143e08e508736803b4eb4648 100644 (file)
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -281,7 +281,8 @@ void SequenceDialog::mouseMoved(QMouseEvent *event)
     }
 
     if (hint.isEmpty()) {
-        hint += QString("%1 nodes, %2 items").arg(seq_analysis_.num_nodes).arg(num_items_);
+        hint += tr("%Ln node(s)", "", seq_analysis_.num_nodes) + QString(", ")
+                + tr("%Ln item(s)", "", num_items_);
     }
 
     hint.prepend("<small><i>");

diff --git a/wsutil/u3.c b/wsutil/u3.c
index 217d9f3bace47166114707f0eecb9c3067f58578..73bf80b9bd363acb6af08fcf57a059b871972e67 100644 (file)
--- a/wsutil/u3.c
+++ b/wsutil/u3.c
@@ -89,8 +89,6 @@ void u3_runtime_info(GString *str)
     g_string_append(str, " from a ");
   }
 
-  g_string_append(str, " U3 device");
-
   if((u3devicepath_lcl =
 #ifdef _WIN32
       getenv_utf8