From: Jenny Herbert Date: Sun, 31 May 2009 16:59:42 +0000 (+0000) Subject: Merged sections in en.yml X-Git-Tag: live~8104^2~3 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/cfb8afb8def03c86c152fb3b885566875ef7a466 Merged sections in en.yml --- diff --git a/config/locales/en.yml b/config/locales/en.yml index 118217f87..7b6b07ba2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -245,6 +245,34 @@ 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}}" + signup_confirm_plain: + greeting: "Hi there!" + hopefully_you: "Someone (hopefully you) would like to create an account over at" + # next two translations run-on : please word wrap appropriately + click_the_link_1: "If this is you, welcome! Please click the link below to confirm your" + click_the_link_2: "account and read on for more information about OpenStreetMap." + introductory_video: "You can watch an introductory video to OpenStreetMap here:" + more_videos: "There are more videos here:" + the_wiki: "Get reading about OpenStreetMap on the wiki:" + opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:" + wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" + # next four translations are in pairs : please word wrap appropriately + user_wiki_1: "It is recommended that you create a user wiki page, which includes" + user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]." + current_user_1: "A list of current users in categories, based on where in the world" + current_user_2: "they are, is available from:" + signup_confirm_html: + greeting: "Hi there!" + hopefully_you: "Someone (hopefully you) would like to create an account over at" + click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap" + introductory_video: "You can watch an {{introductory_video_link}}." + video_to_openstreetmap: "introductory video to OpenStreetMap" + more_videos: "There are {{more_videos_link}}." + more_videos_here: "more videos here" + get_reading: 'Get reading about OpenStreetMap on the wiki

or the opengeodata blog which has podcasts to listen to also!' + wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.' + user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].' + current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.' message: inbox: my_inbox: "My inbox" @@ -289,35 +317,6 @@ en: reading_your_sent_messages: "Reading your sent messages" to: "To" back_to_outbox: "Back to outbox" - notifier: - signup_confirm_plain: - greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - # next two translations run-on : please word wrap appropriately - click_the_link_1: "If this is you, welcome! Please click the link below to confirm your" - click_the_link_2: "account and read on for more information about OpenStreetMap." - introductory_video: "You can watch an introductory video to OpenStreetMap here:" - more_videos: "There are more videos here:" - the_wiki: "Get reading about OpenStreetMap on the wiki:" - opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:" - wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" - # next four translations are in pairs : please word wrap appropriately - user_wiki_1: "It is recommended that you create a user wiki page, which includes" - user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]." - current_user_1: "A list of current users in categories, based on where in the world" - current_user_2: "they are, is available from:" - signup_confirm_html: - greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap" - introductory_video: "You can watch an {{introductory_video_link}}." - video_to_openstreetmap: "introductory video to OpenStreetMap" - more_videos: "There are {{more_videos_link}}." - more_videos_here: "more videos here" - get_reading: 'Get reading about OpenStreetMap on the wiki

or the opengeodata blog which has podcasts to listen to also!' - wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.' - user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].' - current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.' site: index: js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."