Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	public/langs/zh-hk.js
  • Loading branch information
lealife committed Apr 14, 2016
2 parents cde6ba3 + bb3820d commit 4f7b3ab
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 109 deletions.
2 changes: 1 addition & 1 deletion public/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ var Config = {
"name": "繁体中文"
}
],
"lang": "zh-cn",
"lang": "en-us",
"theme": ""
};
216 changes: 108 additions & 108 deletions public/langs/zh-hk.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,69 +2,69 @@
"3th": "第三方登錄",
"aboutLeanote": "關於leanote",
"aboutMe": "關於我",
"accountSetting": "帳戶設置",
"addChildNotebook": "添加子筆記本",
"addNotebook": "添加筆記本",
"addShare": "添加分享",
"accountSetting": "帳戶設定",
"addChildNotebook": "新增子記事本",
"addNotebook": "新增記事本",
"addShare": "新增分享",
"all": "最新",
"app": "leanote",
"attachments ": " 附件",
"basicInfo": "基本信息",
"blog": "博客",
"basicInfo": "基本資訊",
"blog": "部落格",
"blogInfo": "將筆記公開, 讓知識傳播的更遠!",
"blogSet": "博客設置",
"blogSet": "部落格設定",
"blue": "藍色",
"Cancel": "取消",
"Cancel public": "取消公開為博客",
"canntNewNoteTips": "Sorry, 這裏不能添加筆記的. 妳需要先選擇壹個筆記本.",
"checkEmai": "查收郵箱",
"Cancel public": "取消公開為部落格",
"canntNewNoteTips": "Sorry, 這裏不能新增筆記的. 你需要先選擇一個記事本.",
"checkEmai": "檢查郵箱",
"checkEmail": "查看郵件",
"clearSearch": "清除搜索",
"clickAddTag": "點擊添加標簽",
"clickToChangePermission": "點擊改變權限",
"clickToCopy": "點擊復制",
"clearSearch": "清除搜尋",
"clickAddTag": "按一下新增標籤",
"clickToChangePermission": "按一下改變權限",
"clickToCopy": "按一下複製",
"Close": "關閉",
"confirmBackup": "確定要從該版還原? 還原前leanote會備份當前版本到歷史記錄中.",
"confirmBackup": "確定要從該版本還原? 還原前leanote會備份目前版本到歷史記錄中.",
"confirmPassword": "兩次密碼輸入不正確",
"cooperation": "協作",
"cooperationInfo": "分享給好友的同時也可以讓妳的好友和妳壹起來完善它.",
"Copy": "復制",
"copyFailed": "對不起, 復制失敗, 請自行復制",
"copySuccess": "復制成功",
"copyToMyNotebook": "復制到我的筆記本",
"create": "創建",
"createAccount": "創建帳號",
"createAccountFailed": "帳號創建失敗",
"createAccountSuccess": "帳號創建成功",
"cooperationInfo": "分享給好友的同時也可以讓你的好友和你一起來完善它.",
"Copy": "複製",
"copyFailed": "對不起, 複製失敗, 請自行複製",
"copySuccess": "複製成功",
"copyToMyNotebook": "複製到我的記事本",
"create": "建立",
"createAccount": "建立帳號",
"createAccountFailed": "帳號建立失敗",
"createAccountSuccess": "帳號建立成功",
"curUser": "當前登錄帳戶",
"currentEmail": "當前郵箱為: \u003ccode\u003e%s\u003c/code\u003e ",
"datetime": "日期",
"default": "默認",
"defaultShare": "默認共享",
"defaulthhare": "默認共享",
"default": "預設",
"defaultShare": "預設共享",
"defaulthhare": "預設共享",
"delete": "刪除",
"deleteAllShared": "刪除所有共享",
"deleteSharedNotebook": "刪除共享筆記本",
"deleteSharedNotebook": "刪除共享記事本",
"demoRegister": "\u003ca href=\"/register\"\u003e立即註冊\u003c/a\u003e",
"discussion": "社區討論",
"donate ": " 捐贈",
"donate ": " 贊助",
"download": "下載",
"editorTips": "幫助",
"editorTips": "說明",
"email": "Email",
"emailBodyRequired": "郵件內容不能為空",
"emailBodyRequired": "郵件內容不能為空白",
"emailInSending": "正在發送郵件到",
"emailOrOthers": "Email或其它聯系方式",
"emailSendFailed": "郵件發送失敗",
"errorEmail": "請輸入正確的email",
"errorPassword": "請輸入長度不少於6位的密碼, 盡量復雜",
"errorPassword": "請輸入長度不少於6位的密碼, 盡量複雜一點",
"findPassword": "找回密碼",
"findPasswordSendEmailOver": "已經將修改密碼的鏈接發送到您的郵箱, 請查收郵件.",
"findPasswordTimeout": "鏈接已過期",
"findPasswordSendEmailOver": "已經將修改密碼的連結發送到您的郵箱, 請檢查郵件.",
"findPasswordTimeout": "連結已過期",
"fold": "折疊",
"forgetPassword ": " 忘記密碼?",
"fork github": "Github 源碼",
"fork github": "Github 原始碼",
"friendEmail": "好友郵箱",
"friendNotExits": "該用戶還沒有註冊%s, 復制邀請鏈接發送給Ta, 邀請鏈接: %s",
"friendNotExits": "該用戶還沒有註冊%s, 複製邀請連結發送給Ta, 邀請連結: %s",
"green": "綠色",
"hadAcount ": " 已有帳戶?",
"hasAcount ": " 還無帳戶?",
Expand All @@ -80,34 +80,34 @@
"inputPassword2": "請輸入確認密碼",
"inputUsername": "請輸入用戶名",
"knowledge": "知識",
"knowledgeInfo": "leanote是壹個筆記, 妳可以用它來管理自己的知識.",
"leanoteBlog": "官方博客",
"knowledgeInfo": "leanote是一個筆記, 你可以用它來管理自己的知識.",
"leanoteBlog": "官方部落格",
"leftHidden": "隱藏左側",
"leftShow": "展開左側",
"login": "登錄",
"loginSuccess": "登錄成功, 正在跳轉",
"logining": "正在登錄",
"logout": "退出",
"Logout": "註銷",
"logout": "登出",
"Logout": "登出",
"minLength": "長度至少為%s",
"Move": "移動",
"myBlog": "我的博客",
"myBlog": "我的部落格",
"myNote": "我的筆記",
"myNotebook": "我的筆記本",
"myTag": "我的標簽",
"myNotebook": "我的記事本",
"myTag": "我的標籤",
"nav": "文檔導航",
"new": "新建",
"newMarkdown": "新建Markdown筆記",
"newMarkdownNote": "新建Markdown筆記",
"newNote": "新建筆記",
"new": "",
"newMarkdown": "新Markdown筆記",
"newMarkdownNote": "新Markdown筆記",
"newNote": "新筆記",
"newPassword": "新密碼",
"noHistories": "無歷史記錄",
"noNoteNewNoteTips": "該筆記本下空空如也...何不",
"noNoteNewNoteTips": "該記事本下空空如也...何不",
"noSpecialChars": "不能包含特殊字符",
"normalMode": "普通模式",
"notFound": "該頁面不存在",
"notGoodPassword": "密碼至少6位",
"notebook": "筆記本",
"notebook": "記事本",
"oldPassword": "舊密碼",
"or": "或",
"password": "密碼",
Expand All @@ -122,30 +122,30 @@
"rename": "重命名",
"resendVerifiedEmail": "重新發送驗證郵件",
"restoreFromThisVersion": "從該版本還原",
"save": "保存",
"saveSuccess": "保存成功",
"saving": "正在保存",
"search": "搜索",
"save": "儲存",
"saveSuccess": "儲存成功",
"saving": "正在儲存",
"search": "搜尋",
"send": "發送",
"sendFailed": "發送失敗",
"sendInviteEmailToYourFriend": "發送邀請email給Ta",
"sendSuccess": "發送成功",
"sendVerifiedEmail": "發送驗證郵箱",
"setAvatar": "頭像設置",
"setUsername": "用戶名設置",
"setUsernameTips": "妳的郵箱是 \u003ccode\u003e%s\u003c/code\u003e, 可以再設置壹個唯壹的用戶名.\u003cbr /\u003e用戶名至少4位, 不可含特殊字符.",
"setAvatar": "頭像設定",
"setUsername": "用戶名設定",
"setUsernameTips": "你的郵箱是 \u003ccode\u003e%s\u003c/code\u003e, 可以再設定一個唯一的用戶名.\u003cbr /\u003e用戶名至少4位, 不可含特殊字符.",
"share": "分享",
"shareInfo": "妳也可以將知識分享給妳的好友.",
"shareInfo": "你也可以將知識分享給你的好友.",
"shareToFriends": "分享給好友",
"simple": "簡約",
"submit": "提交",
"suggestions": "建議",
"suggestionsInfo": "幫助我們完善leanote",
"tag": "標簽",
"themeSetting": "主題設置",
"thirdCreateAcountTips": "您現在使用的是第三方帳號登錄%(app)s, 您也可以註冊%(app)s帳號登錄, 趕緊註冊壹個吧. \u003cbr /\u003e註冊成功後仍可以使用第三方帳號登錄leanote並管理您現有的筆記.",
"trash": "廢紙簍",
"try": "體驗壹下",
"suggestionsInfo": "說明我們完善leanote",
"tag": "標籤",
"themeSetting": "主題設定",
"thirdCreateAcountTips": "您現在使用的是第三方帳號登錄%(app)s, 您也可以註冊%(app)s帳號登錄, 趕緊註冊一個吧. \u003cbr /\u003e註冊成功後仍可以使用第三方帳號登錄leanote並管理您現有的筆記.",
"trash": "垃圾桶",
"try": "體驗一下",
"unTitled": "無標題",
"unVerified": "未驗證",
"unfold": "展開",
Expand All @@ -160,7 +160,7 @@
"use ": " 使用",
"usernameIsExisted": "用戶名已存在",
"usernameOrEmail": "用戶名或Email",
"usernameSetting": "用戶名設置",
"usernameSetting": "用戶名設定",
"verified": "已驗證",
"verifiedEmaiHasSent": "驗證郵件已發送, 請及時查閱郵件並驗證.",
"verifiedNow": "現在去驗證",
Expand All @@ -172,26 +172,26 @@
"wrongUsernameOrPassword": "用戶名或密碼有誤",
"yellow": "黃色",
"yourContact": "您的聯系方式",
"yourSuggestions": "幫助完善leanote",
"yourSuggestions": "說明完善leanote",
"Close": "關閉",

"Notebook": "筆記本",
"Notebook": "記事本",
"Note": "筆記",
"Tag": "標簽",
"Tag": "標籤",
"Starred": "加星筆記",
"Newest": "最新筆記",
"New": "新建",
"New note": "新建筆記",
"Search note": "搜索筆記",
"Search notebook": "搜索筆記本",
"New": "",
"New note": "新筆記",
"Search note": "搜尋筆記",
"Search notebook": "搜尋記事本",

"Add account": "添加帳戶",
"Add account": "新增帳戶",
"Switch account": "切換帳戶",
"Sync": "同步",
"Loading": "正在加載",
"Loading...": "正在加載",
"loading...": "正在加載",
"loading": "正在加載",
"Loading": "正在載入",
"Loading...": "正在載入",
"loading...": "正在載入",
"loading": "正在載入",
"Choose Files": "選擇文件",
"Check for updates": "檢查更新",
"Checking for udpates...": "正在檢查是否有可用更新...",
Expand All @@ -200,14 +200,14 @@
"This note is conflicted with:": "該筆記與以下筆記沖突:",
"Maker as resolved": "標記已解決沖突",
"Leanote, Not Just A Notepad": "Leanote, 不只是筆記",
"Public as blog": "公開為博客",
"Cancel public": "取消公開為博客",
"Public as blog": "公開為部落格",
"Cancel public": "取消公開為部落格",
"Delete": "刪除",
"Remove": "移除",
"Export": "導出",
"Export notes": "導出筆記",
"Export": "匯出",
"Export notes": "匯出筆記",
"Histories": "歷史記錄",
"Created": "創建",
"Created": "建立",
"Updated": "更新",
"Modify": "修改",
"Toggle writting mode": "切換寫作模式",
Expand All @@ -221,14 +221,14 @@
"Light": "輕量",
"Normal": "普通",

"Add sub notebook": "添加子筆記本",
"Add sub notebook": "新增子記事本",
"Rename": "重命名",
"Import notes": "導入筆記",
"Import notes": "匯入筆記",

"My blog": "我的博客",
"My blog": "我的部落格",
"Sync now": "立即同步",

"Custom server": "配置服務",
"Custom server": "設定服務",
"Host, https://leanote.com": "服務地址, 如 https://leanote.com",
"Username or Email": "用戶名或郵箱",
"Password": "密碼",
Expand All @@ -241,49 +241,49 @@
"No Starred Note": "無加星筆記",
"Conflict": "沖突",
"Star": "加星",
"Blog": "博客",
"Setting": "設置",
"Blog": "部落格",
"Setting": "設定",

"Insert link into content": "插件附件鏈接到筆記中",
"Insert link into content": "插件附件連結到筆記中",
"Save as": "另存為",

"Search results": "搜索結果",
"Search results": "搜尋結果",

"Image saved successful!": "圖片保存成功!",
"Image saved failed!": "圖片保存失敗!",
"File saved failed!": "文件保存失敗!",
"File saved successful!": "文件保存成功!",
"Image saved successful!": "圖片儲存成功!",
"Image saved failed!": "圖片儲存失敗!",
"File saved failed!": "文件儲存失敗!",
"File saved successful!": "文件儲存成功!",

"File not exists!": "文件不存在!",
"Error": "錯誤",
"Cut": "剪切",
"Copy": "復制",
"Paste": "粘貼",
"Cut": "剪下",
"Copy": "複製",
"Paste": "貼上",
"Open link in browser": "在瀏覽器打開",

"Info": "提示",
"Warning": "警告",

"Mode": "模式",
"Toggle Fullscreen": "全屏切換",
"Toggle Presentation": "演示切換",
"Toggle Fullscreen": "全螢幕切換",
"Toggle Presentation": "展示切換",
"Toggle View": "預覽切換",

"More...": "更多",
"Force full sync": "強制全量同步",
"ForceFullSyncMsg": "強制全量同步會先將該帳戶的本地數據全部刪除(包括數據庫, 圖片和附件), 然後從服務器上同步所有數據, 妳確定?",
"Force full sync": "強制全部同步",
"ForceFullSyncMsg": "強制全部同步會先將該帳戶的本地資料全部刪除(包括資料庫, 圖片和附件), 然後從伺服器上同步, 你確定嗎?",

"Are you sure to delete it ?": "確定刪除?",
"Are you sure ?": "妳確定執行該操作?",
"Are you sure ?": "你確定執行該操作?",

"Email or Password Error": "用戶名或密碼錯誤",
"Invalid host": "服務地址錯誤",
"Invalid host": "主機位址錯誤",
"Leanote login": "登錄",
"Email is required": "請輸入用戶名或郵箱",
"Password is required": "請輸入密碼",

"The minimum password length is 6": "密碼長度最少6位",
"Sign in to Self-hosted Service": "登錄自建服務",
"Sign in to Self-hosted Service": "登錄自建伺服器",
"Self-hosted Service": "登錄自建服務",
"Create Local Account": "創建本地帳戶",
"Sign in to Leanote": "登錄到Leanote",
Expand All @@ -294,9 +294,9 @@

"Synchronizing": "正在同步",

"Hyperlink":"超鏈接","Please provide the link URL and an optional title":"請填寫鏈接和壹個可選的標題","optional title":"可選標題","Cancel":"取消","Strong":"粗體","strong text":"粗體","Emphasis":"斜體","emphasized text":"斜體","Blockquote":"引用","Code Sample":"代碼","enter code here":"代碼","Image":"圖片","Heading":"標題","Numbered List":"有序列表","Bulleted List":"無序列表","List item":"項目","Horizontal Rule":"水平線","Undo":"撤銷","Redo":"重做","enter image description here":"圖片標題","enter link description here":"鏈接標題",
"Hyperlink":"超連結","Please provide the link URL and an optional title":"請填寫連結和一個可選的標題","optional title":"可選標題","Cancel":"取消","Strong":"粗體","strong text":"粗體","Emphasis":"斜體","emphasized text":"斜體","Blockquote":"引用","Code Sample":"代碼","enter code here":"代碼","Image":"圖片","Heading":"標題","Numbered List":"有序列表","Bulleted List":"無序列表","List item":"項目","Horizontal Rule":"水平線","Undo":"還原","Redo":"重作","enter image description here":"圖片標題","enter link description here":"連結標題",

"Please select a note firstly.": "請先選擇壹個筆記",
"Please select a note firstly.": "請先選擇一個筆記",
"<span></span> notes selected": "當前選中了 <span></span> 篇筆記",

"Sync error, retry to sync after 3 seconds": "同步失敗, 3 秒後自動重新嘗試同步",
Expand All @@ -306,6 +306,6 @@
"localAccountTips": "妳好, 您使用的是本地離線帳戶, 您的數據只存在本地, 不會同步到Leanote服務器, 如果您不小心刪除了數據或硬盤損壞, 您的數據將永久丟失. <br>所以我們推薦您使用Leanote帳戶來使用該客戶端, 這樣您的數據將會存儲到雲端, 以避免失誤造成的數據丟失. <br>Leanote桌面端不再支持創建本地帳戶, 但您之前創建的本地帳戶還是可以繼續使用.",
"Don't Show Anymore": "不再提示",

"Load Database Error": "加載數據庫出錯, 請嘗試在帳戶管理中優化數據庫",
"ctrl/cmd+e Toggle Modify with Readonly": "ctrl/cmd+e 切換編輯與只讀"
}
"Load Database Error": "載入資料庫出錯, 請嘗試在帳戶管理中優化資料庫",
"ctrl/cmd+e Toggle Modify with Readonly": "ctrl/cmd+e 切換編輯與唯讀"
}

0 comments on commit 4f7b3ab

Please sign in to comment.