merged translations from LP

diff --git a/NEWS b/NEWS
index 9eae635..4b45b7e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -39,8 +39,8 @@
    sensor).
 ** full french translation.
 ** merged some chinese translation provided by LP.
-** added translation files for Brazilian Portuguese, Italian, and Slovenian.
-** partial translations for Russian, Serbian, Ukrainian.
+** added translation files for Brazilian Portuguese, and Italian.
+** partial translations for Russian, Serbian, Ukrainian, Slovenian and German.
 ** psensor: fixed i18n support for the application indicator menu.
 ** psensor: fixed i18n support for the application menu.
 ** psensor: added low thresold support for alerts.

diff --git a/po/de.po b/po/de.po
index 01c0f30..bdca7db 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -13,14 +13,14 @@ msgstr ""
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-02 19:16+0000\n"
-"X-Generator: Launchpad (build 15185)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
-msgstr ""
+msgstr "Einstellungen bearbeiten"
 
 #: src/glade/psensor-pref.glade:76
 msgid "Position of sensors table:"
@@ -36,19 +36,19 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:142
 msgid "Enable menu"
-msgstr ""
+msgstr "Menü aktivieren"
 
 #: src/glade/psensor-pref.glade:161
 msgid "Enable Unity Launcher counter"
-msgstr ""
+msgstr "Wert im Starter von Unity anzeigen"
 
 #: src/glade/psensor-pref.glade:180
 msgid "Hide window on startup"
-msgstr ""
+msgstr "Fenster beim Programmstart ausblenden"
 
 #: src/glade/psensor-pref.glade:199
 msgid "Restore window position and size"
-msgstr ""
+msgstr "Fensterposition und -größe merken"
 
 #: src/glade/psensor-pref.glade:221
 msgid "Temperature unit:"
@@ -60,23 +60,23 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:295
 msgid "Foreground:"
-msgstr ""
+msgstr "Vordergrund:"
 
 #: src/glade/psensor-pref.glade:310
 msgid "Background:"
-msgstr ""
+msgstr "Hintergrund:"
 
 #: src/glade/psensor-pref.glade:346
 msgid "Background opacity:"
-msgstr ""
+msgstr "Hintergrunddeckkraft:"
 
 #: src/glade/psensor-pref.glade:369
 msgid "<i>Min</i>"
-msgstr ""
+msgstr "<i>Min.</i>"
 
 #: src/glade/psensor-pref.glade:396
 msgid "<i>Max</i>"
-msgstr ""
+msgstr "<i>Max.</i>"
 
 #: src/glade/psensor-pref.glade:422
 msgid "Colors"
@@ -84,19 +84,19 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:440
 msgid "Monitoring duration:"
-msgstr ""
+msgstr "Überwachungszeitraum:"
 
 #: src/glade/psensor-pref.glade:478
 msgid "minute(s)"
-msgstr ""
+msgstr "Minute(n)"
 
 #: src/glade/psensor-pref.glade:495 src/glade/psensor-pref.glade:647
 msgid "second(s)"
-msgstr ""
+msgstr "Sekunde(n)"
 
 #: src/glade/psensor-pref.glade:531
 msgid "Update interval:"
-msgstr ""
+msgstr "Aktualisierungsintervall:"
 
 #: src/glade/psensor-pref.glade:549
 msgid "Measures"
@@ -104,11 +104,11 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:585 src/glade/sensor-edit.glade:197
 msgid "Graph"
-msgstr ""
+msgstr "Graph"
 
 #: src/glade/psensor-pref.glade:609
 msgid "Measure update interval:"
-msgstr ""
+msgstr "Messintervall:"
 
 #: src/glade/psensor-pref.glade:666
 msgid "Sensors"
@@ -116,38 +116,38 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
-msgstr ""
+msgstr "Sensor-Einstellungen bearbeiten"
 
 #: src/glade/sensor-edit.glade:102 src/glade/sensor-edit.glade:166
 #: src/glade/sensor-edit.glade:325 src/glade/sensor-edit.glade:421
 #: src/lib/psensor.c:234 src/lib/psensor.c:482 src/ui_sensorlist.c:378
 #: src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 src/ui_notify.c:81
 msgid "N/A"
-msgstr ""
+msgstr "N/V"
 
 #: src/glade/sensor-edit.glade:119
 msgid "Name:"
-msgstr ""
+msgstr "Name:"
 
 #: src/glade/sensor-edit.glade:152
 msgid "Type:"
-msgstr ""
+msgstr "Typ:"
 
 #: src/glade/sensor-edit.glade:182
 msgid "Id:"
-msgstr ""
+msgstr "Id:"
 
 #: src/glade/sensor-edit.glade:215
 msgid "Color:"
-msgstr ""
+msgstr "Farbe:"
 
 #: src/glade/sensor-edit.glade:229
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #: src/glade/sensor-edit.glade:244
 msgid "Activate desktop notifications"
-msgstr ""
+msgstr "Benachrichtigungen aktivieren"
 
 #: src/glade/sensor-edit.glade:265
 msgid "Sensor Information"
@@ -216,7 +216,7 @@ msgstr ""
 #: src/lib/log.c:37
 #, c-format
 msgid "Cannot open log file: %s"
-msgstr ""
+msgstr "Protokolldatei kann nicht geöffnet werden: %s"
 
 #: src/lib/nvidia.c:54
 msgid "Failed to retrieve NVIDIA temperature."
@@ -232,11 +232,11 @@ msgstr ""
 
 #: src/lib/psensor.c:230 src/lib/psensor.c:477
 msgid "RPM"
-msgstr ""
+msgstr "U/min"
 
 #: src/lib/psensor.c:232 src/lib/psensor.c:480
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #: src/main.c:77
 #, c-format
@@ -247,11 +247,17 @@ msgid ""
 "This is free software: you are free to change and  redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright © %s jeanfi@gmail.com\n"
+"Lizenz GPLv2: GNU GPL Version 2 oder neuer <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"Dies ist freie Software: Sie können Sie beliebig ändern und "
+"weiterverbreiten.\n"
+"Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n"
 
 #: src/main.c:88 src/server/server.c:90
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
-msgstr ""
+msgstr "Aufruf: %s [OPTION] …\n"
 
 #: src/main.c:90
 msgid ""
@@ -261,7 +267,7 @@ msgstr ""
 
 #: src/main.c:94
 msgid "Options:"
-msgstr ""
+msgstr "Optionen:"
 
 #: src/main.c:95
 msgid ""
@@ -292,12 +298,12 @@ msgstr ""
 #: src/main.c:115 src/server/server.c:110
 #, c-format
 msgid "Report bugs to: %s\n"
-msgstr ""
+msgstr "Programmfehler melden an: %s\n"
 
 #: src/main.c:117 src/server/server.c:112
 #, c-format
 msgid "%s home page: <%s>\n"
-msgstr ""
+msgstr "%s-Website: <%s>\n"
 
 #: src/main.c:458
 msgid "Psensor has not been compiled with remote sensor support."
@@ -305,12 +311,12 @@ msgstr ""
 
 #: src/main.c:521
 msgid "Enables debug mode."
-msgstr ""
+msgstr "Fehlerdiagnosemodus wird aktiviert."
 
 #: src/main.c:533 src/server/server.c:371
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
 #: src/main.c:546
 msgid "A Psensor instance already exists."
@@ -329,7 +335,7 @@ msgstr ""
 #: src/rsensor.c:184
 #, c-format
 msgid "Invalid JSON: %s"
-msgstr ""
+msgstr "Ungültiges JSON: %s"
 
 #: src/server/server.c:52
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -401,12 +407,12 @@ msgstr ""
 #: src/server/server.c:399
 #, c-format
 msgid "WWW directory: %s"
-msgstr ""
+msgstr "WWW-Ordner: %s"
 
 #: src/server/server.c:400
 #, c-format
 msgid "URL: http://localhost:%d"
-msgstr ""
+msgstr "Adresse: http://localhost:%d"
 
 #: src/ui.c:81
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
@@ -420,19 +426,19 @@ msgstr ""
 
 #: src/ui.c:87
 msgid "About Psensor"
-msgstr ""
+msgstr "Info zu Psensor"
 
 #: src/ui.c:90
 msgid "Psensor Homepage"
-msgstr ""
+msgstr "Psensor-Website"
 
 #: src/ui.c:145 src/ui_appindicator.c:111
 msgid "_Preferences"
-msgstr ""
+msgstr "_Einstellungen"
 
 #: src/ui.c:146 src/ui_sensorlist.c:204 src/ui_appindicator.c:112
 msgid "Preferences"
-msgstr ""
+msgstr "Einstellungen"
 
 #: src/ui.c:150 src/ui_appindicator.c:116
 msgid "S_ensor Preferences"
@@ -440,15 +446,15 @@ msgstr ""
 
 #: src/ui.c:151
 msgid "Sensor Preferences"
-msgstr ""
+msgstr "Sensor-Einstellungen"
 
 #: src/ui.c:155
 msgid "_Quit"
-msgstr ""
+msgstr "_Beenden"
 
 #: src/ui.c:155
 msgid "Quit"
-msgstr ""
+msgstr "Beenden"
 
 #: src/ui.c:158
 msgid "_Help"
@@ -456,20 +462,20 @@ msgstr ""
 
 #: src/ui.c:161 src/ui_appindicator.c:122
 msgid "_About"
-msgstr ""
+msgstr "_Info"
 
 #: src/ui.c:162 src/ui_appindicator.c:124
 msgid "About"
-msgstr ""
+msgstr "Info"
 
 #: src/ui.c:184 src/ui_appindicator.c:187 src/ui_graph.c:99
 #, c-format
 msgid "building menus failed: %s"
-msgstr ""
+msgstr "Erstellen der Menüs ist gescheitert: %s"
 
 #: src/ui.c:236
 msgid "Psensor - Temperature Monitor"
-msgstr ""
+msgstr "Psensor – Temperaturüberwachung"
 
 #: src/ui.c:244
 msgid "Failed to load Psensor icon."
@@ -477,31 +483,31 @@ msgstr ""
 
 #: src/ui_sensorlist.c:235
 msgid "Select foreground color"
-msgstr ""
+msgstr "Wählen Sie eine Vordergrundfarbe"
 
 #: src/ui_sensorlist.c:312
 msgid "Sensor"
-msgstr ""
+msgstr "Sensor"
 
 #: src/ui_sensorlist.c:318
 msgid "Value"
-msgstr ""
+msgstr "Wert"
 
 #: src/ui_sensorlist.c:324
 msgid "Min"
-msgstr ""
+msgstr "Min."
 
 #: src/ui_sensorlist.c:330
 msgid "Max"
-msgstr ""
+msgstr "Max."
 
 #: src/ui_sensorlist.c:337
 msgid "Color"
-msgstr ""
+msgstr "Farbe"
 
 #: src/ui_sensorlist.c:349
 msgid "Enabled"
-msgstr ""
+msgstr "Aktiviert"
 
 #: src/ui_appindicator.c:106
 msgid "_Show"
@@ -521,7 +527,7 @@ msgstr ""
 
 #: src/ui_notify.c:77
 msgid "Temperature alert"
-msgstr ""
+msgstr "Temperaturalarm"
 
 #: src/ui_notify.c:79
 msgid "Fan alert"
@@ -529,4 +535,22 @@ msgstr ""
 
 #: src/ui_sensorpref.c:478
 msgid "Sensor Name"
-msgstr ""
+msgstr "Sensor-Name"
+
+#~ msgid "_Sensor Preferences"
+#~ msgstr "_Sensor-Einstellungen"
+
+#~ msgid "ERROR: Fail to create web server\n"
+#~ msgstr "ERROR: Erzeugen des Web-Servers gescheitert\n"
+
+#~ msgid "ERROR: no sensors detected\n"
+#~ msgstr "FEHLER: Es wurden keine Sensoren erkannt\n"
+
+#~ msgid "HTTP Request: %s\n"
+#~ msgstr "HTTP-Anfrage: %s\n"
+
+#~ msgid "ERROR: ADL library not found!\n"
+#~ msgstr "FEHLER: ADL-Bibliothek wurde nicht gefunden!\n"
+
+#~ msgid "Graph Colors"
+#~ msgstr "Graphenfarben"

diff --git a/po/fr.po b/po/fr.po
index 3cd9c3c..4365e96 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-02 19:16+0000\n"
-"X-Generator: Launchpad (build 15185)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"

diff --git a/po/ru.po b/po/ru.po
index 633f648..f6bb8dd 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-02 19:16+0000\n"
-"X-Generator: Launchpad (build 15185)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
@@ -24,7 +24,7 @@ msgstr "Изменить параметры"
 
 #: src/glade/psensor-pref.glade:76
 msgid "Position of sensors table:"
-msgstr "Положение таблицы сенсоров:"
+msgstr "Положение таблицы датчиков:"
 
 #: src/glade/psensor-pref.glade:85
 msgid "Hide window decoration"
@@ -44,7 +44,7 @@ msgstr "Включить счётчик в панеле запуска Unity"
 
 #: src/glade/psensor-pref.glade:180
 msgid "Hide window on startup"
-msgstr ""
+msgstr "Скрыть окно при запуске"
 
 #: src/glade/psensor-pref.glade:199
 msgid "Restore window position and size"
@@ -52,7 +52,7 @@ msgstr "Восстанавливать положение и размер окн
 
 #: src/glade/psensor-pref.glade:221
 msgid "Temperature unit:"
-msgstr "Единицы измерения температуры:"
+msgstr "Единица измерения температуры:"
 
 #: src/glade/psensor-pref.glade:255
 msgid "Interface"
@@ -68,7 +68,7 @@ msgstr "Фон:"
 
 #: src/glade/psensor-pref.glade:346
 msgid "Background opacity:"
-msgstr "Ð\9fрозрачность фона:"
+msgstr "Ð\9dепрозрачность фона:"
 
 #: src/glade/psensor-pref.glade:369
 msgid "<i>Min</i>"
@@ -88,11 +88,11 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:478
 msgid "minute(s)"
-msgstr ""
+msgstr "мин."
 
 #: src/glade/psensor-pref.glade:495 src/glade/psensor-pref.glade:647
 msgid "second(s)"
-msgstr "секунд(ы)"
+msgstr "сек."
 
 #: src/glade/psensor-pref.glade:531
 msgid "Update interval:"
@@ -116,7 +116,7 @@ msgstr "Датчики"
 
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
-msgstr ""
+msgstr "Изменить параметры датчика"
 
 #: src/glade/sensor-edit.glade:102 src/glade/sensor-edit.glade:166
 #: src/glade/sensor-edit.glade:325 src/glade/sensor-edit.glade:421
@@ -159,11 +159,11 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:366
 msgid "High threshold:"
-msgstr ""
+msgstr "Высший порог:"
 
 #: src/glade/sensor-edit.glade:381
 msgid "Low threshold:"
-msgstr ""
+msgstr "Нижний порог:"
 
 #: src/lib/amd.c:150
 msgid "AMD: cannot found ADL library."
@@ -224,11 +224,11 @@ msgstr "Ошибка чтения температуры NVIDIA."
 
 #: src/lib/nvidia.c:92
 msgid "Cannot open connection to X11 server."
-msgstr "Ошибка открытия соединения к X-серверу"
+msgstr "Ошибка открытия соединения к серверу X11."
 
 #: src/lib/nvidia.c:100
 msgid "Failed to retrieve NVIDIA information."
-msgstr "Ошибка получения информации NVIDIA"
+msgstr "Ошибка получения информации NVIDIA."
 
 #: src/lib/psensor.c:230 src/lib/psensor.c:477
 msgid "RPM"
@@ -259,12 +259,12 @@ msgid ""
 "Psensor is a GTK+ application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
-"Psensor это GTK+ приложение для мониторинга аппаратных датчиков, включая "
+"Psensor — это GTK+ приложение для мониторинга аппаратных датчиков, включая "
 "температуру и скорость вентилятора."
 
 #: src/main.c:94
 msgid "Options:"
-msgstr ""
+msgstr "Опции:"
 
 #: src/main.c:95
 msgid ""
@@ -275,7 +275,6 @@ msgstr ""
 "  -v, --version      показать версию и выйти"
 
 #: src/main.c:101
-#, fuzzy
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server,\n"
 "                      example: http://hostname:3131"
@@ -283,7 +282,6 @@ msgstr ""
 "  -u, --url=URL       URL psensor-сервера, пример: http://hostname:3131"
 
 #: src/main.c:104
-#, fuzzy
 msgid ""
 "  --use-libatasmart   use atasmart library for disk monitoring instead of\n"
 "                      hddtemp daemon"
@@ -297,7 +295,7 @@ msgstr ""
 
 #: src/main.c:110
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr "  -d, --debug=LEVEL   установить уровень отладки, целое между 0 и 3"
+msgstr "  -d, --debug=УРОВЕНЬ   установить уровень отладки, целое между 0 и 3"
 
 #: src/main.c:115 src/server/server.c:110
 #, c-format
@@ -387,7 +385,6 @@ msgstr ""
 "  -w,--wdir=DIR\t\tдиректория для страниц веб-сервера"
 
 #: src/server/server.c:105
-#, fuzzy
 msgid "  -d, --debug=LEVEL     set the debug level, integer between 0 and 3"
 msgstr "  -d, --debug=LEVEL   установить уровень отладки, целое между 0 и 3"
 
@@ -497,7 +494,7 @@ msgstr "Ошибка загрузки значка Psensor."
 
 #: src/ui_sensorlist.c:235
 msgid "Select foreground color"
-msgstr ""
+msgstr "Выберите цвет переднего плана"
 
 #: src/ui_sensorlist.c:312
 msgid "Sensor"

diff --git a/po/sl.po b/po/sl.po
index 99ceb72..ad18bc0 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-02 19:16+0000\n"
-"X-Generator: Launchpad (build 15185)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"

diff --git a/po/sr.po b/po/sr.po
index 57fcad8..cccb845 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-02 19:16+0000\n"
-"X-Generator: Launchpad (build 15185)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"

diff --git a/po/uk.po b/po/uk.po
index 88e7562..5c630b7 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-03 19:00+0000\n"
-"X-Generator: Launchpad (build 15190)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
@@ -64,7 +64,7 @@ msgstr "Передній план:"
 
 #: src/glade/psensor-pref.glade:310
 msgid "Background:"
-msgstr ""
+msgstr "Тло:"
 
 #: src/glade/psensor-pref.glade:346
 msgid "Background opacity:"
@@ -80,7 +80,7 @@ msgstr "<i>Макс.</i>"
 
 #: src/glade/psensor-pref.glade:422
 msgid "Colors"
-msgstr ""
+msgstr "Кольори"
 
 #: src/glade/psensor-pref.glade:440
 msgid "Monitoring duration:"
@@ -88,11 +88,11 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:478
 msgid "minute(s)"
-msgstr ""
+msgstr "хв."
 
 #: src/glade/psensor-pref.glade:495 src/glade/psensor-pref.glade:647
 msgid "second(s)"
-msgstr ""
+msgstr "сек."
 
 #: src/glade/psensor-pref.glade:531
 msgid "Update interval:"
@@ -100,11 +100,11 @@ msgstr "Інтервал оновлення:"
 
 #: src/glade/psensor-pref.glade:549
 msgid "Measures"
-msgstr ""
+msgstr "Заміри"
 
 #: src/glade/psensor-pref.glade:585 src/glade/sensor-edit.glade:197
 msgid "Graph"
-msgstr ""
+msgstr "Діаграма"
 
 #: src/glade/psensor-pref.glade:609
 msgid "Measure update interval:"
@@ -135,11 +135,11 @@ msgstr "Тип:"
 
 #: src/glade/sensor-edit.glade:182
 msgid "Id:"
-msgstr ""
+msgstr "Ідентифікатор:"
 
 #: src/glade/sensor-edit.glade:215
 msgid "Color:"
-msgstr ""
+msgstr "Колір:"
 
 #: src/glade/sensor-edit.glade:229
 msgid "Alarm"
@@ -151,7 +151,7 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:265
 msgid "Sensor Information"
-msgstr ""
+msgstr "Інформація датчика"
 
 #: src/glade/sensor-edit.glade:278
 msgid "Draw sensor curve"
@@ -216,7 +216,7 @@ msgstr ""
 #: src/lib/log.c:37
 #, c-format
 msgid "Cannot open log file: %s"
-msgstr ""
+msgstr "Не вдалося відкрити лог-файл: %s"
 
 #: src/lib/nvidia.c:54
 msgid "Failed to retrieve NVIDIA temperature."
@@ -232,7 +232,7 @@ msgstr ""
 
 #: src/lib/psensor.c:230 src/lib/psensor.c:477
 msgid "RPM"
-msgstr ""
+msgstr "об/хв"
 
 #: src/lib/psensor.c:232 src/lib/psensor.c:480
 msgid "%"
@@ -268,6 +268,8 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          показати цю довідку і вийти\n"
+"  -v, --version       показати версію і вийти"
 
 #: src/main.c:101
 #, fuzzy
@@ -282,6 +284,8 @@ msgid ""
 "  --use-libatasmart   use atasmart library for disk monitoring instead of\n"
 "                      hddtemp daemon"
 msgstr ""
+"  --use-libatasmart   використовувати бібліотеку atasmart для моніторингу\n"
+"дисків замість демона hddtemp"
 
 #: src/main.c:107
 msgid "  -n, --new-instance  force the creation of a new Psensor application"
@@ -289,7 +293,7 @@ msgstr ""
 
 #: src/main.c:110
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr ""
+msgstr "  -d, --debug=РІВЕНЬ   встановити рівень налагодження, ціле між 0 та 3"
 
 #: src/main.c:115 src/server/server.c:110
 #, c-format
@@ -355,7 +359,6 @@ msgid ""
 msgstr ""
 
 #: src/server/server.c:92
-#, fuzzy
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
 msgstr ""
@@ -412,7 +415,7 @@ msgstr ""
 #: src/server/server.c:399
 #, c-format
 msgid "WWW directory: %s"
-msgstr ""
+msgstr "WWW-директорія: %s"
 
 #: src/server/server.c:400
 #, c-format
@@ -431,7 +434,7 @@ msgstr ""
 
 #: src/ui.c:87
 msgid "About Psensor"
-msgstr ""
+msgstr "Про Psensor"
 
 #: src/ui.c:90
 msgid "Psensor Homepage"
@@ -516,7 +519,7 @@ msgstr "Увімкнен"
 
 #: src/ui_appindicator.c:106
 msgid "_Show"
-msgstr ""
+msgstr "Пок_азати"
 
 #: src/ui_appindicator.c:107
 msgid "Show"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ed854d..4c58b7f 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-02 19:16+0000\n"
-"X-Generator: Launchpad (build 15185)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
@@ -123,7 +123,7 @@ msgstr "监视设备选项"
 #: src/lib/psensor.c:234 src/lib/psensor.c:482 src/ui_sensorlist.c:378
 #: src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 src/ui_notify.c:81
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: src/glade/sensor-edit.glade:119
 msgid "Name:"
@@ -562,26 +562,3 @@ msgstr ""
 #: src/ui_sensorpref.c:478
 msgid "Sensor Name"
 msgstr "传感器名称"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -d, --debug=LEVEL     set the debug level, integer between\n"
-#~ "                        0 and 3"
-#~ msgstr "  -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数"
-
-#~ msgid "_Sensor Preferences"
-#~ msgstr "传感器首选项(_S)"
-
-#, fuzzy
-#~ msgid "hddtemp: wrong string: %s"
-#~ msgstr "错误：不正确的硬盘字符串：%s"
-
-#, fuzzy
-#~ msgid "hddtemp: wrong hdd string: %s."
-#~ msgstr "错误：不正确的硬盘字符串：%s"
-
-#~ msgid "ERROR: wrong hdd string: %s\n"
-#~ msgstr "错误：不正确的硬盘字符串：%s\n"
-
-#~ msgid "ERROR: create_sensor, wrong feature type\n"
-#~ msgstr "错误：创建传感器时，不正确的特征类型\n"

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 34ffa36..923ef29 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -594,8 +594,8 @@ uninstall-am:
        uninstall-am
 
 check-local: checkpatch.pl
-       find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl -q --no-tree  -emacs -f {} \;
-       find $(top_srcdir)/src -name \*.h -exec $(srcdir)/checkpatch.pl -q --no-tree  -emacs -f {} \;
+       find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree  -emacs -f {} \;
+       find $(top_srcdir)/src -name \*.h -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree  -emacs -f {} \;
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.