status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into patch-4

This commit is contained in:
Jarrad 2017-01-10 16:23:03 +07:00 committed by GitHub
parent 878b4dc90d a1c12926cf
commit 8481b31f7c
4 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/commands.js
View File

@ -885,7 +885,7 @@ status.command({
handler: function (params) { handler: function (params) {
return { return {
event: "request", event: "request",
params: [params.amount] params: [params.amount],
request: { request: {
command: "send", command: "send",
params: { params: {

10
src/status_im/translations/it.cljs
View File

@ -5,7 +5,7 @@
;common ;common
:members-title "Membri" :members-title "Membri"
:not-implemented "!non implementato" :not-implemented "!non implementato"
:chat-name "Nome chat" :chat-name "Nome della chat"
:notifications-title "Notifiche e suoni" :notifications-title "Notifiche e suoni"
:offline "Offline" :offline "Offline"
@ -124,7 +124,7 @@
:save "Salva" :save "Salva"
:change-color "Cambia colore" :change-color "Cambia colore"
:clear-history "Cancella cronologia" :clear-history "Cancella cronologia"
:delete-and-leave "Cancella e lascia" :delete-and-leave "Elimina e lascia"
:chat-settings "Impostazioni chat" :chat-settings "Impostazioni chat"
:edit "Modifica" :edit "Modifica"
:add-members "Aggiungi membri" :add-members "Aggiungi membri"
@ -184,14 +184,14 @@
;login ;login
:connect "Connetti" :connect "Connettiti"
:address "Indirizzo" :address "Indirizzo"
:password "Password" :password "Password"
:login "Accedi" :login "Accedi"
:wrong-password "Password errata" :wrong-password "Password errata"
;recover ;recover
:recover-from-passphrase "Recupera dalla passphrase" :recover-from-passphrase "Recupera l'account usando la passphrase"
:recover-explain "Inserisci la passphrase per poter accedere alla tua password" :recover-explain "Inserisci la passphrase per poter accedere alla tua password"
:passphrase "Passphrase" :passphrase "Passphrase"
:recover "Recupera" :recover "Recupera"
@ -209,7 +209,7 @@
;validation ;validation
:invalid-phone "Numero di telefono non valido" :invalid-phone "Numero di telefono non valido"
:amount "Ammontare" :amount "Ammontare"
:not-enough-eth (str "ETH sul bilancio insufficiente " :not-enough-eth (str "Non hai abbastanza ETH "
"({{balance}} ETH)") "({{balance}} ETH)")
;transactions ;transactions
:confirm-transactions {:one "Conferma transazione" :confirm-transactions {:one "Conferma transazione"

16
src/status_im/translations/zh_hans.cljs
View File

@ -12,7 +12,7 @@
;drawer ;drawer
:invite-friends "邀请朋友" :invite-friends "邀请朋友"
:faq "常问问题解答" :faq "常问问题解答"
:switch-users "S切换用户" :switch-users "切换用户"
;chat ;chat
:is-typing "正在打字" :is-typing "正在打字"
@ -33,14 +33,14 @@
;sync ;sync
:sync-in-progress "正在同步…" :sync-in-progress "正在同步…"
:sync-synced "同步中" :sync-synced "已同步"
;messages ;messages
:status-sending "正在发送" :status-sending "正在发送"
:status-pending "发送中" :status-pending "等待中"
:status-sent "已发送" :status-sent "已发送"
:status-seen-by-everyone "所有人可见" :status-seen-by-everyone "所有人可见"
:status-seen "看到" :status-seen "可见"
:status-delivered "已交付" :status-delivered "已交付"
:status-failed "失败" :status-failed "失败"
@ -90,7 +90,7 @@
:written-down "确保你把它安全地写下来" :written-down "确保你把它安全地写下来"
:phone-number-required "点击此处输入你的电话号码，我会找到你的朋友" :phone-number-required "点击此处输入你的电话号码，我会找到你的朋友"
:intro-status "跟我聊天，以设置你的帐户并更改你的设置！" :intro-status "跟我聊天，以设置你的帐户并更改你的设置！"
:intro-message1 "欢迎来到状态\n点击该消息，以设置你的密码并开始！" :intro-message1 "欢迎来到Status\n点击该消息，以设置你的密码并开始！"
:account-generation-message "给我一点时间，我得疯狂地计算一下，以生成你的帐户！" :account-generation-message "给我一点时间，我得疯狂地计算一下，以生成你的帐户！"
;chats ;chats
@ -117,7 +117,7 @@
:contacts-group-people "联系人" :contacts-group-people "联系人"
:contacts-group-new-chat "开始新的聊天" :contacts-group-new-chat "开始新的聊天"
:no-contacts "还没有联系人" :no-contacts "还没有联系人"
:show-qr "显示QR" :show-qr "显示二维码"
;group-settings ;group-settings
:remove "删除" :remove "删除"
@ -173,11 +173,11 @@
;new-contact ;new-contact
:add-new-contact "添加新的联系人" :add-new-contact "添加新的联系人"
:import-qr "导入" :import-qr "导入"
:scan-qr "扫描QR" :scan-qr "扫描二维码"
:name "名称" :name "名称"
:whisper-identity "Whisper身份" :whisper-identity "Whisper身份"
:address-explication "也许这里应该有一些文本来解释什么是地址，以及在哪里查找它" :address-explication "也许这里应该有一些文本来解释什么是地址，以及在哪里查找它"
:enter-valid-address "请输入有效地址或扫描QR码" :enter-valid-address "请输入有效地址或扫描二维码"
:contact-already-added "已添加该联系人" :contact-already-added "已添加该联系人"
:can-not-add-yourself "不能添加自己" :can-not-add-yourself "不能添加自己"
:unknown-address "未知地址" :unknown-address "未知地址"

172
src/status_im/translations/zh_hant.cljs
View File

@ -4,7 +4,7 @@
{ {
;common ;common
:members-title "成員" :members-title "成員"
:not-implemented "還未實施" :not-implemented "!尚未完成"
:chat-name "聊天名稱" :chat-name "聊天名稱"
:notifications-title "通知與聲音" :notifications-title "通知與聲音"
:offline "離線" :offline "離線"
@ -15,34 +15,34 @@
:switch-users "切換使用者" :switch-users "切換使用者"
;chat ;chat
:is-typing "正在鍵入中" :is-typing "正在輸入"
:and-you "和您" :and-you "和您"
:search-chat "搜尋聊天" :search-chat "搜尋聊天"
:members {:one "1個成員" :members {:one "1個成員"
:other "{{count}} 個成員" :other "{{count}} 個成員"
:zero "沒有成員"} :zero "沒有成員"}
:members-active {:one "1 個成員, 1 個活動" :members-active {:one "1 個成員, 1 個活動中"
:other "{{count}} 個成員, {{count}} 個活動" :other "{{count}} 個成員, {{count}} 個活動中"
:zero "沒有成員"} :zero "沒有成員"}
:active-online "離線" :active-online "線上"
:active-unknown "未知" :active-unknown "未知"
:available "可用" :available "有空"
:no-messages "沒有訊息" :no-messages "沒有訊息"
:suggestions-requests "請求" :suggestions-requests "請求"
:suggestions-commands "命令" :suggestions-commands "指令"
;sync ;sync
:sync-in-progress "同步中..." :sync-in-progress "同步中..."
:sync-synced "同步" :sync-synced "同步完成"
;messages ;messages
:status-sending "正在發送" :status-sending "正在傳送"
:status-pending "待定" :status-pending "等待中"
:status-sent "已發送" :status-sent "已傳送"
:status-seen-by-everyone "全部可見" :status-seen-by-everyone "所有人都已看過"
:status-seen "可見" :status-seen "已看過"
:status-delivered "已送達" :status-delivered "已送達"
:status-failed "送達失敗" :status-failed "傳送失敗"
;datetime ;datetime
:datetime-second {:one "秒" :datetime-second {:one "秒"
@ -59,49 +59,49 @@
:datetime-today "今天" :datetime-today "今天"
;profile ;profile
:profile "簡況" :profile "個人資料"
:report-user "報告使用者" :report-user "檢舉使用者"
:message "訊息" :message "訊息"
:username "使用者名稱" :username "使用者名稱"
:not-specified "未指定" :not-specified "未指定"
:public-key "公開金鑰" :public-key "公開金鑰"
:phone-number "手機號碼" :phone-number "電話號碼"
:email "電子郵件" :email "電子郵件"
:profile-no-status "無狀態" :profile-no-status "沒有狀態"
:add-to-contacts "添加到聯絡資訊" :add-to-contacts "新增至聯絡資訊"
:error-incorrect-name "請選擇另一個姓名" :error-incorrect-name "錯誤的名稱"
:error-incorrect-email "錯誤的電子郵寄地址" :error-incorrect-email "錯誤的電子郵件地址"
;;make_photo ;;make_photo
:image-source-title "個人照片" :image-source-title "個人圖片"
:image-source-make-photo "捕捉" :image-source-make-photo "拍攝"
:image-source-gallery "從相簿中選擇" :image-source-gallery "從相簿中選擇"
:image-source-cancel "取消" :image-source-cancel "取消"
;sign-up ;sign-up
:contacts-syncronized "您的聯絡資訊已同步" :contacts-syncronized "您的聯絡資訊已同步完成"
:confirmation-code (str "謝謝！我們已向您發送了包含 " :confirmation-code (str "謝謝！我們已向您發送了帶有 "
"確認碼的訊息。請鍵入此代碼以驗證您的手機號碼") "確認代碼的訊息。請輸入此代碼以驗證您的手機號碼")
:incorrect-code (str "很抱歉，代碼不正確，請重新鍵入") :incorrect-code (str "很抱歉，代碼錯誤，請重新輸入")
:generate-passphrase (str "我會給您生成一條口令句，您可以使用它 " :generate-passphrase (str "我會為您產生一個密碼短語，您可以使用它 "
"在其他裝置上以訪問或登入") "在其他裝置上回復帳號或登入")
:phew-here-is-your-passphrase "啊哈，這是您的口令句，*請記下來並 好好保管！ *您需要使用它以回復您帳號。" :phew-here-is-your-passphrase "*啊哈*，這是您的密碼短語，*請寫下來，並好好保管！* 您需要它來回復您的帳號。"
:here-is-your-passphrase "這是您的口令句，*請記下來並 好好保管！ *您需要使用它以回復您帳號。" :here-is-your-passphrase "這是您的密碼短語，*請寫下來，並好好保管！* 您需要它來回復您的帳號。"
:written-down "請一定要把它記下來" :written-down "請確認您已將密碼短語寫下，並存放在安全的地點"
:phone-number-required "點選這裡以鍵入您的手機號碼，我會發現您的好友" :phone-number-required "點選這裡輸入您的手機號碼，我會找到您的好友"
:intro-status "與我聊天以配置您的帳號，變更您的設定！" :intro-status "與我聊天以設定您的帳號並變更設定！"
:intro-message1 "歡迎來到Status\n點選此訊息以設定您的密碼並開始使用！" :intro-message1 "歡迎來到Status\n點選此訊息以設定您的密碼並開始使用！"
:account-generation-message "給我幾秒鐘，我正在努力生成您的帳號！" :account-generation-message "給我幾秒鐘，我正在努力產生您的帳號！"
;chats ;chats
:chats "聊天" :chats "聊天室"
:new-chat "新聊天" :new-chat "新對話"
:new-group-chat "新的群聊" :new-group-chat "新群組"
;discover ;discover
:discover "發現" :discover "發現"
:none "無" :none "無"
:search-tags "在這裡鍵入您的搜尋標籤" :search-tags "在這裡輸入搜尋標籤"
:popular-tags "熱門標籤" :popular-tags "熱門標籤"
:recent "最近" :recent "最近"
:no-statuses-discovered "未發現狀態" :no-statuses-discovered "未發現狀態"
@ -111,37 +111,37 @@
;contacts ;contacts
:contacts "聯絡資訊" :contacts "聯絡資訊"
:new-contact "新聯絡資訊" :new-contact "新聯絡人"
:show-all "顯示全部" :show-all "顯示全部"
:contacts-group-dapps "ÐApps" :contacts-group-dapps "ÐApps"
:contacts-group-people "人" :contacts-group-people "成員"
:contacts-group-new-chat "開始新聊天" :contacts-group-new-chat "開始新對話"
:no-contacts "還沒有聯絡資訊" :no-contacts "尚無聯絡資訊"
:show-qr "顯示QR碼" :show-qr "顯示QR碼"
;group-settings ;group-settings
:remove "移除" :remove "移除"
:save "保存" :save "保存"
:change-color "變更顏色" :change-color "更改顏色"
:clear-history "清理歷史記錄" :clear-history "清理歷史記錄"
:delete-and-leave "刪除並離開" :delete-and-leave "刪除並離開"
:chat-settings "聊天設定" :chat-settings "聊天設定"
:edit "編輯" :edit "編輯"
:add-members "添加成員" :add-members "新增成員"
:blue "藍" :blue "藍色"
:purple "紫" :purple "紫色"
:green "綠" :green "綠色"
:red "紅" :red "紅色"
;commands ;commands
:money-command-description "轉帳" :money-command-description "匯款"
:location-command-description "發送位置" :location-command-description "傳送位置"
:phone-command-description "發送手機號碼" :phone-command-description "傳送手機號碼"
:phone-request-text "請求手機號碼" :phone-request-text "請求手機號碼"
:confirmation-code-command-description "發送確認碼" :confirmation-code-command-description "傳送確認碼"
:confirmation-code-request-text "請求確認碼" :confirmation-code-request-text "請求確認碼"
:send-command-description "發送位置" :send-command-description "傳送位置"
:request-command-description "發送請求" :request-command-description "傳送請求"
:keypair-password-command-description "" :keypair-password-command-description ""
:help-command-description "幫助" :help-command-description "幫助"
:request "請求" :request "請求"
@ -149,38 +149,38 @@
:chat-send-eth-to "{{amount}} ETH 給 {{chat-name}}" :chat-send-eth-to "{{amount}} ETH 給 {{chat-name}}"
:chat-send-eth-from "{{amount}} ETH 來自 {{chat-name}}" :chat-send-eth-from "{{amount}} ETH 來自 {{chat-name}}"
:command-text-location "位置: {{address}}" :command-text-location "位置: {{address}}"
:command-text-browse "流覽網頁: {{webpage}}" :command-text-browse "瀏覽網頁: {{webpage}}"
:command-text-send "交易: {{amount}} ETH" :command-text-send "交易: {{amount}} ETH"
:command-text-help "幫助" :command-text-help "幫助"
;new-group ;new-group
:group-chat-name "聊天名稱" :group-chat-name "群組名稱"
:empty-group-chat-name "請鍵入一個名稱" :empty-group-chat-name "請輸入名稱"
:illegal-group-chat-name "請選擇其他名稱" :illegal-group-chat-name "請選擇其他名稱"
;participants ;participants
:add-participants "添加參與人" :add-participants "新增參與者"
:remove-participants "移除參與人" :remove-participants "移除參與者"
;protocol ;protocol
:received-invitation "接受的聊天邀請" :received-invitation "收到的聊天邀請"
:removed-from-chat "把您移出了群聊" :removed-from-chat "將您移出了群組"
:left "留下的" :left "剩餘"
:invited "邀請的" :invited "已邀請"
:removed "移出的" :removed "已移出"
:You "您" :You "您"
;new-contact ;new-contact
:add-new-contact "添加新的聯絡資訊" :add-new-contact "新增新的聯絡人"
:import-qr "匯入" :import-qr "匯入"
:scan-qr "掃描QR碼" :scan-qr "掃描QR碼"
:name "名稱" :name "名稱"
:whisper-identity "私聊身份" :whisper-identity "Whisper身份"
:address-explication "也許這裡會有文本介紹是什麼樣的位址，在哪裡能找到它" :address-explication "也許這裡要有些文字介紹位址是什麼，又能在哪裡找到它"
:enter-valid-address "請鍵入有效的位址或掃描QR碼" :enter-valid-address "請輸入有效位址或掃描QR碼"
:contact-already-added "聯絡資訊已添加" :contact-already-added "已新增該聯絡人"
:can-not-add-yourself "您無法添加自己" :can-not-add-yourself "您不能新增自己"
:unknown-address "未知得的地址" :unknown-address "未知地址"
;login ;login
@ -191,34 +191,34 @@
:wrong-password "密碼錯誤" :wrong-password "密碼錯誤"
;recover ;recover
:recover-from-passphrase "從口令句恢復" :recover-from-passphrase "使用密碼短語回復"
:recover-explain "請鍵入密碼的口令句以恢復訪問" :recover-explain "請輸入此密碼的密碼短語來回復登入權限"
:passphrase "口令句" :passphrase "密碼短語"
:recover "恢復" :recover "回復"
:enter-valid-passphrase "請鍵入口令句" :enter-valid-passphrase "請輸入密碼短語"
:enter-valid-password "請鍵入密碼" :enter-valid-password "請輸入密碼"
;accounts ;accounts
:recover-access "恢復訪問" :recover-access "回復登入權限"
:add-account "添加帳號" :add-account "新增帳號"
;wallet-qr-code ;wallet-qr-code
:done "完成" :done "完成"
:main-wallet "錢包" :main-wallet "主錢包"
;validation ;validation
:invalid-phone "無效的手機號碼" :invalid-phone "無效的手機號碼"
:amount "金額" :amount "金額"
:not-enough-eth (str "餘額中ETH不足 " :not-enough-eth (str "ETH餘額不足 "
"({{balance}} ETH)") "({{balance}} ETH)")
;transactions ;transactions
:confirm-transactions {:one "確認交易" :confirm-transactions {:one "確認交易"
:other "確認 {{count}} 交易" :other "確認 {{count}} 筆交易"
:zero "無交易"} :zero "無交易"}
:status "狀態" :status "狀態"
:pending-confirmation "等待確認" :pending-confirmation "等待確認中"
:recipient "接收人" :recipient "接收方"
:one-more-item "再來一個" :one-more-item "再一項"
:fee "費用" :fee "費用"
:value "價值" :value "價值"