Attachment 299774 Details for Bug 233898 – The diff against system-config-network 1.4.7-1

[patch] The diff against system-config-network 1.4.7-1

system-config-network-i18n-fixes.diff (text/plain), 19.58 KB, created by Andrew Zabolotny on 2008-03-31 21:58:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Zabolotny

Created: 2008-03-31 21:58:26 UTC

Size: 19.58 KB

patch

obsolete

>diff -ur system-config-network-1.4.7.orig/po/ru.po system-config-network-1.4.7/po/ru.po
>--- system-config-network-1.4.7.orig/po/ru.po	2007-12-03 12:56:54.000000000 +0300
>+++ system-config-network-1.4.7/po/ru.po	2008-04-01 00:28:06.000000000 +0400
>@@ -1,8 +1,3 @@
>-# translation of ru.po to 
>-# translation of ru.po to
>-# translation of ru.po to
>-# translation of ru.po to
>-# translation of ru.po to
> # translation of ru.po to Russian
> # Alexandr Kanevskiy <kad@blackcatlinux.com>, 2003.
> # Leonid Kanter <leon@asplinux.ru>, 2004.
>@@ -39,12 +34,12 @@
> 
> #: ../neat-control.desktop.in.h:1
> msgid "Control and monitor network devices"
>-msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°Ð¼Ð¸ ÑÐµÑÐ¸ Ð¸ Ð¼Ð¾Ð½Ð¸ÑÐ¾ÑÐ¸Ð½Ð³ ÑÑÐ°ÑÐ¸ÐºÐ°"
>+msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐµÑÐµÐ²ÑÐ¼Ð¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°Ð¼Ð¸"
> 
> #: ../neat-control.desktop.in.h:2
> #: ../src/netconfpkg/gui/neat-control.glade.h:12
> msgid "Network Device Control"
>-msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°Ð¼Ð¸ ÑÐµÑÐ¸"
>+msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐµÑÐµÐ²ÑÐ¼Ð¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°Ð¼Ð¸"
> 
> #: ../src/netconfpkg/genClass.py:254 ../src/netconf-cmd.py:329
> #, python-format
>@@ -69,21 +64,19 @@
> 
> #: ../src/netconfpkg/tui/NCTcpIp.py:95
> msgid "Use DHCP"
>-msgstr ""
>+msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ DHCP"
> 
> #: ../src/netconfpkg/tui/NCTcpIp.py:96
> msgid "Static IP"
>-msgstr ""
>+msgstr "Ð¡ÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ IP"
> 
> #: ../src/netconfpkg/tui/NCTcpIp.py:97
>-#, fuzzy
> msgid "Netmask"
>-msgstr "ÐÐ°ÑÐºÐ° Ð¿Ð¾Ð´ÑÐµÑÐ¸:"
>+msgstr "ÐÐ°ÑÐºÐ° Ð¿Ð¾Ð´ÑÐµÑÐ¸"
> 
> #: ../src/netconfpkg/tui/NCTcpIp.py:98
>-#, fuzzy
> msgid "Default gateway IP"
>-msgstr "ÐÐ´ÑÐµÑ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ ÑÐ»ÑÐ·Ð°:"
>+msgstr "ÐÐ´ÑÐµÑ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ ÑÐ»ÑÐ·Ð°"
> 
> #: ../src/netconfpkg/tui/NCTcpIp.py:106
> #: ../src/netconfpkg/tui/NCIsdnInterface.py:80
>@@ -99,45 +92,40 @@
> msgstr "ÐÑÐ¼ÐµÐ½Ð°"
> 
> #: ../src/netconfpkg/tui/NCTcpIp.py:108
>-#, fuzzy
> msgid "Devernet Configuration"
>-msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° xDSL"
>+msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Devernet"
> 
> #: ../src/netconfpkg/tui/NCIsdnInterface.py:70
> #: ../src/netconfpkg/tui/NCModemInterface.py:68
>-#, fuzzy
> msgid "ISP Phonenumber"
>-msgstr "ÐÐ¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð°:"
>+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð° Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÐ°"
> 
> #: ../src/netconfpkg/tui/NCIsdnInterface.py:71
> #: ../src/netconfpkg/tui/NCModemInterface.py:69
> msgid "ISP Login"
>-msgstr ""
>+msgstr "ÐÐ´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ"
> 
> #: ../src/netconfpkg/tui/NCIsdnInterface.py:72
> #: ../src/netconfpkg/tui/NCModemInterface.py:70
>-#, fuzzy
> msgid "ISP Password"
>-msgstr "ÐÐ°ÑÐ¾Ð»Ñ:"
>+msgstr "ÐÐ°ÑÐ¾Ð»Ñ"
> 
> #: ../src/netconfpkg/tui/NCIsdnInterface.py:73
> msgid "MSN"
>-msgstr ""
>+msgstr "MSN"
> 
> #: ../src/netconfpkg/tui/NCIsdnInterface.py:81
>-#, fuzzy
> msgid "ISDN Configuration"
>-msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð° ISDN"
>+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ISDN"
> 
> #: ../src/netconfpkg/tui/NCModemInterface.py:71
>-#, fuzzy
> msgid "Modem Initstring"
>-msgstr "Ð¡ÑÑÐ¾ÐºÐ° _Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¼Ð¾Ð´ÐµÐ¼Ð°:"
>+msgstr "Ð¡ÑÑÐ¾ÐºÐ° Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¼Ð¾Ð´ÐµÐ¼Ð°"
> 
> #: ../src/netconfpkg/tui/NCModemInterface.py:79
> #: ../src/netconfpkg/gui/modemconfig.glade.h:6
> msgid "Modem Configuration"
>-msgstr "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¼Ð¾Ð´ÐµÐ¼Ð°"
>+msgstr "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¼Ð¾Ð´ÐµÐ¼Ð°"
> 
> #: ../src/netconfpkg/NCCipe.py:152
> #, python-format
>@@ -203,33 +191,32 @@
> 
> #: ../src/netconfpkg/exception.py:53 ../src/netconfpkg/exception.py:338
> msgid "Exception Occurred"
>-msgstr ""
>+msgstr "ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°"
> 
> #: ../src/netconfpkg/exception.py:54
>-#, fuzzy
> msgid "_Debug"
>-msgstr "Ð ÐµÐ¶Ð¸Ð¼ _Ð¾ÑÐ»Ð°Ð´ÐºÐ¸"
>+msgstr "_ÐÑÐ»Ð°Ð´ÐºÐ°"
> 
> #: ../src/netconfpkg/exception.py:55
> msgid "_Save to file"
>-msgstr ""
>+msgstr "_Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð² ÑÐ°Ð¹Ð»"
> 
> #: ../src/netconfpkg/exception.py:70
>-#, fuzzy, python-format
>+#, python-format
> msgid ""
> "An unhandled exception has occurred. This is most likely a bug. Please "
> "save the crash dump and file a detailed bug report against %s at https://"
> "bugzilla.redhat.com/bugzilla"
> msgstr ""
>-"ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð¾ Ð½ÐµÐ¾Ð±ÑÐ°Ð±Ð¾ÑÐ°Ð½Ð½Ð¾Ðµ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ. Ð¡ÐºÐ¾ÑÐµÐµ Ð²ÑÐµÐ³Ð¾ ÑÑÐ¾ Ð¾ÑÐ¸Ð±ÐºÐ°. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° "
>+"ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð¾ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾Ðµ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ. Ð¡ÐºÐ¾ÑÐµÐµ Ð²ÑÐµÐ³Ð¾ ÑÑÐ¾ Ð¾ÑÐ¸Ð±ÐºÐ°. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° "
> "ÑÐºÐ¾Ð¿Ð¸ÑÑÐ¹ÑÐµ Ð¿Ð¾Ð»Ð½ÑÐ¹ ÑÐµÐºÑÑ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÐµ Ð¾ÑÐ»Ð°Ð´Ð¾ÑÐ½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð² "
>-"ÑÐ°Ð¹Ð» Ð¸ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸ÑÐµ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÑÐ¹ Ð¾ÑÑÐµÑ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐµ Ð² ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐµ system-config-"
>-"network Ð½Ð° https://bugzilla.redhat.com/bugzilla"
>+"ÑÐ°Ð¹Ð» Ð¸ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸ÑÐµ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÑÐ¹ Ð¾ÑÑÐµÑ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐµ Ð² ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐµ %s "
>+"Ð½Ð° https://bugzilla.redhat.com/bugzilla"
> 
> #: ../src/netconfpkg/exception.py:272
>-#, fuzzy, python-format
>+#, python-format
> msgid "Error: %s: %s"
>-msgstr "ÐÑÐ¸Ð±ÐºÐ°: %s, %s!"
>+msgstr "ÐÑÐ¸Ð±ÐºÐ°: %s, %s"
> 
> #: ../src/netconfpkg/exception.py:275
> #, python-format
>@@ -242,12 +229,12 @@
> 
> #: ../src/netconfpkg/exception.py:349
> msgid "Specify a file to save the dump"
>-msgstr ""
>+msgstr "Ð£ÐºÐ°Ð¶Ð¸ÑÐµ ÑÐ°Ð¹Ð» ÐºÑÐ´Ð° ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¾ÑÑÑÑ"
> 
> #: ../src/netconfpkg/exception.py:368
>-#, fuzzy, python-format
>+#, python-format
> msgid "Failed to write to file %s."
>-msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿ÐµÑÐµÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð½Ð° Ð¿ÑÐ¾ÑÐ¸Ð»Ñ %s"
>+msgstr "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°ÑÑ Ð² ÑÐ°Ð¹Ð» %s"
> 
> #: ../src/netconfpkg/exception.py:372
> #, python-format
>@@ -255,6 +242,8 @@
> "The application's state has been successfully\n"
> "written to the file '%s'."
> msgstr ""
>+"Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð±ÑÐ»Ð¾ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð¾\n"
>+"Ð² ÑÐ°Ð¹Ð» '%s'."
> 
> #: ../src/netconfpkg/NCDialup.py:32
> #: ../src/netconfpkg/gui/DialupInterfaceDialog.glade.h:63
>@@ -557,9 +546,8 @@
> msgstr "ÐÑÐµÑÐ½Ð°Ð¼"
> 
> #: ../src/netconfpkg/NCDialup.py:108
>-#, fuzzy
> msgid "Serbia"
>-msgstr "ÐÐ»Ð¶Ð¸Ñ"
>+msgstr "Ð¡ÐµÑÐ±Ð¸Ñ"
> 
> #. FIXED: [175078] String (country name) change request
> #: ../src/netconfpkg/NCDialup.py:109
>@@ -1508,14 +1496,14 @@
> msgstr ""
> 
> #: ../src/netconfpkg/gui/maindialog.py:1719 ../src/neat-control.py:175
>-#, fuzzy
> msgid ""
> "This software is distributed under the GPL. \n"
> "Please Report bugs to Red Hat's Bug Tracking \n"
> "System: http://bugzilla.redhat.com/"
> msgstr ""
>-"ÐÑÐ¾ ÐÐ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð½Ð° ÑÑÐ»Ð¾Ð²Ð¸ÑÑ GPL. Ð¡Ð¾Ð¾Ð±ÑÐ°Ð¹ÑÐµ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐ°Ñ Ð² Ð¡Ð¸ÑÑÐµÐ¼Ñ "
>-"Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð¾ÑÐ¸Ð±Ð¾Ðº Red Hat Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ: http://bugzilla.redhat.com/"
>+"ÐÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð½Ð° ÑÑÐ»Ð¾Ð²Ð¸ÑÑ GPL. \n"
>+"Ð¡Ð¾Ð¾Ð±ÑÐ°Ð¹ÑÐµ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐ°Ñ Ð² Ð¡Ð¸ÑÑÐµÐ¼Ñ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð¾ÑÐ¸Ð±Ð¾Ðº \n"
>+"Red Hat Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ: http://bugzilla.redhat.com/"
> 
> #: ../src/netconfpkg/gui/maindialog.py:1794
> #, python-format
>@@ -1630,14 +1618,12 @@
> msgstr "ÐÐ°Ð³ÑÑÐ¶Ð°ÐµÑÑÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ"
> 
> #: ../src/netconf-tui.py:152
>-#, fuzzy
> msgid "Which device type do you want to add?"
>-msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° ÑÐ¸Ð¿Ð° %s Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾!"
>+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸Ð¿ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÐµÐ¼Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°"
> 
> #: ../src/netconf-tui.py:153
>-#, fuzzy
> msgid "Add"
>-msgstr "_ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ..."
>+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ"
> 
> #: ../src/netconf-tui.py:155 ../src/netconfpkg/gui/hardwaretype.glade.h:2
> msgid "Ethernet"
>@@ -1796,7 +1782,6 @@
> msgstr "ÐÐ¼Ñ ÑÐµÑÐ¸ (SSID):"
> 
> #: ../src/netconfpkg/gui/wirelessconfig.glade.h:7
>-#, fuzzy
> msgid ""
> "Set the operating mode of the device, which depends on the network topology. "
> "The mode can be Ad-Hoc (network composed of only one cell and without Access "
>@@ -2039,7 +2024,7 @@
> #: ../src/netconfpkg/gui/ChooseProvider.glade.h:2
> #: ../src/netconfpkg/gui/DialupDruid.glade.h:15
> msgid "Internet Provider"
>-msgstr "ÐÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑ ÑÑÐ»ÑÐ³ ÐÐ½ÑÐµÑÐ½ÐµÑ"
>+msgstr "ÐÐ½ÑÐµÑÐ½ÐµÑ-ÐÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑ"
> 
> #: ../src/netconfpkg/gui/hardwaretype.glade.h:1
> msgid "Choose Hardware Type"
>@@ -2087,9 +2072,8 @@
> msgstr "ÐÑÐ±Ð¾Ñ ÑÐ¸Ð¿Ð° ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ"
> 
> #: ../src/netconfpkg/gui/ADSLInterfaceDruid.glade.h:1
>-#, fuzzy
> msgid "Account Type:"
>-msgstr "Ð¢Ð¸Ð¿ ÑÑ.Ð·Ð°Ð¿Ð¸ÑÐ¸:"
>+msgstr "Ð¢Ð¸Ð¿ ÑÑÑÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸:"
> 
> #: ../src/netconfpkg/gui/ADSLInterfaceDruid.glade.h:2
> #: ../src/netconfpkg/gui/tonline.glade.h:3
>@@ -2221,7 +2205,6 @@
> msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
> 
> #: ../src/netconfpkg/gui/tonline.glade.h:4
>-#, fuzzy
> msgid ""
> "Please enter here your personal account data. Without this data, access to T-"
> "Online is unfortunately not possible."
>@@ -2268,7 +2251,7 @@
> 
> #: ../src/netconfpkg/gui/DeviceConfigDialog.glade.h:2
> msgid "Controlled by _NetworkManager"
>-msgstr ""
>+msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÑÐµÑÑÑ ÑÐµÑÐµÐ· _NetworkManager"
> 
> #: ../src/netconfpkg/gui/DeviceConfigDialog.glade.h:3
> msgid "Enable IPv_6 configuration for this interface"
>@@ -2388,7 +2371,6 @@
> msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸Ð¿ ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¸Ñ:"
> 
> #: ../src/netconfpkg/gui/editipsec.glade.h:26
>-#, fuzzy
> msgid ""
> "Please specify your keys or generate them. \n"
> "The keys are symmetric, so your remote partner needs to have the same."
>@@ -2547,7 +2529,7 @@
> 
> #: ../src/netconfpkg/gui/maindialog.glade.h:5
> msgid "D_NS"
>-msgstr "_DNS"
>+msgstr "D_NS"
> 
> #: ../src/netconfpkg/gui/maindialog.glade.h:6
> msgid "Deactivate the selected device, calling ifdown <device>."
>@@ -2567,11 +2549,11 @@
> 
> #: ../src/netconfpkg/gui/maindialog.glade.h:11
> msgid "Do_main:"
>-msgstr "ÐÐ¾Ð¼ÐµÐ½:"
>+msgstr "_ÐÐ¾Ð¼ÐµÐ½:"
> 
> #: ../src/netconfpkg/gui/maindialog.glade.h:12
> msgid "H_osts"
>-msgstr "Ð£_Ð·Ð»Ñ"
>+msgstr "_Ð£Ð·Ð»Ñ"
> 
> #: ../src/netconfpkg/gui/maindialog.glade.h:13
> msgid "Hard_ware"
>@@ -2998,9 +2980,8 @@
> msgstr "ÐÐ±ÑÐ°ÑÐ½ÑÐ¹ _Ð²ÑÐ·Ð¾Ð²"
> 
> #: ../src/netconfpkg/gui/DialupInterfaceDialog.glade.h:3
>-#, fuzzy
> msgid "Callback MS_N:"
>-msgstr "_Ð ÐµÐ¶Ð¸Ð¼ Ð¾Ð±ÑÐ°ÑÐ½Ð¾Ð³Ð¾ Ð²ÑÐ·Ð¾Ð²Ð°:"
>+msgstr "ÐÐ±ÑÐ°ÑÐ½ÑÐ¹ Ð²ÑÐ·Ð¾Ð² MS_N:"
> 
> #: ../src/netconfpkg/gui/DialupInterfaceDialog.glade.h:4
> msgid "Callback _delay:"
>@@ -3585,36 +3566,3 @@
> msgid "ISDN Adapters Configuration"
> msgstr "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð°Ð´Ð°Ð¿ÑÐµÑÐ° ISDN"
> 
>-#~ msgid "Static routes file %s is invalid"
>-#~ msgstr "Ð¤Ð°Ð¹Ð» ÑÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ñ Ð¼Ð°ÑÑÑÑÑÐ¾Ð² %s Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹"
>-
>-#~ msgid "Displaying main screen"
>-#~ msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð³Ð¾ ÑÐºÑÐ°Ð½Ð°"
>-
>-#~ msgid "What do you want to configure?"
>-#~ msgstr "Ð§ÑÐ¾ Ð²Ñ ÑÐ¾ÑÐ¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¸ÑÑ?"
>-
>-#~ msgid "Configure"
>-#~ msgstr "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ"
>-
>-#~ msgid "Exit"
>-#~ msgstr "ÐÑÑÐ¾Ð´"
>-
>-#~ msgid ""
>-#~ "This software is distributed under the GPL. Please report bugs to Red "
>-#~ "Hat's bug tracking system: http://bugzilla.redhat.com/"
>-#~ msgstr ""
>-#~ "ÐÑÐ¾ ÐÐ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð½Ð° ÑÑÐ»Ð¾Ð²Ð¸ÑÑ GPL. Ð¡Ð¾Ð¾Ð±ÑÐ°Ð¹ÑÐµ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐ°Ñ Ð² Ð¡Ð¸ÑÑÐµÐ¼Ñ "
>-#~ "Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð¾ÑÐ¸Ð±Ð¾Ðº Red Hat Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ: http://bugzilla.redhat.com/"
>-
>-#~ msgid "Yugoslavia"
>-#~ msgstr "Ð®Ð³Ð¾ÑÐ»Ð°Ð²Ð¸Ñ"
>-
>-#~ msgid "DMA0:"
>-#~ msgstr "DMA0:"
>-
>-#~ msgid "DMA1:"
>-#~ msgstr "DMA1:"
>-
>-#~ msgid "Resource"
>-#~ msgstr "Ð ÐµÑÑÑÑÑ"
>diff -ur system-config-network-1.4.7.orig/src/neat-control.py system-config-network-1.4.7/src/neat-control.py
>--- system-config-network-1.4.7.orig/src/neat-control.py	2007-11-12 12:04:23.000000000 +0300
>+++ system-config-network-1.4.7/src/neat-control.py	2008-04-01 01:15:00.000000000 +0400
>@@ -35,9 +35,10 @@
> import locale
> from rhpl.translate import _, N_, textdomain_codeset
> locale.setlocale(locale.LC_ALL, "")
>-textdomain_codeset(PROGNAME, locale.nl_langinfo(locale.CODESET))
>+textdomain_codeset(PROGNAME, "utf-8")
> import __builtin__
> __builtin__.__dict__['_'] = _
>+__builtin__.__dict__['__'] = lambda s: _(s).decode ("utf-8").encode (locale.nl_langinfo(locale.CODESET))
> 
> import signal
> import os
>@@ -47,9 +48,9 @@
> try:
> import gtk
> except RuntimeError:
>- sys.stderr.write(_("ERROR: Unable to initialize graphical environment. ") + \
>- _("Most likely cause of failure is that the tool was not run using a graphical environment. ") + \
>- _("Please either start your graphical user interface or set your DISPLAY variable.\n"))
>+ sys.stderr.write(__("ERROR: Unable to initialize graphical environment. ") + \
>+ __("Most likely cause of failure is that the tool was not run using a graphical environment. ") + \
>+ __("Please either start your graphical user interface or set your DISPLAY variable.\n"))
> sys.exit(0)
> 
> import gtk.glade
>@@ -118,6 +119,8 @@
> pix.set_from_pixbuf(get_pixbuf('neat-control-logo.png'))
> clist = self.xml.get_widget('interfaceClist')
> clist.column_titles_passive ()
>+ for x in 0,1,2:
>+ clist.set_column_auto_resize (x, True)
> 
> self.devicelist = self.getProfDeviceList()
> self.activedevicelist = NetworkDevice().get()
>diff -ur system-config-network-1.4.7.orig/src/netconfpkg/gui/GUI_functions.py system-config-network-1.4.7/src/netconfpkg/gui/GUI_functions.py
>--- system-config-network-1.4.7.orig/src/netconfpkg/gui/GUI_functions.py	2007-11-12 14:19:52.000000000 +0300
>+++ system-config-network-1.4.7/src/netconfpkg/gui/GUI_functions.py	2008-04-01 01:52:51.000000000 +0400
>@@ -19,6 +19,7 @@
> import os
> import gtk
> import gtk.glade
>+import locale
> 
> from netconfpkg.NC_functions import *
> from netconfpkg import NC_functions
>@@ -407,7 +408,7 @@
> gtk.main_iteration()
> 
> if len( fdin ):
>- s = os.read( read, 100 )
>+ s = os.read( read, 100 ).decode (locale.nl_langinfo(locale.CODESET)).encode ("utf-8")
> rc = rc + s
> 
> except Exception, e:
>@@ -540,7 +541,7 @@
> raise CancelException
> 
> if len( fdin ):
>- s = os.read( read, 1024 )
>+ s = os.read( read, 1024 ).decode (locale.nl_langinfo(locale.CODESET)).encode ("utf-8")
> rc = rc + s
> iter = buffer.get_end_iter()
> buffer.insert( iter, str( s ) )
>diff -ur system-config-network-1.4.7.orig/src/netconfpkg/gui/maindialog.py system-config-network-1.4.7/src/netconfpkg/gui/maindialog.py
>--- system-config-network-1.4.7.orig/src/netconfpkg/gui/maindialog.py	2007-12-03 12:47:08.000000000 +0300
>+++ system-config-network-1.4.7/src/netconfpkg/gui/maindialog.py	2008-04-01 01:19:20.000000000 +0400
>@@ -159,9 +159,20 @@
> 
> load_icon("network.xpm", self.dialog)
> 
>- self.xml.get_widget ("deviceList").column_titles_passive ()
>- self.xml.get_widget ("hardwareList").column_titles_passive ()
>- self.xml.get_widget ("hostsList").column_titles_passive ()
>+ clist = self.xml.get_widget ("deviceList")
>+ clist.column_titles_passive ()
>+ for x in 0,1,2,3,4:
>+ clist.set_column_auto_resize (x, True)
>+
>+ clist = self.xml.get_widget ("hardwareList")
>+ clist.column_titles_passive ()
>+ for x in 1,2,3:
>+ clist.set_column_auto_resize (x, True)
>+
>+ clist = self.xml.get_widget ("hostsList")
>+ clist.column_titles_passive ()
>+ for x in 0,1,2:
>+ clist.set_column_auto_resize (x, True)
> 
> notebook = self.xml.get_widget('mainNotebook')
> widget = self.xml.get_widget('deviceFrame')
>diff -ur system-config-network-1.4.7.orig/src/netconfpkg/gui/neat-control-debugdialog.glade system-config-network-1.4.7/src/netconfpkg/gui/neat-control-debugdialog.glade
>--- system-config-network-1.4.7.orig/src/netconfpkg/gui/neat-control-debugdialog.glade	2007-11-12 18:15:32.000000000 +0300
>+++ system-config-network-1.4.7/src/netconfpkg/gui/neat-control-debugdialog.glade	2008-04-01 01:03:13.000000000 +0400
>@@ -8,7 +8,7 @@
> <property name="type">GTK_WINDOW_TOPLEVEL</property>
> <property name="window_position">GTK_WIN_POS_NONE</property>
> <property name="modal">True</property>
>- <property name="default_width">322</property>
>+ <property name="default_width">400</property>
> <property name="default_height">325</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
>diff -ur system-config-network-1.4.7.orig/src/netconfpkg/gui/NewInterfaceDruid.glade system-config-network-1.4.7/src/netconfpkg/gui/NewInterfaceDruid.glade
>--- system-config-network-1.4.7.orig/src/netconfpkg/gui/NewInterfaceDruid.glade	2007-11-12 18:15:32.000000000 +0300
>+++ system-config-network-1.4.7/src/netconfpkg/gui/NewInterfaceDruid.glade	2008-04-01 01:26:35.000000000 +0400
>@@ -9,7 +9,7 @@
> <property name="type">GTK_WINDOW_TOPLEVEL</property>
> <property name="window_position">GTK_WIN_POS_NONE</property>
> <property name="modal">True</property>
>- <property name="default_width">500</property>
>+ <property name="default_width">550</property>
> <property name="default_height">400</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
>@@ -49,7 +49,7 @@
> 		<widget class="GtkHPaned" id="hpaned1">
> 		 <property name="visible">True</property>
> 		 <property name="can_focus">True</property>
>-		 <property name="position">155</property>
>+		 <property name="position">180</property>
> 
> 		 <child>
> 		 <widget class="GtkScrolledWindow" id="scrolledwindow1">
>diff -ur system-config-network-1.4.7.orig/src/netconfpkg/NC_functions.py system-config-network-1.4.7/src/netconfpkg/NC_functions.py
>--- system-config-network-1.4.7.orig/src/netconfpkg/NC_functions.py	2007-11-15 14:15:11.000000000 +0300
>+++ system-config-network-1.4.7/src/netconfpkg/NC_functions.py	2008-04-01 01:23:38.000000000 +0400
>@@ -39,7 +39,7 @@
> import locale
> from rhpl.translate import _, N_, textdomain_codeset
> locale.setlocale(locale.LC_ALL, "")
>-textdomain_codeset(PROGNAME, locale.nl_langinfo(locale.CODESET))
>+textdomain_codeset(PROGNAME, "utf-8")
> import __builtin__
> __builtin__.__dict__['_'] = _
> 
>diff -ur system-config-network-1.4.7.orig/src/netconf.py system-config-network-1.4.7/src/netconf.py
>--- system-config-network-1.4.7.orig/src/netconf.py	2007-10-24 17:29:46.000000000 +0400
>+++ system-config-network-1.4.7/src/netconf.py	2008-04-01 00:58:28.000000000 +0400
>@@ -40,9 +40,10 @@
> import locale
> from rhpl.translate import _, N_, textdomain_codeset
> locale.setlocale(locale.LC_ALL, "")
>-textdomain_codeset(PROGNAME, locale.nl_langinfo(locale.CODESET))
>+textdomain_codeset(PROGNAME, "utf-8")
> import __builtin__
> __builtin__.__dict__['_'] = _
>+__builtin__.__dict__['__'] = lambda s: _(s).decode ("utf-8").encode (locale.nl_langinfo(locale.CODESET))
> 
> os.environ["PYgtk_FATAL_EXCEPTIONS"] = '1'
> 
>@@ -52,9 +53,9 @@
> try:
> from netconfpkg.exception import handleException
> except RuntimeError, msg:
>- print _("Error: %s, %s!") % (PROGNAME, msg)
>+ print __("Error: %s, %s!") % (PROGNAME, msg)
> if os.path.isfile("/usr/sbin/system-config-network-tui"):
>- print _("Starting text version")
>+ print __("Starting text version")
> os.execv("/usr/sbin/system-config-network-tui", sys.argv)
> sys.exit(10)
> 
>@@ -69,9 +70,9 @@
> try:
> import gtk
> except RuntimeError:
>- sys.stderr.write(_("ERROR: Unable to initialize graphical environment. ") + \
>- _("Most likely cause of failure is that the tool was not run using a graphical environment. ") + \
>- _("Please either start your graphical user interface or set your DISPLAY variable.\n"))
>+ sys.stderr.write(__("ERROR: Unable to initialize graphical environment. ") + \
>+ __("Most likely cause of failure is that the tool was not run using a graphical environment. ") + \
>+ __("Please either start your graphical user interface or set your DISPLAY variable.\n"))
> sys.exit(0)
> 
> def get_pixpath(pixmap_file):

Actions: View | Diff

Attachments on bug 233898: 299774