cybre cleanup

app/javascript/mastodon/components/status_action_bar.js

@@ -140,7 +140,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
       <div className='status__action-bar'>
         <IconButton className='status__action-bar-button' title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} />
         <IconButton className='status__action-bar-button' disabled={reblogDisabled} active={status.get('reblogged')} title={reblogDisabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
-        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='floppy-o' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
 
         <div className='status__action-bar-dropdown'>
           <DropdownMenu items={menu} icon='ellipsis-h' size={18} direction='right' ariaLabel='More' />

app/javascript/mastodon/features/getting_started/index.js

@@ -10,19 +10,19 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
   heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
-  home_timeline: { id: 'tabs_bar.home', defaultMessage: '/timelines/home' },
-  notifications: { id: 'tabs_bar.notifications', defaultMessage: '~/.notifications' },
-  public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: '/timelines/federated' },
+  home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
+  notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
+  public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
-  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: '/timelines/local' },
+  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
-  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: '~/.follow-requests' },
-  sign_out: { id: 'navigation_bar.logout', defaultMessage: 'exit' },
-  favourites: { id: 'navigation_bar.favourites', defaultMessage: '~/.florps' },
-  blocks: { id: 'navigation_bar.blocks', defaultMessage: '~/.blocked' },
-  mutes: { id: 'navigation_bar.mutes', defaultMessage: '~/.muted' },
-  info: { id: 'navigation_bar.info', defaultMessage: '/about/more' },
+  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
+  sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
+  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
+  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
+  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
+  info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },
 });
 
 const mapStateToProps = state => ({
@@ -65,7 +65,7 @@ export default class GettingStarted extends ImmutablePureComponent {
     }
 
     navItems = navItems.concat([
-      <ColumnLink key='4' icon='floppy-o' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
+      <ColumnLink key='4' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
     ]);
 
     if (me.get('locked')) {

app/javascript/mastodon/features/notifications/components/notification.js

@@ -39,7 +39,7 @@ export default class Notification extends ImmutablePureComponent {
       <div className='notification notification-favourite'>
         <div className='notification__message'>
           <div className='notification__favourite-icon-wrapper'>
-            <i className='fa fa-fw fa-floppy-o star-icon'/>
+            <i className='fa fa-fw fa-star star-icon' />
           </div>
           <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
         </div>

app/javascript/mastodon/features/status/components/action_bar.js

@@ -82,7 +82,7 @@ export default class ActionBar extends React.PureComponent {
       <div className='detailed-status__action-bar'>
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_id', null) === null ? 'reply' : 'reply-all'} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button'><IconButton disabled={reblog_disabled} active={status.get('reblogged')} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div>
-        <div className='detailed-status__button'><IconButton animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='floppy-o' onClick={this.handleFavouriteClick} activeStyle={{ color: '#ca8f04' }} /></div>
+        <div className='detailed-status__button'><IconButton animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} activeStyle={{ color: '#ca8f04' }} /></div>
 
         <div className='detailed-status__action-bar-dropdown'>
           <DropdownMenu size={18} icon='ellipsis-h' items={menu} direction='left' ariaLabel='More' />

app/javascript/mastodon/features/status/components/detailed_status.js

@@ -76,7 +76,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
               <FormattedNumber value={status.get('reblogs_count')} />
             </span>
           </Link> · <Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
-            <i className='fa fa-floppy-o' />
+            <i className='fa fa-star' />
             <span className='detailed-status__favorites'>
               <FormattedNumber value={status.get('favourites_count')} />
             </span>

app/javascript/mastodon/locales/en.json

@@ -2,7 +2,7 @@
   "account.block": "Block @{name}",
   "account.block_domain": "Hide everything from {domain}",
   "account.disclaimer": "This user is from another instance. This number may be larger.",
-  "account.edit_profile": "edit ~/.profile",
+  "account.edit_profile": "Edit profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
   "account.follows": "Follows",
@@ -10,7 +10,7 @@
   "account.media": "Media",
   "account.mention": "Mention @{name}",
   "account.mute": "Mute @{name}",
-  "account.posts": "Pings",
+  "account.posts": "Posts",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
   "account.unblock": "Unblock @{name}",
@@ -18,14 +18,14 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "column.blocks": "~/.blocked",
-  "column.community": "/timelines/local",
-  "column.favourites": "~/.florps",
-  "column.follow_requests": "~/.follow-requests",
-  "column.home": "/timelines/home",
-  "column.mutes": "~/.muted",
-  "column.notifications": "~/.notifications",
-  "column.public": "/timelines/federated",
+  "column.blocks": "Blocked users",
+  "column.community": "Local timeline",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Home",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.public": "Federated timeline",
   "column_back_button.label": "Back",
   "column_header.pin": "Pin",
   "column_header.unpin": "Unpin",
@@ -33,9 +33,9 @@
   "column_subheading.settings": "Settings",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
-  "compose_form.placeholder": "What is in your databanks?",
+  "compose_form.placeholder": "What is on your mind?",
   "compose_form.privacy_disclaimer": "Your post will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is not a public post, and it may be boosted or otherwise made visible to unintended recipients.",
-  "compose_form.publish": "Ping",
+  "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Mark media as sensitive",
   "compose_form.spoiler": "Hide text behind warning",
@@ -61,7 +61,7 @@
   "emoji_button.travel": "Travel & Places",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "You aren't following anyone yet. Visit {public} or use query to get started and meet other users.",
+  "empty_column.home": "You aren't following anyone yet. Visit {public} or use search to get started and meet other users.",
   "empty_column.home.inactivity": "Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon.",
   "empty_column.home.public_timeline": "the public timeline",
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
@@ -76,24 +76,24 @@
   "home.column_settings.advanced": "Advanced",
   "home.column_settings.basic": "Basic",
   "home.column_settings.filter_regex": "Filter out by regular expressions",
-  "home.column_settings.show_reblogs": "Show relays",
+  "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.settings": "Column settings",
   "lightbox.close": "Close",
   "loading_indicator.label": "Loading...",
   "media_gallery.toggle_visible": "Toggle visibility",
   "missing_indicator.label": "Not found",
-  "navigation_bar.blocks": "~/.blocks",
-  "navigation_bar.community_timeline": "/timelines/local",
-  "navigation_bar.edit_profile": "edit ~/.profile",
-  "navigation_bar.favourites": "~/.florps",
-  "navigation_bar.follow_requests": "~/.follow-requests",
-  "navigation_bar.info": "/about/more",
-  "navigation_bar.logout": "Jack out",
-  "navigation_bar.mutes": "~/.muted",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.info": "About this instance",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
   "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "/timelines/federated",
-  "notification.favourite": "{name} florped your ping",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.mention": "{name} mentioned you",
   "notification.reblog": "{name} boosted your status",
@@ -140,18 +140,18 @@
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
-  "search.placeholder": "Query...",
+  "search.placeholder": "Search",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
-  "status.cannot_reblog": "This ping cannot be relayed",
+  "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
-  "status.favourite": "Florp",
+  "status.favourite": "Favourite",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
-  "status.reblog": "Relay",
-  "status.reblogged_by": "{name} relayed",
+  "status.reblog": "Boost",
+  "status.reblogged_by": "{name} boosted",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",

app/javascript/styles/custom.scss

@@ -1,14 +1,5 @@
-$ui-base-color: #181818; // darkest
-$ui-secondary-color: #dae8da; // lightest
-$ui-primary-color: #dae8da; // lighter
-$ui-highlight-color: #1ea21e; // vibrant
-
 @import 'application';
 
-body {
-  background: $ui-base-color url('../images/background-cybre.png');
-}
-
 @media screen and (min-width: 1300px) { 
   .column {
     flex-grow: 1 !important;
@@ -61,16 +52,6 @@ body {
   font-size:150%;
 }
 
-.column .static-content.getting-started {
-  background-image: url('../images/logo-cybre.png'), url('../images/background-cybre.png');
-  background-position: 50% 50%;
-  background-size:cover;
-}
-
-.columns-area {
-  background: $ui-base-color url('../images/background-cybre.png');
-}
-
 .drawer .drawer__inner {
   overflow: visible;
   height:inherit;

app/views/about/show.html.haml

@@ -17,7 +17,7 @@
 
 .wrapper
   %h1
-    = image_tag asset_pack_path('logo-cybre.png')
+    = image_tag asset_pack_path('logo.png')
     = Setting.site_title
 
   %p!= t('about.about_mastodon')

app/views/layouts/admin.html.haml

@@ -6,7 +6,7 @@
     .sidebar-wrapper
       .sidebar
         = link_to root_path do
-          = image_tag asset_pack_path('logo-cybre.png'), class: 'logo'
+          = image_tag asset_pack_path('logo.png'), class: 'logo'
 
         = render_navigation
     .content-wrapper

app/views/layouts/auth.html.haml

@@ -6,7 +6,7 @@
     .logo-container
       %h1
         = link_to root_path do
-          = image_tag asset_pack_path('logo-cybre.png')
+          = image_tag asset_pack_path('logo.png')
 
     .form-container
       = render 'flashes'

config/locales/en.yml

@@ -1,30 +1,30 @@
 ---
 en:
   about:
-    about_mastodon: Cybrespace is an instance of Mastodon, a <em>free, open-source</em> social network. A <em>decentralized</em> alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust &mdash; whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the <em>social network</em> seamlessly.
+    about_mastodon: Mastodon is a <em>free, open-source</em> social network. A <em>decentralized</em> alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust &mdash; whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the <em>social network</em> seamlessly.
     about_this: About this instance
     apps: Apps
     business_email: 'Business e-mail:'
     closed_registrations: Registrations are currently closed on this instance.
     contact: Contact
-    description_headline: What's special about %{domain}?
+    description_headline: What is %{domain}?
     domain_count_after: other instances
     domain_count_before: Connected to
     features:
       api: Open API for apps and services
       blocks: Rich block and muting tools
-      characters: 512 characters per post
+      characters: 500 characters per post
       chronology: Timelines are chronological
       ethics: 'Ethical design: no ads, no tracking'
       gifv: GIFV sets and short videos
-      privacy: Granular, per-ping privacy settings
+      privacy: Granular, per-post privacy settings
       public: Public timelines
     features_headline: What sets Mastodon apart
     get_started: Get started
     links: Links
     other_instances: Other instances
     source_code: Source code
-    status_count_after: pings 
+    status_count_after: statuses
     status_count_before: Who authored
     terms: Terms
     user_count_after: users
@@ -37,7 +37,7 @@ en:
     nothing_here: There is nothing here!
     people_followed_by: People whom %{name} follows
     people_who_follow: People who follow %{name}
-    posts: Pings
+    posts: Posts
     remote_follow: Remote follow
     reserved_username: The username is reserved
     unfollow: Unfollow
@@ -205,9 +205,9 @@ en:
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     didnt_get_confirmation: Didn't receive confirmation instructions?
     forgot_password: Forgot your password?
-    login: Jack in
-    logout: Jack out
-    register: Apply for upload
+    login: Log in
+    logout: Logout
+    register: Sign up
     resend_confirmation: Resend confirmation instructions
     reset_password: Reset password
     set_new_password: Set new password
@@ -255,7 +255,7 @@ en:
     storage: Media storage
   followers:
     domain: Domain
-    explanation_html: If you want to ensure the privacy of your pings , you must be aware of who is following you. <strong>Your private pings are delivered to all instances where you have followers</strong>. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those instances.
+    explanation_html: If you want to ensure the privacy of your statuses, you must be aware of who is following you. <strong>Your private statuses are delivered to all instances where you have followers</strong>. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those instances.
     followers_count: Number of followers
     lock_link: Lock your account
     purge: Remove from followers
@@ -263,7 +263,7 @@ en:
       one: In the process of soft-blocking followers from one domain...
       other: In the process of soft-blocking followers from %{count} domains...
     true_privacy_html: Please mind that <strong>true privacy can only be achieved with end-to-end encryption</strong>.
-    unlocked_warning_html: Anyone can follow you to immediately view your private pings. %{lock_link} to be able to review and reject followers.
+    unlocked_warning_html: Anyone can follow you to immediately view your private statuses. %{lock_link} to be able to review and reject followers.
     unlocked_warning_title: Your account is not locked
   generic:
     changes_saved_msg: Changes successfully saved!
@@ -284,7 +284,7 @@ en:
   landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   media_attachments:
     validations:
-      images_and_video: Cannot attach a video to a ping that already contains images
+      images_and_video: Cannot attach a video to a status that already contains images
       too_many: Cannot attach more than 4 files
   notification_mailer:
     digest:
@@ -297,8 +297,8 @@ en:
         one: "1 new notification since your last visit \U0001F418"
         other: "%{count} new notifications since your last visit \U0001F418"
     favourite:
-      body: 'Your ping was florped by %{name}:'
-      subject: "%{name} florped your ping"
+      body: 'Your status was favourited by %{name}:'
+      subject: "%{name} favourited your status"
     follow:
       body: "%{name} is now following you!"
       subject: "%{name} is now following you"
@@ -309,8 +309,8 @@ en:
       body: 'You were mentioned by %{name} in:'
       subject: You were mentioned by %{name}
     reblog:
-      body: 'Your ping was relayed by %{name}:'
-      subject: "%{name} relayed your ping"
+      body: 'Your status was boosted by %{name}:'
+      subject: "%{name} boosted your status"
   pagination:
     next: Next
     prev: Prev
@@ -324,7 +324,7 @@ en:
     authorized_apps: Authorized apps
     back: Back to Mastodon
     delete: Account deletion
-    edit_profile: edit ~/.profile
+    edit_profile: Edit profile
     export: Data export
     followers: Authorized followers
     import: Import
@@ -344,7 +344,7 @@ en:
       unlisted_long: Everyone can see, but not listed on public timelines
   stream_entries:
     click_to_show: Click to show
-    reblogged: relayed 
+    reblogged: boosted
     sensitive_content: Sensitive content
   time:
     formats:

config/locales/simple_form.en.yml

@@ -8,7 +8,7 @@ en:
           one: <span class="name-counter">1</span> character left
           other: <span class="name-counter">%{count}</span> characters left
         header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
-        locked: Requires you to manually approve followers and defaults ping privacy to followers-only
+        locked: Requires you to manually approve followers and defaults post privacy to followers-only
         note:
           one: <span class="note-counter">1</span> character left
           other: <span class="note-counter">%{count}</span> characters left
@@ -46,11 +46,11 @@ en:
         must_be_following: Block notifications from people you don't follow
       notification_emails:
         digest: Send digest e-mails
-        favourite: Send e-mail when someone florps your ping
+        favourite: Send e-mail when someone favourites your status
         follow: Send e-mail when someone follows you
         follow_request: Send e-mail when someone requests to follow you
         mention: Send e-mail when someone mentions you
-        reblog: Send e-mail when someone boosts your ping
+        reblog: Send e-mail when someone boosts your status
     'no': 'No'
     required:
       mark: "*"

config/settings.yml

@@ -7,7 +7,7 @@
 # For more information, see docs/Running-Mastodon/Administration-guide.md
 #
 defaults: &defaults
-  site_title: 'Cybrespace'
+  site_title: 'dev.glitch.social'
   site_description: ''
   site_extended_description: ''
   site_contact_username: ''

public/500.html

@@ -8,7 +8,7 @@
   <style>
     body {
       font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-      background: #181818 url("/background-cybre.png");
+      background: #181818 url("/background-photo.png");
       color: #1ea21e;
       text-align: center;
       margin: 0;
@@ -33,7 +33,7 @@
 
 <body>
   <div class="dialog">
-    <img src="/logo-cybre-glitch.gif" alt="Cybrespace" />
+    <img src="/logo.png" alt="dev.glitch.social" />
 
     <div>
       <h1>We're sorry, but something went wrong.</h1>