i18n: automatic bump
Change-Id: I35809719dab219472f06b2159425d0bef4f12568
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9ccbd10..5bb503e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,9 +11,9 @@
msgstr ""
"Project-Id-Version: Ring\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-23 03:09-0400\n"
-"PO-Revision-Date: 2018-07-23 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-07-30 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Ling-Xiao Yang <ling-xiao.yang@mail.mcgill.ca>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/ring/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -284,42 +284,46 @@
msgstr "启用来电通知。"
#: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
msgid "Enable notifications for new chat messages."
msgstr "启用新消息通知。"
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
msgid "Show images and videos in chat window."
msgstr "在聊天窗口中显示图片和视频"
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
msgid "Entering a number in the search entry will place a new call."
msgstr "要直接拨打电话号码,请在搜索栏中输入该号码。"
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
msgid "Download folder:"
msgstr ""
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
msgid "Show chat on the right."
msgstr "在右侧显示聊天窗口。"
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
msgid "Show chat on the bottom."
msgstr "在下方显示聊天窗口。"
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
msgid "History Settings"
msgstr "历史记录设置"
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
msgid "Keep history for (days):"
msgstr "历史记录保存天数:"
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
msgid "(set to 0 for unlimited history)"
msgstr "(设置为0则无限制)"
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
msgid "Clear all history"
msgstr "清除所有历史记录"
@@ -335,7 +339,7 @@
msgid "Media"
msgstr "媒体"
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1348
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
msgid "Settings"
msgstr "设置"
@@ -438,7 +442,7 @@
msgid "Click to change password"
msgstr ""
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1996
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
msgid "Export account"
msgstr ""
@@ -719,7 +723,7 @@
msgid "Set selection as image"
msgstr "设置选区为头像"
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
#, c-format
msgid ""
"Unable to initialize.\n"
@@ -727,34 +731,39 @@
"Error: %s"
msgstr ""
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
msgid "Ring Error"
msgstr "Ring错误"
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
msgctxt ""
"In the status icon menu, toggle action to show or hide the Ring main window"
msgid "Show Ring"
msgstr ""
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
msgid "Quit"
msgstr ""
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "来电"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "显示"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "接听"
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s说:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "拒接"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "拒接"
#: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
msgid "Register this username on the name server"
@@ -780,23 +789,23 @@
msgid "Registration in progress..."
msgstr ""
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
msgid ""
"This is a destructive operation. Are you sure you want to delete all of your"
" chat and call history?"
msgstr "该操作不可撤销。确定删除您的所有聊天与通话记录吗?"
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
msgid "Choose download folder"
msgstr ""
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
#: src/avatarmanipulation.cpp:406 src/chatview.cpp:177
#: src/newaccountsettingsview.cpp:926
msgid "_Cancel"
msgstr "取消(_C)"
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
#: src/chatview.cpp:179 src/newaccountsettingsview.cpp:928
msgid "_Save"
msgstr ""
@@ -941,31 +950,51 @@
"Ring is free software for universal communication which respects the freedoms and privacy of its users."
msgstr "Ring:GNOME客户端\nRing是自由软件,尊重用户的通讯自由与隐私。"
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
msgid "Add account..."
msgstr ""
-#: src/ringmainwindow.cpp:626
+#: src/ringmainwindow.cpp:646
msgctxt "button next to search entry will place a new call"
msgid "place call"
msgstr "拨出"
-#: src/ringmainwindow.cpp:629
+#: src/ringmainwindow.cpp:649
msgctxt "button next to search entry will open chat"
msgid "open chat"
msgstr "发起聊天"
-#: src/ringmainwindow.cpp:918
+#: src/ringmainwindow.cpp:1069
msgctxt ""
"Please try to make the translation 50 chars or less so that it fits into the"
" layout"
msgid "Search contacts or enter number"
msgstr "查找通讯录或输入号码"
-#: src/ringmainwindow.cpp:1321
+#: src/ringmainwindow.cpp:1487
msgid "Leave settings page"
msgstr ""
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "来电"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
#: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
msgctxt "Name of error window (dialog)"
msgid "Ring Error"
@@ -1118,30 +1147,30 @@
msgid "Unknown error"
msgstr ""
-#: src/newaccountsettingsview.cpp:1963
+#: src/newaccountsettingsview.cpp:1962
msgid "Initializing..."
msgstr ""
-#: src/newaccountsettingsview.cpp:1966
+#: src/newaccountsettingsview.cpp:1965
msgid "Offline"
msgstr "离线"
-#: src/newaccountsettingsview.cpp:1969
+#: src/newaccountsettingsview.cpp:1968
msgid "Connecting..."
msgstr ""
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1971
msgid "Online"
msgstr "在线"
-#: src/newaccountsettingsview.cpp:1976
+#: src/newaccountsettingsview.cpp:1975
msgid "Unknown status"
msgstr ""
-#: src/newaccountsettingsview.cpp:2007
+#: src/newaccountsettingsview.cpp:2006
msgid "••••••••"
msgstr ""
-#: src/newaccountsettingsview.cpp:2007
+#: src/newaccountsettingsview.cpp:2006
msgid "no password set"
msgstr ""