From e5f73f2671a473805f16fbfb48389a9e774feda4 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Sun, 20 Dec 2020 19:51:30 +0100
Subject: Merge translation files from master branch.

---
 translations/messages/zh_CN.po | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

(limited to 'translations/messages/zh_CN.po')

diff --git a/translations/messages/zh_CN.po b/translations/messages/zh_CN.po
index d474e28..9366c23 100644
--- a/translations/messages/zh_CN.po
+++ b/translations/messages/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"POT-Creation-Date: 2020-11-22 18:59+0800\n"
+"POT-Creation-Date: 2020-12-19 11:10+0900\n"
 "PO-Revision-Date: 2007-02-25 16:46+0800\n"
 "Last-Translator: cao ting <ctqucl@gmail.com>\n"
 "Language-Team: 中文简体 <zh@li.org>\n"
@@ -48,20 +48,20 @@ msgstr ""
 msgid "BasKet Note Pads"
 msgstr "Basket贴示板"
 
-#: src/aboutdata.cpp:42
+#: src/aboutdata.cpp:40
 #, fuzzy
 msgid "Maintainer"
 msgstr "创建者,维护者"
 
-#: src/aboutdata.cpp:46
+#: src/aboutdata.cpp:44
 msgid "Original Author"
 msgstr ""
 
-#: src/aboutdata.cpp:50
+#: src/aboutdata.cpp:48
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Basket 编码, Kontact 整合, KnowIt 输出"
 
-#: src/aboutdata.cpp:54
+#: src/aboutdata.cpp:52
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -69,7 +69,7 @@ msgstr ""
 "Baskets 自动锁定, 保存状态图标, HTML 导入导出, basket 名称 tip, basket 名称导"
 "入"
 
-#: src/aboutdata.cpp:58 src/basketproperties.cpp:65 src/newbasketdialog.cpp:107
+#: src/aboutdata.cpp:56 src/basketproperties.cpp:65 src/newbasketdialog.cpp:107
 msgid "Icon"
 msgstr "图标"
 
@@ -1323,9 +1323,8 @@ msgstr "允许列表"
 
 #: src/formatimporter.cpp:136
 msgid ""
-"<p>Folder mirroring is not possible anymore (see <a href='http://basket.kde."
-"org/'>basket.kde.org</a> for more information).</p><p>The folder <b>%1</b> "
-"has been copied for the basket needs. You can either delete this folder or "
+"<p>Folder mirroring is not possible anymore.</p><p>The folder <b>%1</b> has "
+"been copied for the basket needs. You can either delete this folder or "
 "delete the basket, or use both. But remember that modifying one will not "
 "modify the other anymore as they are now separate entities.</p>"
 msgstr ""
@@ -2272,40 +2271,38 @@ msgstr "两边对齐"
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
 "generic note, allowing you to drag or copy it to an application that "
-"understand it.</p><p>If you want the support of these data, please contact "
-"developer or visit the <a href=\"http://basket.kde.org/dropdb.php\">BasKet "
-"Drop Database</a>.</p>"
+"understand it.</p>"
 msgstr ""
 
-#: src/notefactory.cpp:453
+#: src/notefactory.cpp:451
 msgid "Unsupported MIME Type(s)"
 msgstr "不支持的MIME格式"
 
-#: src/notefactory.cpp:507
+#: src/notefactory.cpp:505
 msgid "&Move Here\tShift"
 msgstr "移动到这里(&M)\tShift"
 
-#: src/notefactory.cpp:508
+#: src/notefactory.cpp:506
 msgid "&Copy Here\tCtrl"
 msgstr "复制这里(&C)\tCtrl"
 
-#: src/notefactory.cpp:509
+#: src/notefactory.cpp:507
 msgid "&Link Here\tCtrl+Shift"
 msgstr "链接这里(&L)\tCtrl+Shift"
 
-#: src/notefactory.cpp:511
+#: src/notefactory.cpp:509
 msgid "C&ancel\tEscape"
 msgstr "取消(&a)\tEscape"
 
-#: src/notefactory.cpp:995
+#: src/notefactory.cpp:993
 msgid "Import Icon as Image"
 msgstr "把图标作为图片载入"
 
-#: src/notefactory.cpp:995
+#: src/notefactory.cpp:993
 msgid "Choose the size of the icon to import as an image:"
 msgstr "选择将图标设置成图片的尺寸:"
 
-#: src/notefactory.cpp:1008
+#: src/notefactory.cpp:1006
 msgid "Load File Content into a Note"
 msgstr "将文件内容载人贴示"
 
-- 
cgit v1.2.1