Merge branch 'master' of https://github.com/syuilo/misskey

2018-05-26 13:31:52 +09:00 · 2018-05-26 13:31:52 +09:00 · 19f6af475a
commit 19f6af475a
parent 65a3bac543 f848e3f226
12 changed files with 114 additions and 91 deletions
--- a/locales/de.yml
+++ b/locales/de.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "Trennen"
 common/views/components/uploader.vue:
  waiting: "Warten"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "Laden"
  no-broadcasts: "Keine Broadcasts"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Serverinformationen"
  toggle: "Sicht umschalten"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Schwarz ... komplett"
  notes: "Blau ... Hinweise"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Weitersagen fehlgeschlagen"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/locales/en.yml
+++ b/locales/en.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "Disconnect"
 common/views/components/uploader.vue:
  waiting: "Waiting"
+common/views/components/visibility-chooser.vue:
+  public: "Public"
+  home: "Home"
+  home-desc: "Post to the home timeline only"
+  followers: "Followers"
+  followers-desc: "Post to followers only"
+  specified: "Direct"
+  specified-desc: "Post to specified users only"
+  private: "Private"
 common/views/widgets/broadcast.vue:
  fetching: "Fetching"
  no-broadcasts: "No broadcasts"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Server info"
  toggle: "Toggle views"
-common/views/widgets/visibility-chooser.vue:
-  public: "Public"
-  home: "Home"
-  home-desc: "Post to the home timeline only"
-  followers: "Followers"
-  followers-desc: "Post to followers only"
-  specified: "Direct"
-  specified-desc: "Post to specified users only"
-  private: "Private"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Failed to Renote"
 desktop/views/components/renote-form-window.vue:
  title: "Are you sure you want to renote this note?"
+desktop/views/components/settings-window.vue:
+  settings: "Settings"
 desktop/views/components/settings.vue:
  profile: "Profile"
  notification: "Notification"
--- a/locales/es.yml
+++ b/locales/es.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/locales/fr.yml
+++ b/locales/fr.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "Deconnecter"
 common/views/components/uploader.vue:
  waiting: "En attente"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "Récuperation"
  no-broadcasts: "No broadcasts"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Info sur le serveur"
  toggle: "Afficher les vues"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "La renote a échoué"
 desktop/views/components/renote-form-window.vue:
  title: "Êtes vous sûr de vouloir renote cette note?"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "Profil"
  notification: "Notification"
--- a/locales/it.yml
+++ b/locales/it.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/locales/ja.yml
+++ b/locales/ja.yml
@ -417,6 +417,9 @@ desktop/views/components/renote-form.vue:
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"

+desktop/views/components/settings-window.vue:
+  settings: "設定"
+
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/locales/ko.yml
+++ b/locales/ko.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/locales/pl.yml
+++ b/locales/pl.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "Rozłącz"
 common/views/components/uploader.vue:
  waiting: "Oczekiwanie"
+common/views/components/visibility-chooser.vue:
+  public: "Publiczny"
+  home: "Lokalny"
+  home-desc: "Widoczny tylko na tej instancji"
+  followers: "Dla śledzących"
+  followers-desc: "Widoczny tylko dla osób, które Cię śledzą"
+  specified: "Bezpośredni"
+  specified-desc: "Tylko dla określonych użytkowników"
+  private: "Prywatny"
 common/views/widgets/broadcast.vue:
  fetching: "Sprawdzanie"
  no-broadcasts: "Brak transmisji"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "Informacje o serwerze"
  toggle: "Przełącz widok"
-common/views/widgets/visibility-chooser.vue:
-  public: "Publiczny"
-  home: "Lokalny"
-  home-desc: "Widoczny tylko na tej instancji"
-  followers: "Dla śledzących"
-  followers-desc: "Widoczny tylko dla osób, które Cię śledzą"
-  specified: "Bezpośredni"
-  specified-desc: "Tylko dla określonych użytkowników"
-  private: "Prywatny"
 desktop/views/components/activity.chart.vue:
  total: "Czarny … Łącznie"
  notes: "Niebieski … Wpisy"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Nie udało się udostępnić"
 desktop/views/components/renote-form-window.vue:
  title: "Czy na pewno chcesz udostępnić ten wpis?"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "Profil"
  notification: "Powiadomienia"
--- a/locales/pt.yml
+++ b/locales/pt.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/locales/ru.yml
+++ b/locales/ru.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/locales/zh.yml
+++ b/locales/zh.yml
@ -151,6 +151,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@ -165,15 +174,6 @@ common/views/widgets/photo-stream.vue:
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@ -358,6 +358,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
--- a/src/client/app/desktop/views/components/settings-window.vue
+++ b/src/client/app/desktop/views/components/settings-window.vue
@ -1,6 +1,6 @@
 <template>
 <mk-window ref="window" is-modal width="700px" height="550px" @closed="$destroy">
-	<span slot="header" :class="$style.header">%fa:cog%設定</span>
+	<span slot="header" :class="$style.header">%fa:cog%%i18n:@settings%</span>
 	<mk-settings @done="close"/>
 </mk-window>
 </template>