diff --git a/.circleci/config.yml b/.circleci/config.yml index cc980f8058..90688ee192 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -141,7 +141,14 @@ workflows: - l10n_develop - imgbot - patch-autogen + - hold: + type: approval + filters: + branches: + ignore: master - build: + requires: + - hold filters: branches: ignore: diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b540546ce3..1de9654f61 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -61,6 +61,7 @@ common: drive: "ドライブ" messaging: "トーク" deck: "デッキ" + timeline: "タイムライン" explore: "みつける" following: "フォロー中" followers: "フォロワー" @@ -1087,7 +1088,6 @@ desktop/views/components/ui.header.account.vue: dark: "闇に飲まれる" desktop/views/components/ui.header.nav.vue: - home: "ホーム" game: "ゲーム" desktop/views/components/ui.header.notifications.vue: diff --git a/src/client/app/desktop/views/components/ui.header.nav.vue b/src/client/app/desktop/views/components/ui.header.nav.vue index 612c8d931f..3d4e34f914 100644 --- a/src/client/app/desktop/views/components/ui.header.nav.vue +++ b/src/client/app/desktop/views/components/ui.header.nav.vue @@ -1,8 +1,8 @@