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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-05-12 14:20:09 +02:00
commit b6cbb17d83
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,6 @@ en:
account_closing_scheduled: "The account of %{name} is scheduled to be closed. It will be processed in a few moments..." account_closing_scheduled: "The account of %{name} is scheduled to be closed. It will be processed in a few moments..."
account_locking_scheduled: "The account of %{name} is scheduled to be locked. It will be processed in a few moments..." account_locking_scheduled: "The account of %{name} is scheduled to be locked. It will be processed in a few moments..."
account_unlocking_scheduled: "The account of %{name} is scheduled to be unlocked. It will be processed in a few moments..." account_unlocking_scheduled: "The account of %{name} is scheduled to be unlocked. It will be processed in a few moments..."
email_to: "Email to Invite"
email_to: "Email to invite" email_to: "Email to invite"
under_13: "Show users that are under 13 (COPPA)" under_13: "Show users that are under 13 (COPPA)"
users: users:
@ -718,7 +717,7 @@ en:
mark_unread: "Mark unread" mark_unread: "Mark unread"
show_all: "Show all" show_all: "Show all"
show_unread: "Show unread" show_unread: "Show unread"
all_notifications: "All Notifications" all_notifications: "All notifications"
also_commented: "Also commented" also_commented: "Also commented"
comment_on_post: "Comment on post" comment_on_post: "Comment on post"
liked: "Liked" liked: "Liked"