[Pkg-xfce-commits] r6678 - in goodies/trunk/xfce4-power-manager/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-04-08 14:57:33 +0000 (Sun, 08 Apr 2012)
New Revision: 6678

Added:
   goodies/trunk/xfce4-power-manager/debian/patches/02_translations-fix-invalid-format-strings.patch
Modified:
   goodies/trunk/xfce4-power-manager/debian/changelog
   goodies/trunk/xfce4-power-manager/debian/patches/series
Log:
* debian/patches:
  - 02_translations-fix-invalid-format-strings.patch: drop translated
    strings when format strings don't match the original ones. This leads
    to hard to reproduce random crashes depending on the locale used…

Modified: goodies/trunk/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/changelog	2012-04-08 14:54:21 UTC (rev 6677)
+++ goodies/trunk/xfce4-power-manager/debian/changelog	2012-04-08 14:57:33 UTC (rev 6678)
@@ -1,3 +1,12 @@
+xfce4-power-manager (1.0.11-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 02_translations-fix-invalid-format-strings.patch: drop translated
+      strings when format strings don't match the original ones. This leads
+      to hard to reproduce random crashes depending on the locale used…
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 08 Apr 2012 16:55:50 +0200
+
 xfce4-power-manager (1.0.11-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Added: goodies/trunk/xfce4-power-manager/debian/patches/02_translations-fix-invalid-format-strings.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/02_translations-fix-invalid-format-strings.patch	                        (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/02_translations-fix-invalid-format-strings.patch	2012-04-08 14:57:33 UTC (rev 6678)
@@ -0,0 +1,221 @@
+Description: Fix incorrect usage of format strings in translations
+Author: Lionel Le Folgoc <lionel at lefolgoc.net>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/975880
+Forwarded: no
+
+--- xfce4-power-manager-1.0.11.orig/po/kk.po
++++ xfce4-power-manager-1.0.11/po/kk.po
+@@ -536,16 +536,6 @@ msgstr "Сіздің %s толығыме
+ msgid "Your %s is charging"
+ msgstr "Сіздің %s зарядталуда"
+ 
+-#: ../src/xfpm-battery.c:222
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"%s until is fully charged."
+-msgstr ""
+-"%s\n"
+-"Сіздің %s зарядталуда (%i%%).\n"
+-"Толық зарядталуға дейін %s қалды."
+-
+ #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266
+ #, c-format
+ msgid "Your %s is discharging"
+@@ -556,16 +546,6 @@ msgstr "Сіздің %s өз зарядÑ
+ msgid "System is running on %s power"
+ msgstr "Жүйе %s қорегінен жұмыс істеуде"
+ 
+-#: ../src/xfpm-battery.c:242
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"Estimated time left is %s."
+-msgstr ""
+-"%s\n"
+-"Сіздің %s өз зарядын беруде (%i%%)\n"
+-"Қалған уақыты шамамен %s."
+-
+ #: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269
+ #, c-format
+ msgid "Your %s is empty"
+--- xfce4-power-manager-1.0.11.orig/po/ru.po
++++ xfce4-power-manager-1.0.11/po/ru.po
+@@ -408,16 +408,6 @@ msgstr ""
+ msgid "System is running on low power"
+ msgstr "Система работает от батареи c низким зарядом "
+ 
+-#: ../src/xfpm-power.c:955
+-#, c-format
+-msgid ""
+-"Your %s charge level is low\n"
+-"Estimated time left %s"
+-msgstr ""
+-"%s\n"
+-"Устройство (%s) разряжается (%i%%)\n"
+-"Оставшееся время работы около %s."
+-
+ #: ../src/xfpm-power.c:1158 ../src/xfpm-power.c:1163
+ msgid "Adaptor is offline"
+ msgstr "Блок питания отключен от сети"
+@@ -546,16 +536,6 @@ msgstr "Ваше устройство (%
+ msgid "Your %s is charging"
+ msgstr "Ваше устройство (%s) заряжается "
+ 
+-#: ../src/xfpm-battery.c:222
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"%s until is fully charged."
+-msgstr ""
+-"%s\n"
+-"Устройство (%s) заряжается (%i%%)\n"
+-"%s до полного заряда."
+-
+ #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266
+ #, c-format
+ msgid "Your %s is discharging"
+@@ -566,23 +546,6 @@ msgstr "Ваше устройство (%
+ msgid "System is running on %s power"
+ msgstr "Система работает от: %s"
+ 
+-#: ../src/xfpm-battery.c:242
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"Estimated time left is %s."
+-msgstr ""
+-"%s\n"
+-"Устройство (%s) разряжается (%i%%)\n"
+-"Оставшееся время работы около %s."
+-
+-#: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269
+-#, c-format
+-msgid "Your %s is empty"
+-msgstr ""
+-"%s\n"
+-"Устройство (%s) полностью разряжено"
+-
+ #: ../src/xfpm-battery.c:408
+ #, c-format
+ msgid "System is running on battery power"
+--- xfce4-power-manager-1.0.11.orig/po/fr.po
++++ xfce4-power-manager-1.0.11/po/fr.po
+@@ -559,9 +559,8 @@ msgid ""
+ "%s (%i%%)\n"
+ "%s until is fully charged."
+ msgstr ""
+-"%s\n"
+-"Votre %s est en charge (%i%%)\n"
+-"%s jusqu'a ce qu'il soit complétement chargé."
++"%s (%i%%)\n"
++"%s jusqu'a ce qu'il soit complètement chargé."
+ 
+ #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266
+ #, c-format
+@@ -579,8 +578,7 @@ msgid ""
+ "%s (%i%%)\n"
+ "Estimated time left is %s."
+ msgstr ""
+-"%s\n"
+-"Votre %s est en décharge (%i%%)\n"
++"%s (%i%%)\n"
+ "Temps restant estimé est de %s."
+ 
+ #: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269
+--- xfce4-power-manager-1.0.11.orig/po/te.po
++++ xfce4-power-manager-1.0.11/po/te.po
+@@ -535,16 +535,6 @@ msgstr "మీ %s పూర్తిగà
+ msgid "Your %s is charging"
+ msgstr "మీ %s చార్జింగ్ అవుతున్నది"
+ 
+-#: ../src/xfpm-battery.c:222
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"%s until is fully charged."
+-msgstr ""
+-"%s\n"
+-"మీ %s చార్జింగు అవుతున్నది (%i%%)\n"
+-"%s లలో పూర్తిగా చార్జ్ అవుతుంది."
+-
+ #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266
+ #, c-format
+ msgid "Your %s is discharging"
+@@ -555,16 +545,6 @@ msgstr "మీ %s డిస్చారà
+ msgid "System is running on %s power"
+ msgstr "వ్యవస్థ %s విద్యుత్ పై నడుస్తున్నది"
+ 
+-#: ../src/xfpm-battery.c:242
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"Estimated time left is %s."
+-msgstr ""
+-"%s\n"
+-"మీ %s డిస్చార్జ్ అవుతున్నది (%i%%)\n"
+-"ఇంకా మిగిలివున్న సమయం %s."
+-
+ #: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269
+ #, c-format
+ msgid "Your %s is empty"
+--- xfce4-power-manager-1.0.11.orig/po/hu.po
++++ xfce4-power-manager-1.0.11/po/hu.po
+@@ -407,16 +407,6 @@ msgstr ""
+ msgid "System is running on low power"
+ msgstr "A rendszer energiaellátása gyenge"
+ 
+-#: ../src/xfpm-power.c:955
+-#, c-format
+-msgid ""
+-"Your %s charge level is low\n"
+-"Estimated time left %s"
+-msgstr ""
+-"%s\n"
+-"A(z) %s kisül (%i%%).\n"
+-"A becsült hátralévő idő: %s."
+-
+ #: ../src/xfpm-power.c:1158 ../src/xfpm-power.c:1163
+ msgid "Adaptor is offline"
+ msgstr "Az adapter nincs csatlakoztatva"
+@@ -541,16 +531,6 @@ msgstr "A(z) %s teljesen feltöltve"
+ msgid "Your %s is charging"
+ msgstr "A(z) %s töltődik"
+ 
+-#: ../src/xfpm-battery.c:222
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"%s until is fully charged."
+-msgstr ""
+-"%s\n"
+-"A(z) %s töltődik (%i%%)\n"
+-"A teljes feltöltésig még %s van."
+-
+ #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266
+ #, c-format
+ msgid "Your %s is discharging"
+@@ -561,23 +541,6 @@ msgstr "A(z) %s kisül"
+ msgid "System is running on %s power"
+ msgstr "A rendszer %s  tápellátásról működik"
+ 
+-#: ../src/xfpm-battery.c:242
+-#, c-format
+-msgid ""
+-"%s (%i%%)\n"
+-"Estimated time left is %s."
+-msgstr ""
+-"%s\n"
+-"A(z) %s kisül (%i%%).\n"
+-"A becsült hátralévő idő: %s."
+-
+-#: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269
+-#, c-format
+-msgid "Your %s is empty"
+-msgstr ""
+-"%s\n"
+-"A(z) %s üres"
+-
+ #: ../src/xfpm-battery.c:408
+ #, c-format
+ msgid "System is running on battery power"

Modified: goodies/trunk/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/series	2012-04-08 14:54:21 UTC (rev 6677)
+++ goodies/trunk/xfce4-power-manager/debian/patches/series	2012-04-08 14:57:33 UTC (rev 6678)
@@ -1,3 +1,4 @@
+02_translations-fix-invalid-format-strings.patch
 03_trap-x-errors.patch
 04_clear-idles-for-removed-batteries.patch
 05_fix-brightness-key-modifiers.patch