working rules, fi_FI for testing, XML fixed

diff --git a/cell-modem-ui/debian/changelog b/cell-modem-ui/debian/changelog
index f6149d8..9dfc606 100644 (file)
--- a/cell-modem-ui/debian/changelog
+++ b/cell-modem-ui/debian/changelog
@@ -9,12 +9,12 @@ cell-modem-ui (0.5-1) unstable; urgency=low
     - Dutch (thanks danielronde)
     - Spanish (thanks ikerrg)
     - Polish (thanks Tomaszd)
-  * Finetuned icons. 
+  * Finetuned icons. (TBD)
      Some have found new icons to be confusing for people who are 
      not aware of N900's history of being a cellularless Tablet 
      and Tablet Mode making no sense to them with the current icon.
 
- -- Tuomo Tanskanen <tumi@tumi.fi>  Fri, 19 Feb 2010 14:13:08 +0200
+ -- Tuomo Tanskanen <tumi@tumi.fi>  Fri, 19 Feb 2010 16:32:52 +0200
 
 cell-modem-ui (0.4-2) unstable; urgency=low
 

diff --git a/cell-modem-ui/debian/rules b/cell-modem-ui/debian/rules
index 576a029..87a3051 100755 (executable)
--- a/cell-modem-ui/debian/rules
+++ b/cell-modem-ui/debian/rules
@@ -46,10 +46,42 @@ install: build
        cp $(CURDIR)/etc/systemui/*.xml $(CURDIR)/debian/tmp/opt/cell-modem-ui/
 
        # install our translations by hand
-       for i in fi_FI en_GB en_US es_ES fr_FR sv_SE pl_PL nl_NL it_IT de_DE; do
-               mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/$i/LC_MESSAGES
-               msgfmt $(CURDIR)/po/$i.po -o $(CURDIR)/debian/tmp/usr/share/locale/$i/LC_MESSAGES/cell-modem-ui.mo
-       done
+#      for i in en_GB en_US es_ES fi_FI fr_FR de_DE it_IT nl_NL pl_PL sv_SE; 
+#      do
+#              mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/$i/LC_MESSAGES
+#              msgfmt $(CURDIR)/po/$i.po -o $(CURDIR)/debian/tmp/usr/share/locale/$i/LC_MESSAGES/cell-modem-ui.mo
+#      done
+
+       # why the above won't work?
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/fi_FI/LC_MESSAGES
+       msgfmt $(CURDIR)/po/fi_FI.po -o $(CURDIR)/debian/tmp/usr/share/locale/fi_FI/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/sv_SE/LC_MESSAGES
+       msgfmt $(CURDIR)/po/sv_SE.po -o $(CURDIR)/debian/tmp/usr/share/locale/sv_SE/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/es_ES/LC_MESSAGES
+       msgfmt $(CURDIR)/po/es_ES.po -o $(CURDIR)/debian/tmp/usr/share/locale/es_ES/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/de_DE/LC_MESSAGES
+       msgfmt $(CURDIR)/po/de_DE.po -o $(CURDIR)/debian/tmp/usr/share/locale/de_DE/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/fr_FR/LC_MESSAGES
+       msgfmt $(CURDIR)/po/fr_FR.po -o $(CURDIR)/debian/tmp/usr/share/locale/fr_FR/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/it_IT/LC_MESSAGES
+       msgfmt $(CURDIR)/po/it_IT.po -o $(CURDIR)/debian/tmp/usr/share/locale/it_IT/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/nl_NL/LC_MESSAGES
+       msgfmt $(CURDIR)/po/nl_NL.po -o $(CURDIR)/debian/tmp/usr/share/locale/nl_NL/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/pl_PL/LC_MESSAGES
+       msgfmt $(CURDIR)/po/pl_PL.po -o $(CURDIR)/debian/tmp/usr/share/locale/pl_PL/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/en_GB/LC_MESSAGES
+       msgfmt $(CURDIR)/po/en_GB.po -o $(CURDIR)/debian/tmp/usr/share/locale/en_GB/LC_MESSAGES/cell-modem-ui.mo
+
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/locale/en_US/LC_MESSAGES
+       msgfmt $(CURDIR)/po/en_US.po -o $(CURDIR)/debian/tmp/usr/share/locale/en_US/LC_MESSAGES/cell-modem-ui.mo
 
 binary-indep: build install
 

diff --git a/cell-modem-ui/etc/systemui/cell-modem-ui.xml b/cell-modem-ui/etc/systemui/cell-modem-ui.xml
index d336008..bb4e927 100644 (file)
--- a/cell-modem-ui/etc/systemui/cell-modem-ui.xml
+++ b/cell-modem-ui/etc/systemui/cell-modem-ui.xml
@@ -1,5 +1,5 @@
 <powerkeymenu path="/">
- <menuitem priority="401" name="Phone mode" visible="tablet_state">
+ <menuitem priority="401" name="cellmodemui_phone_mode" visible="tablet_state">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
        path="/com/nokia/phone/SSC"
@@ -10,9 +10,10 @@
     <argument type="boolean">true</argument>
   </callback>
   <icon>control_bluetooth_phone</icon>
+  <po>cell-modem-ui</po>
  </menuitem>
 
- <menuitem priority="401" name="Phone mode" visible="inactive">
+ <menuitem priority="401" name="cellmodemui_phone_mode" visible="inactive">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
        path="/com/nokia/phone/SSC"
@@ -23,9 +24,10 @@
     <argument type="boolean">true</argument>
   </callback>
   <icon>control_bluetooth_phone</icon>
+  <po>cell-modem-ui</po>
  </menuitem>
 
- <menuitem priority="401" name="Tablet mode" visible="online">
+ <menuitem priority="401" name="cellmodemui_tablet_mode" visible="online">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
        path="/com/nokia/phone/SSC"
@@ -36,9 +38,10 @@
     <argument type="boolean">false</argument>
   </callback>
   <icon>control_device_setup</icon>
+  <po>cell-modem-ui</po>
  </menuitem>
 
- <menuitem priority="401" name="Tablet mode" visible="activation_pending">
+ <menuitem priority="401" name="cellmodemui_tablet_mode" visible="activation_pending">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
        path="/com/nokia/phone/SSC"
@@ -49,9 +52,10 @@
     <argument type="boolean">false</argument>
   </callback>
   <icon>control_device_setup</icon>
+  <po>cell-modem-ui</po>
  </menuitem>
 
- <menuitem priority="401" name="Tablet mode" visible="activation_failed">
+ <menuitem priority="401" name="cellmodemui_tablet_mode" visible="activation_failed">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
        path="/com/nokia/phone/SSC"
@@ -62,9 +66,10 @@
     <argument type="boolean">false</argument>
   </callback>
   <icon>control_device_setup</icon>
+  <po>cell-modem-ui</po>
  </menuitem>
 
- <menuitem priority="401" name="Tablet mode" visible="selection_failed">
+ <menuitem priority="401" name="cellmodemui_tablet_mode" visible="selection_failed">
   <keyfile>/var/run/ssc</keyfile>
   <callback service="com.nokia.phone.SSC"
        path="/com/nokia/phone/SSC"
@@ -75,5 +80,6 @@
     <argument type="boolean">false</argument>
   </callback>
   <icon>control_device_setup</icon>
+  <po>cell-modem-ui</po>
  </menuitem>
 </powerkeymenu>

diff --git a/cell-modem-ui/po/fi_FI.po b/cell-modem-ui/po/fi_FI.po
index b463b5a..a745000 100644 (file)
--- a/cell-modem-ui/po/fi_FI.po
+++ b/cell-modem-ui/po/fi_FI.po
@@ -17,8 +17,8 @@ msgstr ""
 
 #: cell-modem-ui.xml
 msgid "cellmodemui_tablet_mode"
-msgstr "Tablet mode"
+msgstr "Käytä Tablettina"
 
 #: cell-modem-ui.xml
 msgid "cellmodemui_phone_mode"
-msgstr "Phone mode"
+msgstr "Käytä Puhelimena"