merged translation from LP, fixed some fuzzy translations.

diff --git a/NEWS b/NEWS
index c2f88a4..a7e8b0b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ v1.0.1
 * fixed FTBFS due to deprecation of json_object_object_get. (Closes:
   #746145).
 * fixed typo (Celcius/Celsius).
 * fixed FTBFS due to deprecation of json_object_object_get. (Closes:
   #746145).
 * fixed typo (Celcius/Celsius).

+* Merged german translation from LP.
+* Merged turkish translation from LP (İbrahim Çelik).
+* Merged chinese translation from LP.

 
 v0.8.0.6
 --------
 
 v0.8.0.6
 --------

diff --git a/po/de.po b/po/de.po
index 214f520..cc3cc14 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -59,15 +59,15 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"
 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"

-msgstr ""
+msgstr "links"

 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"
 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"

-msgstr ""
+msgstr "Oberseite"

 
 #: src/glade/psensor-pref.glade:33
 msgid "Bottom"
 
 #: src/glade/psensor-pref.glade:33
 msgid "Bottom"

-msgstr ""
+msgstr "Unterseite"

 
 #: src/glade/psensor-pref.glade:60
 msgid "Edit Preferences"
 
 #: src/glade/psensor-pref.glade:60
 msgid "Edit Preferences"


@@ -395,7 +395,7 @@ msgid "Sensor log file already open."
 msgstr "Sensorprotokolldatei ist bereits geöffnet."
 
 #: src/lib/slog.c:105
 msgstr "Sensorprotokolldatei ist bereits geöffnet."
 
 #: src/lib/slog.c:105

-#, fuzzy, c-format
+#, c-format

 msgid "Cannot open sensor log file: %s."
 msgstr "Sensorprotokolldatei kann nicht geöffnet werden: %s."
 
 msgid "Cannot open sensor log file: %s."
 msgstr "Sensorprotokolldatei kann nicht geöffnet werden: %s."
 

diff --git a/po/es.po b/po/es.po
index 02190af..0c3c23c 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -53,7 +53,6 @@ msgid "_Help"
 msgstr "_Ayuda"
 
 #: src/glade/psensor-pref.glade:24
 msgstr "_Ayuda"
 
 #: src/glade/psensor-pref.glade:24

-#, fuzzy

 msgctxt "psensor"
 msgid "Right"
 msgstr "Derecha"
 msgctxt "psensor"
 msgid "Right"
 msgstr "Derecha"


@@ -184,9 +183,8 @@ msgid "Enable sensors logging"
 msgstr "Activar registro de sensores"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Activar registro de sensores"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Intervalo de registro de sensores"
+msgstr "Intervalo de registro de sensores:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"


@@ -259,12 +257,10 @@ msgid "Low threshold:"
 msgstr "Límite inferior"
 
 #: src/glade/sensor-edit.glade:397
 msgstr "Límite inferior"
 
 #: src/glade/sensor-edit.glade:397

-#, fuzzy

 msgid "Application Indicator"
 msgid "Application Indicator"

-msgstr "Indicador de aplicación de Ubuntu"
+msgstr "Indicador de aplicación"

 
 #: src/glade/sensor-edit.glade:411
 
 #: src/glade/sensor-edit.glade:411

-#, fuzzy

 msgid "Display sensor in the menu"
 msgstr "Mostrar sensor en el menú de aplicaciones"
 
 msgid "Display sensor in the menu"
 msgstr "Mostrar sensor en el menú de aplicaciones"
 


@@ -400,7 +396,7 @@ msgid "Sensor log file already open."
 msgstr "Ya existe un registro de sensores abierto"
 
 #: src/lib/slog.c:105
 msgstr "Ya existe un registro de sensores abierto"
 
 #: src/lib/slog.c:105

-#, fuzzy, c-format
+#, c-format

 msgid "Cannot open sensor log file: %s."
 msgstr "No se puede abrir el archivo de registro: %s."
 
 msgid "Cannot open sensor log file: %s."
 msgstr "No se puede abrir el archivo de registro: %s."
 


@@ -476,8 +472,8 @@ msgstr "  -n, --new-instance  Fuerza el inicio de otro Psensor paralelo"
 #: src/main.c:110
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 #: src/main.c:110
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""

-" -d, --debug=NIVEL   Establece el nivel de depuración con un valor entre 0 y "
-"3"
+"  -d, --debug=NIVEL   Establece el nivel de depuración con un valor entre 0 "
+"y 3"

 
 #: src/main.c:115 src/server/server.c:117
 #, c-format
 
 #: src/main.c:115 src/server/server.c:117
 #, c-format

diff --git a/po/hu.po b/po/hu.po
index 0eda500..a7d9f1a 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -184,9 +184,8 @@ msgid "Enable sensors logging"
 msgstr "Érzékelők naplózásának engedélyezése"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Érzékelők naplózásának engedélyezése"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Naplózás időköze"
+msgstr "Naplózás időköze:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"


@@ -259,12 +258,10 @@ msgid "Low threshold:"
 msgstr "Alsó küszöbérték:"
 
 #: src/glade/sensor-edit.glade:397
 msgstr "Alsó küszöbérték:"
 
 #: src/glade/sensor-edit.glade:397

-#, fuzzy

 msgid "Application Indicator"
 msgid "Application Indicator"

-msgstr "Ubuntu Alkalmazásmenü"
+msgstr ""

 
 #: src/glade/sensor-edit.glade:411
 
 #: src/glade/sensor-edit.glade:411

-#, fuzzy

 msgid "Display sensor in the menu"
 msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
 
 msgid "Display sensor in the menu"
 msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
 

diff --git a/po/it.po b/po/it.po
index 98babe3..7599c58 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -55,11 +55,11 @@ msgstr "_Aiuto"
 #: src/glade/psensor-pref.glade:24
 msgctxt "psensor"
 msgid "Right"
 #: src/glade/psensor-pref.glade:24
 msgctxt "psensor"
 msgid "Right"

-msgstr ""
+msgstr "Diritto"

 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"
 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"

-msgstr ""
+msgstr "Sinestra"

 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"
 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"


@@ -183,9 +183,8 @@ msgid "Enable sensors logging"
 msgstr "Abilita registrazione sensori"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Abilita registrazione sensori"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Intervallo registrazione sensori"
+msgstr "Intervallo registrazione sensori:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"


@@ -258,19 +257,16 @@ msgid "Low threshold:"
 msgstr "Soglia verso il basso"
 
 #: src/glade/sensor-edit.glade:397
 msgstr "Soglia verso il basso"
 
 #: src/glade/sensor-edit.glade:397

-#, fuzzy

 msgid "Application Indicator"
 msgid "Application Indicator"

-msgstr "Indicatore Applicazione Ubuntu"
+msgstr "Indicatore Applicazione"

 
 #: src/glade/sensor-edit.glade:411
 
 #: src/glade/sensor-edit.glade:411

-#, fuzzy

 msgid "Display sensor in the menu"
 msgid "Display sensor in the menu"

-msgstr "Mostra sensore nel menu indicatore Applicazione"
+msgstr "Mostra sensore nel menu"

 
 #: src/glade/sensor-edit.glade:429
 
 #: src/glade/sensor-edit.glade:429

-#, fuzzy

 msgid "Display sensor in the label (experimental)"
 msgid "Display sensor in the label (experimental)"

-msgstr "Mostra sensore nel menu indicatore Applicazione"
+msgstr ""

 
 #: src/glade/sensor-edit.glade:500
 msgid "-1"
 
 #: src/glade/sensor-edit.glade:500
 msgid "-1"


@@ -395,12 +391,11 @@ msgid "HOME variable not set."
 msgstr "Variabile HOME non impostata."
 
 #: src/lib/slog.c:96
 msgstr "Variabile HOME non impostata."
 
 #: src/lib/slog.c:96

-#, fuzzy

 msgid "Sensor log file already open."
 msgstr "File di registazione sensori già aperto."
 
 #: src/lib/slog.c:105
 msgid "Sensor log file already open."
 msgstr "File di registazione sensori già aperto."
 
 #: src/lib/slog.c:105

-#, fuzzy, c-format
+#, c-format

 msgid "Cannot open sensor log file: %s."
 msgstr "Impossibile aprire il file di registrazione sensori: %s."
 
 msgid "Cannot open sensor log file: %s."
 msgstr "Impossibile aprire il file di registrazione sensori: %s."
 

diff --git a/po/lv.po b/po/lv.po
index 0368d33..47b14de 100644 (file)
--- a/po/lv.po
+++ b/po/lv.po
@@ -183,18 +183,16 @@ msgid "Enable sensors logging"
 msgstr "Aktivizēt sensora žurnalēšanu"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Aktivizēt sensora žurnalēšanu"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Sensoru žurnalēšanas intervāls"
+msgstr "Sensoru žurnalēšanas intervāls:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "sekunde(s)"
 
 #: src/glade/psensor-pref.glade:844
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "sekunde(s)"
 
 #: src/glade/psensor-pref.glade:844

-#, fuzzy

 msgid "Script executed when an alarm is raised:"
 msgid "Script executed when an alarm is raised:"

-msgstr "Skrips izpildīts, kad trauksme ir aktivizēta"
+msgstr "Skrips izpildīts, kad trauksme ir aktivizēta:"

 
 #: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 
 #: src/glade/psensor-pref.glade:877
 msgid "Sensors"


@@ -259,12 +257,10 @@ msgid "Low threshold:"
 msgstr "Zems slieksnis:"
 
 #: src/glade/sensor-edit.glade:397
 msgstr "Zems slieksnis:"
 
 #: src/glade/sensor-edit.glade:397

-#, fuzzy

 msgid "Application Indicator"
 msgid "Application Indicator"

-msgstr "Ubuntu aplikāciju indikators"
+msgstr "Aplikāciju indikators"

 
 #: src/glade/sensor-edit.glade:411
 
 #: src/glade/sensor-edit.glade:411

-#, fuzzy

 msgid "Display sensor in the menu"
 msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
 
 msgid "Display sensor in the menu"
 msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
 

diff --git a/po/nl.po b/po/nl.po
index 723c235..aee92db 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -183,18 +183,16 @@ msgid "Enable sensors logging"
 msgstr "Logboeken bijhouden inschakelen voor sensoren"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Logboeken bijhouden inschakelen voor sensoren"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Tussenpoze voor bijhouden van logboeken voor sensoren"
+msgstr "Tussenpoze voor bijhouden van logboeken voor sensoren:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "seconden(s)"
 
 #: src/glade/psensor-pref.glade:844
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "seconden(s)"
 
 #: src/glade/psensor-pref.glade:844

-#, fuzzy

 msgid "Script executed when an alarm is raised:"
 msgid "Script executed when an alarm is raised:"

-msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt"
+msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt:"

 
 #: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 
 #: src/glade/psensor-pref.glade:877
 msgid "Sensors"


@@ -264,7 +262,6 @@ msgid "Application Indicator"
 msgstr "Ubuntu Toepassingsindicator"
 
 #: src/glade/sensor-edit.glade:411
 msgstr "Ubuntu Toepassingsindicator"
 
 #: src/glade/sensor-edit.glade:411

-#, fuzzy

 msgid "Display sensor in the menu"
 msgstr "Sensor tonen in het menu van de Toepassingsindicator"
 
 msgid "Display sensor in the menu"
 msgstr "Sensor tonen in het menu van de Toepassingsindicator"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 55d2218..15c410b 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -183,9 +183,8 @@ msgid "Enable sensors logging"
 msgstr "Habilitar registro (log) de sensores"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Habilitar registro (log) de sensores"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Intervalo de registro dos sensores"
+msgstr "Intervalo de registro dos sensores:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"

diff --git a/po/ru.po b/po/ru.po
index d6fb61c..d4b5607 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -183,9 +183,8 @@ msgid "Enable sensors logging"
 msgstr "Вести журнал событий датчиков"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Вести журнал событий датчиков"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Интервал ведения журнала событий датчиков"
+msgstr "Интервал ведения журнала событий датчиков:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"


@@ -258,19 +257,16 @@ msgid "Low threshold:"
 msgstr "Нижний порог:"
 
 #: src/glade/sensor-edit.glade:397
 msgstr "Нижний порог:"
 
 #: src/glade/sensor-edit.glade:397

-#, fuzzy

 msgid "Application Indicator"
 msgstr "Индикатор приложения"
 
 #: src/glade/sensor-edit.glade:411
 msgid "Application Indicator"
 msgstr "Индикатор приложения"
 
 #: src/glade/sensor-edit.glade:411

-#, fuzzy

 msgid "Display sensor in the menu"
 msgstr "Показать датчик в индикаторе меню приложений"
 
 #: src/glade/sensor-edit.glade:429
 msgid "Display sensor in the menu"
 msgstr "Показать датчик в индикаторе меню приложений"
 
 #: src/glade/sensor-edit.glade:429

-#, fuzzy

 msgid "Display sensor in the label (experimental)"
 msgid "Display sensor in the label (experimental)"

-msgstr "Показать датчик в индикаторе меню приложений"
+msgstr ""

 
 #: src/glade/sensor-edit.glade:500
 msgid "-1"
 
 #: src/glade/sensor-edit.glade:500
 msgid "-1"

diff --git a/po/tr.po b/po/tr.po
index 41d835e..4209c99 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -55,19 +55,19 @@ msgstr "_Yardım"
 #: src/glade/psensor-pref.glade:24
 msgctxt "psensor"
 msgid "Right"
 #: src/glade/psensor-pref.glade:24
 msgctxt "psensor"
 msgid "Right"

-msgstr ""
+msgstr "Sağ"

 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"
 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"

-msgstr ""
+msgstr "Sol"

 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"
 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"

-msgstr ""
+msgstr "Üstte"

 
 #: src/glade/psensor-pref.glade:33
 msgid "Bottom"
 
 #: src/glade/psensor-pref.glade:33
 msgid "Bottom"

-msgstr ""
+msgstr "Alt"

 
 #: src/glade/psensor-pref.glade:60
 msgid "Edit Preferences"
 
 #: src/glade/psensor-pref.glade:60
 msgid "Edit Preferences"


@@ -95,7 +95,7 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:210
 msgid "Fahrenheit"
 
 #: src/glade/psensor-pref.glade:210
 msgid "Fahrenheit"

-msgstr ""
+msgstr "Fahrenhayt"

 
 #: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 
 #: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"


@@ -183,18 +183,16 @@ msgid "Enable sensors logging"
 msgstr "Algılayıcı günlük kaydını etkinleştir"
 
 #: src/glade/psensor-pref.glade:810
 msgstr "Algılayıcı günlük kaydını etkinleştir"
 
 #: src/glade/psensor-pref.glade:810

-#, fuzzy

 msgid "Sensors logging interval:"
 msgid "Sensors logging interval:"

-msgstr "Algılayıcı günlük kaydı aralığı"
+msgstr "Algılayıcı günlük kaydı aralığı:"

 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "saniye"
 
 #: src/glade/psensor-pref.glade:844
 
 #: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "saniye"
 
 #: src/glade/psensor-pref.glade:844

-#, fuzzy

 msgid "Script executed when an alarm is raised:"
 msgid "Script executed when an alarm is raised:"

-msgstr "Alarm çaldığında betik çalıştırılır"
+msgstr "Alarm çaldığında betik çalıştırılır:"

 
 #: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 
 #: src/glade/psensor-pref.glade:877
 msgid "Sensors"


@@ -259,14 +257,12 @@ msgid "Low threshold:"
 msgstr "Düşük eşik:"
 
 #: src/glade/sensor-edit.glade:397
 msgstr "Düşük eşik:"
 
 #: src/glade/sensor-edit.glade:397

-#, fuzzy

 msgid "Application Indicator"
 msgid "Application Indicator"

-msgstr "Ubuntu Uygulama Göstergesi"
+msgstr "Uygulama Göstergesi"

 
 #: src/glade/sensor-edit.glade:411
 
 #: src/glade/sensor-edit.glade:411

-#, fuzzy

 msgid "Display sensor in the menu"
 msgid "Display sensor in the menu"

-msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster"
+msgstr "Algılayıcıları menüde göster"

 
 #: src/glade/sensor-edit.glade:429
 #, fuzzy
 
 #: src/glade/sensor-edit.glade:429
 #, fuzzy

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 85c9348..fddd02b 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -59,15 +59,15 @@ msgstr ""
 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"
 
 #: src/glade/psensor-pref.glade:27
 msgid "Left"

-msgstr ""
+msgstr "左侧"

 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"
 
 #: src/glade/psensor-pref.glade:30
 msgid "Top"

-msgstr ""
+msgstr "顶部"

 
 #: src/glade/psensor-pref.glade:33
 msgid "Bottom"
 
 #: src/glade/psensor-pref.glade:33
 msgid "Bottom"

-msgstr ""
+msgstr "底部"

 
 #: src/glade/psensor-pref.glade:60
 msgid "Edit Preferences"
 
 #: src/glade/psensor-pref.glade:60
 msgid "Edit Preferences"