Merge branch 'master' of github.com:laurent22/joplin

CliClient/locales/zh_CN.po

@@ -14,6 +14,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.1\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr "移除相关笔记的标签后才可删除此标签。"
@@ -22,7 +24,7 @@ msgid "Please select the note or notebook to be deleted first."
 msgstr "请先选择需要删除的笔记或笔记本。"
 
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
-msgstr "按 Ctrl+D 或输入 \"exit\" 退出程序"
+msgstr "按 Ctrl+D 或输入“exit”退出程序"
 
 #, javascript-format
 msgid "More than one item match \"%s\". Please narrow down your query."
@@ -55,7 +57,7 @@ msgstr "不存在该命令：%s"
 
 #, javascript-format
 msgid "The command \"%s\" is only available in GUI mode"
-msgstr "命令 \"%s\" 仅在GUI模式下可用"
+msgstr "命令“%s”仅在 GUI 模式下可用"
 
 msgid "Cannot change encrypted item"
 msgstr "无法更改加密项目"
@@ -80,7 +82,7 @@ msgstr "将选定文件添加到笔记中。"
 
 #, javascript-format
 msgid "Cannot find \"%s\"."
-msgstr "无法找到 \"%s\"。"
+msgstr "无法找到“%s”。"
 
 msgid "Displays the given note."
 msgstr "显示选定笔记。"
@@ -119,7 +121,7 @@ msgstr "标记待办事项为完成。"
 
 #, javascript-format
 msgid "Note is not a to-do: \"%s\""
-msgstr "笔记非待办事项：\"%s\""
+msgstr "笔记非待办事项：“%s”"
 
 msgid ""
 "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
@@ -237,7 +239,7 @@ msgid ""
 msgstr "通过方向键与 page up/down 键来滚动列表与文本区域（包含此控制台）。"
 
 msgid "To maximise/minimise the console, press \"tc\"."
-msgstr "按 \"TC\" 最大化/最小化控制台。"
+msgstr "按“TC”最大化/最小化控制台。"
 
 msgid "To enter command line mode, press \":\""
 msgstr "按“:”键进入命令行模式"
@@ -314,7 +316,7 @@ msgstr ""
 "待办事项。"
 
 msgid "Either \"text\" or \"json\""
-msgstr "\"text\" 或 \"json\""
+msgstr "“text”或“json”"
 
 msgid ""
 "Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
@@ -418,8 +420,8 @@ msgid ""
 "taking place, you may delete the lock file at \"%s\" and resume the "
 "operation."
 msgstr ""
-"锁定文件已被保存。如果您确认当前未在进行任何同步，可删除锁定文件 \"%s\" 后继"
+"锁定文件已被保存。如果您确认当前未在进行任何同步，可删除锁定文件“%s”后继续上"
-"续上一部操作。"
+"一部操作。"
 
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
@@ -442,13 +444,13 @@ msgid ""
 "[tag] from [note], or to list the notes associated with [tag]. The command "
 "`tag list` can be used to list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> 可以是 \"add\"、\"remove\" 或者 \"list\"， 用于从 [note] 中赋值"
+"<tag-command> 可以是“add”、“remove”或者“list”， 用于从 [note] 中赋值或删除 "
-"或删除 [tag]，或者列出与 [tag] 相关的笔记。`tag list` 命令可以用于列出所有的"
+"[tag]，或者列出与 [tag] 相关的笔记。`tag list` 命令可以用于列出所有的标签（对"
-"标签（对于过长选项请使用 -l 参数）。"
+"于过长选项请使用 -l 参数）。"
 
 #, javascript-format
 msgid "Invalid command: \"%s\""
-msgstr "无效命令：\"%s\""
+msgstr "无效命令：“%s”"
 
 msgid ""
 "<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
@@ -456,9 +458,9 @@ msgid ""
 "target is a regular note it will be converted to a to-do). Use \"clear\" to "
 "convert the to-do back to a regular note."
 msgstr ""
-"<todo-command> 可以是 \"toggle\" 或者 \"clear\"。使用 \"toggle\" 命令来切换待"
+"<todo-command> 可以是“toggle”或者“clear”。使用“toggle”命令来切换待办事项的完"
-"办事项的完成状态（若目标为普通笔记则将会转换成待办事项）。使用 \"clear\" 命令"
+"成状态（若目标为普通笔记则将会转换成待办事项）。使用“clear”命令来把待办事项转"
-"来把待办事项转换到普通笔记。"
+"换到普通笔记。"
 
 msgid "Marks a to-do as non-completed."
 msgstr "标记待办事项为未完成。"
@@ -513,9 +515,9 @@ msgid ""
 "any files outside this directory nor to any other personal data. No data "
 "will be shared with any third party."
 msgstr ""
-"请在浏览器中打开以下链接激活该应用程序。该应用会建立 \"Apps/Joplin\" 文件目"
+"请在浏览器中打开以下链接激活该应用程序。该应用会建立“Apps/Joplin”文件目录，并"
-"录，并只会读写该目录中的文件。它没有任何权限访问此目录以外的任何文件或个人信"
+"只会读写该目录中的文件。它没有任何权限访问此目录以外的任何文件或个人信息。也"
-"息。也不会与第三方分享任何数据。"
+"不会与第三方分享任何数据。"
 
 msgid "Search:"
 msgstr "搜索："
@@ -545,7 +547,7 @@ msgstr ""
 
 #, javascript-format
 msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr "从 \"%s\" 导出，导出格式为 \"%s\"。请稍等…"
+msgstr "从“%s”导出，导出格式为“%s”。请稍等……"
 
 msgid "Sidebar"
 msgstr "边栏"
@@ -561,7 +563,7 @@ msgstr "笔记正文"
 
 #, javascript-format
 msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr "从 \"%s\" 导入，导入格式为 \"%s\" 。请稍等…"
+msgstr "从“%s”导入，导入格式为“%s”。请稍等……"
 
 msgid "PDF File"
 msgstr "PDF 文件"
@@ -692,7 +694,7 @@ msgid "Make a donation"
 msgstr "捐赠"
 
 msgid "Toggle development tools"
-msgstr ""
+msgstr "切换开发者工具"
 
 #, javascript-format
 msgid "Open %s"
@@ -899,7 +901,7 @@ msgstr "返回"
 #, javascript-format
 msgid ""
 "New notebook \"%s\" will be created and file \"%s\" will be imported into it"
-msgstr "将新建的笔记本“%s”，并将文件 \"%s\" 导入其中"
+msgstr "将新建的笔记本“%s”，并将文件“%s”导入其中"
 
 msgid "Please create a notebook first."
 msgstr "请先创建笔记本。"
@@ -934,19 +936,18 @@ msgstr "一些项目无法被同步。"
 msgid "View them now"
 msgstr "立刻查看"
 
-#, fuzzy
 msgid "One or more master keys need a password."
-msgstr "输入主密码："
+msgstr "一个或多个主密钥需要密码。"
 
 msgid "Set the password"
 msgstr "设置密码"
 
 msgid "No notes in here. Create one by clicking on \"New note\"."
-msgstr "此处没有任何笔记。点击\"新建笔记\"创建。"
+msgstr "此处没有任何笔记。点击“新建笔记”创建。"
 
 msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
-msgstr "此处没有任何笔记本。点击\"新建笔记本\"创建。"
+msgstr "此处没有任何笔记本。点击“新建笔记本”创建。"
 
 msgid "Location"
 msgstr "位置"
@@ -965,7 +966,7 @@ msgstr "笔记属性"
 
 #, javascript-format
 msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
-msgstr "笔记\"%s\"已成功恢复到笔记本\"%s\"中。"
+msgstr "笔记“%s”已成功恢复到笔记本“%s”中。"
 
 msgid "This note has no history"
 msgstr "此笔记没有历史记录"
@@ -978,8 +979,8 @@ msgid ""
 "Click \"%s\" to restore the note. It will be copied in the notebook named "
 "\"%s\". The current version of the note will not be replaced or modified."
 msgstr ""
-"单击 \"%s\" 以恢复笔记。它将会被复制到名为 \"%s\" 的笔记本中。笔记的当前版本"
+"单击“%s”以恢复笔记。它将会被复制到名为“%s”的笔记本中。笔记的当前版本不会被替"
-"不会被替换或修改。"
+"换或修改。"
 
 msgid "Open..."
 msgstr "打开…"
@@ -1131,7 +1132,7 @@ msgid "Please select where the sync status should be exported to"
 msgstr "请选择同步状态的导出位置"
 
 msgid "Retry"
-msgstr ""
+msgstr "重试"
 
 msgid "Add or remove tags"
 msgstr "添加或删除标签"
@@ -1306,7 +1307,7 @@ msgstr "无法移动笔记本到该位置"
 
 #, javascript-format
 msgid "Notebooks cannot be named \"%s\", which is a reserved title."
-msgstr "笔记本无法被命名为 \"%s\"，这个标题被留作他用。"
+msgstr "笔记本无法被命名为“%s”，这个标题被留作他用。"
 
 msgid "created date"
 msgstr "创建日期"
@@ -1362,25 +1363,27 @@ msgid "WebDAV password"
 msgstr "WebDAV 密码"
 
 msgid "Attachment download behaviour"
-msgstr ""
+msgstr "附件下载行为"
 
 msgid ""
 "In \"Manual\" mode, attachments are downloaded only when you click on them. "
 "In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
+"在“手动”模式下，只有单击附件时才会下载它们。在“自动”中，当你打开笔记时，它们"
+"就会被下载下来。在“总是”中，无论你是否打开笔记，所有的附件都会被下载。"
 
 msgid "Always"
-msgstr ""
+msgstr "总是"
 
 msgid "Manual"
-msgstr ""
+msgstr "手动"
 
 msgid "Auto"
-msgstr ""
+msgstr "自动"
 
 msgid "Max concurrent connections"
-msgstr ""
+msgstr "最大并发连接数"
 
 msgid "Language"
 msgstr "语言"
@@ -1564,11 +1567,11 @@ msgid "%d days"
 msgstr ""
 
 msgid "Keep note history for"
-msgstr ""
+msgstr "保留笔记历史记录"
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
-msgstr "无效的选项值：\"%s\"。可用值有：%s。"
+msgstr "无效的选项值：“%s”。可用值有：%s。"
 
 msgid "General"
 msgstr "通用选项"
@@ -1590,7 +1593,7 @@ msgstr "应用程序"
 
 #, javascript-format
 msgid "The tag \"%s\" already exists. Please choose a different name."
-msgstr "标签 \"%s\" 已存在。请选择一个不同的名称。"
+msgstr "标签“%s”已存在。请选择一个不同的名称。"
 
 msgid "Joplin Export File"
 msgstr "Joplin 导出文件"
@@ -1615,7 +1618,7 @@ msgstr "文件目录"
 
 #, javascript-format
 msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr "无法加载 \"%s\" 模块用于读取 \"%s\" 格式"
+msgstr "无法加载“%s”模块用于读取“%s”格式"
 
 #, javascript-format
 msgid "Please specify import format for %s"
@@ -1625,7 +1628,7 @@ msgstr "请指定 %s 的导入格式"
 msgid ""
 "This item is currently encrypted: %s \"%s\". Please wait for all items to be "
 "decrypted and try again."
-msgstr "该项目当前已加密：%s \"%s\"。请等待所有项目解密后再重试。"
+msgstr "该项目当前已加密：%s“%s”。请等待所有项目解密后再重试。"
 
 msgid "There is no data to export."
 msgstr "没有可导出的数据。"
@@ -1653,17 +1656,18 @@ msgstr "%s (%s) 无法上传到：%s"
 
 #, javascript-format
 msgid "Item \"%s\" could not be downloaded: %s"
-msgstr "项目 \"%s\" 无法从 %s 中下载"
+msgstr "项目“%s”无法从 %s 中下载"
 
-#, fuzzy
 msgid "Items that cannot be decrypted"
-msgstr "无法同步项目"
+msgstr "无法解密的项目"
 
 msgid ""
 "Joplin failed to decrypt these items multiple times, possibly because they "
 "are corrupted or too large. These items will remain on the device but Joplin "
 "will no longer attempt to decrypt them."
 msgstr ""
+"Joplin 多次解密这些项目均已失败，可能是它们太大或已经损坏导致的。这些项目会保"
+"留再设备上，但 Joplin 不会再尝试对它们进行解密。"
 
 msgid "Sync status (synced items / total items)"
 msgstr "同步状态（已同步项目/项目总数）"
@@ -1787,9 +1791,8 @@ msgstr "新建标签："
 msgid "Type new tags or select from list"
 msgstr "输入新的标签或从列表中选择"
 
-#, fuzzy
 msgid "More information"
-msgstr "配置"
+msgstr "更多信息"
 
 msgid ""
 "To work correctly, the app needs the following permissions. Please enable "
@@ -1875,7 +1878,7 @@ msgstr "Joplin 手机应用目前不支持这种类型的链接：%s"
 
 #, javascript-format
 msgid "Links with protocol \"%s\" are not supported"
-msgstr ""
+msgstr "不支持“%s”协议链接"
 
 #, javascript-format
 msgid "Unsupported image type: %s"

Clipper/joplin-webclipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.0.15",
+    "version": "1.0.16",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",

Joplin_install_and_update.sh

@@ -71,7 +71,7 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; t
 
     # Create icon for Gnome
     echo 'Create Desktop icon.'
-    if [[ $desktop =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.* ]]
+    if [[ $desktop =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.* ]]
     then
        : "${TMPDIR:=/tmp}"
        # This command extracts to squashfs-root by default and can't be changed...