From a86cbb934b16e238dd0ded1ac2f82516be33eaf5 Mon Sep 17 00:00:00 2001 From: lmath Date: Wed, 23 Nov 2016 21:57:28 +0800 Subject: [PATCH 1/7] Fix translation commented by ooser --- plugins/Sidebar/languages/zh-tw.json | 22 +++++++++++----------- src/Translate/languages/zh-tw.json | 18 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/Sidebar/languages/zh-tw.json b/plugins/Sidebar/languages/zh-tw.json index c1b740cc..5e48e5fd 100644 --- a/plugins/Sidebar/languages/zh-tw.json +++ b/plugins/Sidebar/languages/zh-tw.json @@ -19,7 +19,7 @@ "Size limit": "大小限制", "limit used": "限制使用", "free space": "可用空間", - "Set": "设定", + "Set": "設定", "Optional files": "可選文件", "Downloaded": "已下載", @@ -43,7 +43,7 @@ "Delete": "刪除", "Are you sure?": "你確定？", - "Site address": "站點地址", + "Site address": "網站地址", "Donate": "捐贈", "Missing files": "缺少的檔", @@ -51,29 +51,29 @@ "{} tries": "{} 已嘗試", "+ {num_bad_files} more": "+ {num_bad_files} 更多", - "This is my site": "這是我的站點", - "Site title": "站點標題", - "Site description": "站點描寫", - "Save site settings": "存儲站點設定", + "This is my site": "這是我的網站", + "Site title": "網站標題", + "Site description": "網站描寫", + "Save site settings": "存儲網站設定", "Content publishing": "內容髮布", "Choose": "選擇", "Sign": "簽署", - "Publish": "髮布", + "Publish": "發佈", "This function is disabled on this proxy": "此代理上禁用此功能", "GeoLite2 City database download error: {}!
Please download manually and unpack to data dir:
{}": "GeoLite2 地理位置資料庫下載錯誤：{}!
請手動下載並解壓到數據目錄：
{}", "Downloading GeoLite2 City database (one time only, ~20MB)...": "正在下載 GeoLite2 地理位置資料庫 （僅一次，約 20MB ）...", "GeoLite2 City database downloaded!": "GeoLite2 地理位置資料庫已下載！", "Are you sure?": "你確定？", - "Site storage limit modified!": "站點存儲限制已改變！", + "Site storage limit modified!": "網站存儲限制已改變！", "Database schema reloaded!": "資料庫架構重新加載！", "Database rebuilding....": "資料庫重建中...", "Database rebuilt!": "資料庫已重建！", - "Site updated!": "站點已更新！", - "Delete this site": "刪除此站點", + "Site updated!": "網站已更新！", + "Delete this site": "刪除此網站", "File write error: ": "檔寫入錯誤：", - "Site settings saved!": "站點設置已保存！", + "Site settings saved!": "網站設置已保存！", "Enter your private key:": "輸入您的私鑰：", " Signed!": " 已簽署！", "WebGL not supported": "不支持 WebGL" diff --git a/src/Translate/languages/zh-tw.json b/src/Translate/languages/zh-tw.json index 54584d2d..3327e48a 100644 --- a/src/Translate/languages/zh-tw.json +++ b/src/Translate/languages/zh-tw.json @@ -7,16 +7,16 @@ "Your connection is restricted. Please, open {0} port on your router": "你的連接受限制。請在你的路由器上打開 {0} 埠", "or configure Tor to become full member of ZeroNet network.": "或者配置你的 Tor 來成為 ZeroNet 的正式成員。", - "Select account you want to use in this site:": "選擇你要在這個站點使用的帳戶：", + "Select account you want to use in this site:": "選擇你要在這個網站使用的帳戶：", "currently selected": "當前選擇", - "Unique to site": "站點獨有身份", + "Unique to site": "網站獨有身份", "Content signing failed": "內容簽署失敗", "Content publish queued for {0:.0f} seconds.": "內容已加入 {0:.0f} 秒後的發布隊列。", "Content published to {0} peers.": "內容已發布到 {0} 個節點。", "No peers found, but your content is ready to access.": "找不到節點，但是你的內容已經準備好被訪問。", "Your network connection is restricted. Please, open {0} port": "你的網路連接受限制。請在你的路由器上打開 {0} 埠", - "on your router to make your site accessible for everyone.": "確保你的站點能被每一個人訪問。", + "on your router to make your site accessible for everyone.": "確保你的網站能被每一個人訪問。", "Content publish failed.": "內容發布失敗。", "This file still in sync, if you write it now, then the previous content may be lost.": "這個檔仍然在同步中，如果你現在寫入它，之前的內容可能會被丟失。", "Write content anyway": "強制寫入內容", @@ -24,18 +24,18 @@ "You current certificate:": "你當前的證書：", "Change it to {auth_type}/{auth_user_name}@{domain}": "改變至 {auth_type}/{auth_user_name}@{domain}-ra", "Certificate changed to: {auth_type}/{auth_user_name}@{domain}.": "證書更改至：{auth_type}/{auth_user_name}@{domain}。", - "Site cloned": "站點已克隆", + "Site cloned": "網站已克隆", - "You have successfully changed the web interface's language!": "你已經成功改變了 web 界面的語言！", + "You have successfully changed the web interface's language!": "你已經成功改變了 Web 界面的語言！", "Due to the browser's caching, the full transformation could take some minute.": "由於你的瀏覽器緩存，完整的翻譯可能需要花幾分鐘。", "Connection with UiServer Websocket was lost. Reconnecting...": "UiServer Websocket 的連線已丟失。重新連線中...", "Connection with UiServer Websocket recovered.": "UiServer Websocket 的連線已恢復。", "UiServer Websocket error, please reload the page.": "UiServer Websocket 錯誤，請重新載入頁面。", "   Connecting...": "   連線中...", - "Site size: ": "站點大小：", + "Site size: ": "網站大小：", "MB is larger than default allowed ": "MB 比預設允許的值更大 ", - "Open site and set size limit to \" + site_info.next_size_limit + \"MB": "打開站點並設定大小限制到 \" + site_info.next_size_limit + \"MB", + "Open site and set size limit to \" + site_info.next_size_limit + \"MB": "打開網站並設定大小限制到 \" + site_info.next_size_limit + \"MB", " files needs to be downloaded": " 個檔需要下載", " downloaded": " 已下載", " download failed": " 下載失敗", @@ -43,9 +43,9 @@ "No peers found": "找不到節點", "Running out of size limit (": "超出大小限制", "Set limit to \" + site_info.next_size_limit + \"MB": "設定限制到 \" + site_info.next_size_limit + \"MB", - "Site size limit changed to {0}MB": "站點大小限制已改變到 {0}MB", + "Site size limit changed to {0}MB": "網站大小限制已改變到 {0}MB", " New version of this page has just released.
Reload to see the modified content.": " 本頁面的新版本已經發布。
重新載入來查看更改後的內容。", - "This site requests permission:": "這個站點的請求許可權：", + "This site requests permission:": "這個網站的請求許可權：", "Grant": "授權" } From cf52b505b2b8524e48de1823ec2cc603673969cd Mon Sep 17 00:00:00 2001 From: lmath Date: Sat, 26 Nov 2016 22:22:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E2=80=9CSite=20Control"=20translation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/Sidebar/languages/zh-tw.json | 1 + plugins/Sidebar/languages/zh.json | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/Sidebar/languages/zh-tw.json b/plugins/Sidebar/languages/zh-tw.json index 5e48e5fd..07e0f29b 100644 --- a/plugins/Sidebar/languages/zh-tw.json +++ b/plugins/Sidebar/languages/zh-tw.json @@ -37,6 +37,7 @@ "Identity address": "身份地址", "Change": "改變", + "Site control": "網站控制", "Update": "更新", "Pause": "暫停", "Resume": "恢復", diff --git a/plugins/Sidebar/languages/zh.json b/plugins/Sidebar/languages/zh.json index 6962edc2..f43edc7c 100644 --- a/plugins/Sidebar/languages/zh.json +++ b/plugins/Sidebar/languages/zh.json @@ -37,6 +37,7 @@ "Identity address": "身份地址", "Change": "更改", + "Site control": "站点控制", "Update": "更新", "Pause": "暂停", "Resume": "恢复", From a875ddcf543fbf34bfc332a17d366e756344de4c Mon Sep 17 00:00:00 2001 From: lmath Date: Mon, 5 Dec 2016 18:43:56 +0800 Subject: [PATCH 3/7] Add/Update Chinese (Simplified) translation --- plugins/MergerSite/languages/zh.json | 5 +++++ plugins/OptionalManager/languages/zh.json | 7 +++++++ plugins/Trayicon/languages/zh.json | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 plugins/MergerSite/languages/zh.json create mode 100644 plugins/OptionalManager/languages/zh.json diff --git a/plugins/MergerSite/languages/zh.json b/plugins/MergerSite/languages/zh.json new file mode 100644 index 00000000..127044e6 --- /dev/null +++ b/plugins/MergerSite/languages/zh.json @@ -0,0 +1,5 @@ +{ + "Add %s new site?": "添加新站点: %s？", + "Added %s new site": "已添加到新站点：%s", + "Site deleted: %s": "站点已删除：%s" +} diff --git a/plugins/OptionalManager/languages/zh.json b/plugins/OptionalManager/languages/zh.json new file mode 100644 index 00000000..bb9161f5 --- /dev/null +++ b/plugins/OptionalManager/languages/zh.json @@ -0,0 +1,7 @@ +{ + "Pinned %s files": "已固定 %s 个文件", + "Removed pin from %s files": "已解除固定 %s 个文件", + "You started to help distribute %s.
Directory: %s": "你已经开始帮助分发 %s 。
目录：%s", + "Help distribute all new optional files on site %s": "你想要帮助分发 %s 站点的所有文件吗？", + "Yes, I want to help!": "是，我想要帮助！" +} diff --git a/plugins/Trayicon/languages/zh.json b/plugins/Trayicon/languages/zh.json index 270f2e88..29b73305 100644 --- a/plugins/Trayicon/languages/zh.json +++ b/plugins/Trayicon/languages/zh.json @@ -5,10 +5,10 @@ "Report bug/request feature": "反馈问题/请求功能", "!Open ZeroNet": "!打开 ZeroNet", "Quit": "退出", - "(active)": "(激活)", - "(passive)": "(passive)", + "(active)": "(主动模式)", + "(passive)": "(被动模式)", "Connections: %s": "连接数: %s", - "Received: %.2f MB | Sent: %.2f MB": "已收到: %.2f MB | 已发送: %.2f MB", + "Received: %.2f MB | Sent: %.2f MB": "已接收: %.2f MB | 已发送: %.2f MB", "Show console window": "显示控制台窗口", "Start ZeroNet when Windows starts": "在 Windows 启动时运行 ZeroNet" } From d62c8a0f1661a1178a5cfac87b08a5183a4775ab Mon Sep 17 00:00:00 2001 From: lmath Date: Mon, 5 Dec 2016 19:11:00 +0800 Subject: [PATCH 4/7] Add/Update Chinese (Traditional) translation --- plugins/MergerSite/languages/zh-tw.json | 5 +++++ plugins/OptionalManager/languages/zh-tw.json | 7 +++++++ plugins/Sidebar/languages/zh-tw.json | 8 ++++---- plugins/Trayicon/languages/zh-tw.json | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 plugins/MergerSite/languages/zh-tw.json create mode 100644 plugins/OptionalManager/languages/zh-tw.json create mode 100644 plugins/Trayicon/languages/zh-tw.json diff --git a/plugins/MergerSite/languages/zh-tw.json b/plugins/MergerSite/languages/zh-tw.json new file mode 100644 index 00000000..a0684e63 --- /dev/null +++ b/plugins/MergerSite/languages/zh-tw.json @@ -0,0 +1,5 @@ +{ + "Add %s new site?": "添加新網站: %s？", + "Added %s new site": "已添加到新網站：%s", + "Site deleted: %s": "網站已刪除：%s" +} diff --git a/plugins/OptionalManager/languages/zh-tw.json b/plugins/OptionalManager/languages/zh-tw.json new file mode 100644 index 00000000..dfa9eaf3 --- /dev/null +++ b/plugins/OptionalManager/languages/zh-tw.json @@ -0,0 +1,7 @@ +{ + "Pinned %s files": "已固定 %s 個檔", + "Removed pin from %s files": "已解除固定 %s 個檔", + "You started to help distribute %s.
Directory: %s": "你已經開始幫助分發 %s 。
目錄：%s", + "Help distribute all new optional files on site %s": "你想要幫助分發 %s 網站的所有檔嗎？", + "Yes, I want to help!": "是，我想要幫助！" +} diff --git a/plugins/Sidebar/languages/zh-tw.json b/plugins/Sidebar/languages/zh-tw.json index 07e0f29b..f4460fd2 100644 --- a/plugins/Sidebar/languages/zh-tw.json +++ b/plugins/Sidebar/languages/zh-tw.json @@ -5,10 +5,10 @@ "Connectable peers": "可連線節點", "Data transfer": "數據傳輸", - "Received": "已接收", - "Received bytes": "接收字節", - "Sent": "已發送", - "Sent bytes": "發送字節", + "Received": "已收到", + "Received bytes": "收到字節", + "Sent": "已傳送", + "Sent bytes": "傳送字節", "Files": "檔", "Total": "共計", diff --git a/plugins/Trayicon/languages/zh-tw.json b/plugins/Trayicon/languages/zh-tw.json new file mode 100644 index 00000000..2189033e --- /dev/null +++ b/plugins/Trayicon/languages/zh-tw.json @@ -0,0 +1,14 @@ +{ + "ZeroNet Twitter": "ZeroNet Twitter", + "ZeroNet Reddit": "ZeroNet Reddit", + "ZeroNet Github": "ZeroNet Github", + "Report bug/request feature": "回饋问题/請求功能", + "!Open ZeroNet": "!開啟 ZeroNet", + "Quit": "退出", + "(active)": "(主動模式)", + "(passive)": "(被動模式)", + "Connections: %s": "連線數: %s", + "Received: %.2f MB | Sent: %.2f MB": "已收到: %.2f MB | 已傳送: %.2f MB", + "Show console window": "顯示控制臺窗體", + "Start ZeroNet when Windows starts": "在 Windows 啟動時執行 ZeroNet" +} From 83d8a44db71bab6514568eff16c172e112b1ccc5 Mon Sep 17 00:00:00 2001 From: lmath Date: Mon, 5 Dec 2016 19:53:05 +0800 Subject: [PATCH 5/7] Correct "limit used" translation by P2P --- plugins/Sidebar/languages/zh-tw.json | 2 +- plugins/Sidebar/languages/zh.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Sidebar/languages/zh-tw.json b/plugins/Sidebar/languages/zh-tw.json index f4460fd2..724de508 100644 --- a/plugins/Sidebar/languages/zh-tw.json +++ b/plugins/Sidebar/languages/zh-tw.json @@ -17,7 +17,7 @@ "User data": "用戶數據", "Size limit": "大小限制", - "limit used": "限制使用", + "limit used": "限额", "free space": "可用空間", "Set": "設定", diff --git a/plugins/Sidebar/languages/zh.json b/plugins/Sidebar/languages/zh.json index f43edc7c..55ad3acd 100644 --- a/plugins/Sidebar/languages/zh.json +++ b/plugins/Sidebar/languages/zh.json @@ -17,7 +17,7 @@ "User data": "用户数据", "Size limit": "大小限制", - "limit used": "限制已用", + "limit used": "限额", "free space": "剩余空间", "Set": "设置", From 4559ee0d7f6c07a86cdcddc06405870f9ba4f170 Mon Sep 17 00:00:00 2001 From: lmath Date: Sat, 28 Jan 2017 06:27:45 +0800 Subject: [PATCH 6/7] Update Chinese translation --- plugins/Sidebar/SidebarPlugin.py | 2 +- src/Translate/languages/zh-tw.json | 11 +++++++---- src/Translate/languages/zh.json | 3 +++ src/Ui/UiWebsocket.py | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/plugins/Sidebar/SidebarPlugin.py b/plugins/Sidebar/SidebarPlugin.py index 08ed66df..7930a88d 100644 --- a/plugins/Sidebar/SidebarPlugin.py +++ b/plugins/Sidebar/SidebarPlugin.py @@ -573,7 +573,7 @@ class UiWebsocketPlugin(object): permissions = self.getPermissions(to) if "Multiuser" in PluginManager.plugin_manager.plugin_names: - self.cmd("notification", ["info", "This function is disabled on this proxy"]) + self.cmd("notification", ["info", _["This function is disabled on this proxy"]]) return False if "ADMIN" not in permissions: diff --git a/src/Translate/languages/zh-tw.json b/src/Translate/languages/zh-tw.json index 3327e48a..a30dd023 100644 --- a/src/Translate/languages/zh-tw.json +++ b/src/Translate/languages/zh-tw.json @@ -12,12 +12,13 @@ "Unique to site": "網站獨有身份", "Content signing failed": "內容簽署失敗", - "Content publish queued for {0:.0f} seconds.": "內容已加入 {0:.0f} 秒後的發布隊列。", - "Content published to {0} peers.": "內容已發布到 {0} 個節點。", + "Content publish queued for {0:.0f} seconds.": "內容已加入 {0:.0f} 秒後的發佈隊列。", + "Content published to {0}/{1} peers.": "內容已發佈到 {0}/{1} 個節點。", + "Content published to {0} peers.": "內容已發佈到 {0} 個節點。", "No peers found, but your content is ready to access.": "找不到節點，但是你的內容已經準備好被訪問。", "Your network connection is restricted. Please, open {0} port": "你的網路連接受限制。請在你的路由器上打開 {0} 埠", "on your router to make your site accessible for everyone.": "確保你的網站能被每一個人訪問。", - "Content publish failed.": "內容發布失敗。", + "Content publish failed.": "內容發佈失敗。", "This file still in sync, if you write it now, then the previous content may be lost.": "這個檔仍然在同步中，如果你現在寫入它，之前的內容可能會被丟失。", "Write content anyway": "強制寫入內容", "New certificate added:": "新證書：", @@ -43,8 +44,10 @@ "No peers found": "找不到節點", "Running out of size limit (": "超出大小限制", "Set limit to \" + site_info.next_size_limit + \"MB": "設定限制到 \" + site_info.next_size_limit + \"MB", + "Cloning site...": "複製網站中...", + "Site cloned": "網站已複製", "Site size limit changed to {0}MB": "網站大小限制已改變到 {0}MB", - " New version of this page has just released.
Reload to see the modified content.": " 本頁面的新版本已經發布。
重新載入來查看更改後的內容。", + " New version of this page has just released.
Reload to see the modified content.": " 本頁面的新版本已經發佈。
重新載入來查看更改後的內容。", "This site requests permission:": "這個網站的請求許可權：", "Grant": "授權" diff --git a/src/Translate/languages/zh.json b/src/Translate/languages/zh.json index 230fcec4..e0b1232f 100644 --- a/src/Translate/languages/zh.json +++ b/src/Translate/languages/zh.json @@ -13,6 +13,7 @@ "Content signing failed": "内容签名失败", "Content publish queued for {0:.0f} seconds.": "内容已加入 {0:.0f} 秒后的发布队列。", + "Content published to {0}/{1} peers.": "内容已发布到 {0}/{1} 个节点。", "Content published to {0} peers.": "内容已发布到 {0} 个节点。", "No peers found, but your content is ready to access.": "找不到节点，但是你的内容已经准备好被访问。", "Your network connection is restricted. Please, open {0} port": "你的网络连接受限制。请在你的路由器上打开 {0} 端口", @@ -43,6 +44,8 @@ "No peers found": "找不到节点", "Running out of size limit (": "超出大小限制", "Set limit to \" + site_info.next_size_limit + \"MB": "设置限制到 \" + site_info.next_size_limit + \"MB", + "Cloning site...": "克隆站点中...", + "Site cloned": "站点已克隆", "Site size limit changed to {0}MB": "站点大小限制已更改到 {0}MB", " New version of this page has just released.
Reload to see the modified content.": " 本页面的新版本已经发布。
重新加载来查看更改后的内容。", "This site requests permission:": "这个站点的请求权限：", diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index 7408e9a3..546a3df4 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -723,7 +723,7 @@ class UiWebsocket(object): self.response(to, {"error": "Unknown site: %s" % address}) def actionSiteClone(self, to, address, root_inner_path=""): - self.cmd("notification", ["info", "Cloning site..."]) + self.cmd("notification", ["info", _["Cloning site..."]]) site = self.server.sites.get(address) # Generate a new site from user's bip32 seed new_address, new_address_index, new_site_data = self.user.getNewSiteData() From f2700332aeb6bf449196e47546a33f521e726973 Mon Sep 17 00:00:00 2001 From: lmath Date: Sat, 28 Jan 2017 06:33:09 +0800 Subject: [PATCH 7/7] Replace to Chinese slideshow --- README-zh-cn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-zh-cn.md b/README-zh-cn.md index 5bd62771..1f1aba4f 100644 --- a/README-zh-cn.md +++ b/README-zh-cn.md @@ -42,7 +42,7 @@ * 如果站点的所有者 (拥有私钥的那个人) 修改了站点, 并且他/她签名了新的 `content.json` 然后推送至其他节点， 那么所有节点将会在验证 `content.json` 的真实性 (使用签名)后, 下载修改后的文件并推送至其他节点。 -#### [有关于 ZeroNet 加密, 站点更新, 多用户站点的幻灯片 »](https://docs.google.com/presentation/d/1_2qK1IuOKJ51pgBvllZ9Yu7Au2l551t3XBgyTSvilew/pub?start=false&loop=false&delayms=3000) +#### [有关于 ZeroNet 加密, 站点更新, 多用户站点的幻灯片 »](https://docs.google.com/presentation/d/1qBxkroB_iiX2zHEn0dt-N-qRZgyEzui46XS2hEa3AA4/pub?start=false&loop=false&delayms=3000) #### [常见问题 »](https://zeronet.readthedocs.org/en/latest/faq/) #### [ZeroNet开发者文档 »](https://zeronet.readthedocs.org/en/latest/site_development/getting_started/)