From 222615e92813e45cedcedc79a1df458fea70669d Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@sugarlabs.org>
Date: Fri, 20 Feb 2009 18:09:25 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f827ce..5f19663 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,7 +24,6 @@ extensions/deviceicon/network.py
 extensions/deviceicon/speaker.py
 extensions/deviceicon/volume.py
 extensions/globalkey/screenshot.py
-extensions/globalkey/viewsource.py
 data/sugar.schemas.in
 src/jarabe/controlpanel/cmd.py
 src/jarabe/controlpanel/gui.py
@@ -56,4 +55,5 @@ src/jarabe/journal/volumestoolbar.py
 src/jarabe/view/buddymenu.py
 src/jarabe/view/keyhandler.py
 src/jarabe/view/palettes.py
+src/jarabe/view/viewsource.py
 
diff --git a/po/vi.po b/po/vi.po
index c03875d..af803fd 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -527,6 +527,7 @@ msgstr ""
 "    -g khoá       lấy giá trị hiện thời của khoá này\n"
 "     -s khoá       đặt giá trị hiện thời của khoá này\n"
 "     -c khoá       xoá giá trị hiện thời của khoá\n"
+"    "
 
 #: ../src/jarabe/controlpanel/cmd.py:50
 msgid "To apply your changes you have to restart sugar.\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ca2efc4..4300edd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -279,7 +279,7 @@ msgstr "電池電源即將用完"
 #: ../extensions/deviceicon/battery.py:149
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
-msgstr "剩餘 %(小時)d:%(分).2d"
+msgstr "剩餘 %(hour)d:%(min).2d"
 
 #: ../extensions/deviceicon/battery.py:153
 msgid "Charged"
@@ -519,6 +519,7 @@ msgstr ""
 "    -g key       取得本件值的資料 \n"
 "    -s key       設定本鍵值的資料 \n"
 "    -c key       清除本鍵值的資料 \n"
+"    "
 
 #: ../src/jarabe/controlpanel/cmd.py:50
 msgid "To apply your changes you have to restart sugar.\n"
--
cgit v0.9.1