fixed duplicate

merged translation

diff --git a/NEWS b/NEWS
index 8c2ba4c..a77ea41 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@
 ** Added keywords in .desktop file.
 ** Added LFS support.
 ** Fixed compilation issue for x32 architecture on 64bits systems.
+** Merged German translation from LP (Dennis Baudys).
+** Merged Spanish translation from LP (Javier).
+** Merged French translation from LP (londumas).
+** Merged Brazilian translation from LP (Celio Alves).
 
 * v0.8.0.3
 

diff --git a/po/de.po b/po/de.po
index 6b9fa92..644c7dc 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 "POT-Creation-Date: 2013-10-16 09:19+0200\n"
-"PO-Revision-Date: 2013-05-12 16:51+0000\n"
+"PO-Revision-Date: 2013-05-20 21:13+0000\n"
 "Last-Translator: Dennis Baudys <Unknown>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-20 08:44+0000\n"
-"X-Generator: Launchpad (build 16626)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #: src/glade/psensor.glade:5 src/ui_appindicator.c:124
 msgid "About"

diff --git a/po/es.po b/po/es.po
index 6b1e496..2eee923 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 "POT-Creation-Date: 2013-10-16 09:19+0200\n"
-"PO-Revision-Date: 2013-04-01 09:00+0000\n"
+"PO-Revision-Date: 2013-05-12 22:16+0000\n"
 "Last-Translator: Javier <buik8roadmaster@hotmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-20 08:36+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #: src/glade/psensor.glade:5 src/ui_appindicator.c:124
 msgid "About"

diff --git a/po/fr.po b/po/fr.po
index 2fc6a91..3b035be 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 "POT-Creation-Date: 2013-10-16 09:19+0200\n"
-"PO-Revision-Date: 2013-04-20 19:57+0000\n"
-"Last-Translator: Jean-Philippe Orsini <Unknown>\n"
+"PO-Revision-Date: 2013-06-29 15:14+0000\n"
+"Last-Translator: londumas <helion331990@gmail.com>\n"
 "Language-Team: French <>\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-20 08:44+0000\n"
-"X-Generator: Launchpad (build 16626)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #: src/glade/psensor.glade:5 src/ui_appindicator.c:124
 msgid "About"
@@ -48,7 +48,7 @@ msgstr "_Aide"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
-msgstr "Préférences"
+msgstr "Modifier les préférences"
 
 #: src/glade/psensor-pref.glade:72
 msgid "Position of sensors table:"
@@ -165,11 +165,11 @@ msgstr "Préférences des capteurs"
 
 #: src/glade/sensor-edit.glade:87
 msgid "Name"
-msgstr "Nom:"
+msgstr "Nom :"
 
 #: src/glade/sensor-edit.glade:138
 msgid "Type:"
-msgstr "Type:"
+msgstr "Type :"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
@@ -325,7 +325,7 @@ msgstr "Le journal des capteurs est déjà ouvert."
 #: src/lib/slog.c:87
 #, fuzzy, c-format
 msgid "Cannot open sensor log file: %s."
-msgstr "Ne peut ouvrir le journal: %s."
+msgstr "Ne peut ouvrir le journal : %s."
 
 #: src/lib/slog.c:118
 msgid "Sensor log file not open."

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 38c9a83..e19e29d 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 "POT-Creation-Date: 2013-10-16 09:19+0200\n"
-"PO-Revision-Date: 2013-03-12 16:07+0000\n"
-"Last-Translator: MestreLion <launchpad@rodrigosilva.com>\n"
+"PO-Revision-Date: 2013-09-01 18:54+0000\n"
+"Last-Translator: Celio Alves <Unknown>\n"
 "Language-Team: Brazilian Portuguese\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-20 08:36+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #: src/glade/psensor.glade:5 src/ui_appindicator.c:124
 msgid "About"
@@ -40,7 +40,7 @@ msgstr "Psensor - Monitor de temperatura"
 
 #: src/glade/psensor.glade:111
 msgid "_Psensor"
-msgstr ""
+msgstr "_Psensor"
 
 #: src/glade/psensor.glade:158
 msgid "_Help"
@@ -165,7 +165,7 @@ msgstr "Editar preferências do sensor"
 
 #: src/glade/sensor-edit.glade:87
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: src/glade/sensor-edit.glade:138
 msgid "Type:"
@@ -248,12 +248,12 @@ msgstr "AMD: não foi possível obter número de adaptadores."
 #: src/lib/amd.c:252
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgstr "Número de adaptadores AMD/ATI: %d"
 
 #: src/lib/amd.c:253
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgstr "Número de adaptadores AMD/ATI ativos: %d"
 
 #: src/lib/hdd_atasmart.c:152
 #, c-format
@@ -597,7 +597,7 @@ msgstr ""
 
 #: src/ui_appindicator.c:118
 msgid "SensorPreferences"
-msgstr ""
+msgstr "Preferências do Sensor"
 
 #: src/ui_appindicator.c:122
 msgid "_About"