Localisation updates from https://translatewiki.net.

diff --git a/config/locales/da.yml b/config/locales/da.yml
index c3de169ca04cfe9f7ffb1360890f97ba77cacc29..42464efbf8449dfd2e8b884eac2537f9e0eef427 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -128,6 +128,9 @@ da:
         description: Beskrivelse
         languages: Sprog
         pass_crypt: Adgangskode
         description: Beskrivelse
         languages: Sprog
         pass_crypt: Adgangskode

+  datetime:
+    distance_in_words_ago:
+      half_a_minute: for et halvt minut siden

   editor:
     default: Foretrukket (i øjeblikket %{name})
     potlatch:
   editor:
     default: Foretrukket (i øjeblikket %{name})
     potlatch:


@@ -145,10 +148,10 @@ da:
   api:
     notes:
       comment:
   api:
     notes:
       comment:

-        opened_at_html: Oprettet for %{when} siden
+        opened_at_html: Oprettet den %{when}

         opened_at_by_html: Oprettet for %{when} siden af %{user}
         opened_at_by_html: Oprettet for %{when} siden af %{user}

-        commented_at_html: Opdateret for %{when} siden
-        commented_at_by_html: Opdateret for %{when} siden af %{user}
+        commented_at_html: Opdateret den %{when}
+        commented_at_by_html: Opdateret den %{when} af %{user}

         closed_at_html: Løst for %{when} siden
         closed_at_by_html: Løst for %{when} siden af %{user}
         reopened_at_html: Genaktiveret for %{when} siden
         closed_at_html: Løst for %{when} siden
         closed_at_by_html: Løst for %{when} siden af %{user}
         reopened_at_html: Genaktiveret for %{when} siden


@@ -2204,7 +2207,7 @@ da:
       ct status: 'Vilkår for bidragsydere:'
       ct undecided: Uafklaret
       ct declined: Afslået
       ct status: 'Vilkår for bidragsydere:'
       ct undecided: Uafklaret
       ct declined: Afslået

-      latest edit: 'Seneste ændring %{ago}:'
+      latest edit: 'Seneste ændring (%{ago}):'

       email address: 'E-mailadresse:'
       created from: 'Oprettet fra:'
       status: 'Status:'
       email address: 'E-mailadresse:'
       created from: 'Oprettet fra:'
       status: 'Status:'

diff --git a/config/locales/de.yml b/config/locales/de.yml
index eecae9bb11aba172dc38bc988eb0d929546e145a..3f0d5c63e3ecfd2d6f88ff5263683f947f656cae 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -22,6 +22,7 @@
 # Author: Geitost
 # Author: GerdP
 # Author: Grille chompa
 # Author: Geitost
 # Author: GerdP
 # Author: Grille chompa

+# Author: Hendrik-17

 # Author: Hikemaniac
 # Author: Holger
 # Author: HolgerJeromin
 # Author: Hikemaniac
 # Author: Holger
 # Author: HolgerJeromin


@@ -174,6 +175,27 @@ de:
         one: vor fast einem Jahr
         other: vor fast %{count} Jahren
       half_a_minute: vor einer halben Minute
         one: vor fast einem Jahr
         other: vor fast %{count} Jahren
       half_a_minute: vor einer halben Minute

+      less_than_x_seconds:
+        one: vor weniger als 1 Sekunde
+        other: vor weniger als %{count} Sekunden
+      less_than_x_minutes:
+        one: vor weniger als einer Minute
+        other: vor weniger als %{count} Minuten
+      over_x_years:
+        one: vor über einem Jahr
+        other: vor über %{count} Jahren
+      x_seconds:
+        one: vor 1 Sekunde
+        other: vor %{count} Sekunden
+      x_minutes:
+        one: vor 1 Minute
+        other: vor %{count} Minuten
+      x_days:
+        one: vor 1 Tag
+        other: vor %{count} Tagen
+      x_months:
+        one: vor 1 Monat
+        other: vor %{count} Monaten

   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:
   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 1827558cc3b8f5f3ff809493c1d61e1daf994f52..c97d67866efaf6dc7b9426bb68bd2900929a2949 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -20,6 +20,7 @@
 # Author: Sampablokuper
 # Author: Shirayuki
 # Author: Smsm1
 # Author: Sampablokuper
 # Author: Shirayuki
 # Author: Smsm1

+# Author: TomH

 # Author: ديفيد
 ---
 en-GB:
 # Author: ديفيد
 ---
 en-GB:


@@ -137,14 +138,14 @@ en-GB:
   api:
     notes:
       comment:
   api:
     notes:
       comment:

-        opened_at_html: Created %{when} ago
-        opened_at_by_html: Created %{when} ago by %{user}
-        commented_at_html: Updated %{when} ago
-        commented_at_by_html: Updated %{when} ago by %{user}
-        closed_at_html: Resolved %{when} ago
-        closed_at_by_html: Resolved %{when} ago by %{user}
-        reopened_at_html: Reactivated %{when} ago
-        reopened_at_by_html: Reactivated %{when} ago by %{user}
+        opened_at_html: Created %{when}
+        opened_at_by_html: Created %{when} by %{user}
+        commented_at_html: Updated %{when}
+        commented_at_by_html: Updated %{when} by %{user}
+        closed_at_html: Resolved %{when}
+        closed_at_by_html: Resolved %{when} by %{user}
+        reopened_at_html: Reactivated %{when}
+        reopened_at_by_html: Reactivated %{when} by %{user}

       rss:
         title: OpenStreetMap Notes
         description_area: A list of notes, reported, commented on or closed in your
       rss:
         title: OpenStreetMap Notes
         description_area: A list of notes, reported, commented on or closed in your


@@ -160,12 +161,12 @@ en-GB:
   browse:
     created: Created
     closed: Closed
   browse:
     created: Created
     closed: Closed

-    created_html: Created <abbr title='%{title}'>%{time} ago</abbr>
-    closed_html: Closed <abbr title='%{title}'>%{time} ago</abbr>
-    created_by_html: Created <abbr title='%{title}'>%{time} ago</abbr> by %{user}
-    deleted_by_html: Deleted <abbr title='%{title}'>%{time} ago</abbr> by %{user}
-    edited_by_html: Edited <abbr title='%{title}'>%{time} ago</abbr> by %{user}
-    closed_by_html: Closed <abbr title='%{title}'>%{time} ago</abbr> by %{user}
+    created_html: Created <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Closed <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Created <abbr title='%{title}'>%{time}</abbr> by %{user}
+    deleted_by_html: Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}
+    edited_by_html: Edited <abbr title='%{title}'>%{time}</abbr> by %{user}
+    closed_by_html: Closed <abbr title='%{title}'>%{time}</abbr> by %{user}

     version: Version
     in_changeset: Changeset
     anonymous: anonymous
     version: Version
     in_changeset: Changeset
     anonymous: anonymous


@@ -185,9 +186,8 @@ en-GB:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})

-      hidden_commented_by: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      hidden_commented_by: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:


@@ -263,19 +263,15 @@ en-GB:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'

-      open_by: Created by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      open_by_anonymous: Created by anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      commented_by_anonymous: Comment from anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      closed_by: Resolved by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      closed_by_anonymous: Resolved by anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      reopened_by: Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}
-        ago</abbr>
-      hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      open_by: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       report: Report this note
     query:
       title: Query Features
       report: Report this note
     query:
       title: Query Features


@@ -300,7 +296,7 @@ en-GB:
     index:
       title: Changesets
       title_user: Changesets by %{user}
     index:
       title: Changesets
       title_user: Changesets by %{user}

-      title_friend: Changesets by your friends
+      title_friend: Changesets by my friends

       title_nearby: Changesets by nearby users
       empty: No changesets found.
       empty_area: No changesets in this area.
       title_nearby: Changesets by nearby users
       empty: No changesets found.
       empty_area: No changesets in this area.


@@ -314,7 +310,7 @@ en-GB:
   changeset_comments:
     comment:
       comment: 'New comment on changeset #%{changeset_id} by %{author}'
   changeset_comments:
     comment:
       comment: 'New comment on changeset #%{changeset_id} by %{author}'

-      commented_at_by_html: Updated %{when} ago by %{user}
+      commented_at_by_html: Updated %{when} by %{user}

     index:
       title_all: OpenStreetMap changeset discussion
       title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
     index:
       title_all: OpenStreetMap changeset discussion
       title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'


@@ -336,7 +332,7 @@ en-GB:
       user_title: '%{user}''s diary'
       in_language_title: Diary Entries in %{language}
       new: New Diary Entry
       user_title: '%{user}''s diary'
       in_language_title: Diary Entries in %{language}
       new: New Diary Entry

-      new_title: Compose a new entry in your user diary
+      new_title: Compose a new entry in my user diary

       no_entries: No diary entries
       recent_entries: Recent diary entries
       older_entries: Older Entries
       no_entries: No diary entries
       recent_entries: Recent diary entries
       older_entries: Older Entries


@@ -394,12 +390,12 @@ en-GB:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Results from <a href="http://openstreetmap.org/">Internal</a>
-        ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon: Results from <a href="https://openstreetmap.org/">Internal</a>
+        ca_postcode: Results from <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Results from <a href="http://www.geonames.org/">GeoNames</a>
           Nominatim</a>
         geonames: Results from <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Results from <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Results from <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -856,7 +852,7 @@ en-GB:
           "yes": Shop
         tourism:
           alpine_hut: Alpine Hut
           "yes": Shop
         tourism:
           alpine_hut: Alpine Hut

-          apartment: Apartment
+          apartment: Holiday Apartment

           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast


@@ -907,7 +903,7 @@ en-GB:
         level10: Suburb Boundary
     description:
       title:
         level10: Suburb Boundary
     description:
       title:

-        osm_nominatim: Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Location from <a href="http://www.geonames.org/">GeoNames</a>
       types:
           Nominatim</a>
         geonames: Location from <a href="http://www.geonames.org/">GeoNames</a>
       types:


@@ -1179,13 +1175,15 @@ en-GB:
         Licence page</a> for details.
       legal_title: Legal
       legal_html: "This site and many other related services are formally operated
         Licence page</a> for details.
       legal_title: Legal
       legal_html: "This site and many other related services are formally operated

-        by the  \n<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a>
+        by the  \n<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>

         (OSMF) \non behalf of the community. Use of all OSMF operated services is
         (OSMF) \non behalf of the community. Use of all OSMF operated services is

-        subject \nto our <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
-        Use Policies</a> and our <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
-        Policy</a>\n<br> \nPlease <a href='http://osmfoundation.org/Contact'>contact
-        the OSMF</a> \nif you have licensing, copyright or other legal questions and
-        issues."
+        subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
+        of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
+        Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
+        Policy</a>\n<br> \nPlease <a href='https://osmfoundation.org/Contact'>contact
+        the OSMF</a> \nif you have licensing, copyright or other legal questions.\n<br>\nOpenStreetMap,
+        the magnifying glass logo and State of the Map are <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">registered
+        trademarks of the OSMF</a>."

       partners_title: Partners
     copyright:
       foreign:
       partners_title: Partners
     copyright:
       foreign:


@@ -1275,8 +1273,11 @@ en-GB:
           Direction Générale des Impôts.'
         contributors_nl_html: '<strong>Netherlands</strong>: Contains &copy; AND data,
           2007 (<a href="http://www.and.com">www.and.com</a>)'
           Direction Générale des Impôts.'
         contributors_nl_html: '<strong>Netherlands</strong>: Contains &copy; AND data,
           2007 (<a href="http://www.and.com">www.and.com</a>)'

-        contributors_nz_html: '<strong>New Zealand</strong>: Contains data sourced
-          from Land Information New Zealand. Crown Copyright reserved.'
+        contributors_nz_html: |-
+          <strong>New Zealand</strong>: Contains data sourced from the
+          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
+          licensed for reuse under
+          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.

         contributors_si_html: |-
           <strong>Slovenia</strong>: Contains data from the
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
         contributors_si_html: |-
           <strong>Slovenia</strong>: Contains data from the
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and


@@ -1286,7 +1287,7 @@ en-GB:
           from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
           Information</a>, State copyright reserved.'
         contributors_gb_html: '<strong>United Kingdom</strong>: Contains Ordnance
           from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
           Information</a>, State copyright reserved.'
         contributors_gb_html: '<strong>United Kingdom</strong>: Contains Ordnance

-          Survey data &copy; Crown copyright and database right 2010-12.'
+          Survey data &copy; Crown copyright and database right 2010-19.'

         contributors_footer_1_html: For further details of these, and other sources
           that have been used to help improve OpenStreetMap, please see the <a href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
           page</a> on the OpenStreetMap Wiki.
         contributors_footer_1_html: For further details of these, and other sources
           that have been used to help improve OpenStreetMap, please see the <a href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
           page</a> on the OpenStreetMap Wiki.


@@ -1327,13 +1328,13 @@ en-GB:
       anon_edits: (%{link})
       anon_edits_link_text: Find out why this is the case.
       flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap
       anon_edits: (%{link})
       anon_edits_link_text: Find out why this is the case.
       flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap

-        Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download
-        Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several
+        Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download
+        Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several

         other options</a> are also available for editing OpenStreetMap.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
         should deselect the current way or point, if editing in live mode, or click
         save if you have a save button.)
         other options</a> are also available for editing OpenStreetMap.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
         should deselect the current way or point, if editing in live mode, or click
         save if you have a save button.)

-      potlatch2_not_configured: Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2

         for more information
       potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
         you should click save.)
         for more information
       potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
         you should click save.)


@@ -1452,7 +1453,7 @@ en-GB:
       get_directions_title: Find directions between two points
       from: From
       to: To
       get_directions_title: Find directions between two points
       from: From
       to: To

-      where_am_i: Where am I?
+      where_am_i: Where is this?

       where_am_i_title: Describe the current location using the search engine
       submit_text: Go
       reverse_directions_text: Reverse Directions
       where_am_i_title: Describe the current location using the search engine
       submit_text: Go
       reverse_directions_text: Reverse Directions


@@ -1530,7 +1531,7 @@ en-GB:
       edit: Edit
       preview: Preview
     markdown_help:
       edit: Edit
       preview: Preview
     markdown_help:

-      title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>

       headings: Headings
       heading: Heading
       subheading: Subheading
       headings: Headings
       heading: Heading
       subheading: Subheading


@@ -1581,7 +1582,7 @@ en-GB:
         title: Any questions?
         paragraph_1_html: |-
           OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics.
         title: Any questions?
         paragraph_1_html: |-
           OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics.

-          <a href='%{help_url}'>Get help here</a>.
+          <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>.

       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!
       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!


@@ -1914,10 +1915,10 @@ en-GB:
         Terms. For more information, please see <a href="%{url}">this wiki page</a>.
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
         Terms. For more information, please see <a href="%{url}">this wiki page</a>.
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:

-      title: Contributor terms
-      heading: Contributor terms
-      consider_pd: In addition to the above agreement, I consider my contributions
-        to be in the Public Domain
+      title: Terms
+      heading: Terms
+      consider_pd: In addition to the above, I consider my contributions to be in
+        the Public Domain

       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Information to help understand these terms: a <a href="%{summary}">human
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Information to help understand these terms: a <a href="%{summary}">human


@@ -1961,7 +1962,7 @@ en-GB:
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined

-      latest edit: 'Latest edit %{ago}:'
+      latest edit: 'Latest edit (%{ago}):'

       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'
       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'


@@ -2217,7 +2218,7 @@ en-GB:
       title: Revoking block on %{block_on}
       heading: Revoking block on %{block_on} by %{block_by}
       time_future: This block will end in %{time}.
       title: Revoking block on %{block_on}
       heading: Revoking block on %{block_on} by %{block_by}
       time_future: This block will end in %{time}.

-      past: This block ended %{time} ago and cannot be revoked now.
+      past: This block ended %{time} and cannot be revoked now.

       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.
       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.


@@ -2225,7 +2226,7 @@ en-GB:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.
       time_future_and_until_login: Ends in %{time} and after the user has logged in.
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.
       time_future_and_until_login: Ends in %{time} and after the user has logged in.

-      time_past: Ended %{time} ago.
+      time_past: Ended %{time}.

       block_duration:
         hours:
           one: 1 hour
       block_duration:
         hours:
           one: 1 hour


@@ -2344,8 +2345,7 @@ en-GB:
       new:
         intro: Spotted a mistake or something missing? Let other mappers know so we
           can fix it. Move the marker to the correct position and type a note to explain
       new:
         intro: Spotted a mistake or something missing? Let other mappers know so we
           can fix it. Move the marker to the correct position and type a note to explain

-          the problem. (Please don't enter personal information or information from
-          copyrighted maps or directory listings.)
+          the problem.

         advice: Your note is public and may be used to update the map, so don't enter
           personal information or information from copyrighted maps or directory listings.
         add: Add Note
         advice: Your note is public and may be used to update the map, so don't enter
           personal information or information from copyrighted maps or directory listings.
         add: Add Note


@@ -2371,7 +2371,7 @@ en-GB:
       distance: Distance
       errors:
         no_route: Couldn't find a route between those two places.
       distance: Distance
       errors:
         no_route: Couldn't find a route between those two places.

-        no_place: Sorry - couldn't find that place.
+        no_place: Sorry - couldn't locate '%{place}'.

       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}


@@ -2409,7 +2409,7 @@ en-GB:
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}

-        roundabout_without_exit: At roundabout take %{name}
+        roundabout_without_exit: At roundabout take exit onto %{name}

         leave_roundabout_without_exit: Leave roundabout - %{name}
         stay_roundabout_without_exit: Stay on roundabout - %{name}
         start_without_exit: Start on %{name}
         leave_roundabout_without_exit: Leave roundabout - %{name}
         stay_roundabout_without_exit: Stay on roundabout - %{name}
         start_without_exit: Start on %{name}

diff --git a/config/locales/es.yml b/config/locales/es.yml
index ebb4bc300ccd8b21e61c68a655df8b8de95df457..e375314bf0f1fd4c5925aeffc2b844cac44acf42 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -452,11 +452,13 @@ es:
         other: '%{count} comentarios'
       edit_link: Editar esta entrada
       hide_link: Ocultar esta entrada
         other: '%{count} comentarios'
       edit_link: Editar esta entrada
       hide_link: Ocultar esta entrada

+      unhide_link: Mostrar esta entrada

       confirm: Confirmar
       report: Denunciar esta entrada
     diary_comment:
       comment_from: Comentario de %{link_user} el %{comment_created_at}
       hide_link: Ocultar este comentario
       confirm: Confirmar
       report: Denunciar esta entrada
     diary_comment:
       comment_from: Comentario de %{link_user} el %{comment_created_at}
       hide_link: Ocultar este comentario

+      unhide_link: Mostrar este comentario

       confirm: Confirmar
       report: Denunciar este comentario
     location:
       confirm: Confirmar
       report: Denunciar este comentario
     location:


@@ -1216,6 +1218,7 @@ es:
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: socios
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: socios

+    tou: Términos de uso

     osm_offline: La base de datos de OpenStreetMap no está disponible en estos momentos
       debido a trabajos de mantenimiento.
     osm_read_only: La base de datos de OpenStreetMap se encuentra en modo de sólo
     osm_offline: La base de datos de OpenStreetMap no está disponible en estos momentos
       debido a trabajos de mantenimiento.
     osm_read_only: La base de datos de OpenStreetMap se encuentra en modo de sólo


@@ -1462,7 +1465,8 @@ es:
       legal_html: "Este sitio y muchos otros servicios relacionados son gestionados
         formalmente por la  \n<a href='https://osmfoundation.org/'>Fundación OpenStreetMap</a>
         (OSMF) \nen nombre de la comunidad. El uso de todos los servicios gestionados
       legal_html: "Este sitio y muchos otros servicios relacionados son gestionados
         formalmente por la  \n<a href='https://osmfoundation.org/'>Fundación OpenStreetMap</a>
         (OSMF) \nen nombre de la comunidad. El uso de todos los servicios gestionados

-        por la OSMF está sujeto \na nuestra <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nnormativa
+        por la OSMF está sujeto \na nuestros  <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Términos
+        de uso</a>,  <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nnormativa

         de uso aceptable</a> y nuestra <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">normativa
         de privacidad</a>\n<br> \n<a href='http://osmfoundation.org/Contact'>Ponte
         en contacto con la OSMF</a> \nsi tienes preguntas sobre licencias, derechos
         de uso aceptable</a> y nuestra <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">normativa
         de privacidad</a>\n<br> \n<a href='http://osmfoundation.org/Contact'>Ponte
         en contacto con la OSMF</a> \nsi tienes preguntas sobre licencias, derechos


@@ -2214,14 +2218,25 @@ es:
         página wiki</a>.
       terms declined url: https://wiki.openstreetmap.org/wiki/ES:Contributor_Terms_Declined
     terms:
         página wiki</a>.
       terms declined url: https://wiki.openstreetmap.org/wiki/ES:Contributor_Terms_Declined
     terms:

-      title: Términos del colaborador
-      heading: Términos del colaborador
+      title: Términos
+      heading: Términos
+      heading_ct: Términos del colaborador
+      read and accept with tou: Por favor lee los términos de colaboración y los de
+        uso, tilda ambas opciones cuando termines y presiona el botón de continuar.
+      contributor_terms_explain: Este acuerdo gobierna los términos de tus contribuciones
+        actuales y futuras.
+      read_ct: He leido y estoy de acuerdo con los términos de contribución arriba
+        descritos
+      tou_explain_html: Estos %{tou_link} gobiernan el uso del sitio web y de la infraestructura
+        provistas por OSMF. Por favor ingrese al enlace, lea y acéptelos.
+      read_tou: He leído y estoy de acuerdo con los Términos de Uso

       consider_pd: Además del acuerdo anterior, considero que mis contribuciones se
         encuentran en Dominio Público.
       consider_pd_why: ¿qué es esto?
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Información para ayudar a comprender estos términos: un <a href="%{summary}">resumen
         legible</a> y algunas <a href="%{translations}">traducciones informales</a>'
       consider_pd: Además del acuerdo anterior, considero que mis contribuciones se
         encuentran en Dominio Público.
       consider_pd_why: ¿qué es esto?
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Información para ayudar a comprender estos términos: un <a href="%{summary}">resumen
         legible</a> y algunas <a href="%{translations}">traducciones informales</a>'

+      continue: Continuar

       declined: https://wiki.openstreetmap.org/wiki/ES:Contributor_Terms_Declined
       decline: Declinar
       you need to accept or decline: Por favor lea y, a continuación, acepte o rechace
       declined: https://wiki.openstreetmap.org/wiki/ES:Contributor_Terms_Declined
       decline: Declinar
       you need to accept or decline: Por favor lea y, a continuación, acepte o rechace


@@ -2653,6 +2668,8 @@ es:
         title: Capas
       copyright: © <a href='%{copyright_url}'>Colaboradores de OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Hacer una donación</a>
         title: Capas
       copyright: © <a href='%{copyright_url}'>Colaboradores de OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Hacer una donación</a>

+      terms: <a href='%{terms_url}' target='_blank'>Términos del sitio web y de la
+        API</a>

     site:
       edit_tooltip: Editar el mapa
       edit_disabled_tooltip: Acercar para editar el mapa
     site:
       edit_tooltip: Editar el mapa
       edit_disabled_tooltip: Acercar para editar el mapa

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 23c5cc8d7ce4ae40cf34c6398d101597c9c71275..d04b524dfad6d5f73ffcddfbf103b79b8281f476 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -51,6 +51,8 @@ fi:
       diary_entry:
         create: Julkaise
         update: Päivitä
       diary_entry:
         create: Julkaise
         update: Päivitä

+      issue_comment:
+        create: Lisää kommentti

       message:
         create: Lähetä
       client_application:
       message:
         create: Lähetä
       client_application:


@@ -137,6 +139,45 @@ fi:
         description: Kuvaus
         languages: Kielet
         pass_crypt: Salasana
         description: Kuvaus
         languages: Kielet
         pass_crypt: Salasana

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: noin 1 tunti sitten
+        other: noin %{count} tuntia sitten
+      about_x_months:
+        one: noin 1 kuukausi sitten
+        other: noin %{count} kuukautta sitten
+      about_x_years:
+        one: noin 1 vuosi sitten
+        other: noin %{count} vuotta sitten
+      almost_x_years:
+        one: melkein 1 vuosi sitten
+        other: melkein %{count} vuotta sitten
+      half_a_minute: puoli minuuttia sitten
+      less_than_x_seconds:
+        one: vähemmän kuin 1 sekuntia sitten
+        other: vähemmän kuin %{count} sekuntia sitten
+      less_than_x_minutes:
+        one: vähemmän kuin minuutti sitten
+        other: vähemmän kuin %{count} minuuttia sitten
+      over_x_years:
+        one: yli 1 vuosi sitten
+        other: yli %{count} vuotta sitten
+      x_seconds:
+        one: 1 sekunti sitten
+        other: '%{count} sekuntia sitten'
+      x_minutes:
+        one: 1 minuutti sitten
+        other: '%{count} minuuttia sitten'
+      x_days:
+        one: 1 päivä sitten
+        other: '%{count} päivää sitten'
+      x_months:
+        one: 1 kuukausi sitten
+        other: '%{count} kuukautta sitten'
+      x_years:
+        one: 1 vuosi sitten
+        other: '%{count} vuotta sitten'

   editor:
     default: Oletus (tällä hetkellä %{name})
     potlatch:
   editor:
     default: Oletus (tällä hetkellä %{name})
     potlatch:


@@ -154,14 +195,14 @@ fi:
   api:
     notes:
       comment:
   api:
     notes:
       comment:

-        opened_at_html: Luotu %{when} sitten
-        opened_at_by_html: '%{user} luonut %{when} sitten'
-        commented_at_html: Päivitetty %{when} sitten
-        commented_at_by_html: '%{user} päivittänyt %{when} sitten'
-        closed_at_html: Ratkaistu %{when} sitten
-        closed_at_by_html: '%{user} ratkaissut %{when} sitten'
-        reopened_at_html: Avattu uudelleen %{when} sitten
-        reopened_at_by_html: '%{user} aktivoinut uudelleen %{when} sitten'
+        opened_at_html: Luotu %{when}
+        opened_at_by_html: '%{user} luonut %{when}'
+        commented_at_html: Päivitetty %{when}
+        commented_at_by_html: '%{user} päivittänyt %{when}'
+        closed_at_html: Ratkaistu %{when}
+        closed_at_by_html: '%{user} ratkaissut %{when}'
+        reopened_at_html: Avattu uudelleen %{when}
+        reopened_at_by_html: '%{user} aktivoinut uudelleen %{when}'

       rss:
         title: OpenStreetMapin karttailmoitukset
         description_area: Luettelo raportoiduista, kommentoiduista tai suljetuista
       rss:
         title: OpenStreetMapin karttailmoitukset
         description_area: Luettelo raportoiduista, kommentoiduista tai suljetuista


@@ -177,15 +218,14 @@ fi:
   browse:
     created: Luotu
     closed: Ratkaistu
   browse:
     created: Luotu
     closed: Ratkaistu

-    created_html: Lähettänyt käyttäjä <abbr title='%{title}'>%{time} sitten</abbr>
-    closed_html: Ratkaistu <abbr title='%{title}'>%{time} sitten</abbr>
-    created_by_html: Lähettänyt käyttäjä %{user} <abbr title='%{title}'>%{time} sitten</abbr>
-    deleted_by_html: Poistettu <abbr title='%{title}'>%{time} sitten</abbr> käyttäjän
-      %{user} toimesta
-    edited_by_html: Muokannut viimeksi käyttäjä %{user} <abbr title='%{title}'>%{time}
-      sitten</abbr>
-    closed_by_html: Suljettu <abbr title='%{title}'>%{time} sitten</abbr> käyttäjän
-      %{user} toimesta
+    created_html: Lähettänyt käyttäjä <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Ratkaistu <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Lähettänyt käyttäjä %{user} <abbr title='%{title}'>%{time}</abbr>
+    deleted_by_html: Poistettu <abbr title='%{title}'>%{time}</abbr> käyttäjän %{user}
+      toimesta
+    edited_by_html: Muokannut viimeksi käyttäjä %{user} <abbr title='%{title}'>%{time}</abbr>
+    closed_by_html: Suljettu <abbr title='%{title}'>%{time}</abbr> käyttäjän %{user}
+      toimesta

     version: Versio
     in_changeset: Muutoskokoelma
     anonymous: tuntematon
     version: Versio
     in_changeset: Muutoskokoelma
     anonymous: tuntematon


@@ -205,10 +245,8 @@ fi:
       relation: Relaatiot (%{count})
       relation_paginated: Relaatiot (%{x}-%{y} / %{count})
       comment: Kommentit (%{count})
       relation: Relaatiot (%{count})
       relation_paginated: Relaatiot (%{x}-%{y} / %{count})
       comment: Kommentit (%{count})

-      hidden_commented_by: Käyttäjän %{user} piilotettu kommentti <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
-      commented_by: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
+      hidden_commented_by: Käyttäjän %{user} piilotettu kommentti <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       changesetxml: Muutoskokoelman XML
       osmchangexml: osmChange XML
       feed:
       changesetxml: Muutoskokoelman XML
       osmchangexml: osmChange XML
       feed:


@@ -285,22 +323,15 @@ fi:
       open_title: 'Ratkaisematon karttailmoitus #%{note_name}'
       closed_title: 'Ratkaistu karttailmoitus #%{note_name}'
       hidden_title: 'Piilotettu karttailmoitus #%{note_name}'
       open_title: 'Ratkaisematon karttailmoitus #%{note_name}'
       closed_title: 'Ratkaistu karttailmoitus #%{note_name}'
       hidden_title: 'Piilotettu karttailmoitus #%{note_name}'

-      open_by: Lähettänyt käyttäjä %{user} <abbr title='%{exact_time}'>%{when} sitten</abbr>
-      open_by_anonymous: Luonut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
-      commented_by: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
-      commented_by_anonymous: Kommentti tuntemattomalta käyttäjältä <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
-      closed_by: Ratkaissut käyttäjä %{user} <abbr title='%{exact_time}'>%{when} sitten</abbr>
-      closed_by_anonymous: Ratkaissut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
-      reopened_by: Avannut uudelleen käyttäjä %{user} <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
-      reopened_by_anonymous: Avannut uudelleen tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
-      hidden_by: Piilottanut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}
-        sitten</abbr>
+      open_by: Lähettänyt käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Luonut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Kommentti tuntemattomalta käyttäjältä <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Ratkaissut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Ratkaissut tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Avannut uudelleen käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Avannut uudelleen tuntematon käyttäjä <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Piilottanut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       report: Ilmianna karttailmoitus
     query:
       title: Ominaisuuskysely
       report: Ilmianna karttailmoitus
     query:
       title: Ominaisuuskysely


@@ -340,12 +371,15 @@ fi:
   changeset_comments:
     comment:
       comment: 'Käyttäjä %{author} kommentoi muutoskokoelmaa #%{changeset_id}'
   changeset_comments:
     comment:
       comment: 'Käyttäjä %{author} kommentoi muutoskokoelmaa #%{changeset_id}'

-      commented_at_by_html: '%{user} päivittänyt %{when} sitten'
+      commented_at_by_html: '%{user} päivittänyt %{when}'

     comments:
       comment: 'Uusi kommentti käyttäjän %{author} muutoskokoelmassa #%{changeset_id}'
     index:
       title_all: Keskustelu OpenStreetMapin muutoskokoelmasta
       title_particular: 'OpenStreetMap muutoskokoelma #%{changeset_id} keskustelu'
     comments:
       comment: 'Uusi kommentti käyttäjän %{author} muutoskokoelmassa #%{changeset_id}'
     index:
       title_all: Keskustelu OpenStreetMapin muutoskokoelmasta
       title_particular: 'OpenStreetMap muutoskokoelma #%{changeset_id} keskustelu'

+    timeout:
+      sorry: Valitettavasti pyytämäsi muutoskokoelmien kommenttien hakeminen kesti
+        liian kauan.

   diary_entries:
     new:
       title: Uusi päiväkirjamerkintä
   diary_entries:
     new:
       title: Uusi päiväkirjamerkintä


@@ -393,11 +427,13 @@ fi:
         other: '%{count} kommenttia'
       edit_link: Muokkaa päiväkirjamerkintää
       hide_link: Piilota tämä merkintä
         other: '%{count} kommenttia'
       edit_link: Muokkaa päiväkirjamerkintää
       hide_link: Piilota tämä merkintä

+      unhide_link: Poista merkinnän piilottaminen

       confirm: Vahvista
       report: Ilmianna julkaisu
     diary_comment:
       comment_from: Kommentti käyttäjältä %{link_user} %{comment_created_at}
       hide_link: Piilota tämä kommentti
       confirm: Vahvista
       report: Ilmianna julkaisu
     diary_comment:
       comment_from: Kommentti käyttäjältä %{link_user} %{comment_created_at}
       hide_link: Piilota tämä kommentti

+      unhide_link: Poista kommentin piilottaminen

       confirm: Vahvista
       report: Ilmianna kommentti
     location:
       confirm: Vahvista
       report: Ilmianna kommentti
     location:


@@ -1034,9 +1070,8 @@ fi:
       status: Tila
       reports: Ilmiannot
       last_updated: Päivitetty
       status: Tila
       reports: Ilmiannot
       last_updated: Päivitetty

-      last_updated_time_html: <abbr title='%{title}'>%{time} sitten</abbr>
-      last_updated_time_user_html: käyttäjä %{user} <abbr title='%{title}'>%{time}
-        sitten</abbr>
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: käyttäjä %{user} <abbr title='%{title}'>%{time}</abbr>

       link_to_reports: Näytä ilmiannot
       reports_count:
         one: 1 ilmoitus
       link_to_reports: Näytä ilmiannot
       reports_count:
         one: 1 ilmoitus


@@ -2182,7 +2217,7 @@ fi:
       ct status: 'Osallistumisehdot:'
       ct undecided: Ei valittu
       ct declined: Hylätty
       ct status: 'Osallistumisehdot:'
       ct undecided: Ei valittu
       ct declined: Hylätty

-      latest edit: 'Viimeisin muutos %{ago}:'
+      latest edit: 'Viimeisin muutos (%{ago}):'

       email address: 'Sähköpostiosoite:'
       created from: 'Tekijä:'
       status: 'Tila:'
       email address: 'Sähköpostiosoite:'
       created from: 'Tekijä:'
       status: 'Tila:'


@@ -2438,7 +2473,7 @@ fi:
       title: Esto %{block_on} poistetaan
       heading: Poistetaan käyttäjän %{block_on} esto, jonka oli tehnyt %{block_by}
       time_future: Tämä esto päättyy %{time} kuluttua.
       title: Esto %{block_on} poistetaan
       heading: Poistetaan käyttäjän %{block_on} esto, jonka oli tehnyt %{block_by}
       time_future: Tämä esto päättyy %{time} kuluttua.

-      past: Tämä esto päättyi %{time} sitten ja sitä ei voida poistaa.
+      past: Tämä esto päättyi %{time} ja sitä ei voida poistaa.

       confirm: Oletko varma, että haluat poistaa tämän eston?
       revoke: Poista!
       flash: Tämä esto on poistettu
       confirm: Oletko varma, että haluat poistaa tämän eston?
       revoke: Poista!
       flash: Tämä esto on poistettu


@@ -2447,7 +2482,7 @@ fi:
       until_login: Aktiivinen kunnes käyttäjä kirjautuu sisään.
       time_future_and_until_login: Päättyy %{time} kuluttua ja käyttäjän kirjauduttua
         sisään.
       until_login: Aktiivinen kunnes käyttäjä kirjautuu sisään.
       time_future_and_until_login: Päättyy %{time} kuluttua ja käyttäjän kirjauduttua
         sisään.

-      time_past: Päättyi %{time} sitten.
+      time_past: Päättyi %{time}.

       block_duration:
         hours:
           one: 1 tunti
       block_duration:
         hours:
           one: 1 tunti

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9e2419c245b431ee0711eb706c6de13a34681ce1..2cdf12deaa799ce4cc4f7d6bffc09e531e447d84 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -11,6 +11,7 @@
 # Author: Damouns
 # Author: DavidL
 # Author: Dereckson
 # Author: Damouns
 # Author: DavidL
 # Author: Dereckson

+# Author: Derugon

 # Author: E THP
 # Author: Efred
 # Author: Eruedin
 # Author: E THP
 # Author: Efred
 # Author: Eruedin


@@ -177,35 +178,35 @@ fr:
         one: il y a environ un mois
         other: il y a environ %{count} mois
       about_x_years:
         one: il y a environ un mois
         other: il y a environ %{count} mois
       about_x_years:

-        one: il y a environ un an
+        one: il y a environ 1 an

         other: il y a environ %{count} ans
       almost_x_years:
         other: il y a environ %{count} ans
       almost_x_years:

-        one: il y a presque un an
-        other: il y a presuqe %{count} ans
-      half_a_minute: il y a une demi minute
+        one: il y a presque 1 an
+        other: il y a presque %{count} ans
+      half_a_minute: il y a une demi-minute

       less_than_x_seconds:
       less_than_x_seconds:

-        one: il y a moins d'une seconde
+        one: il y a moins d’1 seconde

         other: il y a moins de %{count} secondes
       less_than_x_minutes:
         other: il y a moins de %{count} secondes
       less_than_x_minutes:

-        one: il y a moins d'une minute
+        one: il y a moins d’une minute

         other: il y a moins de %{count} minutes
       over_x_years:
         other: il y a moins de %{count} minutes
       over_x_years:

-        one: il y a plus d'une année
+        one: il y a plus d’1 année

         other: il y a plus de %{count} ans
       x_seconds:
         other: il y a plus de %{count} ans
       x_seconds:

-        one: il y a une seconde
+        one: il y a 1 seconde

         other: il y a %{count} secondes
       x_minutes:
         one: il y a 1 minute
         other: il y a %{count} minutes
       x_days:
         other: il y a %{count} secondes
       x_minutes:
         one: il y a 1 minute
         other: il y a %{count} minutes
       x_days:

-        one: il y a un jour
+        one: il y a 1 jour

         other: il y a %{count} jours
       x_months:
         other: il y a %{count} jours
       x_months:

-        one: il y a un mois
+        one: il y a 1 mois

         other: il y a %{count} mois
       x_years:
         other: il y a %{count} mois
       x_years:

-        one: il y a un an
+        one: il y a 1 an

         other: il y a %{count} ans
   printable_name:
     with_name_html: '%{name} (%{id})'
         other: il y a %{count} ans
   printable_name:
     with_name_html: '%{name} (%{id})'


@@ -227,8 +228,8 @@ fr:
     notes:
       comment:
         opened_at_html: Créé le %{when}
     notes:
       comment:
         opened_at_html: Créé le %{when}

-        opened_at_by_html: Créé il y le %{when} par %{user}
-        commented_at_html: Mis à jour le %{when}
+        opened_at_by_html: Créé le %{when} par %{user}
+        commented_at_html: Mis-à-jour le %{when}

         commented_at_by_html: Mis à jour le %{when} par %{user}
         closed_at_html: Résolu le %{when}
         closed_at_by_html: Résolu %{when} par %{user}
         commented_at_by_html: Mis à jour le %{when} par %{user}
         closed_at_html: Résolu le %{when}
         closed_at_by_html: Résolu %{when} par %{user}


@@ -251,7 +252,7 @@ fr:
     closed: Fermé
     created_html: Créé à <abbr title='%{title}'>%{time}</abbr>
     closed_html: Fermé <abbr title='%{title}'>%{time}</abbr>
     closed: Fermé
     created_html: Créé à <abbr title='%{title}'>%{time}</abbr>
     closed_html: Fermé <abbr title='%{title}'>%{time}</abbr>

-    created_by_html: Créé <abbr title='%{title}'>%{time}</abbr> par %{user}
+    created_by_html: Créé à <abbr title='%{title}'>%{time}</abbr> par %{user}

     deleted_by_html: Supprimé il y a <abbr title='%{title}'>%{time}</abbr> par %{user}
     edited_by_html: Modifié <abbr title='%{title}'>%{time}</abbr> par %{user}
     closed_by_html: Fermé <abbr title='%{title}'>%{time}</abbr> par %{user}
     deleted_by_html: Supprimé il y a <abbr title='%{title}'>%{time}</abbr> par %{user}
     edited_by_html: Modifié <abbr title='%{title}'>%{time}</abbr> par %{user}
     closed_by_html: Fermé <abbr title='%{title}'>%{time}</abbr> par %{user}


@@ -274,9 +275,8 @@ fr:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x} à %{y} sur %{count})
       comment: Commentaires (%{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x} à %{y} sur %{count})
       comment: Commentaires (%{count})

-      hidden_commented_by: Commentaire masqué de %{user} <abbr title='%{exact_time}'>il
-        y a %{when}</abbr>
-      commented_by: Commentaire de %{user} <abbr title='%{exact_time}'> le %{when}</abbr>
+      hidden_commented_by: Commentaire masqué de %{user} il y a <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Commentaire de %{user} <abbr title='%{exact_time}'>le %{when}</abbr>

       changesetxml: XML du groupe de modifications
       osmchangexml: XML osmChange
       feed:
       changesetxml: XML du groupe de modifications
       osmchangexml: XML osmChange
       feed:


@@ -355,7 +355,7 @@ fr:
       open_title: Note non résolue nº %{note_name}
       closed_title: Note résolue nº %{note_name}
       hidden_title: Note masquée nº %{note_name}
       open_title: Note non résolue nº %{note_name}
       closed_title: Note résolue nº %{note_name}
       hidden_title: Note masquée nº %{note_name}

-      open_by: Créé par %{user} <abbr title='%{exact_time}'> à %{when}</abbr>
+      open_by: Créé par %{user} <abbr title='%{exact_time}'>à %{when}</abbr>

       open_by_anonymous: Créé par un utilisateur anonyme <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by: Commenté par %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Commenté par un utilisateur anonyme <abbr title='%{exact_time}'>%{when}</abbr>
       open_by_anonymous: Créé par un utilisateur anonyme <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by: Commenté par %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Commenté par un utilisateur anonyme <abbr title='%{exact_time}'>%{when}</abbr>


@@ -1107,7 +1107,7 @@ fr:
       reports: Rapports
       last_updated: Dernière mise à jour
       last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
       reports: Rapports
       last_updated: Dernière mise à jour
       last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>

-      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> par %{user}
+      last_updated_time_user_html: à <abbr title='%{title}'>%{time}</abbr> par %{user}

       link_to_reports: Afficher les rapports
       reports_count:
         one: 1 rapport
       link_to_reports: Afficher les rapports
       reports_count:
         one: 1 rapport


@@ -2307,7 +2307,7 @@ fr:
       ct status: 'Conditions du contributeur:'
       ct undecided: Indécis
       ct declined: Refusé
       ct status: 'Conditions du contributeur:'
       ct undecided: Indécis
       ct declined: Refusé

-      latest edit: 'Dernière modification (%{ago}) :'
+      latest edit: 'Dernière modification (%{ago})&nbsp;:'

       email address: 'Adresse de courriel :'
       created from: 'Créé depuis :'
       status: 'État :'
       email address: 'Adresse de courriel :'
       created from: 'Créé depuis :'
       status: 'État :'

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b5ecf2539d24672b7873900399067d61f0120675..1026ae9b321290372e48ec2ab5558d94f1e997c3 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -484,15 +484,15 @@ gl:
           bbq: Barbacoa
           bench: Asento
           bicycle_parking: Aparcadoiro de bicicletas
           bbq: Barbacoa
           bench: Asento
           bicycle_parking: Aparcadoiro de bicicletas

-          bicycle_rental: Aluguer de bicicletas
+          bicycle_rental: Alugamento de bicicletas

           biergarten: Terraza
           biergarten: Terraza

-          boat_rental: Aluguer de botes
+          boat_rental: Alugamento de embarcacións

           brothel: Prostíbulo
           bureau_de_change: Casa de troco
           bus_station: Estación de autobuses
           cafe: Cafetaría
           brothel: Prostíbulo
           bureau_de_change: Casa de troco
           bus_station: Estación de autobuses
           cafe: Cafetaría

-          car_rental: Aluguer de automóbiles
-          car_sharing: Aluguer de automóbiles
+          car_rental: Alugamento de automóbiles
+          car_sharing: Automóbil compartido

           car_wash: Lavadoiro de coches
           casino: Casino
           charging_station: Estación de carrega
           car_wash: Lavadoiro de coches
           casino: Casino
           charging_station: Estación de carrega

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7e88d52ad24b5cda530c740ca49e2f69fa572dfb..5cdaca5c32d4602b636011f76a7bef201bf97e98 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -157,9 +157,8 @@ pl:
       about_x_hours:
         one: około godziny temu
         other: około %{count} godz. temu
       about_x_hours:
         one: około godziny temu
         other: około %{count} godz. temu

-      about_x_months:
-        one: około miesiąc temu
-        other: około %{count} miesiące temu
+      about_x_months: około {{PLURAL:%{count}|miesiąc|%{count} miesiące|%{count} miesięcy}}
+        temu

       about_x_years:
         one: około rok temu
         other: około %{count} lata temu
       about_x_years:
         one: około rok temu
         other: około %{count} lata temu


@@ -185,9 +184,7 @@ pl:
       x_days:
         one: 1 dzień temu
         other: '%{count} dni temu'
       x_days:
         one: 1 dzień temu
         other: '%{count} dni temu'

-      x_months:
-        one: miesiąc temu
-        other: '%{count} miesiące temu'
+      x_months: '{{PLURAL:%{count}|miesiąc|%{count} miesiące|%{count} miesięcy}} temu'

       x_years:
         one: rok temu
         other: '%{count} lata temu'
       x_years:
         one: rok temu
         other: '%{count} lata temu'

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 8d53d65b872b2d292f32400fb3afb422d9aa282e..4dc6e7442889cc3c3b8bd77b83cbc393ad8f9ee1 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -30,6 +30,7 @@
 # Author: ViriatoLusitano
 # Author: Vitorvicentevalente
 # Author: Waldir
 # Author: ViriatoLusitano
 # Author: Vitorvicentevalente
 # Author: Waldir

+# Author: Waldyrious

 ---
 pt-PT:
   html:
 ---
 pt-PT:
   html:

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 5846ce0c3c8cd4e0046b3e1db92ca29214b011c5..bddaf27c047746a8fbbda17ec2e37b0767e99b01 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -28,6 +28,8 @@ ro:
       diary_entry:
         create: Publică
         update: Actualizează
       diary_entry:
         create: Publică
         update: Actualizează

+      issue_comment:
+        create: Adaugă un comentariu

       message:
         create: Trimite
       client_application:
       message:
         create: Trimite
       client_application:


@@ -114,6 +116,45 @@ ro:
         description: Descriere
         languages: Limbi
         pass_crypt: Parolă
         description: Descriere
         languages: Limbi
         pass_crypt: Parolă

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: aproximativ 1 oră în urmă
+        other: aproximativ %{count} ore în urmă
+      about_x_months:
+        one: aproximativ 1 lună în urmă
+        other: aproximativ %{count} luni în urmă
+      about_x_years:
+        one: aproximativ 1 an în urmă
+        other: aproximativ %{count} ani în urmă
+      almost_x_years:
+        one: aproape 1 an în urmă
+        other: aproape %{count} luni în urmă
+      half_a_minute: o jumătate de minut în urmă
+      less_than_x_seconds:
+        one: mai puțin de 1 secundă în urmă
+        other: aproximativ acum %{count} luni în urmă
+      less_than_x_minutes:
+        one: mai puțin de un minut în urmă
+        other: mai puțin de %{count} minute în urmă
+      over_x_years:
+        one: acum peste 1 an
+        other: peste %{count} ani în urmă
+      x_seconds:
+        one: acum 1 secundă
+        other: cu %{count} secunde în urmă
+      x_minutes:
+        one: acum 1 minut
+        other: cu %{count} minute în urmă
+      x_days:
+        one: acum 1 zi
+        other: cu %{count} zile în urmă
+      x_months:
+        one: acum 1 lună
+        other: cu %{count} luni în urmă
+      x_years:
+        one: acum 1 an
+        other: cu %{count} ani în urmă

   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'


@@ -134,14 +175,14 @@ ro:
   api:
     notes:
       comment:
   api:
     notes:
       comment:

-        opened_at_html: Actualizat acum %{when}
+        opened_at_html: Creat %{when}

         opened_at_by_html: Creat %{when} de %{user}
         opened_at_by_html: Creat %{when} de %{user}

-        commented_at_html: Actualizat acum %{when}
-        commented_at_by_html: Actualizat acum %{when} de %{user}
-        closed_at_html: Rezolvată %{when} în urmă
-        closed_at_by_html: Rezolvată %{when} în urmă de %{user}
-        reopened_at_html: Reactivat %{when} în urmă
-        reopened_at_by_html: Reactivat %{when} în urmă de %{user}
+        commented_at_html: Actualizat %{when}
+        commented_at_by_html: Actualizat %{when} de %{user}
+        closed_at_html: Rezolvat %{when}
+        closed_at_by_html: Rezolvat %{when} de %{user}
+        reopened_at_html: Reactivat %{when}
+        reopened_at_by_html: Reactivat %{when} de %{user}

       rss:
         title: Note OpenStreetMap
         description_area: O listă de note, raportate, comentate sau închise în zona
       rss:
         title: Note OpenStreetMap
         description_area: O listă de note, raportate, comentate sau închise în zona


@@ -157,13 +198,12 @@ ro:
   browse:
     created: Creat
     closed: Închis
   browse:
     created: Creat
     closed: Închis

-    created_html: Creat <abbr title='%{title}'>cu %{time} în urmă</abbr>
-    closed_html: Închis <abbr title='%{title}'>cu %{time} în urmă</abbr>
-    created_by_html: Creat <abbr title='%{title}'>cu %{time} în urmă</abbr> de %{user}
-    deleted_by_html: Șters <abbr title='%{title}'>cu %{time} în urmă</abbr> de %{user}
-    edited_by_html: Modificat <abbr title='%{title}'>cu %{time} în urmă</abbr> de
-      %{user}
-    closed_by_html: Închis <abbr title='%{title}'>cu %{time} în urmă</abbr> de %{user}
+    created_html: Creat <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Închis <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Creat <abbr title='%{title}'>%{time}</abbr> de %{user}
+    deleted_by_html: Șters <abbr title='%{title}'>%{time}</abbr> de %{user}
+    edited_by_html: Modificat <abbr title='%{title}'>%{time}</abbr> de %{user}
+    closed_by_html: Închis <abbr title='%{title}'>%{time}</abbr> de %{user}

     version: Versiune
     in_changeset: Set de modificări
     anonymous: anonim
     version: Versiune
     in_changeset: Set de modificări
     anonymous: anonim


@@ -183,10 +223,8 @@ ro:
       relation: Comunicații (%{count})
       relation_paginated: Comunicații (%{x}-%{y} din %{count})
       comment: Comentarii (%{count})
       relation: Comunicații (%{count})
       relation_paginated: Comunicații (%{x}-%{y} din %{count})
       comment: Comentarii (%{count})

-      hidden_commented_by: Ascuns comentariu scris de %{user} <abbr title='%{exact_time}'>cu
-        %{when} în urmă</abbr>
-      commented_by: Comentariu scris de %{user} <abbr title='%{exact_time}'>cu %{when}
-        în urmă</abbr>
+      hidden_commented_by: Ascuns comentariu de la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comentariu de la %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       changesetxml: Set de modificări XML
       osmchangexml: XML osmChange
       feed:
       changesetxml: Set de modificări XML
       osmchangexml: XML osmChange
       feed:


@@ -221,7 +259,7 @@ ro:
       entry: Relația %{relation_name}
       entry_role: Relația %{relation_name} (ca %{relation_role})
     not_found:
       entry: Relația %{relation_name}
       entry_role: Relația %{relation_name} (ca %{relation_role})
     not_found:

-      sorry: 'Ne pare rău, dar %{type} #%{id} nu s-a putut găsi.'
+      sorry: 'Scuze, dar %{type} #%{id} nu s-a putut găsi.'

       type:
         node: nod
         way: drum
       type:
         node: nod
         way: drum


@@ -266,18 +304,15 @@ ro:
       open_title: 'Notă nerezolvată #%{note_name}'
       closed_title: 'Notă rezolvată #%{note_name}'
       hidden_title: 'Notă ascunsă #%{note_name}'
       open_title: 'Notă nerezolvată #%{note_name}'
       closed_title: 'Notă rezolvată #%{note_name}'
       hidden_title: 'Notă ascunsă #%{note_name}'

-      open_by: Creat de %{user} <abbr title=cu '%{exact_time}'>%{when} în urmă</abbr>
-      open_by_anonymous: Creat de un utilizator anonim <abbr title=cu '%{exact_time}'>%{when}
-        în urmă</abbr>
-      commented_by: Comentariu scris de %{user} <abbr title='%{exact_time}'>cu %{when}
-        în urmă</abbr>
-      commented_by_anonymous: Comentariu scris de un utilizator anonim <abbr title=cu
-        '%{exact_time}'>%{when} în urmă</abbr>
-      closed_by: Rezolvat de %{user} acum <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Rezolvat de anonimul acum <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: Reactivat de acum %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: Reactivat de anonim acum <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: Ascunsă de %{user} acum <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by: Creat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Creat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comentariu de la %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Comentariu de la anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Rezolvat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Rezolvat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Reactivat de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Reactivat de anonim <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Ascunsă de %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       report: Raportează această notă
     query:
       title: Interogări ale funcțiilor
       report: Raportează această notă
     query:
       title: Interogări ale funcțiilor


@@ -317,7 +352,7 @@ ro:
   changeset_comments:
     comment:
       comment: 'Comentariu nou privind modificările #%{changeset_id} de către %{author}'
   changeset_comments:
     comment:
       comment: 'Comentariu nou privind modificările #%{changeset_id} de către %{author}'

-      commented_at_by_html: Actualizat acum %{when} de %{user}
+      commented_at_by_html: Actualizat %{when} de %{user}

     comments:
       comment: 'Comentariu nou făcut la #%{changeset_id} de %{author}'
     index:
     comments:
       comment: 'Comentariu nou făcut la #%{changeset_id} de %{author}'
     index:


@@ -374,11 +409,13 @@ ro:
         other: '%{count} comentarii'
       edit_link: Editează această înregistrare
       hide_link: Ascunde această înregistrare
         other: '%{count} comentarii'
       edit_link: Editează această înregistrare
       hide_link: Ascunde această înregistrare

+      unhide_link: Arată această intrare

       confirm: Confirmă
       report: Reclamă această înregistrare
     diary_comment:
       comment_from: Comentariu de la %{link_user} pe %{comment_created_at}
       hide_link: Ascunde acest comentariu
       confirm: Confirmă
       report: Reclamă această înregistrare
     diary_comment:
       comment_from: Comentariu de la %{link_user} pe %{comment_created_at}
       hide_link: Ascunde acest comentariu

+      unhide_link: Arată acest comentariu

       confirm: Confirmă
       report: Reclamă acest comentariu
     location:
       confirm: Confirmă
       report: Reclamă acest comentariu
     location:


@@ -833,7 +870,7 @@ ro:
           abandoned: Cale ferată abandonată
           construction: Cale ferată în construcție
           disused: Cale ferată dezafectată
           abandoned: Cale ferată abandonată
           construction: Cale ferată în construcție
           disused: Cale ferată dezafectată

-          funicular: Funicular
+          funicular: Cale Ferată Funicular

           halt: Gară
           junction: Nod feroviar
           level_crossing: Trecere la nivel
           halt: Gară
           junction: Nod feroviar
           level_crossing: Trecere la nivel


@@ -1017,8 +1054,8 @@ ro:
       status: Stare
       reports: Rapoarte
       last_updated: Ultima actualizare
       status: Stare
       reports: Rapoarte
       last_updated: Ultima actualizare

-      last_updated_time_html: <abbr title='%{title}'>%{time} în urmă</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} ago</abbr> de %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> de %{user}

       link_to_reports: Vizualizați rapoartele
       reports_count:
         one: 1 Report
       link_to_reports: Vizualizați rapoartele
       reports_count:
         one: 1 Report


@@ -1358,7 +1395,7 @@ ro:
         despre drumuri, trasee, cafenele, stații de cale ferată și multe altele din întreaga lume.
       local_knowledge_title: Cunoaștere locală
       local_knowledge_html: |-
         despre drumuri, trasee, cafenele, stații de cale ferată și multe altele din întreaga lume.
       local_knowledge_title: Cunoaștere locală
       local_knowledge_html: |-

-        OpenStreetMap simpatizează cunoștințele locale. Colaboratorii folosesc imaginile aeriene, dispozitivele GPS și hărțile câmpurilor de joasă tehnologie pentru a verifica faptul că OSM
+        OpenStreetMap îndrăgește cunoștințele locale. Colaboratorii folosesc imaginile aeriene, dispozitivele GPS și hărțile câmpurilor de joasă tehnologie pentru a verifica faptul că OSM

         este exactă și actualizată.
       community_driven_title: Condusă de comunitate
       community_driven_html: |-
         este exactă și actualizată.
       community_driven_title: Condusă de comunitate
       community_driven_html: |-


@@ -2210,7 +2247,7 @@ ro:
       ct status: 'Termenii colaboratorului:'
       ct undecided: Nedefinit
       ct declined: Declinat
       ct status: 'Termenii colaboratorului:'
       ct undecided: Nedefinit
       ct declined: Declinat

-      latest edit: 'Ultima editare %{ago}:'
+      latest edit: 'Ultima modificare %{ago}:'

       email address: 'Adresa de e-mail:'
       created from: 'Creat de la:'
       status: 'Statut:'
       email address: 'Adresa de e-mail:'
       created from: 'Creat de la:'
       status: 'Statut:'


@@ -2316,7 +2353,7 @@ ro:
       update home location on click: Actualizați locația locuinței dvs. când faceți
         click pe hartă?
       save changes button: Salvează modificările
       update home location on click: Actualizați locația locuinței dvs. când faceți
         click pe hartă?
       save changes button: Salvează modificările

-      make edits public button: Efectuați toate editările mele publice
+      make edits public button: Faceți toate editările mele publice

       return to profile: Reveniți la profil
       flash update success confirm needed: Informațiile despre utilizator s-au actualizat
         cu succes. Verificați e-mailul pentru o notă pentru a confirma noua adresă
       return to profile: Reveniți la profil
       flash update success confirm needed: Informațiile despre utilizator s-au actualizat
         cu succes. Verificați e-mailul pentru o notă pentru a confirma noua adresă


@@ -2495,20 +2532,20 @@ ro:
       time_past: Terminat în urmă cu %{time}.
       block_duration:
         hours:
       time_past: Terminat în urmă cu %{time}.
       block_duration:
         hours:

-          one: 1 hour
-          other: '%{count} hours'
+          one: 1 oră
+          other: '%{count} ore'

         days:
         days:

-          one: 1 day
-          other: '%{count} days'
+          one: 1 zi
+          other: '%{count} zile'

         weeks:
         weeks:

-          one: 1 week
-          other: '%{count} weeks'
+          one: 1 săptămână
+          other: '%{count} săptămâni'

         months:
         months:

-          one: 1 month
-          other: '%{count} months'
+          one: 1 lună
+          other: '%{count} luni'

         years:
         years:

-          one: 1 year
-          other: '%{count} years'
+          one: 1 an
+          other: '%{count} ani'

     blocks_on:
       title: Blocări pe %{name}
       heading: Lista blocărilor pe %{name}
     blocks_on:
       title: Blocări pe %{name}
       heading: Lista blocărilor pe %{name}


@@ -2654,7 +2691,7 @@ ro:
       distance: Distanță
       errors:
         no_route: Nu s-a putut găsi un traseu între cele două locuri.
       distance: Distanță
       errors:
         no_route: Nu s-a putut găsi un traseu între cele două locuri.

-        no_place: Ne pare rău - nu am găsit locația '%{place}'.
+        no_place: Scuze - nu am găsit '%{place}'.

       instructions:
         continue_without_exit: Continuă pe %{name}
         slight_right_without_exit: Virează direct în %{name}
       instructions:
         continue_without_exit: Continuă pe %{name}
         slight_right_without_exit: Virează direct în %{name}


@@ -2676,12 +2713,12 @@ ro:
         onramp_right_without_directions: Virează la dreapta către banda
         onramp_right: Virează la dreapta către banda
         endofroad_right_without_exit: La finalul drumul virează dreapta către %{name}
         onramp_right_without_directions: Virează la dreapta către banda
         onramp_right: Virează la dreapta către banda
         endofroad_right_without_exit: La finalul drumul virează dreapta către %{name}

-        merge_right_without_exit: Intră direct pe %{name}
-        fork_right_without_exit: La intersecția în formă de furculiță (Y) fă dreapta
-          pe %{name}
+        merge_right_without_exit: Mergeți direct pe %{name}
+        fork_right_without_exit: La intersecția în formă de furcă (Y) fă dreapta pe
+          %{name}

         turn_right_without_exit: Virează la dreapta pe %{name}
         sharp_right_without_exit: Strângeți dreapta spre %{name}
         turn_right_without_exit: Virează la dreapta pe %{name}
         sharp_right_without_exit: Strângeți dreapta spre %{name}

-        uturn_without_exit: Fă o întoarcere în U %{name}
+        uturn_without_exit: Întoarceți-vă în U pe %{name}

         sharp_left_without_exit: Brusc stânga spre %{name}
         turn_left_without_exit: Virează la stânga pe %{name}
         offramp_left: Abordați ieșirea de pe partea stângă
         sharp_left_without_exit: Brusc stânga spre %{name}
         turn_left_without_exit: Virează la stânga pe %{name}
         offramp_left: Abordați ieșirea de pe partea stângă


@@ -2693,7 +2730,7 @@ ro:
           spre %{name}, către %{directions}
         offramp_left_with_name: Abordează ieșirea de pe stângă către %{name}
         offramp_left_with_directions: Abordează ieșirea de pe stânga către %{directions}
           spre %{name}, către %{directions}
         offramp_left_with_name: Abordează ieșirea de pe stângă către %{name}
         offramp_left_with_directions: Abordează ieșirea de pe stânga către %{directions}

-        offramp_left_with_name_directions: Abordează ieșirea de pe stânga pe %{name},
+        offramp_left_with_name_directions: Abordează ieșirea de pe stânga spre %{name},

           către %{directions}
         onramp_left_without_exit: Virează la stânga către %{name}
         onramp_left_with_directions: Virează la stânga spre banda către %{directions}
           către %{directions}
         onramp_left_without_exit: Virează la stânga către %{name}
         onramp_left_with_directions: Virează la stânga spre banda către %{directions}


@@ -2703,35 +2740,34 @@ ro:
         onramp_left: Virează la stânga către banda
         endofroad_left_without_exit: La finalul drumul virează stânga către %{name}
         merge_left_without_exit: Strângeți stânga spre %{name}
         onramp_left: Virează la stânga către banda
         endofroad_left_without_exit: La finalul drumul virează stânga către %{name}
         merge_left_without_exit: Strângeți stânga spre %{name}

-        fork_left_without_exit: La intersecția în formă de furculiță (Y) fă stânga
-          pe %{name}
+        fork_left_without_exit: La intersecția în formă de furcă (Y) fă stânga pe
+          %{name}

         slight_left_without_exit: Ușor stânga pe %{name}
         slight_left_without_exit: Ușor stânga pe %{name}

-        via_point_without_exit: (prin via)
+        via_point_without_exit: (via prin)

         follow_without_exit: Urmarește %{name}
         roundabout_without_exit: La sensul giratoriu, ieșiți pe %{name}
         leave_roundabout_without_exit: Părăsește sensul giratoriu - %{name}
         follow_without_exit: Urmarește %{name}
         roundabout_without_exit: La sensul giratoriu, ieșiți pe %{name}
         leave_roundabout_without_exit: Părăsește sensul giratoriu - %{name}

-        stay_roundabout_without_exit: Stai pe sensul giratoriu - %{name}
+        stay_roundabout_without_exit: Rămâi pe sensul giratoriu - %{name}

         start_without_exit: Începe pe %{name}
         start_without_exit: Începe pe %{name}

-        destination_without_exit: Atingeți destinația
-        against_oneway_without_exit: Mergi împotriva sensului de trafic cu sens unic
-          pe %{name}
+        destination_without_exit: Destinație atinsă
+        against_oneway_without_exit: Mergi împotriva sensului unic pe %{name}

         end_oneway_without_exit: Finalul străzii cu sens unic pe %{name}
         end_oneway_without_exit: Finalul străzii cu sens unic pe %{name}

-        roundabout_with_exit: La sensul giratoriu %{exit} pe %{name}
-        roundabout_with_exit_ordinal: La sensul giratoriu %{exit}, ieșiți pe %{name}
-        exit_roundabout: Ieșiți în sensul giratoriu pe %{name}
+        roundabout_with_exit: La sensul giratoriu ieși pe %{exit} către %{name}
+        roundabout_with_exit_ordinal: La sensul giratoriu a %{exit} ieșire spre %{name}
+        exit_roundabout: Ieșiți din sensul giratoriu spre %{name}

         unnamed: drum fără nume
         unnamed: drum fără nume

-        courtesy: Instrucțiuni prin curtoazie de %{link}
+        courtesy: Instrucțiuni prin curtoazia %{link}

         exit_counts:
         exit_counts:

-          first: Primul loc
-          second: Al doilea loc
-          third: Locul trei
-          fourth: Locul 4
-          fifth: Locul 5
-          sixth: Locul 6
-          seventh: Locul 7
-          eighth: Locul 8
-          ninth: Locul 9
-          tenth: Locul 10
+          first: primul loc
+          second: al doilea loc
+          third: locul trei
+          fourth: locul 4
+          fifth: locul 5
+          sixth: locul 6
+          seventh: locul 7
+          eighth: locul 8
+          ninth: locul 9
+          tenth: locul 10

       time: Durată
     query:
       node: Nod
       time: Durată
     query:
       node: Nod

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 0932acb662bff2376ac92da5c962d153ea250b2d..0d80099747d755f65a1c70d3a33586f8aed79377 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -69,6 +69,7 @@
 # Author: WindEwriX
 # Author: Wirbel78
 # Author: XAN
 # Author: WindEwriX
 # Author: Wirbel78
 # Author: XAN

+# Author: XnL

 # Author: Yuri Nazarov
 # Author: Yuryleb
 # Author: Zverik
 # Author: Yuri Nazarov
 # Author: Yuryleb
 # Author: Zverik


@@ -108,7 +109,7 @@ ru:
   activerecord:
     errors:
       messages:
   activerecord:
     errors:
       messages:

-        invalid_email_address: не поÑ\85оже на коÑ\80Ñ\80екÑ\82ный адрес электронной почты
+        invalid_email_address: не поÑ\85оже на дейÑ\81Ñ\82виÑ\82елÑ\8cный адрес электронной почты

         email_address_not_routable: не маршрутизирован
     models:
       acl: Список контроля доступа
         email_address_not_routable: не маршрутизирован
     models:
       acl: Список контроля доступа


@@ -180,26 +181,26 @@ ru:
   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:

-        one: около 1 часа назад
+        one: около часа назад

         other: около %{count} часов назад
       about_x_months:
         other: около %{count} часов назад
       about_x_months:

-        one: около 1 месяца назад
+        one: около месяца назад

         other: около %{count} месяцев назад
       about_x_years:
         other: около %{count} месяцев назад
       about_x_years:

-        one: около 1 года назад
+        one: около года назад

         other: около %{count} лет назад
       almost_x_years:
         other: около %{count} лет назад
       almost_x_years:

-        one: почти 1 год назад
+        one: почти год назад

         other: почти %{count} лет назад
       half_a_minute: полминуты назад
       less_than_x_seconds:
         other: почти %{count} лет назад
       half_a_minute: полминуты назад
       less_than_x_seconds:

-        one: менее 1 секунды назад
+        one: менее секунды назад

         other: менее %{count} секунд назад
       less_than_x_minutes:
         other: менее %{count} секунд назад
       less_than_x_minutes:

-        one: менее 1 минуты назад
+        one: менее минуты назад

         other: менее %{count} минут назад
       over_x_years:
         other: менее %{count} минут назад
       over_x_years:

-        one: более 1 года назад
+        one: более года назад

         other: более %{count} лет назад
       x_seconds:
         one: 1 секунда назад
         other: более %{count} лет назад
       x_seconds:
         one: 1 секунда назад


@@ -238,14 +239,14 @@ ru:
   api:
     notes:
       comment:
   api:
     notes:
       comment:

-        opened_at_html: Создана %{when} назад
-        opened_at_by_html: Создана %{when} назад %{user}
-        commented_at_html: Обновлена %{when} назад
-        commented_at_by_html: Ð\9eбновлена %{when} назад %{user}
-        closed_at_html: Обработана %{when} назад
-        closed_at_by_html: Ð\9eбÑ\80абоÑ\82ана %{when} назад %{user}
-        reopened_at_html: Ð\9eÑ\82кÑ\80Ñ\8bÑ\82а заново %{when} назад
-        reopened_at_by_html: Ð\9eÑ\82кÑ\80Ñ\8bÑ\82а заново %{when} назад %{user}
+        opened_at_html: Создана %{when}
+        opened_at_by_html: Создана %{when} полÑ\8cзоваÑ\82елем %{user}
+        commented_at_html: Обновлена %{when}
+        commented_at_by_html: Ð\9eбновлена %{when} полÑ\8cзоваÑ\82елем %{user}
+        closed_at_html: Обработана %{when}
+        closed_at_by_html: Ð\9eбÑ\80абоÑ\82ана %{when} полÑ\8cзоваÑ\82елем %{user}
+        reopened_at_html: Ð\9fеÑ\80еоÑ\82кÑ\80Ñ\8bÑ\82а %{when}
+        reopened_at_by_html: Ð\9fеÑ\80еоÑ\82кÑ\80Ñ\8bÑ\82а %{when} полÑ\8cзоваÑ\82елем %{user}

       rss:
         title: Заметки OpenStreetMap
         description_area: Список заметок, созданных, прокомментированных или закрытых
       rss:
         title: Заметки OpenStreetMap
         description_area: Список заметок, созданных, прокомментированных или закрытых


@@ -261,16 +262,13 @@ ru:
   browse:
     created: Создано
     closed: Закрыто
   browse:
     created: Создано
     closed: Закрыто

-    created_html: Создано <abbr title='%{title}'>%{time} назад</abbr>
-    closed_html: Закрыто <abbr title='%{title}'>%{time} назад</abbr>
-    created_by_html: Создано <abbr title='%{title}'>%{time} назад</abbr> пользователем
-      %{user}
-    deleted_by_html: Удалено <abbr title='%{title}'>%{time} назад</abbr> пользователем
-      %{user}
-    edited_by_html: Отредактировано <abbr title='%{title}'>%{time} назад</abbr> пользователем
-      %{user}
-    closed_by_html: Закрыто <abbr title='%{title}'>%{time} назад</abbr> пользователем
+    created_html: Создано <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Закрыто <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Создано <abbr title='%{title}'>%{time}</abbr> пользователем %{user}
+    deleted_by_html: Удалено <abbr title='%{title}'>%{time}</abbr> пользователем %{user}
+    edited_by_html: Отредактировано <abbr title='%{title}'>%{time}</abbr> пользователем

       %{user}
       %{user}

+    closed_by_html: Закрыто <abbr title='%{title}'>%{time}</abbr> пользователем %{user}

     version: Версия
     in_changeset: Пакет правок
     anonymous: аноним
     version: Версия
     in_changeset: Пакет правок
     anonymous: аноним


@@ -290,10 +288,8 @@ ru:
       relation: Отношения (%{count})
       relation_paginated: Отношения (%{x}-%{y} из %{count})
       comment: Комментарии (%{count})
       relation: Отношения (%{count})
       relation_paginated: Отношения (%{x}-%{y} из %{count})
       comment: Комментарии (%{count})

-      hidden_commented_by: Скрытый комментарий от %{user} <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
-      commented_by: Комментарий пользователя %{user} <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
+      hidden_commented_by: Скрытый комментарий от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Комментарий от %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       changesetxml: XML пакета правок
       osmchangexml: osmChange XML
       feed:
       changesetxml: XML пакета правок
       osmchangexml: osmChange XML
       feed:


@@ -333,7 +329,7 @@ ru:
         way: линия
         relation: отношение
         changeset: пакет правок
         way: линия
         relation: отношение
         changeset: пакет правок

-        note: пÑ\80имеÑ\87ание
+        note: замеÑ\82ка

     timeout:
       sorry: Извините, данные для %{type} с id %{id} требуют слишком много времени
         для извлечения.
     timeout:
       sorry: Извините, данные для %{type} с id %{id} требуют слишком много времени
         для извлечения.


@@ -342,7 +338,7 @@ ru:
         way: линии
         relation: отношения
         changeset: пакета правок
         way: линии
         relation: отношения
         changeset: пакета правок

-        note: пÑ\80имеÑ\87ание
+        note: замеÑ\82ка

     redacted:
       redaction: Исправление %{id}
       message_html: Версия %{version} этого объекта (%{type}) скрыта и не может быть
     redacted:
       redaction: Исправление %{id}
       message_html: Версия %{version} этого объекта (%{type}) скрыта и не может быть


@@ -371,27 +367,21 @@ ru:
       open_title: 'Необработанная заметка #%{note_name}'
       closed_title: 'Обработанная заметка #%{note_name}'
       hidden_title: 'Скрытая заметка #%{note_name}'
       open_title: 'Необработанная заметка #%{note_name}'
       closed_title: 'Обработанная заметка #%{note_name}'
       hidden_title: 'Скрытая заметка #%{note_name}'

-      open_by: Создана пользователем %{user} <abbr title='%{exact_time}'>%{when} назад</abbr>
-      open_by_anonymous: Создано анонимно <abbr title='%{exact_time}'>%{when} назад</abbr>
-      commented_by: Комментарий пользователя %{user} <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
-      commented_by_anonymous: Анонимный комментарий <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
-      closed_by: Обработана пользователем %{user} <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
-      closed_by_anonymous: Обработана анонимно <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
-      reopened_by: Открыта заново пользователем %{user} <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
-      reopened_by_anonymous: Открыта заново анонимно <abbr title='%{exact_time}'>%{when}
-        назад</abbr>
-      hidden_by: Скрыта %{user} <abbr title='%{exact_time}'>%{when} назад</abbr>
+      open_by: Создана %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Создано анонимно <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Комментарий от %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Анонимный комментарий <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Обработана %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Обработана анонимно <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Переоткрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Переоткрыта анонимно <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Скрыта %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       report: Сообщить об этой заметке
     query:
       title: Что здесь?
       introduction: Нажмите на карту, чтобы найти ближайшие объекты
       nearby: Ближайшие объекты
       report: Сообщить об этой заметке
     query:
       title: Что здесь?
       introduction: Нажмите на карту, чтобы найти ближайшие объекты
       nearby: Ближайшие объекты

-      enclosing: Ð\9cеÑ\81Ñ\82оположение
+      enclosing: Ð\9eкÑ\80Ñ\83жаÑ\8eÑ\89ие обÑ\8aекÑ\82Ñ\8b

   changesets:
     changeset_paging_nav:
       showing_page: Страница %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Страница %{page}


@@ -425,7 +415,7 @@ ru:
   changeset_comments:
     comment:
       comment: 'Новый комментарий к пакету правок #%{changeset_id} от %{author}'
   changeset_comments:
     comment:
       comment: 'Новый комментарий к пакету правок #%{changeset_id} от %{author}'

-      commented_at_by_html: Ð\9eбновлена %{when} назад %{user}
+      commented_at_by_html: Ð\9eбновлена %{when} полÑ\8cзоваÑ\82елем %{user}

     comments:
       comment: 'Новый комментарий к пакету правок #%{changeset_id} от %{author}'
     index:
     comments:
       comment: 'Новый комментарий к пакету правок #%{changeset_id} от %{author}'
     index:


@@ -452,7 +442,7 @@ ru:
       user_title: Дневник пользователя %{user}
       in_language_title: Дневниковые записи на языке %{language}
       new: Новая запись в дневнике
       user_title: Дневник пользователя %{user}
       in_language_title: Дневниковые записи на языке %{language}
       new: Новая запись в дневнике

-      new_title: СделаÑ\82Ñ\8c новÑ\83Ñ\8e запиÑ\81Ñ\8c в моем дневнике
+      new_title: СоздаÑ\82Ñ\8c новÑ\83Ñ\8e запиÑ\81Ñ\8c в моÑ\91м дневнике

       no_entries: Нет записей в дневнике
       recent_entries: Недавние записи в дневнике
       older_entries: Более старые записи
       no_entries: Нет записей в дневнике
       recent_entries: Недавние записи в дневнике
       older_entries: Более старые записи


@@ -472,8 +462,8 @@ ru:
       body: К сожалению, нет записи или комментария с номером %{id}. Проверьте правильность
         написания. Или, возможно, ссылка, по которой вы перешли, ошибочна.
     diary_entry:
       body: К сожалению, нет записи или комментария с номером %{id}. Проверьте правильность
         написания. Или, возможно, ссылка, по которой вы перешли, ошибочна.
     diary_entry:

-      posted_by: 'Отправил %{link_user} %{created}, язык: %{language_link}'
-      comment_link: Ð\9aомменÑ\82иÑ\80оваÑ\82Ñ\8c
+      posted_by: Опубликован %{link_user} %{created} на языке %{language_link}
+      comment_link: Ð\9eÑ\81Ñ\82авиÑ\82Ñ\8c комменÑ\82аÑ\80ий

       reply_link: Ответить
       comment_count:
         few: '%{count} комментария'
       reply_link: Ответить
       comment_count:
         few: '%{count} комментария'


@@ -484,7 +474,7 @@ ru:
       hide_link: Скрыть эту запись
       unhide_link: Отобразить эту запись
       confirm: Подтвердить
       hide_link: Скрыть эту запись
       unhide_link: Отобразить эту запись
       confirm: Подтвердить

-      report: Сообщить об этой записи в дневнике
+      report: Сообщить об этой записи

     diary_comment:
       comment_from: Комментарий %{link_user} %{comment_created_at}
       hide_link: Скрыть этот комментарий
     diary_comment:
       comment_from: Комментарий %{link_user} %{comment_created_at}
       hide_link: Скрыть этот комментарий


@@ -498,13 +488,14 @@ ru:
     feed:
       user:
         title: Дневниковые записи OpenStreetMap %{user}
     feed:
       user:
         title: Дневниковые записи OpenStreetMap %{user}

-        description: Ð\9fоÑ\81ледние дневниковÑ\8bе запиÑ\81и OpenStreetMap %{user}
+        description: Ð\9fоÑ\81ледние запиÑ\81и в дневнике OpenStreetMap оÑ\82 %{user}

       language:
       language:

-        title: Дневниковые записи OpenStreetMap на %{language_name}
-        description: Последние дневниковые записи пользователей OpenStreetMap на %{language_name}
+        title: Записи в дневнике OpenStreetMap на %{language_name}
+        description: Последние записи в дневнике от пользователей OpenStreetMap на
+          %{language_name}

       all:
       all:

-        title: Ð\94невниковÑ\8bе запиÑ\81и OpenStreetMap
-        description: Ð\9fоÑ\81ледние дневниковÑ\8bе запиÑ\81и пользователей OpenStreetMap
+        title: Ð\97апиÑ\81и в дневнике OpenStreetMap
+        description: Ð\9fоÑ\81ледние запиÑ\81и в дневнике оÑ\82 пользователей OpenStreetMap

     comments:
       has_commented_on: '%{display_name} прокомментировал следующие записи дневника'
       post: Сообщение
     comments:
       has_commented_on: '%{display_name} прокомментировал следующие записи дневника'
       post: Сообщение


@@ -1124,8 +1115,8 @@ ru:
       status: Статус
       reports: Сообщения
       last_updated: Последнее изменение
       status: Статус
       reports: Сообщения
       last_updated: Последнее изменение

-      last_updated_time_html: <abbr title='%{title}'>%{time} назад</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} назад</abbr> пользователем
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> пользователем

         %{user}
       link_to_reports: Просмотр сообщений
       reports_count:
         %{user}
       link_to_reports: Просмотр сообщений
       reports_count:


@@ -2296,7 +2287,7 @@ ru:
       ct status: 'Условия участия:'
       ct undecided: Неопределено
       ct declined: Отклонены
       ct status: 'Условия участия:'
       ct undecided: Неопределено
       ct declined: Отклонены

-      latest edit: 'Последняя правка %{ago}:'
+      latest edit: 'Последняя правка (%{ago}):'

       email address: 'Адрес Email:'
       created from: 'Создано из:'
       status: 'Статус:'
       email address: 'Адрес Email:'
       created from: 'Создано из:'
       status: 'Статус:'


@@ -2568,7 +2559,7 @@ ru:
       title: Снять блокировку для %{block_on}
       heading: Отмена блокировки для пользователя %{block_on}, которую создал %{block_by}
       time_future: Эта блокировка закончится через %{time}.
       title: Снять блокировку для %{block_on}
       heading: Отмена блокировки для пользователя %{block_on}, которую создал %{block_by}
       time_future: Эта блокировка закончится через %{time}.

-      past: ЭÑ\82а блокиÑ\80овка законÑ\87илаÑ\81Ñ\8c %{time} назад и Ñ\83же не можеÑ\82 бÑ\8bÑ\82Ñ\8c оÑ\82менена.
+      past: Эта блокировка закончилась %{time} и уже не может быть отменена.

       confirm: Вы уверены, что хотите снять эту блокировку?
       revoke: Снять блокировку!
       flash: Эта блокировка была снята.
       confirm: Вы уверены, что хотите снять эту блокировку?
       revoke: Снять блокировку!
       flash: Эта блокировка была снята.


@@ -2577,7 +2568,7 @@ ru:
       until_login: Активно до тех пор, пока пользователь не войдёт в систему.
       time_future_and_until_login: Заканчивается через %{time} и после того, как пользователь
         войдёт в систему.
       until_login: Активно до тех пор, пока пользователь не войдёт в систему.
       time_future_and_until_login: Заканчивается через %{time} и после того, как пользователь
         войдёт в систему.

-      time_past: Закончилось %{time} назад.
+      time_past: Закончилось %{time}.

       block_duration:
         hours:
           one: 1 час
       block_duration:
         hours:
           one: 1 час

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 0c2f8ba2224ab88cd5ff82e116ab38718c746dc9..0e73e7539c0448026f8dc75b2372d521d598ecdc 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -16,6 +16,7 @@
 # Author: Nemo bis
 # Author: Rudko
 # Author: Ruila
 # Author: Nemo bis
 # Author: Rudko
 # Author: Ruila

+# Author: Spider 001757

 # Author: Teslaton
 # Author: TomášPolonec
 # Author: Vladolc
 # Author: Teslaton
 # Author: TomášPolonec
 # Author: Vladolc


@@ -28,6 +29,11 @@ sk:
     submit:
       diary_comment:
         create: Uložiť
     submit:
       diary_comment:
         create: Uložiť

+      diary_entry:
+        create: Publikovať
+        update: Aktualizovať
+      issue_comment:
+        create: Pridať komentár

       message:
         create: Odoslať
       client_application:
       message:
         create: Odoslať
       client_application:


@@ -43,6 +49,9 @@ sk:
         create: Vytvoriť blok
         update: Aktualizácia bloku
   activerecord:
         create: Vytvoriť blok
         update: Aktualizácia bloku
   activerecord:

+    errors:
+      messages:
+        invalid_email_address: nevyzerá ako platná e-mailová adresa

     models:
       acl: Zoznam prístupových práv
       changeset: Sada zmien
     models:
       acl: Zoznam prístupových práv
       changeset: Sada zmien


@@ -128,6 +137,11 @@ sk:
     notes:
       comment:
         opened_at_html: Vytvorené pred %{when}
     notes:
       comment:
         opened_at_html: Vytvorené pred %{when}

+      rss:
+        title: Poznámky OpenStreetMap
+      entry:
+        comment: Komentár
+        full: Celá poznámka

   browse:
     created: Vytvorené
     closed: Uzavreté
   browse:
     created: Vytvorené
     closed: Uzavreté


@@ -240,6 +254,11 @@ sk:
       closed_by: Vyriešil %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
       closed_by_anonymous: Vyriešil anonym <abbr title='%{exact_time}'>pred %{when}</abbr>
       hidden_by: Skryl %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
       closed_by: Vyriešil %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>
       closed_by_anonymous: Vyriešil anonym <abbr title='%{exact_time}'>pred %{when}</abbr>
       hidden_by: Skryl %{user} <abbr title='%{exact_time}'>pred %{when}</abbr>

+      report: Nahlásiť túto poznámku
+    query:
+      title: Prieskum prvkov
+      nearby: Okolité prvky
+      enclosing: Umiestnenie prvku

   changesets:
     changeset_paging_nav:
       showing_page: Stránka %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Stránka %{page}

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index c8ed2268ac785d0559c2630f66f7d5a171507052..512b73db25fac7fd389c8acd9a5c5ede81e1896f 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -162,10 +162,10 @@ zh-CN:
       half_a_minute: 30秒前
       less_than_x_seconds:
         one: 小于1秒前
       half_a_minute: 30秒前
       less_than_x_seconds:
         one: 小于1秒前

-        other: 小于 %{count} 秒前
+        other: 小于%{count}秒前

       less_than_x_minutes:
         one: 小于1分钟前
       less_than_x_minutes:
         one: 小于1分钟前

-        other: 小于 %{count} 分钟前
+        other: 小于%{count}分钟前

       over_x_years:
         one: 超过1年前
         other: 超过%{count}年前
       over_x_years:
         one: 超过1年前
         other: 超过%{count}年前


@@ -2138,7 +2138,7 @@ zh-CN:
         gravatar: 使用 Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: 这是什么？
         gravatar: 使用 Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: 这是什么？

-        disabled: Gravatar已被禁用。
+        disabled: Gravatar已禁用。

         enabled: 您的Gravatar显示已启用。
       new image: 添加图像
       keep image: 保持当前图像
         enabled: 您的Gravatar显示已启用。
       new image: 添加图像
       keep image: 保持当前图像