[meego-commits] 7592: Changes to MeeGo:1.0:Netbook:Update:Testing/gnome-bluetooth

[daihan]

Hi,
I have made the following changes to gnome-bluetooth in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
daihan

[This message was auto-generated]

---

Request #7592:

  submit:   home:daihan:branches:MeeGo:1.0:Netbook:Update:Testing/gnome-bluetooth(r3)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/gnome-bluetooth


Message:
    add a po patch to fix BMC#1263, 1376 

State:   new          2010-09-18T18:23:30 daihan
Comment: None



changes files:
--------------
--- gnome-bluetooth.changes
+++ gnome-bluetooth.changes
@@ -0,0 +1,3 @@
+* Sun Sep 20 2010 Han Dai <han.dai at intel.com> 2.30.0_20100511
+- Add BMC_1263_1376_po_update.patch to fix BMC#1263,1376.
+

new:
----
  BMC_1263_1376_po_update.patch

spec files:
-----------
--- gnome-bluetooth.spec
+++ gnome-bluetooth.spec
@@ -9,6 +9,7 @@
 Source1: 61-gnome-bluetooth-rfkill.rules
 Patch0:  connect-handsfree-gateway.patch
 Patch1:  Enable-Button_4042.patch
+Patch2:  BMC_1263_1376_po_update.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,6 +92,7 @@
 %setup -q -n gnome-bluetooth-%{version}
 %patch0 -p1 -b .connect-handsfree-gateway
 %patch1 -p1 -b .Enable-Button_4042
+%patch2 -p1 -b .BMC_1263_1376_po_update.patch
 
 %build
 %autogen --enable-moblin --enable-gtk-doc --disable-scrollkeeper --disable-desktop-update --disable-static --disable-nautilus-sendto

other changes:
--------------

++++++ BMC_1263_1376_po_update.patch (new)
--- BMC_1263_1376_po_update.patch
+++ BMC_1263_1376_po_update.patch
+diff -Nur gnome-bluetooth-2.30.0_20100511/po/de.po gnome-bluetooth-2.30.0_20100511.new/po/de.po
+--- gnome-bluetooth-2.30.0_20100511/po/de.po	2010-05-11 23:19:14.000000000 +0800
++++ gnome-bluetooth-2.30.0_20100511.new/po/de.po	2010-09-17 14:27:44.000000000 +0800
+@@ -811,6 +811,61 @@
+ msgid "bluetooth"
+ msgstr "bluetooth"
+ 
++#: ../moblin/moblin-panel.c:177
++#, c-format
++msgid "%d hour"
++msgid_plural "%d hours"
++msgstr[0] "%d Stunde"
++msgstr[1] "%d Stunden"
++
++#: ../moblin/moblin-panel.c:179
++#, c-format
++msgid "%d minute"
++msgid_plural "%d minutes"
++msgstr[0] "%d Minute"
++msgstr[1] "%d Minuten"
++
++#: ../moblin/moblin-panel.c:182
++#, c-format
++msgid "%d second"
++msgid_plural "%d seconds"
++msgstr[0] "%d Sekunde"
++msgstr[1] "%d Sekunden"
++
++#. hour:minutes:seconds
++#: ../moblin/moblin-panel.c:188
++#, c-format
++msgid "%s %s %s"
++msgstr "%s %s %s"
++
++#. minutes:seconds
++#: ../moblin/moblin-panel.c:192
++#, c-format
++msgid "%s %s"
++msgstr "%s %s"
++
++#. minutes
++#. seconds
++#: ../moblin/moblin-panel.c:195 ../moblin/moblin-panel.c:199
++#, c-format
++msgid "%s"
++msgstr "%s"
++
++#. 0 seconds
++#: ../moblin/moblin-panel.c:202
++msgid "0 seconds"
++msgstr "0 Sekunden"
++
++
++#: ../moblin/moblin-panel.c:224
++#, c-format
++msgid ""
++"Your computer is visible on\n"
++"Bluetooth for %s."
++msgstr ""
++"Dein Computer ist %s\n"
++"auf Bluetooth sichtbar."
++
+ #: ../moblin/moblin-panel.c:533
+ #, c-format
+ msgid "Pairing with %s failed."
+@@ -847,6 +902,10 @@
+ msgid "Device setup"
+ msgstr "Geräte-Inbetriebnahme"
+ 
++#: ../moblin/moblin-panel.c:1472 ../moblin/moblin-panel.c:1605
++msgid "Settings"
++msgstr "Einstellungen"
++
+ #: ../moblin/moblin-panel.c:1344
+ msgid "Only show:"
+ msgstr "Nur zeigen:"
+diff -Nur gnome-bluetooth-2.30.0_20100511/po/fi.po gnome-bluetooth-2.30.0_20100511.new/po/fi.po
+--- gnome-bluetooth-2.30.0_20100511/po/fi.po	2010-05-11 23:19:14.000000000 +0800
++++ gnome-bluetooth-2.30.0_20100511.new/po/fi.po	2010-09-17 14:48:32.000000000 +0800
+@@ -797,6 +797,60 @@
+ msgid "bluetooth"
+ msgstr "bluetooth"
+ 
++#: ../moblin/moblin-panel.c:177
++#, c-format
++msgid "%d hour"
++msgid_plural "%d hours"
++msgstr[0] "%d tunti"
++msgstr[1] "%d tuntia"
++
++#: ../moblin/moblin-panel.c:179
++#, c-format
++msgid "%d minute"
++msgid_plural "%d minutes"
++msgstr[0] "%d minuutti"
++msgstr[1] "%d minuuttia"
++
++#: ../moblin/moblin-panel.c:182
++#, c-format
++msgid "%d second"
++msgid_plural "%d seconds"
++msgstr[0] "%d sekunti"
++msgstr[1] "%d sekuntia"
++
++#. hour:minutes:seconds
++#: ../moblin/moblin-panel.c:188
++#, c-format
++msgid "%s %s %s"
++msgstr "%s %s %s"
++
++#. minutes:seconds
++#: ../moblin/moblin-panel.c:192
++#, c-format
++msgid "%s %s"
++msgstr "%s %s"
++
++#. minutes
++#. seconds
++#: ../moblin/moblin-panel.c:195 ../moblin/moblin-panel.c:199
++#, c-format
++msgid "%s"
++msgstr "%s"
++
++#. 0 seconds
++#: ../moblin/moblin-panel.c:202
++msgid "0 seconds"
++msgstr "0 sekuntia"
++
++#: ../moblin/moblin-panel.c:224
++#, c-format
++msgid ""
++"Your computer is visible on\n"
++"Bluetooth for %s."
++msgstr ""
++"Tietokoneesi on näkyvissä\n"
++"Bluetoothissä %s."
++
+ #: ../moblin/moblin-panel.c:533
+ #, c-format
+ msgid "Pairing with %s failed."
+@@ -833,6 +887,10 @@
+ msgid "Device setup"
+ msgstr "Laiteasetukset"
+ 
++#: ../moblin/moblin-panel.c:1472 ../moblin/moblin-panel.c:1605
++msgid "Settings"
++msgstr "Asetukset"
++
+ #: ../moblin/moblin-panel.c:1344
+ msgid "Only show:"
+ msgstr "Näytä vain:"
+diff -Nur gnome-bluetooth-2.30.0_20100511/po/fr.po gnome-bluetooth-2.30.0_20100511.new/po/fr.po
+--- gnome-bluetooth-2.30.0_20100511/po/fr.po	2010-05-11 23:19:14.000000000 +0800
++++ gnome-bluetooth-2.30.0_20100511.new/po/fr.po	2010-09-17 14:22:19.000000000 +0800
+@@ -815,6 +815,60 @@
+ msgid "bluetooth"
+ msgstr "bluetooth"
+ 
++#: ../moblin/moblin-panel.c:177
++#, c-format
++msgid "%d hour"
++msgid_plural "%d hours"
++msgstr[0] "%d heure"
++msgstr[1] "%d heures"
++
++#: ../moblin/moblin-panel.c:179
++#, c-format
++msgid "%d minute"
++msgid_plural "%d minutes"
++msgstr[0] "%d minute"
++msgstr[1] "%d minutes"
++
++#: ../moblin/moblin-panel.c:182
++#, c-format
++msgid "%d second"
++msgid_plural "%d seconds"
++msgstr[0] "%d seconde"
++msgstr[1] "%d secondes"
++
++#. hour:minutes:seconds
++#: ../moblin/moblin-panel.c:188
++#, c-format
++msgid "%s %s %s"
++msgstr "%s %s %s"
++
++#. minutes:seconds
++#: ../moblin/moblin-panel.c:192
++#, c-format
++msgid "%s %s"
++msgstr "%s %s"
++
++#. minutes
++#. seconds
++#: ../moblin/moblin-panel.c:195 ../moblin/moblin-panel.c:199
++#, c-format
++msgid "%s"
++msgstr "%s"
++
(783 more lines skipped)