From 8a753f684d07e29c99e9e8e87f4fadcb3120999d Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 4 Apr 2017 20:45:35 +0900 Subject: [PATCH] l10n --- locales/en.yml | 25 ++++--------------- locales/ja.yml | 25 ++++--------------- src/web/app/common/tags/messaging/form.tag | 4 +-- src/web/app/common/tags/messaging/message.tag | 2 +- src/web/app/common/tags/messaging/room.tag | 2 +- src/web/app/desktop/tags/drive/browser.tag | 4 +-- .../desktop/tags/drive/file-contextmenu.tag | 4 +-- .../desktop/tags/drive/folder-contextmenu.tag | 2 +- src/web/app/desktop/tags/drive/folder.tag | 2 +- .../tags/home-widgets/photo-stream.tag | 2 +- .../tags/home-widgets/recommended-polls.tag | 2 +- .../app/desktop/tags/home-widgets/trends.tag | 2 +- .../tags/home-widgets/user-recommendation.tag | 2 +- src/web/app/mobile/tags/drive.tag | 2 +- src/web/app/mobile/tags/notifications.tag | 2 +- src/web/app/mobile/tags/page/entrance.tag | 2 +- src/web/app/mobile/tags/timeline.tag | 4 +-- src/web/app/mobile/tags/users-list.tag | 4 +-- 18 files changed, 31 insertions(+), 61 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 1afe1328ee..61fec0ff06 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -19,12 +19,15 @@ common: surprise: "Wow" congrats: "Congrats!" + input-message-here: "Enter message here" + send: "Send" + delete: "Delete" + loading: "Loading" + ok: "OK" update-available: "New version of Misskey is now available({newer}, current is {current}). Reload page to apply update." tags: mk-messaging-form: - placeholder: "Enter message here" - send: "Send" attach-from-local: "Attach file from your pc" attach-from-drive: "Attach file from the drive" @@ -35,11 +38,9 @@ common: mk-messaging-message: is-read: "Read" - delete: "Delete this message" deleted: "This message has been deleted" mk-messaging-room: - loading: "Loading" empty: "No conversations" resize-form: "Drag to resize" new-message: "New message" @@ -141,7 +142,6 @@ desktop: empty-folder: "このフォルダーは空です" unable-to-process: "操作を完了できません" circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。" - ok: "OK" unhandled-error: "不明なエラー" url-upload: "URLアップロード" url-of-file: "アップロードしたいファイルのURL" @@ -154,7 +154,6 @@ desktop: rename: "名前を変更" copy-url: "URLをコピー" download: "ダウンロード" - delete: "削除" else-files: "その他..." set-as-avatar: "アバターに設定" set-as-banner: "バナーに設定" @@ -164,7 +163,6 @@ desktop: input-new-file-name: "新しいファイル名を入力してください" copied: "コピー完了" copied-url-to-clipboard: "URLをクリップボードにコピーしました" - ok: "OK" mk-drive-browser-file: avatar: "アバター" @@ -175,14 +173,12 @@ desktop: move-to-this-folder: "このフォルダへ移動" show-in-new-window: "新しいウィンドウで表示" rename: "名前を変更" - delete: "削除" rename-folder: "フォルダ名の変更" input-new-folder-name: "新しいフォルダ名を入力してください" mk-drive-browser-folder: unable-to-process: "操作を完了できません" circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。" - ok: "OK" unhandled-error: "不明なエラー" mk-drive-browser-nav-folder: @@ -246,23 +242,19 @@ desktop: title: "Recommended users" refresh: "Show others" no-one: "No one" - fetching: "Loading" mk-recommended-polls-home-widget: title: "Polls" refresh: "Show others" nothing: "Nothing" - fetching: "Loading" mk-trends-home-widget: title: "Trend" refresh: "Show others" nothing: "Nothing" - fetching: "Loading" mk-photo-stream-home-widget: title: "Photostream" - initializing: "Loading" no-photos: "No photos" mk-donation-home-widget: @@ -307,9 +299,6 @@ mobile: mk-drive-page: drive: "Drive" - mk-entrance: - ok: "OK" - mk-home: home: "Home" @@ -354,7 +343,6 @@ mobile: count-separator: ", " file-count: "File(s)" load-more: "Load more" - loading: "Loading" nothing-in-drive: "Nothing" folder-is-empty: "This folder is empty" @@ -367,7 +355,6 @@ mobile: mk-notifications: empty: "No notifications" - loading: "Loading" mk-post-detail: reply: "Reply" @@ -390,7 +377,6 @@ mobile: reposted-by: "Reposted by {}" mk-timeline: - loading: "Loading" empty: "No posts" load-more: "More" @@ -425,4 +411,3 @@ mobile: all: "All" known: "You know" load-more: "More" - loading: "Loading" diff --git a/locales/ja.yml b/locales/ja.yml index 06a72fb04d..b999e55450 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -19,12 +19,15 @@ common: surprise: "わお" congrats: "おめでとう" + input-message-here: "ここにメッセージを入力" + send: "送信" + delete: "削除" + loading: "読み込み中" + ok: "わかった" update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。" tags: mk-messaging-form: - placeholder: "ここにメッセージを入力" - send: "メッセージを送信" attach-from-local: "PCからファイルを添付する" attach-from-drive: "ドライブからファイルを添付する" @@ -35,11 +38,9 @@ common: mk-messaging-message: is-read: "既読" - delete: "メッセージを削除" deleted: "このメッセージは削除されました" mk-messaging-room: - loading: "読み込み中" empty: "このユーザーと話したことはありません" resize-form: "ドラッグしてフォームの広さを調整" new-message: "新しいメッセージがあります" @@ -141,7 +142,6 @@ desktop: empty-folder: "このフォルダーは空です" unable-to-process: "操作を完了できません" circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。" - ok: "OK" unhandled-error: "不明なエラー" url-upload: "URLアップロード" url-of-file: "アップロードしたいファイルのURL" @@ -154,7 +154,6 @@ desktop: rename: "名前を変更" copy-url: "URLをコピー" download: "ダウンロード" - delete: "削除" else-files: "その他..." set-as-avatar: "アバターに設定" set-as-banner: "バナーに設定" @@ -164,7 +163,6 @@ desktop: input-new-file-name: "新しいファイル名を入力してください" copied: "コピー完了" copied-url-to-clipboard: "URLをクリップボードにコピーしました" - ok: "OK" mk-drive-browser-file: avatar: "アバター" @@ -175,14 +173,12 @@ desktop: move-to-this-folder: "このフォルダへ移動" show-in-new-window: "新しいウィンドウで表示" rename: "名前を変更" - delete: "削除" rename-folder: "フォルダ名の変更" input-new-folder-name: "新しいフォルダ名を入力してください" mk-drive-browser-folder: unable-to-process: "操作を完了できません" circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。" - ok: "OK" unhandled-error: "不明なエラー" mk-drive-browser-nav-folder: @@ -246,23 +242,19 @@ desktop: title: "おすすめユーザー" refresh: "他を見る" no-one: "いません!" - fetching: "読み込んでいます" mk-recommended-polls-home-widget: title: "投票" refresh: "他を見る" nothing: "ありません!" - fetching: "読み込んでいます" mk-trends-home-widget: title: "トレンド" refresh: "他を見る" nothing: "ありません!" - fetching: "読み込んでいます" mk-photo-stream-home-widget: title: "フォトストリーム" - initializing: "読み込んでいます" no-photos: "写真はありません" mk-donation-home-widget: @@ -307,9 +299,6 @@ mobile: mk-drive-page: drive: "ドライブ" - mk-entrance: - ok: "わかった" - mk-home: home: "ホーム" @@ -354,7 +343,6 @@ mobile: count-separator: "、" file-count: "ファイル" load-more: "もっと読み込む" - loading: "読み込み中" nothing-in-drive: "ドライブには何もありません" folder-is-empty: "このフォルダは空です" @@ -367,7 +355,6 @@ mobile: mk-notifications: empty: "ありません!" - loading: "読み込み中" mk-post-detail: reply: "返信" @@ -390,7 +377,6 @@ mobile: reposted-by: "{}がRepost" mk-timeline: - loading: "読み込み中" empty: "表示するものがありません" load-more: "もっとみる" @@ -425,4 +411,3 @@ mobile: all: "すべて" known: "知り合い" load-more: "もっと" - loading: "読み込み中" diff --git a/src/web/app/common/tags/messaging/form.tag b/src/web/app/common/tags/messaging/form.tag index b3b61b43d2..97b1b7c446 100644 --- a/src/web/app/common/tags/messaging/form.tag +++ b/src/web/app/common/tags/messaging/form.tag @@ -1,8 +1,8 @@ - +
- +
image
diff --git a/src/web/app/common/tags/messaging/room.tag b/src/web/app/common/tags/messaging/room.tag index 72deb20823..33bd644f82 100644 --- a/src/web/app/common/tags/messaging/room.tag +++ b/src/web/app/common/tags/messaging/room.tag @@ -1,6 +1,6 @@
-

%i18n:common.tags.mk-messaging-room.loading%

+

%i18n:common.loading%

%i18n:common.tags.mk-messaging-room.empty%

diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag index 12e1923215..d121d4736c 100644 --- a/src/web/app/desktop/tags/drive/browser.tag +++ b/src/web/app/desktop/tags/drive/browser.tag @@ -445,7 +445,7 @@ case 'detected-circular-definition': dialog('%i18n:desktop.tags.mk-drive-browser.unable-to-process%', '%i18n:desktop.tags.mk-drive-browser.circular-reference-detected%', [{ - text: '%i18n:desktop.tags.mk-drive-browser.ok%' + text: '%i18n:common.ok%' }]); break; default: @@ -485,7 +485,7 @@ dialog('%i18n:desktop.tags.mk-drive-browser.url-upload-requested%', '%i18n:desktop.tags.mk-drive-browser.may-take-time%', [{ - text: '%i18n:desktop.tags.mk-drive-browser.ok%' + text: '%i18n:common.ok%' }]); }); }; diff --git a/src/web/app/desktop/tags/drive/file-contextmenu.tag b/src/web/app/desktop/tags/drive/file-contextmenu.tag index d80ba49f9a..0ea72333fb 100644 --- a/src/web/app/desktop/tags/drive/file-contextmenu.tag +++ b/src/web/app/desktop/tags/drive/file-contextmenu.tag @@ -10,7 +10,7 @@
  • %i18n:desktop.tags.mk-drive-browser-file-contextmenu.download%
  • -

    %i18n:desktop.tags.mk-drive-browser-file-contextmenu.delete%

    +

    %i18n:common.delete%

  • @@ -74,7 +74,7 @@ this.refs.ctx.close(); dialog('%i18n:desktop.tags.mk-drive-browser-file-contextmenu.copied%', '%i18n:desktop.tags.mk-drive-browser-file-contextmenu.copied-url-to-clipboard%', [{ - text: '%i18n:desktop.tags.mk-drive-browser-file-contextmenu.ok%' + text: '%i18n:common.ok%' }]); }; diff --git a/src/web/app/desktop/tags/drive/folder-contextmenu.tag b/src/web/app/desktop/tags/drive/folder-contextmenu.tag index 8ac5da6548..ce95ccfb1d 100644 --- a/src/web/app/desktop/tags/drive/folder-contextmenu.tag +++ b/src/web/app/desktop/tags/drive/folder-contextmenu.tag @@ -13,7 +13,7 @@
  • -

    %i18n:desktop.tags.mk-drive-browser-folder-contextmenu.delete%

    +

    %i18n:common.delete%

  • diff --git a/src/web/app/desktop/tags/drive/folder.tag b/src/web/app/desktop/tags/drive/folder.tag index db7963f553..e03c4e3534 100644 --- a/src/web/app/desktop/tags/drive/folder.tag +++ b/src/web/app/desktop/tags/drive/folder.tag @@ -147,7 +147,7 @@ case 'detected-circular-definition': dialog('%i18n:desktop.tags.mk-drive-browser-folder.unable-to-process%', '%i18n:desktop.tags.mk-drive-browser-folder.circular-reference-detected%', [{ - text: '%i18n:desktop.tags.mk-drive-browser-folder.ok%' + text: '%i18n:common.ok%' }]); break; default: diff --git a/src/web/app/desktop/tags/home-widgets/photo-stream.tag b/src/web/app/desktop/tags/home-widgets/photo-stream.tag index 4edfc01f72..cba0e3cdb0 100644 --- a/src/web/app/desktop/tags/home-widgets/photo-stream.tag +++ b/src/web/app/desktop/tags/home-widgets/photo-stream.tag @@ -1,6 +1,6 @@

    %i18n:desktop.tags.mk-photo-stream-home-widget.title%

    -

    %i18n:desktop.tags.mk-photo-stream-home-widget.initializing%

    +

    %i18n:common.loading%

    0 }>
    diff --git a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag index 2bda474264..5f43f4fc84 100644 --- a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag +++ b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag @@ -7,7 +7,7 @@

    %i18n:desktop.tags.mk-recommended-polls-home-widget.nothing%

    -

    %i18n:desktop.tags.mk-recommended-polls-home-widget.fetching%

    +

    %i18n:common.loading%