[Xfce4-commits] <orage:master> I18n: Update translation zh_CN (96%).

Transifex noreply at xfce.org
Mon Sep 9 12:32:05 CEST 2013


Updating branch refs/heads/master
         to b6dd7c7078b1cb9d7a1fa5c37a328828abfec7a7 (commit)
       from 241e4025d35ac1ec9fcbb0ef4930a6286ba9ade5 (commit)

commit b6dd7c7078b1cb9d7a1fa5c37a328828abfec7a7
Author: 玉堂白鹤 <yjwork at qq.com>
Date:   Mon Sep 9 12:31:01 2013 +0200

    I18n: Update translation zh_CN (96%).
    
    794 translated messages, 27 untranslated messages.
    
    Transifex (https://www.transifex.com/projects/p/xfce/).

 po/zh_CN.po | 1065 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 497 insertions(+), 568 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2d79092..18804fd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,26 +1,27 @@
-# Simplified Chinese translations for
-# the orage package.
-# This file is distributed under the same license as
-# the orage package.
-# Yongtao Yang <yongtao.yang at telia.com>, 2004.
-# Huang Huan <unicon221 at gmail.com>, 2006.
-# Chris K. Zhang <plutino at gmail.com>, 2009.
-# Aron Xu <aronmalache at 163.com>, 2009.
-# Hunt Xu <huntxu at live.cn>, 2009, 2011.
-# Chipong Luo <chipong.luo at yahoo.com>, 2011, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aron Xu <aronmalache at 163.com>, 2009
+# Chipong Luo <chipong.luo at yahoo.com>, 2011-2012
+# Chris K. Zhang <plutino at gmail.com>, 2009
+# Huang Huan <unicon221 at gmail.com>, 2006
+# Hunt Xu <huntxu at live.cn>, 2009,2011
+# 玉堂白鹤 <yjwork at qq.com>, 2013
+# Yongtao Yang <yongtao.yang at telia.com>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: orage\n"
-"Report-Msgid-Bugs-To: <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-02-15 21:29+0800\n"
-"Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
-"Language-Team: Chinese (Simplified) <xfce-i18n-cn at xfce.org>\n"
-"Language: zh_CN\n"
+"Project-Id-Version: Xfce Apps\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 22:14+0200\n"
+"PO-Revision-Date: 2013-09-09 08:51+0000\n"
+"Last-Translator: 玉堂白鹤 <yjwork at qq.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../globaltime/globaltime.c:100
@@ -37,9 +38,7 @@ msgstr "无法提升全球时间窗口"
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"点击修改时钟"
+msgstr "%s\n点击修改时钟"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -49,9 +48,7 @@ msgstr "本地时间"
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"按钮 1 更改首选项\n"
-"按钮 2 调整时钟时间"
+msgstr "按钮 1 更改首选项\n按钮 2 调整时钟时间"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -60,9 +57,7 @@ msgstr "调整以更改小时"
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"调整以更改分钟。点击带按钮 2 的箭头只更改 "
-"1 分钟。"
+msgstr "调整以更改分钟。点击带按钮 2 的箭头只更改 1 分钟。"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -339,7 +334,7 @@ msgstr "不更改"
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2675
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "位置"
@@ -400,18 +395,18 @@ msgstr "UTC"
 msgid "floating"
 msgstr "浮动"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "全球时间"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage 全球时间"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "显示不同国家的时钟"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "全球时间"
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "外观"
@@ -483,12 +478,7 @@ msgid ""
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"短期(少于 5 小时)挂起或休眠而且在您可见的"
-"时间不包含秒时才需要此选项。在这些情况下,"
-"除非您选了此项,Orage 时钟显示的时间可能"
-"不准确。(选中此项会防止使 cpu 和中断保留"
-"功能起作用。)"
+msgstr "短期(少于 5 小时)挂起或休眠而且在您可见的时间不包含秒时才需要此选项。在这些情况下,除非您选了此项,Orage 时钟显示的时间可能不准确。(选中此项会防止使 cpu 和中断保留功能起作用。)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -500,15 +490,7 @@ msgid ""
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"此程序使用 strftime 函数获取时间。使用\n"
-"任何有效的代码获取您偏爱格式的时间。一些\n"
-"常用代码是:\n"
-"\t%A 为工作日\t\t\t%B 为月\n"
-"\t%c 为日期和时间\t\t%R 为小时和分钟\n"
-"\t%V 为周数\t\t%Z 为使用的时区\n"
-"\t%H 为小时\t\t\t\t%M 为分钟\n"
-"\t%X 为本地时间\t\t\t%x 为本地日期"
+msgstr "此程序使用 strftime 函数获取时间。使用\n任何有效的代码获取您偏爱格式的时间。一些\n常用代码是:\n\t%A 为工作日\t\t\t%B 为月\n\t%c 为日期和时间\t\t%R 为小时和分钟\n\t%V 为周数\t\t%Z 为使用的时区\n\t%H 为小时\t\t\t\t%M 为分钟\n\t%X 为本地时间\t\t\t%x 为本地日期"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
@@ -523,7 +505,7 @@ msgstr "Orage 时钟首选项"
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%Y-%B-%d %A/%V"
@@ -539,7 +521,7 @@ msgstr "用 Orage 管理您的时间"
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2704
 msgid "End"
 msgstr "结束"
 
@@ -547,13 +529,13 @@ msgstr "结束"
 msgid "Due"
 msgstr "到期"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:844
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:251 ../src/parameters.c:359
 msgid "Select a file..."
 msgstr "选择文件..."
 
@@ -561,227 +543,246 @@ msgstr "选择文件..."
 msgid "Sound Files"
 msgstr "声音文件"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:264
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "已修改约会信息。"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1195 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "你要继续吗?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "不,不要离开"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "是的,忽略修改并离开"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "约会结束时间早于开始时间。"
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1827
 msgid "Not set"
 msgstr "没有设置"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1194
 msgid "This appointment will be permanently removed."
 msgstr "会永久移除此约会。"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1196 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1197
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1282 ../src/appointment.c:1297 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "选取日期"
+
+#: ../src/appointment.c:1284 ../src/appointment.c:1299 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "今天"
+
+#: ../src/appointment.c:1707
 msgid "This appointment does not exist."
 msgstr "此约会不存在。"
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1708
 msgid "It was probably removed, please refresh your screen."
 msgstr "它可能已被移除,请刷新屏幕。"
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2009
 msgid "Current categories"
 msgstr "当前类别"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2024
 msgid "Add new category with color"
 msgstr "添加新的颜色类别"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2028
 msgid "Category:"
 msgstr "类别:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2059
 msgid "Colors of categories - Orage"
 msgstr "类别的颜色-Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2105
 msgid " *** COPY ***"
 msgstr "*** 复制 ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2366
 msgid "New appointment - Orage"
 msgstr "新建约会-Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2395 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:736 ../src/mainbox.c:279
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2401
 msgid "Sav_e and close"
 msgstr "保存并关闭(_E)"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2414 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "重复(_U)"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2601
 msgid "Save"
 msgstr "保存"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2603
 msgid "Save and close"
 msgstr "保存并关闭"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2608
 msgid "Revert"
 msgstr "重置"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2610 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "重复"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2615 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2633
 msgid "Free"
 msgstr "空闲"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2633
 msgid "Busy"
 msgstr "繁忙"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2637
 msgid "General"
 msgstr "一般"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2643
 msgid "Type "
 msgstr "类型 "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2645 ../src/event-list.c:1176
 msgid "Event"
 msgstr "事件"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2648
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"某时要发生的事件,比如:\n"
-"会议、生日或电视节目。"
+msgstr "某时要发生的事件,比如:\n会议、生日或电视节目。"
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2651 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "待办"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2654
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"某时您应该做的事情,比如:\n"
-"洗车或测试新版 Orage。"
+msgstr "某时您应该做的事情,比如:\n洗车或测试新版 Orage。"
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2657 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "日志"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2661
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"记录发生的事情,比如:\n"
-"记录妈妈的电话或初雪到来。"
+msgstr "记录发生的事情,比如:\n记录妈妈的电话或初雪到来。"
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2668
 msgid "Title "
 msgstr "标题 "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2683
 msgid "All day event"
 msgstr "全天事件"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2689 ../src/appointment.c:3350 ../src/day-view.c:801
 msgid "Start"
 msgstr "开始"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2709
 msgid "Set      "
 msgstr "设置      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2730
 msgid "Duration"
 msgstr "持续时间"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2734 ../src/appointment.c:2924 ../src/reminder.c:758
 msgid "days"
 msgstr "天"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2736 ../src/appointment.c:2926 ../src/reminder.c:760
 msgid "hours"
 msgstr "小时"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2738 ../src/appointment.c:2928 ../src/reminder.c:762
 msgid "mins"
 msgstr "分钟"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2750
 msgid "Availability"
 msgstr "有效性"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2758 ../src/appointment.c:3356
 msgid "Completed"
 msgstr "完成"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2761
 msgid "Done"
 msgstr "做完"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2782
 msgid "Categories"
 msgstr "类别"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2794
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"这个特殊类别可用来在列表视图中将本约会"
-"彩色显示。"
+msgstr "这个特殊类别可用来在列表视图中将本约会彩色显示。"
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2799
 msgid "update colors for categories."
 msgstr "更新类别的颜色。"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2805
 msgid "Priority"
 msgstr "优先级"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2815
 msgid "Note"
 msgstr "备注"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2836
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -790,139 +791,124 @@ msgid ""
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"这些简略命令立即生效:\n"
-"    <D> 以本地日期格式插入当前日期\n"
-"    <T> 插入时间和\n"
-"    <DT> 插入日期和时间。\n"
-"\n"
-"这些只有在后来看见它们时才会转换:\n"
-"    <&Ynnnn> 转换为当前的年减去 nnnn。\n"
-"(此用来如在生日提醒中显示这个人的年龄。)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "这些简略命令立即生效:\n    <D> 以本地日期格式插入当前日期\n    <T> 插入时间和\n    <DT> 插入日期和时间。\n\n这些只有在后来看见它们时才会转换:\n    <&Ynnnn> 转换为当前的年减去 nnnn。\n(此用来如在生日提醒中显示这个人的年龄。)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:2907
 msgid "Before Start"
 msgstr "开始前"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:2907
 msgid "Before End"
 msgstr "结束前"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:2908
 msgid "After Start"
 msgstr "开始后"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:2908
 msgid "After End"
 msgstr "结束后"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:2915
 msgid "Alarm"
 msgstr "闹铃"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:2921
 msgid "Alarm time"
 msgstr "闹铃时间"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:2945
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"通常您要有闹铃:\n"
-" 1) 事件发生前\n"
-" 2) 待办结束前\n"
-" 3) 待办开始后"
+msgstr "通常您要有闹铃:\n 1) 事件发生前\n 2) 待办结束前\n 3) 待办开始后"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:2950
 msgid "Persistent alarm"
 msgstr "持续闹铃"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:2952
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"闹铃响时,如果您要即使还没激活 Orage 时"
-"也提醒您,选择此项。"
+msgstr "闹铃响时,如果您要即使还没激活 Orage 时也提醒您,选择此项。"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:2961
 msgid "Sound"
 msgstr "声音"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:2965 ../src/appointment.c:3085
 msgid "Use"
 msgstr "使用"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:2967
 msgid "Select this if you want audible alarm"
 msgstr "如果您要可听的闹铃则选择此项"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:2984
 msgid "Repeat alarm sound"
 msgstr "重复闹铃声音"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3000 ../src/appointment.c:3299
 msgid "times"
 msgstr "时间"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3016
 msgid "sec interval"
 msgstr "秒间隔"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3026
 msgid "Visual"
 msgstr "可见"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3030
 msgid "Use Orage window"
 msgstr "使用 Orage 窗口"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3032
 msgid "Select this if you want Orage window alarm"
 msgstr "如果您要 Orage 窗口闹铃则选择此项"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3044
 msgid "Use notification"
 msgstr "使用通知"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3046
 msgid "Select this if you want notification alarm"
 msgstr "如果您要通知闹铃则选择此项"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3052
 msgid "Set timeout"
 msgstr "设置超时"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3054
 msgid "Select this if you want notification to expire automatically"
 msgstr "如果您要通知自动终止则选择此项"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3065
 msgid "0 = system default expiration time"
 msgstr "0 为系统默认终止时间"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3070
 msgid "seconds"
 msgstr "秒"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3081
 msgid "Procedure"
 msgstr "步骤"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3087
 msgid "Select this if you want procedure or script alarm"
 msgstr "如果您要步骤或脚本闹铃则选择此项"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3093
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -932,164 +918,150 @@ msgid ""
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"您必须自己输入所有退格键等字符。\n"
-"此字符串仅用于进程 shell。\n"
-"在运行时会替换以下特殊命令:\n"
-"\t<&T>  约会标题\n"
-"\t<&D>  约会描述\n"
-"\t<&AT> 闹铃时间\n"
-"\t<&ST> 约会开始时间\n"
-"\t<&ET> 约会结束时间"
-
-#: ../src/appointment.c:3094
+msgstr "您必须自己输入所有退格键等字符。\n此字符串仅用于进程 shell。\n在运行时会替换以下特殊命令:\n\t<&T>  约会标题\n\t<&D>  约会描述\n\t<&AT> 闹铃时间\n\t<&ST> 约会开始时间\n\t<&ET> 约会结束时间"
+
+#: ../src/appointment.c:3105
 msgid "Test this alarm by raising it now"
 msgstr "现在触发闹铃来测试"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3112
 msgid "<b>Default alarm</b>"
 msgstr "<b>默认闹铃</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3120
 msgid "Store current settings as default alarm"
 msgstr "把当前设置存为默认闹铃"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3125
 msgid "Set current settings from default alarm"
 msgstr "从默认闹铃设置当前设置"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3187
 msgid "None"
 msgstr "无"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3187
 msgid "Daily"
 msgstr "每天"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3187
 msgid "Weekly"
 msgstr "每周"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3187
 msgid "Monthly"
 msgstr "每月"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3187
 msgid "Yearly"
 msgstr "每年"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3187
 msgid "Hourly"
 msgstr "每小时"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3189
 msgid "Mon"
 msgstr "星期一"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3189
 msgid "Tue"
 msgstr "星期二"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3189
 msgid "Wed"
 msgstr "星期三"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3189
 msgid "Thu"
 msgstr "星期四"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3189
 msgid "Fri"
 msgstr "星期五"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3189
 msgid "Sat"
 msgstr "星期六"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3189
 msgid "Sun"
 msgstr "星期日"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3194
 msgid "Recurrence"
 msgstr "重复发生"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3200
 msgid "Complexity"
 msgstr "复杂度"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3203
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3209
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3213
 msgid "Use this if you want regular repeating event"
 msgstr "如果您要规则的重复事件则使用它"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3215
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"使用它,如果您需要复杂的时间如:\n"
-"  每星期六和星期日,或\n"
-"  每月的第一个星期二"
+msgstr "使用它,如果您需要复杂的时间如:\n  每星期六和星期日,或\n  每月的第一个星期二"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3221
 msgid "Frequency"
 msgstr "频率"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3227
 msgid "Each"
 msgstr "每个"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3234
 msgid "occurrence"
 msgstr "发生"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3238
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"限定频率为特定间隔。\n"
-" 比如:每三天:\n"
-" 频率为每天且间隔为 3"
+msgstr "限定频率为特定间隔。\n 比如:每三天:\n 频率为每天且间隔为 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3283
 msgid "Limit"
 msgstr "限定"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3285
 msgid "Repeat forever"
 msgstr "一直重复"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3291
 msgid "Repeat "
 msgstr "重复 "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3307
 msgid "Repeat until "
 msgstr "重复直到 "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3320
 msgid "Weekdays"
 msgstr "工作日"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3332
 msgid "Which day"
 msgstr "哪一天"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3340
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1097,125 +1069,108 @@ msgid ""
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"指定月事件和年事件的哪个工作日。\n"
-" 比如:\n"
-" 每月的第二个星期三:\n"
-"\t频率为每月,\n"
-"\t工作日为只检查星期三,\n"
-"\t哪一天为从星期三下的数字中选择 2"
+msgstr "指定月事件和年事件的哪个工作日。\n 比如:\n 每月的第二个星期三:\n\t频率为每月,\n\t工作日为只检查星期三,\n\t哪一天为从星期三下的数字中选择 2"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3347
 msgid "TODO base"
 msgstr "待办基本"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3360
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"待办有规律地在开始时间启动并在每个间隔后"
-"重复,它会重复发生而不管上次是何时完成的"
+msgstr "待办有规律地在开始时间启动并在每个间隔后重复,它会重复发生而不管上次是何时完成的"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3362
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"待办基于完成时间在从上次完成时间计时的"
-"间隔后重复发生。\n"
-"(注意重复发生基本在每次完成后改变,"
-"所以您不能知道待办的任何相关历史。)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "待办基于完成时间在从上次完成时间计时的间隔后重复发生。\n(注意重复发生基本在每次完成后改变,所以您不能知道待办的任何相关历史。)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3368
 msgid "Exceptions"
 msgstr "例外"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3381
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"在下面点击日历天数添加更多例外日期。\n"
-"例外取决于选择要么排除(-)要么包括(+)。\n"
-"点击数据移除。"
+msgstr "在下面点击日历天数添加更多例外日期。\n例外取决于选择要么排除(-)要么包括(+)。\n点击数据移除。"
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3386
 msgid "Add excluded date (-)"
 msgstr "添加排除日期(-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3388
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "排除天数是约会不会发生的全天"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3394
 msgid "Add included time (+)"
 msgstr "添加包括时间(+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3396
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"包括时间与开始时间的时区相同,但可能时间"
-"不同"
+msgstr "包括时间与开始时间的时区相同,但可能时间不同"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3413
 msgid "Action dates"
 msgstr "动作日期"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:305
 msgid "_View"
 msgstr "视图(_V)"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "转到(_G)"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "新建"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "后退"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "今天"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "前进"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:757
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       要显示的天数"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage-日视图"
 
@@ -1224,89 +1179,83 @@ msgstr "Orage-日视图"
 msgid "All day"
 msgstr "所有天"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "时间"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "没有选择任何行。"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "点击一行选择,之后您可以复制它。"
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "将永久移除所有\n选中的约会。"
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"将永久移除所有\n"
-"选中的约会。"
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "后退"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "前进"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "查找"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "日视图"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "要显示的额外天数 "
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "日志条目开始于:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "搜索"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "搜索文字 "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "标签"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "标题"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"双击编辑本行。\n"
-"\n"
-"标签顺序:\n"
-"\t 1. 闹铃:n 为无闹铃\n"
-"\t\t A 为视觉闹铃,S 也为声音闹铃\n"
-"\t 2. 重复发生:n 为不重复\n"
-"\t\t D 为每天,W 为每周,M 为每月,Y 为每年\n"
-"\t 3. 类型:f 为空闲,B 为忙\n"
-"\t 4. 定位于该文件中:\n"
-"\t\tO 为 Orage,A 为归档文件,F 为外部文件\n"
-"\t 5. 约会类型:\n"
-"\t\tE 为事件,T 为待办,J 为日志"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "选取日期"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
@@ -1371,20 +1320,16 @@ msgstr "归档移除已完成\n"
 msgid "Orage default alarm"
 msgstr "Orage 默认闹铃"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3141
 #, c-format
 msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"生成闹铃列表:添加 %d 个闹铃。处理 %d 个"
-"事件。"
+msgstr "生成闹铃列表:添加 %d 个闹铃。处理 %d 个事件。"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3143
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t找到 %d 个闹铃,其中 %d 个已激活。"
-"(搜索了 %d 个重复发生闹铃。)"
+msgstr "\t找到 %d 个闹铃,其中 %d 个已激活。(搜索了 %d 个重复发生闹铃。)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1402,360 +1347,324 @@ msgstr "...将时区修正为 Orage 格式。"
 msgid "Import file preprocessing done"
 msgstr "导入文件预处理已完成"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:258
 msgid "Calendar files"
 msgstr "日历文件"
 
-#: ../src/interface.c:631
+#: ../src/interface.c:605
 msgid "Current foreign files"
 msgstr "当前外部文件"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:617
 msgid "READ ONLY"
 msgstr "只读"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:619
 msgid "READ WRITE"
 msgstr "读写"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:637
 msgid "***** No foreign files *****"
 msgstr "***** 无外部文件 *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:888
 msgid "Import/export"
 msgstr "导入/导出"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:895
 msgid "Import"
 msgstr "导入"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:900
 msgid "Read from file:"
 msgstr "从文件读取:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:917
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"用逗号(,)隔开文件名。\n"
-" 注意:对 Orage 来说在文件名中逗号不是\n"
-" 有效的字符。"
+msgstr "用逗号(,)隔开文件名。\n 注意:对 Orage 来说在文件名中逗号不是\n 有效的字符。"
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:922
 msgid "Export"
 msgstr "导出"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:927
 msgid "Write to file:"
 msgstr "写入文件:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:948 ../src/interface.c:960
 msgid "Select"
 msgstr "选择"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:951
 msgid "All appointments"
 msgstr "所有约会"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:964
 msgid "Named appointments: "
 msgstr "已命名的约会:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:976
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"注意只读取了主文件约会。\n"
-"没有导入已归档和外部事件。"
+msgstr "注意只读取了主文件约会。\n没有导入已归档和外部事件。"
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:979
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"注意只读取了主文件约会。\n"
-"没有导入外部事件。"
+msgstr "注意只读取了主文件约会。\n没有导入外部事件。"
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:982
 msgid "You can easily drag these from event-list window."
-msgstr ""
-"您可以很容易地从事件列表窗口中拖动这些。"
+msgstr "您可以很容易地从事件列表窗口中拖动这些。"
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:984
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage UID 用逗号隔开。"
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:990
 msgid "Archive"
 msgstr "归档"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:998
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "现在归档(阈值:%d 月)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1008
 msgid "You can change archive threshold in parameters"
 msgstr "您可以在参数中改变归档阈值"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1015
 msgid "Revert archive now"
 msgstr "现在重置归档"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1021
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"导入所有已归档事件至 orage 文件并移除归档\n"
-"文件。这在如导出并移动 Orage 约会至另一\n"
-"系统时有用。"
+msgstr "导入所有已归档事件至 orage 文件并移除归档\n文件。这在如导出并移动 Orage 约会至另一\n系统时有用。"
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1032
 msgid "Orage files"
 msgstr "Orage 文件"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1039
 msgid "Orage main calendar file"
 msgstr "Orage 主日历文件"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
+#: ../src/interface.c:1044 ../src/interface.c:1109
 msgid "Current file"
 msgstr "当前文件"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
+#: ../src/interface.c:1051 ../src/interface.c:1116
 msgid "New file"
 msgstr "新建文件"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
+#: ../src/interface.c:1067 ../src/interface.c:1133
 msgid "Action options"
 msgstr "动作选项"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1070 ../src/interface.c:1136
 msgid "Rename"
 msgstr "重命名"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1074
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"只重命名 Orage 内部文件。\n"
-"一点也不涉及外部文件系统。\n"
-"新文件必须存在。"
+msgstr "只重命名 Orage 内部文件。\n一点也不涉及外部文件系统。\n新文件必须存在。"
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1078 ../src/interface.c:1141
 msgid "Copy"
 msgstr "复制"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1082
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "复制当前文件并在原位置保持原样。"
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1086 ../src/interface.c:1146
 msgid "Move"
 msgstr "移动"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1090
 msgid "Current file is moved and vanishes from the old place."
 msgstr "当前文件被移走并从原位置消失。"
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1104
 msgid "Archive file"
 msgstr "归档文件"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1168
 msgid "Foreign files"
 msgstr "外部文件"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1175
 msgid "Add new foreign file"
 msgstr "添加新的外部文件"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1180
 msgid "Foreign file:"
 msgstr "外部文件:"
 
-#: ../src/interface.c:1284
+#: ../src/interface.c:1198
 msgid "Options"
 msgstr "选项"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1200
 msgid "Read only"
 msgstr "只读"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1208
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"如果您确定 Orage 将永不修改此文件则设置\n"
-"此项。注意修改外部文件将使与其来源的源工具\n"
-"不兼容。"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "如果您确定 Orage 将永不修改此文件则设置\n此项。注意修改外部文件将使与其来源的源工具\n不兼容。"
 
-#: ../src/interface.c:1308
+#: ../src/interface.c:1222
 msgid "Exchange data - Orage"
 msgstr "交换数据-Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:269
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\t这是 %s 版 %s\n"
-"\n"
+msgstr "\t这是 %s 版 %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:271
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\t以 GNU 通用公共许可协议方式发布。\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:272
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\t对 GTK+-%d.%d.%d 编译,"
 
-#: ../src/main.c:273
+#: ../src/main.c:274
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "使用 GTK+-%d.%d.%d。\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:277
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\t使用 DBUS 导入。\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:279
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\t不使用 DBUS。导入只部分可用。\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:282
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\t使用 libnotify。\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:284
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\t不使用 libnotify。\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:287
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\t使用自动归档。\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:289
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\t不使用归档。\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:292
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\t使用操作系统软件包 libical。\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:294
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\t使用 Orage 本地版本 libical。\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:307
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"用法:orage [选项] [文件]\n"
-"\n"
+msgstr "用法:orage [选项] [文件]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:308
 #, c-format
 msgid "Options:\n"
 msgstr "选项:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:309
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\t显示 orage 版本\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:310
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\t列印此文本\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:311
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-"--preferences (-p) \t显示首选项表格\n"
+msgstr "--preferences (-p) \t显示首选项表格\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:312
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-"--toggle (-t) \t\t显示/隐藏 orage\n"
+msgstr "--toggle (-t) \t\t显示/隐藏 orage\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:313
 #, c-format
 msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-"--add-foreign (-a) 文件 [RW] \t添加"
-"外部文件\n"
+msgstr "--add-foreign (-a) 文件 [RW] \t添加外部文件\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:314
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-"--remove-foreign (-r) 文件 \t移除"
-"外部文件\n"
+msgstr "--remove-foreign (-r) 文件 \t移除外部文件\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:315
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) 文件 [约会...] \t从 "
-"Orage 导出约会至文件\n"
+msgstr "--export (-e) 文件 [约会...] \t从 Orage 导出约会至文件\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:317
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "文件为要载入进 orage 的 ical 文件\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:319
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\torage 中不包括 dbus。\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:320
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\t没有 dbus [文件] 和外部文件选项(-a "
-"和 -r)只能在 orage 启动时使用\n"
+msgstr "\t没有 dbus [文件] 和外部文件选项(-a 和 -r)只能在 orage 启动时使用\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:512
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"未知选项 %s\n"
-"\n"
+msgstr "\n未知选项 %s\n\n"
 
 #: ../src/mainbox.c:287
 msgid "_Exchange data"
@@ -1787,251 +1696,276 @@ msgstr "显示全球时间(_G)"
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:396
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:453
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:463
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:471
 msgid "Never"
 msgstr "从不"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:477
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"标题: %s\n"
-" 位置:%s\n"
-" 开始:\t%s\n"
-" 到期:\t%s\n"
-" 做完:\t%s\n"
-" 注意:\n"
-"%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:485
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"标题: %s\n"
-" 位置:%s\n"
-" 开始:\t%s\n"
-" 结束:\t%s\n"
-" 注意:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:595
 msgid "<b>To do:</b>"
 msgstr "<b>待办:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:631
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s 的事件:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:642
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s-%s 的事件:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:464
 msgid "Main settings"
 msgstr "主设置"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:470
 msgid "Timezone"
 msgstr "时区"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:485
 msgid "You should always define your local timezone."
 msgstr "您应该总是定义您的本地时区。"
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:493
 msgid "Archive threshold (months)"
 msgstr "归档阈值(月)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:503
 msgid "(0 = no archiving)"
 msgstr "(0 为不归档)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:506
 msgid "Archiving is used to save time and space when handling events."
 msgstr "处理事件时归档用于节省时间和空间。"
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:514
 msgid "Sound command"
 msgstr "声音命令"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:529
 msgid "This command is given to shell to make sound in alarms."
 msgstr "此命令传递给 shell 用来放闹铃声音。"
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "显示设置"
+#: ../src/parameters.c:568
+msgid "Calendar window"
+msgstr "日历窗口"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "日历主窗口"
+#: ../src/parameters.c:575
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:581
 msgid "Show borders"
 msgstr "显示边框"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:586
 msgid "Show menu"
 msgstr "显示菜单"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "显示月和年"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:594
 msgid "Show day names"
 msgstr "显示天名称"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:599
 msgid "Show week numbers"
 msgstr "显示周数"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:607
+msgid "Show month and year"
+msgstr "显示月和年"
+
+#: ../src/parameters.c:627
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:632
 msgid "Show todo list"
 msgstr "显示待办列表"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:639
 msgid "Number of days to show in event window"
 msgstr "在事件窗口中要显示的天数"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:645
 msgid "0 = do not show event list at all"
 msgstr "0 为绝不显示事件列表"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:658
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:663
 msgid "Show on all desktops"
 msgstr "在所有桌面显示"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:668
 msgid "Keep on top"
 msgstr "置顶"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:676
 msgid "Show in taskbar"
 msgstr "在任务栏中显示"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:681
 msgid "Show in pager"
 msgstr "在页面中显示"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:689
 msgid "Show in systray"
 msgstr "在系统托盘中显示"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:710
 msgid "Calendar start"
 msgstr "日历开始"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:715
 msgid "Show"
 msgstr "显示"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:727
 msgid "Hide"
 msgstr "隐藏"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:739
 msgid "Minimized"
 msgstr "最小化"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "额外设置"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "在日历窗口打开"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "选择今天的日期"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "选择先前选中的日期"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "使用动态托盘图标"
+#: ../src/parameters.c:759
+msgid "On calendar window open"
+msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "使用动态图标"
+#: ../src/parameters.c:764
+msgid "Select today's date"
+msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "动态图标显示此月的当前月份和天"
+#: ../src/parameters.c:777
+msgid "Select previously selected date"
+msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "主日历双击显示"
+#: ../src/parameters.c:795
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:800
 msgid "Days view"
 msgstr "日视图"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:812
 msgid "Event list"
 msgstr "事件列表"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "事件列表窗口"
+#: ../src/parameters.c:834
+msgid "Extra settings"
+msgstr "额外设置"
+
+#: ../src/parameters.c:841
+msgid "Event list window extra days"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:846
 msgid "Number of extra days to show in event list"
 msgstr "在事件列表中显示的额外天数"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:854
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "这只是默认值,您可以在实际的事件列表窗口中更改它。"
+
+#: ../src/parameters.c:863
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:868
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:881
+msgid "Selected day"
 msgstr ""
-"这只是默认值,您可以在实际的事件列表窗口中"
-"更改它。"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:899
+msgid "Use dynamic tray icon"
+msgstr "使用动态托盘图标"
+
+#: ../src/parameters.c:904
+msgid "Use dynamic icon"
+msgstr "使用动态图标"
+
+#: ../src/parameters.c:910
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "动态图标显示此月的当前月份和天"
+
+#: ../src/parameters.c:917 ../src/parameters.c:922
 msgid "Use wakeup timer"
 msgstr "使用唤醒定时器"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:928
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "如果 Orage 在挂起或休眠后正常唤醒时有问题则使用此定时器(比如托盘图标没有刷新或闹铃没有启动。)。"
+
+#: ../src/parameters.c:936
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:941
+msgid "Orage window"
+msgstr "Orage 窗口"
+
+#: ../src/parameters.c:954
+msgid "Notify notification"
 msgstr ""
-"如果 Orage 在挂起或休眠后正常唤醒时有"
-"问题则使用此定时器(比如托盘图标没有刷新"
-"或闹铃没有启动。)。"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:980
 msgid "Orage Preferences"
 msgstr "Orage 首选项"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1092
 msgid "First Orage start. Searching default timezone."
 msgstr "Orage 第一次启动。正在搜索默认时区。"
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1111
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "默认时区设置为 %s。"
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1114
 msgid "Default timezone not found, please, set it manually."
 msgstr "未找到默认时区,请手动设置。"
 
@@ -2043,40 +1977,35 @@ msgstr "提醒 "
 msgid "Open"
 msgstr "打开"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "提醒-Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr ""
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "在指定时间后再次提醒我"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "按 <执行> 在指定的时间后再次提醒我:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1092
 msgid "Next active alarms:"
 msgstr "下一个活动闹铃:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1144
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d 天 %02d 小时 %02d 分钟到:%s"
+msgstr "\n%02d 天 %02d 小时 %02d 分钟到:%s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1153
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"未找到活动闹铃"
+msgstr "\n未找到活动闹铃"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3647,26 +3576,26 @@ msgid "Show time and date?"
 msgstr "显示时间和日期?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "日历"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage 日历首选项"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage 首选项"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Xfce 4 日历应用程序(Orage)设置"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "桌面日历"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage 日历首选项"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "日历"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage 日历"
+
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "桌面日历"


More information about the Xfce4-commits mailing list