From: Tom Hughes Date: Sun, 31 May 2009 23:22:10 +0000 (+0000) Subject: Merge a final translation from i18n branch. X-Git-Tag: live~7351 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ceb6a86430343b379e09771d7f040c223adde69d?hp=010dc8719596add0fec05a7d43f677dffdf03beb Merge a final translation from i18n branch. --- diff --git a/app/views/notifier/friend_notification.rhtml b/app/views/notifier/friend_notification.rhtml index 4103a763d..8917061f1 100644 --- a/app/views/notifier/friend_notification.rhtml +++ b/app/views/notifier/friend_notification.rhtml @@ -1,3 +1,4 @@ -<%= @user %> has added you as a friend on OpenStreetMap. +<%= t'notifier.friend_notification.had_added_you', :user => @user %> + +<%= t'notifier.friend_notification.see_their_profile', :userurl => @userurl %> -You can see their profile at <%= @userurl %> and add them as a friend too if you wish. \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 06ce50027..7f8320cba 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -245,6 +245,9 @@ en: hi: "Hi {{to_user}}," header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:" footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}" + friend_notification: + had_added_you: "{{user}} has added you as a friend on OpenStreetMap." + see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish." signup_confirm_plain: greeting: "Hi there!" hopefully_you: "Someone (hopefully you) would like to create an account over at"