Add argument markers as requested by Gettext Python standard, update translation catalog

3 files changed, 206 insertions, 25 deletions

diff --git a/po/net_monitor.pot b/po/net_monitor.pot
index d7518b8..64bde26 100644
--- a/po/net_monitor.pot
+++ b/po/net_monitor.pot
@@ -1,82 +1,263 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
+# Copyright (C) YEAR This_file_is_part_of_Mageia
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-04 14:07+CEST\n"
+"Report-Msgid-Bugs-To: http://bugs.mageia.org\n"
+"POT-Creation-Date: 2013-10-07 18:36+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-"Generated-By: pygettext.py 1.5\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-
-#: src/monitor.py:40 src/monitor.py:54
+#: ../src/monitor.py:40 ../src/monitor.py:54
 msgid "ESTABLISHED"
 msgstr ""
 
-#: src/monitor.py:41 src/monitor.py:55
+#: ../src/monitor.py:41 ../src/monitor.py:55
 msgid "SYN_SENT"
 msgstr ""
 
-#: src/monitor.py:42 src/monitor.py:56
+#: ../src/monitor.py:42 ../src/monitor.py:56
 msgid "SYN_RECV"
 msgstr ""
 
-#: src/monitor.py:43 src/monitor.py:57
+#: ../src/monitor.py:43 ../src/monitor.py:57
 msgid "FIN_WAIT1"
 msgstr ""
 
-#: src/monitor.py:44 src/monitor.py:58
+#: ../src/monitor.py:44 ../src/monitor.py:58
 msgid "FIN_WAIT2"
 msgstr ""
 
-#: src/monitor.py:45 src/monitor.py:59
+#: ../src/monitor.py:45 ../src/monitor.py:59
 msgid "TIME_WAIT"
 msgstr ""
 
-#: src/monitor.py:46
+#: ../src/monitor.py:46
 msgid "CLOSE"
 msgstr ""
 
-#: src/monitor.py:47 src/monitor.py:61
+#: ../src/monitor.py:47 ../src/monitor.py:61
 msgid "CLOSE_WAIT"
 msgstr ""
 
-#: src/monitor.py:48 src/monitor.py:62
+#: ../src/monitor.py:48 ../src/monitor.py:62
 msgid "LAST_ACK"
 msgstr ""
 
-#: src/monitor.py:49 src/monitor.py:63
+#: ../src/monitor.py:49 ../src/monitor.py:63
 msgid "LISTEN"
 msgstr ""
 
-#: src/monitor.py:50 src/monitor.py:64
+#: ../src/monitor.py:50 ../src/monitor.py:64
 msgid "CLOSING"
 msgstr ""
 
-#: src/monitor.py:101 src/monitor.py:111 src/monitor.py:125 src/monitor.py:155
-#: src/monitor.py:328 src/monitor.py:386 src/monitor.py:389
+#: ../src/monitor.py:101 ../src/monitor.py:111 ../src/monitor.py:125
+#: ../src/monitor.py:155 ../src/monitor.py:328 ../src/monitor.py:386
+#: ../src/monitor.py:389
 msgid "Unknown"
 msgstr ""
 
-#: src/monitor.py:185
+#: ../src/monitor.py:185
 msgid "No physical address"
 msgstr ""
 
-#: src/monitor.py:191 src/monitor.py:197
+#: ../src/monitor.py:191 ../src/monitor.py:197
 msgid "No address assigned"
 msgstr ""
 
-#: src/monitor.py:392
+#: ../src/monitor.py:392
 msgid "Device is offline"
 msgstr ""
 
-#: src/monitor.py:399
-msgid "%d hours, %d minutes, %d seconds"
+#: ../src/monitor.py:399
+#, python-format
+msgid "%(hours)d hours, %(mins)d minutes, %(secs)d seconds"
+msgstr ""
+
+#: ../src/net_monitor:49
+msgid "Bytes"
+msgstr ""
+
+#: ../src/net_monitor:50
+msgid "Upload"
+msgstr ""
+
+#: ../src/net_monitor:50
+msgid "Download"
+msgstr ""
+
+#: ../src/net_monitor:283
+msgid "Network monitor"
+msgstr ""
+
+#: ../src/net_monitor:344
+msgid "Please wait.."
+msgstr ""
+
+#: ../src/net_monitor:362 ../src/net_monitor:368
+msgid "Not found"
+msgstr ""
+
+#: ../src/net_monitor:369
+#, python-format
+msgid "Default routes: %(gw_message)s; DNS: %(dns_message)s"
+msgstr ""
+
+#: ../src/net_monitor:501
+#, python-format
+msgid "Network statistics for %s"
+msgstr ""
+
+#: ../src/net_monitor:514
+#, python-format
+msgid "Network traffic statistics for %s"
+msgstr ""
+
+#: ../src/net_monitor:519
+msgid "Summary"
+msgstr ""
+
+#: ../src/net_monitor:523
+msgid "Hourly traffic"
+msgstr ""
+
+#: ../src/net_monitor:527
+msgid "Daily traffic"
+msgstr ""
+
+#: ../src/net_monitor:531
+msgid "Monthly traffic"
+msgstr ""
+
+#: ../src/net_monitor:535
+msgid "Top 10 traffic days"
+msgstr ""
+
+#: ../src/net_monitor:539
+#, python-format
+msgid ""
+"Network accounting was not enabled on interface %s.\n"
+"Please enable network accounting on the interface in order to view traffic "
+"statistics and restart your network connection to start collecting traffic "
+"statistics."
+msgstr ""
+
+#: ../src/net_monitor:586
+msgid "Protocol"
+msgstr ""
+
+#: ../src/net_monitor:587
+msgid "Local address"
+msgstr ""
+
+#: ../src/net_monitor:588
+msgid "Local port"
+msgstr ""
+
+#: ../src/net_monitor:589
+msgid "Remote address"
+msgstr ""
+
+#: ../src/net_monitor:590
+msgid "Remote port"
+msgstr ""
+
+#: ../src/net_monitor:591
+msgid "Connection status"
+msgstr ""
+
+#: ../src/net_monitor:610
+msgid "connections"
+msgstr ""
+
+#: ../src/net_monitor:615
+msgid "Refresh"
+msgstr ""
+
+#: ../src/net_monitor:640
+msgid "Traffic statistics"
+msgstr ""
+
+#: ../src/net_monitor:647
+msgid "Downloaded:"
+msgstr ""
+
+#: ../src/net_monitor:649
+msgid "Uploaded:"
 msgstr ""
 
+#: ../src/net_monitor:653
+msgid "Download speed:"
+msgstr ""
+
+#: ../src/net_monitor:655
+msgid "Upload speed:"
+msgstr ""
+
+#: ../src/net_monitor:666
+msgid "Interface settings"
+msgstr ""
+
+#: ../src/net_monitor:674
+msgid "Network interface:"
+msgstr ""
+
+#: ../src/net_monitor:675
+msgid "Device status:"
+msgstr ""
+
+#: ../src/net_monitor:677
+msgid "IP Address:"
+msgstr ""
+
+#: ../src/net_monitor:679
+msgid "Hardware address:"
+msgstr ""
+
+#: ../src/net_monitor:693
+msgid "Wireless ESSID:"
+msgstr ""
+
+#: ../src/net_monitor:696
+msgid "Wireless mode:"
+msgstr ""
+
+#: ../src/net_monitor:700
+msgid "Connection speed:"
+msgstr ""
+
+#: ../src/net_monitor:703
+msgid "Access point or cell:"
+msgstr ""
+
+#: ../src/net_monitor:710
+msgid "Link quality:"
+msgstr ""
+
+#: ../src/net_monitor:731
+msgid "Traffic accounting"
+msgstr ""
+
+#: ../src/net_monitor:735
+msgid "Connection time:"
+msgstr ""
+
+#: ../src/net_monitor:738
+msgid "Show detailed network statistics"
+msgstr ""
+
+#: ../src/net_monitor:742
+msgid ""
+"Network accounting is not enabled for this interface. Please enable it in "
+"Mandriva network center in order to view detailed traffic statistics"
+msgstr ""
diff --git a/src/monitor.py b/src/monitor.py
index bc9c323..726a586 100644
--- a/src/monitor.py
+++ b/src/monitor.py
@@ -396,4 +396,4 @@ class Monitor:
             hours = uptime / 3600
             mins = (uptime - (hours * 3600)) / 60
             secs = uptime % 60
-            return _("%d hours, %d minutes, %d seconds") % (hours, mins, secs)
+            return _("%(hours)d hours, %(mins)d minutes, %(secs)d seconds") % (hours, mins, secs)
diff --git a/src/net_monitor b/src/net_monitor
index 117ddc4..cb3c513 100755
--- a/src/net_monitor
+++ b/src/net_monitor
@@ -366,7 +366,7 @@ class MonitorGui:
             gw_message = ", ".join(["%s (%s)" % (gw, iface) for gw, iface in default_routes])
         else:
             gw_message = _("Not found")
-        tray_message = _("Default routes: %s; DNS: %s") % (gw_message, dns_message)
+        tray_message = _("Default routes: %(gw_message)s; DNS: %(dns_message)s") % (gw_message, dns_message)
         self.statusbar.pop(self.context_id)
         self.statusbar.push(self.context_id, tray_message)