diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:36:06 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:51:38 -0500 |
| commit | 20b8fcfa33feeade5946bc7f3046705da5d164fe (patch) | |
| tree | 5199d13a9f18aa90ce51244c3c3eb6685d7673ab /po/zh_TW.po | |
| parent | dc94a241c30484611688a8bfb5515577f017529e (diff) | |
| parent | d11ac82062d729be5d63c9c40c5c2bb312a8b8f1 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c
Diffstat (limited to 'po/zh_TW.po')
| -rw-r--r-- | po/zh_TW.po | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index 8b3cb32d..c0217bfa 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-01-17 22:13+0100\n" +"POT-Creation-Date: 2008-01-25 03:51+0100\n" "PO-Revision-Date: 2007-07-23 23:22+0200\n" "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -26,7 +26,7 @@ msgstr "要求的動作「%s」無效。無此類動作存在。" msgid "Failed to convert the path '%s' from utf8" msgstr "轉換路徑「%s」自 utf8 時失敗" -#: openbox/actions/execute.c:97 openbox/actions/execute.c:115 +#: openbox/actions/execute.c:97 openbox/actions/execute.c:116 #, c-format msgid "Failed to execute '%s': %s" msgstr "執行「%s」時失敗：%s" @@ -285,7 +285,7 @@ msgstr "" "\n" "請向 %s 報告錯誤\n" -#: openbox/openbox.c:604 +#: openbox/openbox.c:602 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "無效的命令列引數「%s」\n" @@ -305,7 +305,14 @@ msgstr "無法於螢幕 %d 獲選為視窗管理員" msgid "The WM on screen %d is not exiting" msgstr "螢幕 %d 中的視窗管理員並未離開" -#: openbox/screen.c:1162 +#: openbox/screen.c:407 +#, c-format +msgid "" +"Openbox is configured for %d desktops, but the current session has %d. " +"Overriding the Openbox configuration." +msgstr "" + +#: openbox/screen.c:1168 #, c-format msgid "desktop %i" msgstr "桌面 %i" @@ -325,7 +332,7 @@ msgstr "無法儲存執行階段到「%s」：%s" msgid "Error while saving the session to '%s': %s" msgstr "當儲存執行階段「%s」時發生錯誤：%s" -#: openbox/startupnotify.c:237 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s\n" msgstr "正在運行 %s\n" |