diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 029450d6d9a8a7de175ece572d7d337ca0158871..d9b246e688493654c70b07392ae21ba5790771a9 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: 'Fedibird info' }, - hashtag_fedibird: { id: 'navigation_bar.hashtag_fedibird', defaultMessage: 'fedibird' }, + 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 => ({ @@ -116,8 +116,8 @@ 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/2' />, - <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_fedibird)} to='/timelines/tag/fedibird' />, + <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' />, ); height += 34 + 48*2; @@ -136,7 +136,7 @@ class GettingStarted extends ImmutablePureComponent { navItems.push( <ColumnLink key={i++} icon='info-circle' text={intl.formatMessage(messages.information_acct)} to='/accounts/2' />, - <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_fedibird)} to='/timelines/tag/fedibird' />, + <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_qoto_journal)} to='/timelines/tag/QotoJornal' />, ); height += 48*2; diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js index bcbd8cd858374d06fab5fbc3b84996fd27d38d58..f2ac5072f92560960471e93f920ae4d82ac5e87c 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.js +++ b/app/javascript/mastodon/features/ui/components/columns_area.js @@ -231,11 +231,6 @@ class ColumnsArea extends ImmutablePureComponent { })} {React.Children.map(children, child => React.cloneElement(child, { multiColumn: true }))} - <div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'> - <div className='columns-area__panels__pane__inner'> - <NavigationPanel /> - </div> - </div> </div> ); } diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js index cfb6bc613fb7dbf907033e98beb7858a46fd96da..3e85fffd968c4d99da0af59a6ffaefdd71620f76 100644 --- a/app/javascript/mastodon/features/ui/components/navigation_panel.js +++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js @@ -15,8 +15,8 @@ const NavigationPanel = () => ( <NavLink className='column-link column-link--transparent' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon className='column-link__icon' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink> <FollowRequestsNavLink /> <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/2'><Icon className='column-link__icon' id='info-circle' fixedWidth /><FormattedMessage id='navigation_bar.information_acct' defaultMessage='Fedibird info' /></NavLink> - <NavLink className='column-link column-link--transparent' to='/timelines/tag/fedibird'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.hashtag_fedibird' defaultMessage='Fedibird topics' /></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 631910601521fc445b6b110f02aebe9d7d6bd300..574ad96354473e42eac1fb37ff841307b160f1e7 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -275,10 +275,10 @@ "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.follows_and_followers": "Follows and followers", - "navigation_bar.hashtag_fedibird": "Fedibird topics", + "navigation_bar.hashtag_qoto_journal": "Qoto Journal", "navigation_bar.info": "About this server", "navigation_bar.information": "Information", - "navigation_bar.information_acct": "Fedibird info", + "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 e7b548a84f31f4a6eb9075f959be523d1da598fe..f17a372ad5b2be9b224cad4a5c8446bbc5c11309 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -275,10 +275,10 @@ "navigation_bar.filters": "フィルターè¨å®š", "navigation_bar.follow_requests": "フォãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆ", "navigation_bar.follows_and_followers": "フォãƒãƒ¼ãƒ»ãƒ•ã‚©ãƒãƒ¯ãƒ¼", - "navigation_bar.hashtag_fedibird": "Fedibirdã«é–¢ã™ã‚‹è©±é¡Œ", + "navigation_bar.hashtag_qoto_journal": "Qoto Journal", "navigation_bar.info": "ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«ã¤ã„ã¦", "navigation_bar.information": "ãŠçŸ¥ã‚‰ã›ã¨æƒ…å ±", - "navigation_bar.information_acct": "Fedibirdインフォメーション", + "navigation_bar.information_acct": "Qoto Announcements", "navigation_bar.keyboard_shortcuts": "ホットã‚ー", "navigation_bar.lists": "リスト", "navigation_bar.logout": "ãƒã‚°ã‚¢ã‚¦ãƒˆ", diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 962fd6802f0f7184566bb8340c979f2f4ad5fbe5..d080286532b673cd04c4b714d3b8bd6db9ff8876 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -28,7 +28,7 @@ .fields-group = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true - %h4= t 'preferences.fedibird_features' + %h4= t 'preferences.qoto_features' .fields-group = f.input :setting_show_follow_button_on_timeline, as: :boolean, wrapper: :with_label diff --git a/config/locales/en.yml b/config/locales/en.yml index 2b13f40d83a1fcb93850faefb7878d41c8136a96..6265364d92eb0e23970c903463d74897ca3a73da 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: - fedibird_features: Fedibird features + qoto_features: Qoto features other: Other posting_defaults: Posting defaults public_timelines: Public timelines @@ -1307,14 +1307,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 federation timeline and in hashtags. You may want to introduce yourself on the #fedibird hashtag.' + final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the federation 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 #fedibird tag and 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 c7355f2408b6fd83574f56c7094c40105504539b..49b6af76e512f58310cddc14268ef059b6881bf3 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -966,7 +966,7 @@ ja: too_few_options: ã¯è¤‡æ•°å¿…è¦ã§ã™ too_many_options: ã¯%{max}個ã¾ã§ã§ã™ preferences: - fedibird_features: Fedibirdã®æ©Ÿèƒ½ + qoto_features: Qotoã®æ©Ÿèƒ½ other: ãã®ä»– posting_defaults: ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŠ•ç¨¿è¨å®š public_timelines: 公開タイムライン @@ -1271,14 +1271,14 @@ ja: edit_profile_step: アイコンやヘッダーã®ç”»åƒã‚’アップãƒãƒ¼ãƒ‰ã—ãŸã‚Šã€è¡¨ç¤ºåを変更ã—ãŸã‚Šã—ã¦ã€è‡ªåˆ†ã®ãƒ—ãƒãƒ•ィールをカスタマイズã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã¾ãŸã€èª°ã‹ã‹ã‚‰ã®æ–°è¦ãƒ•ã‚©ãƒãƒ¼ã‚’許å¯ã™ã‚‹å‰ã«ãã®äººã®æ§˜åを見ã¦ãŠããŸã„å ´åˆã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’承èªåˆ¶ã«ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ explanation: å§‹ã‚ã‚‹ã«ã‚ãŸã£ã¦ã®ã‚¢ãƒ‰ãƒã‚¤ã‚¹ã§ã™ final_action: å§‹ã‚ã¾ã—ょㆠ- final_step: 'ã•ã‚ã€å§‹ã‚ã¾ã—ょã†ï¼ ãŸã¨ãˆãƒ•ã‚©ãƒãƒ¯ãƒ¼ãŒã¾ã ã„ãªãã¦ã‚‚ã€ã‚ãªãŸã®å…¬é–‹ã—ãŸæŠ•ç¨¿ã¯é€£åˆã‚¿ã‚¤ãƒ ラインやãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ãªã©ã‚’通ã˜ã¦èª°ã‹ã®ç›®ã«ã¨ã¾ã‚‹ã¯ãšã§ã™ã€‚自己紹介をã—ãŸã„ã¨ãã«ã¯ #fedibird ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ãŒä¾¿åˆ©ã‹ã‚‚ã—れã¾ã›ã‚“。' + final_step: 'ã•ã‚ã€å§‹ã‚ã¾ã—ょã†ï¼ ãŸã¨ãˆãƒ•ã‚©ãƒãƒ¯ãƒ¼ãŒã¾ã ã„ãªãã¦ã‚‚ã€ã‚ãªãŸã®å…¬é–‹ã—ãŸæŠ•ç¨¿ã¯é€£åˆã‚¿ã‚¤ãƒ ラインやãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ãªã©ã‚’通ã˜ã¦èª°ã‹ã®ç›®ã«ã¨ã¾ã‚‹ã¯ãšã§ã™ã€‚自己紹介をã—ãŸã„ã¨ãã«ã¯ #qoto ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ãŒä¾¿åˆ©ã‹ã‚‚ã—れã¾ã›ã‚“。' full_handle: ã‚ãªãŸã®æ£å¼ãªãƒ¦ãƒ¼ã‚¶ãƒ¼ID full_handle_hint: 別ã®ã‚µãƒ¼ãƒãƒ¼ã®å‹é”ã¨ãƒ•ã‚©ãƒãƒ¼ã‚„メッセージをやりå–りã™ã‚‹éš›ã«ã¯ã€ã“れをä¼ãˆã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ review_preferences_action: è¨å®šã®å¤‰æ›´ review_preferences_step: å—ã‘å–りãŸã„メールã®ç¨®é¡žã‚„投稿ã®ãƒ‡ãƒ•ォルト公開範囲ãªã©ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼è¨å®šã‚’å¿…ãšæ¸ˆã¾ã›ã¦ãŠãã¾ã—ょã†ã€‚ç›®ãŒå›žã‚‰ãªã„自信ãŒã‚ã‚‹ãªã‚‰ã€ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ GIF を自動å†ç”Ÿã™ã‚‹è¨å®šã‚‚ã”æ¤œè¨Žãã ã•ã„。 subject: Mastodon ã¸ã‚ˆã†ã“ã tip_federated_timeline: 連åˆã‚¿ã‚¤ãƒ ライン㯠Mastodon ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®æµã‚Œã‚’見られるもã®ã§ã™ã€‚ãŸã ã—ã‚ãªãŸã¨åŒã˜ã‚µãƒ¼ãƒãƒ¼ã®äººãŒãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„る人やã€ãƒªãƒ¬ãƒ¼ã‚’経由ã—ã¦é€ã‚‰ã‚Œã¦ãる投稿ã ã‘ãŒå«ã¾ã‚Œã‚‹ã®ã§ã€ãれãŒå…¨ã¦ã§ã¯ã‚りã¾ã›ã‚“。 - tip_following: 最åˆã¯ã€ã‚µãƒ¼ãƒãƒ¼ã®ã‚¤ãƒ³ãƒ•ォメーションアカウントをフォãƒãƒ¼ã—ãŸçŠ¶æ…‹ã«ãªã£ã¦ã„ã¾ã™ã€‚ã‚‚ã£ã¨èˆˆå‘³ã®ã‚る人ãŸã¡ã‚’見ã¤ã‘ã‚‹ã«ã¯ã€#fedibird ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã‚¿ã‚¤ãƒ ラインã¨é€£åˆã‚¿ã‚¤ãƒ ラインを確èªã—ã¦ã¿ã¾ã—ょã†ã€‚ + tip_following: 最åˆã¯ã€ã‚µãƒ¼ãƒãƒ¼ã®ã‚¤ãƒ³ãƒ•ォメーションアカウントをフォãƒãƒ¼ã—ãŸçŠ¶æ…‹ã«ãªã£ã¦ã„ã¾ã™ã€‚ã‚‚ã£ã¨èˆˆå‘³ã®ã‚る人ãŸã¡ã‚’見ã¤ã‘ã‚‹ã«ã¯ã€#qoto ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã‚¿ã‚¤ãƒ ラインã¨é€£åˆã‚¿ã‚¤ãƒ ラインを確èªã—ã¦ã¿ã¾ã—ょã†ã€‚ tip_local_timeline: ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ライン㯠%{instance} ã«ã„ã‚‹äººã€…ã®æµã‚Œã‚’見られるもã®ã§ã™ã€‚彼らã¯ã‚ãªãŸã¨åŒã˜ã‚µãƒ¼ãƒãƒ¼ã«ã„る隣人ã®ã‚ˆã†ãªã‚‚ã®ã§ã™ï¼ tip_mobile_webapp: ãŠä½¿ã„ã®ãƒ¢ãƒã‚¤ãƒ«ç«¯æœ«ã§ã€ãƒ–ラウザã‹ã‚‰ Mastodon をホーム画é¢ã«è¿½åŠ ã§ãã¾ã™ã‹ï¼Ÿ ã‚‚ã—è¿½åŠ ã§ãã‚‹å ´åˆã€ãƒ—ッシュ通知ã®å—ã‘å–りãªã©ã€ã¾ã‚‹ã§ã€Œæ™®é€šã®ã€ã‚¢ãƒ—リã®ã‚ˆã†ãªæ©Ÿèƒ½ãŒæ¥½ã—ã‚ã¾ã™ï¼ tips: 豆知è˜