From 1d729e71754e7a403f107a99781ed7aae71f4594 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Thu, 23 Jan 2020 22:41:39 +0100
Subject: [PATCH] Chore: Fixed the spelling for QOTO to all uppercase.

---
 app/javascript/mastodon/features/getting_started/index.js  | 6 +++---
 .../mastodon/features/ui/components/navigation_panel.js    | 4 ++--
 app/javascript/mastodon/locales/en.json                    | 4 ++--
 app/javascript/mastodon/locales/ja.json                    | 4 ++--
 config/locales/en.yml                                      | 7 ++++---
 config/locales/ja.yml                                      | 5 +++--
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 7db344f09b..d8d99e3816 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -37,8 +37,8 @@ const messages = defineMessages({
   menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
   profile_directory: { id: 'getting_started.directory', defaultMessage: 'Profile directory' },
   information: { id: 'navigation_bar.information', defaultMessage: 'Information' },
-  information_acct: { id: 'navigation_bar.information_acct', defaultMessage: 'Qoto Announcements' },
-  hashtag_qoto_journal: { id: 'navigation_bar.hashtag_qoto_journal', defaultMessage: 'Qoto Journal' },
+  information_acct: { id: 'navigation_bar.information_acct', defaultMessage: 'QOTO Announcements' },
+  hashtag_qoto_journal: { id: 'navigation_bar.hashtag_qoto_journal', defaultMessage: 'QOTO Journal' },
 });
 
 const mapStateToProps = state => ({
@@ -118,7 +118,7 @@ class GettingStarted extends ImmutablePureComponent {
       navItems.push(
         <ColumnSubheading key={i++} text={intl.formatMessage(messages.information)} />,
           <ColumnLink key={i++} icon='info-circle' text={intl.formatMessage(messages.information_acct)} to='/accounts/95378' />,
-        <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_qoto_journal)} to='/timelines/tag/QotoJournal' />,
+        <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_qoto_journal)} to='/timelines/tag/QOTOJournal' />,
       );
 
       height += 34 + 48*2;
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index f620586661..8a23235f88 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -16,8 +16,8 @@ const NavigationPanel = () => (
     <FollowRequestsNavLink />
     <NavLink className='column-link column-link--transparent' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
     <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/accounts/95378'><Icon className='column-link__icon' id='info-circle' fixedWidth /><FormattedMessage id='navigation_bar.information_acct' defaultMessage='Qoto info' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/timelines/tag/QotoJournal'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.hashtag_qoto_journal' defaultMessage='Qoto Journal' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/accounts/95378'><Icon className='column-link__icon' id='info-circle' fixedWidth /><FormattedMessage id='navigation_bar.information_acct' defaultMessage='QOTO info' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/timelines/tag/QOTOJournal'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.hashtag_qoto_journal' defaultMessage='QOTO Journal' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index b7031404b3..47656e89d9 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -280,10 +280,10 @@
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.hashtag_qoto_journal": "Qoto Journal",
+  "navigation_bar.hashtag_qoto_journal": "QOTO Journal",
   "navigation_bar.info": "About this server",
   "navigation_bar.information": "Information",
-  "navigation_bar.information_acct": "Qoto Announcements",
+  "navigation_bar.information_acct": "QOTO Announcements",
   "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 4e9e3ca3ae..99b61da922 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -280,10 +280,10 @@
   "navigation_bar.filters": "フィルター設定",
   "navigation_bar.follow_requests": "フォローリクエスト",
   "navigation_bar.follows_and_followers": "フォロー・フォロワー",
-  "navigation_bar.hashtag_qoto_journal": "Qoto Journal",
+  "navigation_bar.hashtag_qoto_journal": "QOTO Journal",
   "navigation_bar.info": "このサーバーについて",
   "navigation_bar.information": "お知らせと情報",
-  "navigation_bar.information_acct": "Qoto Announcements",
+  "navigation_bar.information_acct": "QOTO Announcements",
   "navigation_bar.keyboard_shortcuts": "ホットキー",
   "navigation_bar.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
diff --git a/config/locales/en.yml b/config/locales/en.yml
index da47151973..1300e8a0ae 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -997,7 +997,7 @@ en:
       too_few_options: must have more than one item
       too_many_options: can't contain more than %{max} items
   preferences:
-    qoto_features: Qoto features
+    qoto_features: QOTO features
     other: Other
     posting_defaults: Posting defaults
     public_timelines: Public timelines
@@ -1247,6 +1247,7 @@ en:
     mastodon-wide-dark: Mastodon Default Theme, Full Width (dark)
     contrast: Mastodon (High contrast)
     default: QOTO Default Theme
+    qoto-no-ticker: QOTO Default Theme without instance ticker
     instance-ticker-type-0-contrast: Mastodon (High contrast / Instance Ticker Type-0 alticon)
     instance-ticker-type-0-light: Mastodon (Light / Instance Ticker Type-0 alticon)
     instance-ticker-type-0: Mastodon (Dark / Instance Ticker Type-0 alticon)
@@ -1315,14 +1316,14 @@ en:
       edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
       explanation: Here are some tips to get you started
       final_action: Start posting
-      final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the federated timeline, local timeline, and in hashtags. You may want to introduce yourself on the #Introduction hashtag or share professional work via the #QotoJournal hashtag.'
+      final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the federated timeline, local timeline, and in hashtags. You may want to introduce yourself on the #Introduction hashtag or share professional work via the #QOTOJournal hashtag.'
       full_handle: Your full handle
       full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
       review_preferences_action: Change preferences
       review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay.
       subject: Welcome to Mastodon
       tip_federated_timeline: The federated timeline is a firehose view of the Mastodon network. But it only includes people your neighbors are subscribed to or posts sent via relay, so it's not complete.
-      tip_following: "You follow your server's information account by default. To find more interesting people, check the #Introduction tag, #QotoJournal tag, and the federated timelines."
+      tip_following: "You follow your server's information account by default. To find more interesting people, check the #Introduction tag, #QOTOJournal tag, and the federated timelines."
       tip_local_timeline: The local timeline is a firehose view of people on %{instance}. These are your immediate neighbours!
       tip_mobile_webapp: If your mobile browser offers you to add Mastodon to your homescreen, you can receive push notifications. It acts like a native app in many ways!
       tips: Tips
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f4e265f01a..10378b50e0 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -966,7 +966,7 @@ ja:
       too_few_options: は複数必要です
       too_many_options: は%{max}個までです
   preferences:
-    qoto_features: Qotoの機能
+    qoto_features: QOTOの機能
     other: その他
     posting_defaults: デフォルトの投稿設定
     public_timelines: 公開タイムライン
@@ -1202,7 +1202,8 @@ ja:
     title: "%{instance} 利用規約・プライバシーポリシー"
   themes:
     contrast: Mastodon (ハイコントラスト)
-    default: Mastodon (ダーク)
+    default: QOTO Default Theme
+    qoto-no-ticker: QOTO Default theme w/o instance ticker
     instance-ticker-type-0-contrast: Mastodon (ハイコントラスト / インスタンス・ティッカー Type-0 代替アイコン)
     instance-ticker-type-0-light: Mastodon (ライト / インスタンス・ティッカー Type-0 代替アイコン)
     instance-ticker-type-0: Mastodon (ダーク / インスタンス・ティッカー Type-0 代替アイコン)
-- 
GitLab