diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
commit | a942ad3062285b6b4984fe92f9bd610829f04456 (patch) | |
tree | 2476b65436959dda09871ee96edca53b53201b96 /app/javascript/mastodon/locales/ro.json | |
parent | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff) | |
parent | 32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
Diffstat (limited to 'app/javascript/mastodon/locales/ro.json')
-rw-r--r-- | app/javascript/mastodon/locales/ro.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index c5f2c7607..2a6479b91 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -95,7 +95,6 @@ "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?", "confirmations.unfollow.confirm": "Nu mai urmări", "confirmations.unfollow.message": "Ești sigur că nu mai vrei să îl urmărești pe {name}?", - "conversation.last_message": "Last message:", "embed.instructions": "Inserează această postare pe site-ul tău adăugând codul de mai jos.", "embed.preview": "Cam așa va arăta:", "emoji_button.activity": "Activitate", @@ -315,6 +314,8 @@ "status.show_more_all": "Arată mai mult pentru toți", "status.unmute_conversation": "Repornește conversația", "status.unpin": "Eliberează din profil", + "suggestions.dismiss": "Dismiss suggestion", + "suggestions.header": "You might be interested in…", "tabs_bar.federated_timeline": "Global", "tabs_bar.home": "Acasă", "tabs_bar.local_timeline": "Local", |