Commit 9c1b99a3 authored by Nathan Ladd's avatar Nathan Ladd

Merge branch 'remove-remaining-mastodon-references'

parents ceda043c ccb4a3cb
......@@ -26,8 +26,8 @@
"account.mute_notifications": "Mute notifications from @{name}",
"account.muted": "Muted",
"account.never_active": "Never",
"account.posts": "Toots",
"account.posts_with_replies": "Toots and replies",
"account.posts": "Posts",
"account.posts_with_replies": "Posts and replies",
"account.report": "Report @{name}",
"account.requested": "Awaiting approval. Click to cancel follow request",
"account.share": "Share @{name}'s profile",
......@@ -82,7 +82,7 @@
"compose_form.poll.duration": "Poll duration",
"compose_form.poll.option_placeholder": "Choice {number}",
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish": "Post",
"compose_form.publish_loud": "{publish}!",
"compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
......@@ -339,7 +339,7 @@
"search_popout.tips.user": "user",
"search_results.accounts": "People",
"search_results.hashtags": "Hashtags",
"search_results.statuses": "Toots",
"search_results.statuses": "Posts",
"search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"status.admin_account": "Open moderation interface for @{name}",
......
......@@ -6,10 +6,12 @@
%li= link_to t('auth.login'), new_user_session_path
- if controller_name != 'registrations'
%li= link_to t('auth.register'), available_sign_up_path
%li
New user?
= link_to t('auth.register'), "https://librem.one/#mce_1"
- if controller_name != 'passwords' && controller_name != 'registrations' && !use_seamless_external_login?
%li= link_to t('auth.forgot_password'), new_user_password_path
- if controller_name != 'passwords' && controller_name != 'registrations'
%li= link_to t('auth.forgot_password'), "https://librem.one/accounts/recover"
- if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?) && !use_seamless_external_login?
%li= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path
......
......@@ -13,13 +13,12 @@
- unless whitelist_mode?
= link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
= link_to t('about.about_this'), 'https://librem.one/', class: 'nav-link optional'
.nav-center
.nav-right
- if user_signed_in?
= link_to t('settings.back'), root_url, class: 'nav-link nav-button webapp-btn'
= link_to "Back to Librem One", "https://librem.one/accounts/profile", class: 'nav-link nav-button webapp-btn'
- else
= link_to t('auth.login'), new_user_session_path, class: 'webapp-btn nav-link nav-button'
= link_to t('auth.register'), 'https://librem.one/', class: 'webapp-btn nav-link nav-button'
......
---
en:
about:
about_hashtag_html: These are public toots tagged with <strong>#%{hashtag}</strong>. You can interact with them if you have an account anywhere in the fediverse.
about_hashtag_html: These are public posts tagged with <strong>#%{hashtag}</strong>. You can interact with them if you have an account anywhere in the fediverse.
about_mastodon_html: 'The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!'
about_this: About
active_count_after: active
......@@ -70,10 +70,10 @@ en:
pin_errors:
following: You must be already following the person you want to endorse
posts:
one: Toot
other: Toots
posts_tab_heading: Toots
posts_with_replies: Toots and replies
one: Post
other: Posts
posts_tab_heading: Posts
posts_with_replies: Posts and replies
reserved_username: The username is reserved
roles:
admin: Admin
......@@ -381,11 +381,11 @@ en:
relays:
add_new: Add new relay
delete: Delete
description_html: A <strong>federation relay</strong> is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. <strong>It can help small and medium servers discover content from the fediverse</strong>, which would otherwise require local users manually following other people on remote servers.
description_html: A <strong>federation relay</strong> is an intermediary server that exchanges large volumes of public posts between servers that subscribe and publish to it. <strong>It can help small and medium servers discover content from the fediverse</strong>, which would otherwise require local users manually following other people on remote servers.
disable: Disable
disabled: Disabled
enable: Enable
enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it.
enable_hint: Once enabled, your server will subscribe to all public posts from this relay, and will begin sending this server's public posts to it.
enabled: Enabled
inbox_url: Relay URL
pending: Waiting for relay's approval
......@@ -579,7 +579,7 @@ en:
confirmation_dialogs: Confirmation dialogs
discovery: Discovery
sensitive_content: Sensitive content
toot_layout: Toot layout
post_layout: Post layout
application_mailer:
notification_preferences: Change e-mail preferences
salutation: "%{name},"
......@@ -617,7 +617,7 @@ en:
providers:
cas: CAS
saml: SAML
register: Sign up
register: Register now!
registration_closed: "%{instance} is not accepting new members"
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
......@@ -709,7 +709,7 @@ en:
archive_takeout:
date: Date
download: Download your archive
hint_html: You can request an archive of your <strong>toots and uploaded media</strong>. The exported data will be in the ActivityPub format, readable by any compliant software. You can request an archive every 7 days.
hint_html: You can request an archive of your <strong>posts and uploaded media</strong>. The exported data will be in the ActivityPub format, readable by any compliant software. You can request an archive every 7 days.
in_progress: Compiling your archive...
request: Request your archive
size: Size
......@@ -772,8 +772,8 @@ en:
i_am_html: I am %{username} on %{service}.
identity: Identity
inactive: Inactive
publicize_checkbox: 'And toot this:'
publicize_toot: 'It is proven! I am %{username} on %{service}: %{url}'
publicize_checkbox: 'And post this:'
publicize_post: 'It is proven! I am %{username} on %{service}: %{url}'
status: Verification status
view_proof: View proof
imports:
......@@ -940,16 +940,16 @@ en:
remote_interaction:
favourite:
proceed: Proceed to favourite
prompt: 'You want to favourite this toot:'
prompt: 'You want to favourite this post:'
reblog:
proceed: Proceed to boost
prompt: 'You want to boost this toot:'
prompt: 'You want to boost this post:'
reply:
proceed: Proceed to reply
prompt: 'You want to reply to this toot:'
prompt: 'You want to reply to this post:'
scheduled_statuses:
over_daily_limit: You have exceeded the limit of %{limit} scheduled toots for that day
over_total_limit: You have exceeded the limit of %{limit} scheduled toots
over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for that day
over_total_limit: You have exceeded the limit of %{limit} scheduled posts
too_soon: The scheduled date must be in the future
sessions:
activity: Last activity
......@@ -998,7 +998,7 @@ en:
aliases: Account aliases
appearance: Appearance
authorized_apps: Authorized apps
back: Back to Mastodon
back: Back to Librem Social
delete: Account deletion
development: Development
edit_profile: Edit profile
......@@ -1033,9 +1033,9 @@ en:
open_in_web: Open in web
over_character_limit: character limit of %{max} exceeded
pin_errors:
limit: You have already pinned the maximum number of toots
ownership: Someone else's toot cannot be pinned
private: Non-public toot cannot be pinned
limit: You have already pinned the maximum number of posts
ownership: Someone else's post cannot be pinned
private: Non-public post cannot be pinned
reblog: A boost cannot be pinned
poll:
total_people:
......@@ -1056,7 +1056,7 @@ en:
unlisted: Unlisted
unlisted_long: Everyone can see, but not listed on public timelines
stream_entries:
pinned: Pinned toot
pinned: Pinned post
reblogged: boosted
sensitive_content: Sensitive content
tags:
......@@ -1176,8 +1176,8 @@ en:
warning:
explanation:
disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked.
silence: While your account is limited, only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follow you.
suspend: Your account has been suspended, and all of your toots and your uploaded media files have been irreversibly removed from this server, and servers where you had followers.
silence: While your account is limited, only people who are already following you will see your posts on this server, and you may be excluded from various public listings. However, others may still manually follow you.
suspend: Your account has been suspended, and all of your posts and your uploaded media files have been irreversibly removed from this server, and servers where you had followers.
get_in_touch: You can reply to this e-mail to get in touch with the staff of %{instance}.
review_server_policies: Review server policies
statuses: 'Specifically, for:'
......
public/favicon-dev.ico

8.87 KB | W: | H:

public/favicon-dev.ico

105 KB | W: | H:

public/favicon-dev.ico
public/favicon-dev.ico
public/favicon-dev.ico
public/favicon-dev.ico
  • 2-up
  • Swipe
  • Onion skin
public/favicon.ico

8.87 KB | W: | H:

public/favicon.ico

105 KB | W: | H:

public/favicon.ico
public/favicon.ico
public/favicon.ico
public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment