nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup some translations

Browse source 
closes #7465
This commit is contained in:
Benjamin Neff 2016-11-06 17:51:59 +01:00
parent ddda28102c
commit 0e13a316f6
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -1,6 +1,7 @@
# 0.6.7.0
## Refactor
* Cleanup some translations [#7465](https://github.com/diaspora/diaspora/pull/7465)
## Bug fixes

32
config/locales/diaspora/en.yml
View file

@ -55,14 +55,10 @@ en:
attributes:
person_id:
taken: "must be unique among this user’s contacts."
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
reshare:
attributes:
root_guid:
taken: "That good, eh? You've already reshared that post!"
taken: "That good, eh? You've already reshared that post!"
poll:
attributes:
poll_answers:
@ -174,7 +170,7 @@ en:
you_should_add_some_more_contacts: "You should add some more contacts!"
try_adding_some_more_contacts: "You can search or %{invite_link} more contacts."
invite_link_text: "invite"
or_spotlight: "Or you can share with %{link}"
or_spotlight: "Or you can share with %{link}"
community_spotlight: "Community spotlight"
aspect_listings:
add_an_aspect: "+ Add an aspect"
@ -198,7 +194,7 @@ en:
keep_pod_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
donate_liberapay: "Donate to liberapay"
welcome_to_diaspora: "Welcome to diaspora*, %{name}!"
introduce_yourself: "This is your stream. Jump in and introduce yourself."
introduce_yourself: "This is your stream. Jump in and introduce yourself."
new_here:
title: "Welcome new users"
@ -254,7 +250,6 @@ en:
contacts:
index:
start_a_conversation: "Start a conversation"
add_a_new_aspect: "Add a new aspect"
title: "Contacts"
no_contacts: "Looks like you need to add some contacts!"
no_contacts_message: "Check out %{community_spotlight}"
@ -572,9 +567,9 @@ en:
sending_invitation: "Sending invitation..."
paste_link: "Share this link with your friends to invite them to diaspora*, or email them the link directly."
codes_left:
zero: "No invites left on this code"
one: "One invite left on this code"
other: "%{count} invites left on this code"
zero: "No invites left on this code"
one: "One invite left on this code"
other: "%{count} invites left on this code"
layouts:
header:
@ -629,7 +624,6 @@ en:
zero: "%{actors} have reshared your post %{post_link}."
one: "%{actors} has reshared your post %{post_link}."
other: "%{actors} have reshared your post %{post_link}."
post: "post"
also_commented_deleted:
zero: "%{actors} commented on a deleted post."
one: "%{actors} commented on a deleted post."
@ -913,9 +907,9 @@ en:
photos:
create:
runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
integrity_error: "Photo upload failed. Are you sure that was an image?"
type_error: "Photo upload failed. Are you sure an image was added?"
runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
integrity_error: "Photo upload failed. Are you sure that was an image?"
type_error: "Photo upload failed. Are you sure an image was added?"
destroy:
notice: "Photo deleted."
new_profile_photo:
@ -1080,8 +1074,8 @@ en:
share_this: "Share this link via email, blog, or social networks!"
public_explain:
control_your_audience: "Control your audience"
new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions"
visibility_dropdown: "Use this dropdown to change visibility of your post. (We suggest you make this first one public.)"
new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions"
visibility_dropdown: "Use this dropdown to change visibility of your post. (We suggest you make this first one public.)"
title: "Set up connected services"
share: "Share"
outside: "Public messages will be available for others outside of diaspora* to see."
@ -1234,11 +1228,11 @@ en:
connect_to_facebook: "We can speed things up a bit by %{link} to diaspora*. This will pull your name and photo, and enable cross-posting."
connect_to_facebook_link: "Hooking up your Facebook account"
what_are_you_in_to: "What are you into?"
hashtag_explanation: "Hashtags allow you to talk about and follow your interests. They’re also a great way to find new people on diaspora*."
hashtag_explanation: "Hashtags allow you to talk about and follow your interests. They’re also a great way to find new people on diaspora*."
hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
update:
password_changed: "Password changed. You can now log in with your new password."
password_changed: "Password changed. You can now log in with your new password."
password_not_changed: "Password change failed"
language_changed: "Language changed"

6
config/locales/javascript/javascript.en.yml
View file

@ -135,8 +135,6 @@ en:
my_aspects: "My aspects"
publisher:
limited: "Limited: your post will only be seen by people you are sharing with"
public: "Public: your post will be visible to everyone and found by search engines"
near_from: "Posted from: <%= location %>"
option: "Answer"
add_option: "Add an answer"
@ -184,7 +182,7 @@ en:
mobile_row_unchecked: "<%= name %> (add)"
stopped_sharing_with: "You have stopped sharing with <%= name %>."
started_sharing_with: "You have started sharing with <%= name %>!"
error: "Couldn’t start sharing with <%= name %>. Are you ignoring them?"
error: "Couldn’t start sharing with <%= name %>. Are you ignoring them?"
error_remove: "Couldn’t remove <%= name %> from the aspect :("
toggle:
one: "In <%= count %> aspect"
@ -206,7 +204,7 @@ en:
add_an_aspect: "+ Add an aspect"
getting_started:
hey: "Hey, <%= name %>!"
no_tags: "Hey, you haven’t followed any tags! Continue anyway?"
no_tags: "Hey, you haven’t followed any tags! Continue anyway?"
alright_ill_wait: "All right, I’ll wait."
preparing_your_stream: "Preparing your personalized stream..."
photo_uploader: