Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 1848ff5773d0a663cb271614cd4fb50c90088b94..7fc84a39033ccbeb7c393cd4b6c539c6047b4fe2 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -13,6 +13,7 @@
 # Author: Mutarjem horr
 # Author: Omda4wady
 # Author: OsamaK
+# Author: Ruila
 # Author: TTMTT
 # Author: Yahya Sakhnini
 # Author: Zaher kadour
@@ -964,6 +965,8 @@ ar:
   help_page:
     welcome:
       title: مرحبا بك في خرائط الشوارع " المفتوحة المصدر"
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Ar:Beginners%27_guide
   about_page:
     partners_title: الشركاء
   notifier:

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 4a3f3783b7f683abc4996b4c1fb93ecffbca766f..b1cdf39f8b8c539927a1dee7cb0274f5429d3e81 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -4,6 +4,7 @@
 # Author: AZISS
 # Author: Cekli829
 # Author: Mushviq Abdulla
+# Author: Ruila
 # Author: SalihB
 # Author: Vugar 1981
 # Author: Wertuose
@@ -785,6 +786,9 @@ az:
       contributors_gb_html: <strong>Böyük Britaniya Krallığı</strong> Ordnance Survey
         © Crown copyright tərəfindən məlumatlar. Verilənlər bazasına icazə 2010-12.
       infringement_title_html: Müəllif hüquqlarının pozulması
+  help_page:
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Az:Beginners%27_guide
   notifier:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} adlı istifadəçi sənin gündəliy yazına şərh

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 4272eebb9c77f0a0ebd992157924516ff889785c..dc5ca28358fb31f0fec965dc9da89f90eebcd8b9 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -28,15 +28,15 @@ be:
       notifier: Абвяшчэнне
       old_node: Стары вузел
       old_node_tag: Стары тэг вузла
-      old_relation: Старая сувязь
+      old_relation: Старыя адносіны
       old_relation_member: Стары ўдзельнік сувязі
-      old_relation_tag: Стары тэг сувязі
-      old_way: СÑ\82аÑ\80аÑ\8f кÑ\80Ñ\8bвая
-      old_way_node: Стары вузел шляху
-      old_way_tag: СÑ\82аÑ\80Ñ\8b Ñ\82Ñ\8dг кÑ\80Ñ\8bвой
-      relation: СÑ\83вÑ\8fзÑ\8c
+      old_relation_tag: Стары тэг адносін
+      old_way: СÑ\82аÑ\80аÑ\8f лÑ\96нÑ\96я
+      old_way_node: Стары вузел лініі
+      old_way_tag: СÑ\82аÑ\80Ñ\8b Ñ\82Ñ\8dг лÑ\96нÑ\96Ñ\96
+      relation: Ð\90дноÑ\81Ñ\96нÑ\8b
       relation_member: Удзельнік сувязі
-      relation_tag: Тэг сувязі
+      relation_tag: Тэг адносін
       session: Сеанс
       trace: След
       tracepoint: Кропка следу
@@ -44,9 +44,9 @@ be:
       user: Карыстальнік
       user_preference: Налады карыстальніка
       user_token: Токен карыстальніка
-      way: Ð\9aÑ\80Ñ\8bвая
-      way_node: Ð\92Ñ\83зел кÑ\80Ñ\8bвой
-      way_tag: ТÑ\8dг кÑ\80Ñ\8bвой
+      way: Ð\9bÑ\96нÑ\96я
+      way_node: Ð\92Ñ\83зел лÑ\96нÑ\96Ñ\96
+      way_tag: ТÑ\8dг лÑ\96нÑ\96Ñ\96
     attributes:
       diary_comment:
         body: Тэкст
@@ -119,7 +119,7 @@ be:
       node_paginated: Вузлы (%{x}-%{y} з %{count})
       way: Крывыя (%{count})
       way_paginated: Лініі (%{x}-%{y} з %{count})
-      relation: СÑ\83вÑ\8fзÑ\96 (%{count})
+      relation: Ð\90дноÑ\81Ñ\96нÑ\8b (%{count})
       relation_paginated: Сувязі (%{x}-%{y} з %{count})
       comment: Каментары (%{count})
       hidden_commented_by: Схаваны каментар ад %{user} <abbr title='%{exact_time}'>%{when}
@@ -136,39 +136,39 @@ be:
       title: 'Вузел: %{name}'
       history_title: 'Гісторыя вузла: %{name}'
     way:
-      title: 'Ð\9aÑ\80Ñ\8bвая: %{name}'
+      title: 'Ð\9bÑ\96нÑ\96я: %{name}'
       history_title: 'Гісторыя крывой: %{name}'
       nodes: Вузлы
       also_part_of:
         one: з'яўляецца часткай крывой %{related_ways}
         other: з'яўляецца часткай крывых % {related_ways}
     relation:
-      title: 'СÑ\83вÑ\8fзÑ\8c: %{name}'
+      title: 'Ð\90дноÑ\81Ñ\96нÑ\8b: %{name}'
       history_title: 'Гісторыя сувязі: %{name}'
       members: Удзельнікі
     relation_member:
       entry_role: '%{type} %{name} як %{role}'
       type:
         node: Вузел
-        way: Ð\9aÑ\80Ñ\8bвая
-        relation: СÑ\83вÑ\8fзÑ\8c
+        way: Ð\9bÑ\96нÑ\96я
+        relation: Ð\90дноÑ\81Ñ\96нÑ\8b
     containing_relation:
-      entry: СÑ\83вÑ\8fзÑ\8c %{relation_name}
-      entry_role: СÑ\83вÑ\8fзÑ\8c %{relation_name} (як %{relation_role})
+      entry: Ð\90дноÑ\81Ñ\96нÑ\8b %{relation_name}
+      entry_role: Ð\90дноÑ\81Ñ\96нÑ\8b %{relation_name} (як %{relation_role})
     not_found:
       sorry: Прабачце, %{type} з нумарам %{id} не знойдзены.
       type:
         node: вузел
-        way: кÑ\80Ñ\8bвая
-        relation: сувязь
+        way: лÑ\96нÑ\96я
+        relation: адносіны
         changeset: набор змен
     timeout:
       sorry: Прабачце, дадзеныя для %{type} з ідэнтыфікатарам %{id} занадта доўгія
         для атрымання.
       type:
         node: вузел
-        way: кÑ\80Ñ\8bвая
-        relation: сувязь
+        way: лÑ\96нÑ\96я
+        relation: адносіны
         changeset: набор змен
     redacted:
       redaction: Рэдакцыя %{id}
@@ -176,8 +176,8 @@ be:
         была адрэдагаваная. Глядзіце %{redaction_link} для падрабязнасцяў.
       type:
         node: вузел
-        way: кÑ\80Ñ\8bвая
-        relation: сувязь
+        way: лÑ\96нÑ\96я
+        relation: адносіны
     start_rjs:
       feature_warning: Неабходна загрузіць %{num_features} аб'ектаў, што можа запаволіць
         ваш браўзэр. Вы ўпэўнены, што жадаеце праглядзець гэтыя дадзеныя?
@@ -552,7 +552,7 @@ be:
           path: Сцежка
           pedestrian: Пешаходная дарожка
           platform: Платформа
-          primary: Ð\9fеÑ\80Ñ\88аÑ\81ная дарога
+          primary: Ð\90Ñ\81ноÑ\9eная дарога
           primary_link: Першасная дарога
           proposed: Плануемая дарога
           raceway: Гоначная траса
@@ -566,7 +566,7 @@ be:
           speed_camera: Фотарадар
           steps: Прыступкі
           street_lamp: Вулічны ліхтар
-          tertiary: Трэцясная дарога
+          tertiary: Троесная дарога
           tertiary_link: Трэцясная дарога
           track: Каляя
           traffic_signals: Святлафор
@@ -984,9 +984,9 @@ be:
       mapping_link: пачаць маляваць карту
     legal_babble:
       title_html: Аўтарскія правы і ліцэнзія
-      intro_1_html: Дадзеныя праекту OpenStreetMap распаўсюджваюцца па ліцэнзіі <a
-        href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open
-        Database License</a> (ODbL).
+      intro_1_html: |-
+        Дадзеныя праекту OpenStreetMap распаўсюджваюцца <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) па ліцэнзіі <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
       intro_2_html: "Вы можаце капіяваць, распаўсюджваць, перадаваць і змяняць нашыя
         \ дадзеныя да той пары пакуль Вы спасылаецеся на OpenStreetMap і яе ўдзельнікаў.
         Калі Вы змяняеце ці выкарыстоўваеце нашыя дадзеныя, Вы можаце распаўсюджваць
@@ -1015,9 +1015,9 @@ be:
         alt: Прыклад таго, як трэба спасылацца на OpenStreetMap на старонцы
         title: Прыклад спасылкі
       more_title_html: Даведацца больш
-      more_1_html: Даведайцеся больш аб выкарыстанні нашых дадзеных і аб тым, як паказваць
-        наÑ\81 Ñ\8fк кÑ\80Ñ\8bнÑ\96Ñ\86Ñ\83 паÑ\85оджаннÑ\8f дадзенÑ\8bÑ\85 Ñ\83 <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">адказаÑ\85
-        па прававыя пытанні</a>.
+      more_1_html: |-
+        Ð\94аведайÑ\86еÑ\81Ñ\8f болÑ\8cÑ\88 аб вÑ\8bкаÑ\80Ñ\8bÑ\81Ñ\82аннÑ\96 наÑ\88Ñ\8bÑ\85 дадзенÑ\8bÑ\85 Ñ\96 аб Ñ\82Ñ\8bм, Ñ\8fк паказваÑ\86Ñ\8c наÑ\81 Ñ\8fк кÑ\80Ñ\8bнÑ\96Ñ\86Ñ\83 паÑ\85оджаннÑ\8f дадзенÑ\8bÑ\85 на <a
+        href="http://osmfoundation.org/Licence">старонцы OSMF Licence</a> і <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">адказах на прававыя пытанні</a>.
       more_2_html: Хоць дадзеныя OpenStreetMap з'яўляецца адкрытымі дадзенымі, мы
         не ў стане прадастаўляць бясплатны картаграфічны API для іншых распрацоўнікаў.
         Азнаёмціся з нашымі <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Правіламі
@@ -1099,10 +1099,10 @@ be:
         можаце выкарыстоўваць для рэдагавання карты.
       node_html: <Strong>Вузел (node)</strong> - гэта кропка на карце, напрыклад,
         рэстаран ці дрэва.
-      way_html: <Strong>Ð\9aÑ\80Ñ\8bвая (way)</strong> - гэта лінія або многавугольнік, напрыклад,
+      way_html: <Strong>Ð\9bÑ\96нÑ\96я (way)</strong> - гэта лінія або многавугольнік, напрыклад,
         дарогі, рэкі, азёры або будынкі.
       tag_html: |-
-        <strong>ЦÑ\8dÑ\82лÑ\96к (tag)</strong> - гÑ\8dÑ\82а Ñ\8dлеменÑ\82 апÑ\96Ñ\81аннÑ\8f вÑ\83зла або кÑ\80Ñ\8bвой, напрыклад,
+        <strong>ЦÑ\8dÑ\82лÑ\96к (tag)</strong> - гÑ\8dÑ\82а Ñ\8dлеменÑ\82 апÑ\96Ñ\81аннÑ\8f вÑ\83зла або лÑ\96нÑ\96Ñ\96, напрыклад,
         назва рэстарана або абмежаванне хуткасці на дарозе.
     questions:
       title: Ёсць пытанні?
@@ -1151,10 +1151,29 @@ be:
       url: /welcome
       title: Вітаем у OSM
       description: Пачніце з гэтага кароткага кіраўніцтва, што ахоплівае асновы OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: Дапаможнік для пачаткоўцаў
+      description: Супольнасць падтрымлівае дапаможнік для пачаткоўцаў.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Задаць пытанне або знайсці адказы на сайце пытанняў і адказаў OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Рассылкі
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Форумы
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Інтэрактыўны чат на розных мовах і на розныя тэмы.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Дапамога кампаніям і арганізацыям у пераходзе на карты OpenStreetMap
+        і іншыя паслугі.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1183,6 +1202,7 @@ be:
       новых прадуктаў, вы можаце распаўсюджваць вынік толькі па той жа ліцэнзіі. Глядзіце
       старонку <a href='%{copyright_path}'>аўтарскія правы і \nліцэнзія</a>, каб атрымаць
       падрабязную інфармацыю."
+    legal_title: Прававыя пытанні
     partners_title: Партнёры
   notifier:
     diary_comment_notification:
@@ -1390,9 +1410,9 @@ be:
         Вы можаце <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">загрузіць
         Flash-плэер з Adobe.com</a>. Існуюць і <a href="http://wiki.openstreetmap.org/wiki/Editing">іншыя
         магчымасці</a> для рэдагавання OpenStreetMap.
-      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
-        should deselect the current шлях ці point, if editing in list mode, ці click
-        save if you have a save button.)
+      potlatch_unsaved_changes: Маюцца незахаваныя змены. (Для захавання ў Potlatch
+        зніміце вылучэнне з лініі або кропкі, калі рэдагуеце ў «жывым» рэжыме, альбо
+        націсніце кнопку «захаваць», калі вы ў рэжыме адкладзенага захавання.)
       potlatch2_not_configured: Potlatch 2 не быў наладжаны. Калі ласка, паглядзіце
         http://wiki.openstreetmap.org/wiki/The_Rails_Port
       potlatch2_unsaved_changes: Вы маеце незахаваныя змены. (Каб захаваць у Potlatch
@@ -1416,7 +1436,7 @@ be:
         entry:
           motorway: Аўтамагістраль
           trunk: Шаша
-          primary: Ð\9fеÑ\80Ñ\88аÑ\81ная дарога
+          primary: Ð\90Ñ\81ноÑ\9eная дарога
           secondary: Другасная дарога
           unclassified: Некласіфікаваная дарога
           unsurfaced: Дарога без пакрыцця
@@ -2310,8 +2330,8 @@ be:
       time: Час
     query:
       node: Вузел
-      way: Ð\9aÑ\80Ñ\8bвая
-      relation: СÑ\83вÑ\8fзÑ\8c
+      way: Ð\9bÑ\96нÑ\96я
+      relation: Ð\90дноÑ\81Ñ\96нÑ\8b
       nothing_found: Аб’екты не знойдзены
       error: 'Памылка сувязі %{server}: %{error}'
       timeout: Тайм-аўт падключэння да %{server}

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 10cd88286ba300534b53843fd6351cc024b35626..5da600f5edf6347f5b315bb22799d3c7f0f32a7b 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -7,6 +7,7 @@
 # Author: Edinwiki
 # Author: KWiki
 # Author: Maxmus
+# Author: Ruila
 ---
 bs:
   time:
@@ -918,6 +919,8 @@ bs:
   help_page:
     welcome:
       url: /dobrodošlica
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Bs:Beginners%27_guide
   about_page:
     next: Slijedeće
   notifier:

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0092402c16fe5baaf7bc645d08c7723240eec40a..17bbdddb08d0a81c2e6c415a81746e5af173b165 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -9,6 +9,7 @@
 # Author: Grondin
 # Author: Jconstanti
 # Author: Jmontane
+# Author: Macofe
 # Author: Martorell
 # Author: McDutchie
 # Author: Micru
@@ -16,6 +17,7 @@
 # Author: Nemo bis
 # Author: PerroVerd
 # Author: Pitort
+# Author: Ruila
 # Author: SMP
 # Author: Sim6
 # Author: Solde
@@ -1173,11 +1175,17 @@ ca:
       url: /welcome
       title: Benvinguts a l'OSM
       description: Comença amb aquesta guia ràpida sobre els aspectes bàsics de l'OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Ca:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Feu una pregunta o busqueu respostes a la pàgina de preguntes i
         respostes d'OSM.
+    mailing_lists:
+      title: Llistes de correu
+    irc:
+      title: IRC
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f9c8b10e822486d02089288300a38b51a544bff0..76f2697d7878974ade431cd235bb322944eb5f0c 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -5,6 +5,7 @@
 # Author: Chmee2
 # Author: Cvanca
 # Author: DemonioCZ
+# Author: H4nek
 # Author: JAn Dudík
 # Author: Jezevec
 # Author: Jkjk
@@ -998,9 +999,10 @@ cs:
       mapping_link: začít mapovat
     legal_babble:
       title_html: Autorská práva a licence
-      intro_1_html: OpenStreetMap jsou <i>svobodná data</i>, nabízená za podmínek
-        <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open
-        Database License</a> (ODbL).
+      intro_1_html: OpenStreetMap jsou <i>svobodná data</i>, která za podmínek <a
+        href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database
+        License</a> (ODbL) nabízí nadace <a href="http://osmfoundation.org/">OpenStreetMap
+        Foundation</a> (OSMF).
       intro_2_html: Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat
         naše data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud
         naše data budete upravovat nebo je použijete ve svém díle, musíte výsledek
@@ -1023,7 +1025,8 @@ cs:
         title: Příklad uvedení autorství
       more_title_html: Další informace
       more_1_html: O používání našich dat a způsobu uvádění autorství se můžete dočíst
-        více v našem <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Právním
+        více na <a href="http://osmfoundation.org/Licence">licenční stránce OSMF</a>
+        a v našem komunitním <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Právním
         FAQ</a>.
       more_2_html: |-
         Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API.
@@ -1140,11 +1143,34 @@ cs:
       url: /welcome
       title: Vítejte v OSM
       description: Začněte tímto rychlým průvodcem zahrnujícím základy OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Cs:Beginners%27_guide
+      title: Průvodce začátečníka
+      description: Komunitou spravovaná příručka pro začátečníky.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Položte dotaz nebo vyhledejte odpovědi na stránce otázek a odpovědí
         týkajících se OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: E-mailové konference
+      description: Položte dotaz nebo diskutujte o zajímavých věcech na některé ze
+        široké nabídky tematických či regionálních e-mailových konferencí.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Diskusní fóra
+      description: Otázky a diskuse pro ty, kteří preferují rozhraní v nástěnkovém
+        stylu.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Interaktivní chat v mnoha jazycích a na mnoho témat.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Pomoc společnostem a organizacím s přechodem na mapy a další služby
+        založené na OpenStreetMap.
     wiki:
       url: http://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs
       title: wiki.openstreetmap.org
@@ -1171,6 +1197,11 @@ cs:
       data měníte nebo rozšiřujete jistými způsoby, smíte výsledek šířit jen pod stejnou
       licencí. Podrobnosti najdete na stránce <a href=''%{copyright_path}''>Autorská
       práva a licence</a>.'
+    legal_title: Právní informace
+    legal_html: |-
+      Tento web a mnoho dalších souvisejících služeb za komunitu oficiálně provozuje <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF).
+      <br>
+      Pokud máte problémy či dotazy týkající se licencování, autorských práv či jiných právních záležitostí, <a href='http://osmfoundation.org/Contact'>kontaktujte prosím OSMF</a>.
     partners_title: Partneři
   notifier:
     diary_comment_notification:
@@ -1739,6 +1770,11 @@ cs:
         google:
           title: Přihlásit se prostřednictvím Google
           alt: Přihlášení pomocí Google OpenID
+        facebook:
+          title: Přihlásit se přes Facebook
+        windowslive:
+          title: Přihlásit se přes Windows Live
+          alt: Přihlášení pomocí Účtu Windows Live
         yahoo:
           title: Přihlásit se prostřednictvím Yahoo
           alt: Přihlášení pomocí Yahoo OpenID

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 8041e43ba98621ed84e4e05e080fca0250bbd883..325f85b1b8ee605029f40c84c507f5d45823eb5b 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -15,6 +15,7 @@
 # Author: Nemo bis
 # Author: OleLaursen
 # Author: Peter Alberti
+# Author: Ruila
 # Author: The real emj
 # Author: Winbladh
 ---
@@ -1157,6 +1158,8 @@ da:
       url: /welcome
       title: Velkommen til OSM
       description: Start med denne hurtige guide der dækker det grundlæggende i OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Da:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 378e29b16f2afc56c41b87f1e03176b4b5890a7b..185358e58310f81763b2d3df95639e28fda100b7 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1025,8 +1025,10 @@ de:
       mapping_link: mit dem Kartieren anfangen
     legal_babble:
       title_html: Urheberrecht und Lizenz
-      intro_1_html: OpenStreetMap sind <i>„Open Data“</i>, die gemäß der <a href="http://opendatacommons.org/licenses/odbl/">Open
-        Data Commons Open Database Lizenz</a> (ODbL) verfügbar sind.
+      intro_1_html: |-
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> sind <i>„Open Data“</i>, die gemäß der
+        <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database Lizenz</a>
+        (ODbL) durch die <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) verfügbar sind.
       intro_2_html: |-
         Es steht dir frei unsere Daten zu kopieren, weiterzugeben,
         zu übermitteln sowie anzupassen, sofern du OpenStreetMap
@@ -1060,9 +1062,10 @@ de:
         alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist
         title: Namensnennungs-Beispiel auf einer Website mit elektronischer Karte
       more_title_html: Weitere Informationen
-      more_1_html: Mehr Informationen dazu, wie unsere Daten verwendet werden können
-        und wie man auf unsere Urheberschaft hinweist, kann man unter <a href="http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ">Häufige
-        rechtliche Fragen (Legal FAQ)</a> nachlesen.
+      more_1_html: |-
+        Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist,
+        kann man auf unserer <a href="http://osmfoundation.org/Licence">OSMF-Lizenzseite</a> und in den
+        <a href="http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ">Häufigen rechtlichen Fragen (Legal FAQ)</a> nachlesen.
       more_2_html: "Obwohl OpenStreetMap „Open Data“ ist, können wir keine \nunentgeltliche
         Karten-API für Drittparteienentwickler bereitstellen.\nSiehe unsere <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-Verwendungsrichtlinie</a>,\n<a
         href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Kachelverwendungsrichtlinie</a>\nund
@@ -1118,6 +1121,10 @@ de:
         bitte über unser <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">Verfahren
         zum Entfernen von Inhalten</a> oder melde dies direkt mit unserem
         <a href="http://dmca.openstreetmap.org/">Onlineformular</a>.
+      trademarks_title_html: <span id="trademarks"></span>Markenzeichen
+      trademarks_1_html: OpenStreetMap und das Lupenlogo sind eingetragene Warenzeichen
+        der OpenStreetMap Foundation. Falls du Fragen über deine Verwendung der Marken
+        hast, sende deine Fragen bitte an die <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Lizenz-Arbeitsgruppe</a>.
   welcome_page:
     title: Willkommen!
     introduction_html: |-
@@ -1191,10 +1198,34 @@ de:
       title: Willkommen bei OSM
       description: Beginne mit dieser Schnellanleitung, die die OpenStreetMap-Grundlagen
         abdeckt.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/DE:Beginners%27_guide
+      title: Anleitung für Anfänger
+      description: Eine durch die Gemeinschaft gewartete Anleitung für Anfänger.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Stelle eine Frage oder suche nach Antworten auf der OSM-Fragen-und-Antworten-Seite.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Mailinglisten
+      description: Stelle eine Frage und diskutiere interessante Sachen zu einem weiten
+        Bereich von thematischen oder regionalen Mailinglisten.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Foren
+      description: Fragen und Diskussionen für diejenigen, die eine Oberfläche in
+        der Art einer Anschlagstafel bevorzugen.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Interaktiver Chat in vielen unterschiedlichen Sprachen und zu vielen
+        Themen.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: Zu OSM wechseln
+      description: Hilfe für auf Karten und anderen Diensten gegründeten Unternehmen
+        und Organisationen, die zu OpenStreetMap wechseln.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1228,6 +1259,13 @@ de:
       abänderst oder auf bestimmte Art einbaust, darfst du das Ergebnis nur unter
       der gleichen Lizenz verbreiten. Siehe die
       <a href='%{copyright_path}'>Urheberrechts- und Lizenzseite</a> für Einzelheiten.
+    legal_title: Gesetzliche Hinweise
+    legal_html: |-
+      Diese Website und viele andere ähnliche Dienste werden im Auftrag der Gemeinschaft
+      formal betrieben von der <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF).
+      <br>
+      Bitte <a href='http://osmfoundation.org/Contact'>kontaktiere die OSMF</a>,
+      falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen und Probleme hast.
     partners_title: Partner
   notifier:
     diary_comment_notification:
@@ -1800,6 +1838,12 @@ de:
         google:
           title: Mit Google anmelden
           alt: Mit einer Google-OpenID anmelden
+        facebook:
+          title: Mit Facebook anmelden
+          alt: Mit einem Facebook-Konto anmelden
+        windowslive:
+          title: Mit Windows Live anmelden
+          alt: Mit einem Windows-Live-Konto anmelden
         yahoo:
           title: Mit Yahoo anmelden
           alt: Mit einer Yahoo-OpenID anmelden
@@ -2109,6 +2153,9 @@ de:
     auth_failure:
       connection_failed: Verbindung zum Authentifikationsprovider fehlgeschlagen
       invalid_credentials: Ungültige Authentifikationsinformationen
+      no_authorization_code: Kein Autorisierungscode
+      unknown_signature_algorithm: Unbekannter Signaturalgorithmus
+      invalid_scope: Ungültiger Bereich
   user_role:
     filter:
       not_an_administrator: Benutzerrollen können nur von Administratoren verwaltet
@@ -2377,7 +2424,7 @@ de:
         slight_left: Links halten auf
         via_point: (via point)
         follow: Folge&nbsp;
-        roundabout: Im Kreisverkehr&nbsp;
+        roundabout: Im Kreisverkehr nehme&nbsp;
         leave_roundabout: Verlasse den Kreisverkehr -
         stay_roundabout: Stay on roundabout -
         start: Start at end of

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 971606650fb28b09f18ce5c370737bbb4a1d66dc..eeebbfcf2515c67c4922b9e2d2551f3147968220 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -14,6 +14,7 @@
 # Author: Logictheo
 # Author: Omnipaedista
 # Author: Protnet
+# Author: Ruila
 # Author: Shirayuki
 # Author: Zserdx
 # Author: 아라
@@ -1104,6 +1105,8 @@ el:
       title: Καλώς ήλθατε στο OSM
       description: Ξεκινήστε με αυτές τις γρήγορες οδηγίες που καλύπτουν τα βασικά
         OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/El:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9f908a63c41ac19fd3a150af5be10c1744137f6d..feb0c4f2fab6a219b8ceeeefd5b94aa79b395f44 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -936,9 +936,10 @@ en-GB:
     legal_babble:
       title_html: Copyright and Licence
       intro_1_html: |-
-        OpenStreetMap is <i>open data</i>, licenced under the <a
+        OpenStreetMap is <i>open data</i>, licensed under the <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database Licence</a> (ODbL).
+        Commons Open Database Licence</a> (ODbL) by the  <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: You are free to copy, distribute,  transmit and adapt our data,
         as long as you credit OpenStreetMap and its contributors. If you alter or
         build upon our data, you may distribute the result only under the same licence.
@@ -972,6 +973,7 @@ en-GB:
       more_title_html: Finding out more
       more_1_html: |-
         Read more about using our data, and how to credit us, at the <a
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
@@ -1905,7 +1907,7 @@ en-GB:
       press confirm button: Press the confirm button below to confirm your new e-mail
         address.
       button: Confirm
-      success: Confirmed your e-mail address, thanks for signing up!
+      success: Confirmed your change of email address!
       failure: An e-mail address has already been confirmed with this token.
     set_home:
       flash success: Home location saved successfully

diff --git a/config/locales/es.yml b/config/locales/es.yml
index eb20156eaf2f35706f1d956d350161fa0db82a59..ee334aaa16657d92d07e3eff0a6c59175cf78661 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -4,6 +4,7 @@
 # Author: Armando-Martin
 # Author: Carlosz22
 # Author: Crazymadlover
+# Author: Csbotero
 # Author: Egofer
 # Author: Fitoschido
 # Author: Fortega
@@ -24,6 +25,7 @@
 # Author: Peter17
 # Author: Remux
 # Author: Rubenwap
+# Author: Ruila
 # Author: Sim6
 # Author: Toliño
 # Author: Translationista
@@ -1015,7 +1017,8 @@ es:
       intro_1_html: |-
         OpenStreetMap es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        Commons Open Database License</a> (ODbL) de la  <a
+        href="http://osmfoundation.org/">Fundación OpenStreetMap</a> (OSMF).
       intro_2_html: Puedes copiar, distribuir, transmitir y adaptar nuestros mapas
         e información libremente siempre y cuando des reconocimiento a OpenStreetMap
         y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e
@@ -1038,9 +1041,9 @@ es:
         alt: Ejemplo de como dar reconocimiento a OpenStreetMap en una página web
         title: Ejemplo de atribución
       more_title_html: Para saber más...
-      more_1_html: Encontrarás más información acerca de cómo utilizar nuestros datos,
-        y cómo citarnos como fuente, en <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Preguntas
-        legales más frecuentes</a>.
+      more_1_html: |-
+        Encontrarás más información acerca de cómo utilizar nuestros datos, y cómo citarnos como fuente, en la <a
+        href="http://osmfoundation.org/Licence">página de licencia de OSMF</a> y en las <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">preguntas legales más frecuentes</a> de la comunidad.
       more_2_html: |-
         A pesar de que OpenStreetMap es contenido abierto, no podemos suminstrar una API de mapas gratuita para desarrolladores de aplicaciones para terceros.
 
@@ -1167,11 +1170,34 @@ es:
       url: /welcome
       title: Le damos la bienvenida a OSM
       description: Comenzar con esta guía rápida que cubre lo básico de OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/ES:Beginners%27_guide
+      title: Guía del principiante
+      description: Guía para principiantes, mantenida por la comunidad.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Hacer una pregunta o buscar respuestas en el sitio de preguntas
         y respuestas de OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Listas de correo
+      description: Pregunta o discute temas interesantes de un amplio abanico de listas
+        de correo temáticas o regionales.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Foros
+      description: Preguntas y discusiones para aquellos que prefieren una interfaz
+        del estilo cartelera de anuncios.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Chat interactivo en muchos idiomas diferentes y sobre muchos temas.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: Migra a OSM
+      description: Ayuda para las empresas y organizaciones que migran a mapas y a
+        otros servicios, basados en OpenStreetMap.
     wiki:
       url: http://wiki.openstreetmap.org/wiki/ES:Main_Page
       title: wiki.openstreetmap.org
@@ -1198,6 +1224,12 @@ es:
       colaboradores. Si alteras o te basas en los datos en casos determinados, deberás
       distribuir el resultado únicamente bajo la misma licencia. Consulta la <a href=''%{copyright_path}''>
       página sobre Derechos de autor y Licencia</a> para obtener más detalles.'
+    legal_title: Legal
+    legal_html: "Este sitio y muchos otros servicios relacionados son manejados por
+      la  \n<a href='http://osmfoundation.org/'>Fundación OpenStreetMap</a> (OSMF)
+      \nen nombre de la comunidad.\n<br> \n<a href='http://osmfoundation.org/Contact'>Contacta
+      a la OSMF</a> \nsi tienes preguntas o problemas sobre licencias, derechos de
+      autor u otro tema legal."
     partners_title: Socios
   notifier:
     diary_comment_notification:

diff --git a/config/locales/et.yml b/config/locales/et.yml
index d3ec9efc805b2d067a266197d427a1b9a913ae28..8223e35fdf1df0add17fb6bc4c298717dd0c5a7d 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -973,10 +973,33 @@ et:
       url: /welcome
       title: Tere tulemast OSMi
       description: Alusta selle kiirjuhendiga, mis hõlmab OpenStreetMapi põhitõdesid.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Et:Beginners%27_guide
+      title: Juhend algajatele
+      description: Kogukonna poolt loodud juhend algajatele.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Esita küsimus või otsi vastuseid OSMi küsimuste ja vastuste veebilehel.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Postiloendid
+      description: Esita küsimusi või arutle huvi pakkuvatel teemadel laias teemade
+        ringis või kohalikes postiloendites.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Foorumid
+      description: Küsimused ja arutelud nendele, kes eelistavad teadetetahvlile sarnanevat
+        kasutajaliidest.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Interaktiivne suhtluskanal paljudes keeltes ja paljudel teemadel.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Abi ettevõtetele ja organisatsioonidele, kes plaanivad kasutusele
+        võtta OpenStreetMapil põhinevad kaardid ja muud teenused.
     wiki:
       url: http://wiki.openstreetmap.org/wiki/Et:Main_Page
       title: wiki.openstreetmap.org
@@ -1215,6 +1238,7 @@ et:
       close: Sulge
     search:
       search: Otsi
+      get_directions_title: Juhised liikumiseks kahe punkti vahel
       from: Alguspunkt
       to: Sihtpunkt
       where_am_i: Kus ma asun?
@@ -1499,6 +1523,7 @@ et:
       register now: 'Registreeru:'
       with username: Kas omad juba OpenStreetMap kasutajakontot? Palun logi sisse
         enda kasutajanime ja salasõnaga.
+      with external: 'Teise võimalusena võid sisse logida kolmanda osapoole kaudu:'
       new to osm: Oled uus OpenStreetMap kasutaja?
       to make changes: Muudatuste tegemiseks OpenStreetMap andmetes peab sul olema
         kasutajakonto.
@@ -1512,6 +1537,22 @@ et:
         kui soovid sellel teemal arutleda.
       auth failure: Vabandust, kahjuks ei saa nende andmetega sisse.
       openid_logo_alt: Sisene OpenID tunnusega
+      auth_providers:
+        openid:
+          title: Sisene OpenID tunnusega
+          alt: Sisene OpenID URL abil
+        google:
+          title: Sisene Google'i tunnusega
+          alt: Sisene Google'i OpenID tunnusega
+        yahoo:
+          title: Sisene Yahoo tunnusega
+          alt: Sisene Yahoo OpenID tunnusega
+        wordpress:
+          title: Sisene Wordpress tunnusega
+          alt: Sisene Wordpress OpenID tunnusega
+        aol:
+          title: Sisene AOL tunnusega
+          alt: Sisene AOL OpenID tunnusega
     logout:
       title: Logi välja
       heading: Välju OpenStreetMap -st
@@ -1557,6 +1598,7 @@ et:
         eelistustes.
       password: 'Uus parool:'
       confirm password: 'Kinnita parool:'
+      use external auth: Teise võimalusena võid sisse logida kolmanda osapoole kaudu
       continue: Registreeru
       terms accepted: Täname, et nõustusid uute kaastöö tingimustega!
       terms declined: Meil on kahju, et otsustasid mitte nõustuda uute kaastöö tingimustega.
@@ -1662,6 +1704,7 @@ et:
       current email address: 'Praegune e-posti aadress:'
       new email address: 'Uus e-posti aadress:'
       email never displayed publicly: (ei näidata mitte kunagi avalikult)
+      external auth: 'Väline autentimine:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: mis see on?
@@ -1722,6 +1765,7 @@ et:
       press confirm button: Vajuta allolevale kinnitamise nupule, et oma kasutajakonto
         aktiveerida.
       button: Kinnita
+      success: Sinu kasutajakonto on kinnitatud, täname registreerimast!
       already active: See konto on juba kinnitatud.
       unknown token: See kinnituskood on aegunud või seda pole olemas.
       reconfirm_html: Kui soovid, et saadaksime sulle uuesti kinnitusmeili, siis <a
@@ -1737,8 +1781,9 @@ et:
       heading: Kinnita e-posti aadressi muutmine
       press confirm button: Kliki nupul kinnita oma uue e-posti aadressi kinnitamiseks.
       button: Kinnita
-      success: Sinu eposti aadress on kinnitatud, tänan registreerimast!
+      success: Sinu eposti aadressi muudatus on kinnitatud, täname registreerimast!
       failure: E-posti aadress on juba antud pääsuloaga kinnitatud.
+      unknown_token: See kinnituskood on aegunud või seda pole olemas.
     set_home:
       flash success: Kodukoht edukalt salvestatud
     go_public:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ba372625cf0089e21c0e9699b50cf9f3104da376..b23527dcd4ef02a74293c033856d2072af3f9c64 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -17,6 +17,7 @@
 # Author: Movyn
 # Author: Omidh
 # Author: Reza1615
+# Author: Ruila
 # Author: Sahim
 # Author: Taha
 # Author: Wayiran
@@ -538,8 +539,10 @@ fa:
           plumber: لوله کش
           shoemaker: کفاش
           tailor: خیاط
+          "yes": فروشگاه قایق
         emergency:
           ambulance_station: ایستگاه آمبولانس
+          defibrillator: برگرداننده تپش قلب
           landing_site: محوطه فرود اضطراری
           phone: تلفن اضطراری
         highway:
@@ -644,11 +647,13 @@ fa:
           road: جاده منطقه
           village_green: روستای سبز
           vineyard: باغ انگوری
+          "yes": کاربری زمین
         leisure:
           beach_resort: تفریحگاه ساحلی
           bird_hide: محل مشاهده ی پرندگان
           club: باشگاه
           common: سرزمین مشترک
+          dog_park: پارک سگ
           fishing: منطقهٔ ماهی‌گیری
           fitness_centre: مرکز تناسب اندام
           fitness_station: ایستگاه تناسب اندام
@@ -663,6 +668,7 @@ fa:
           pitch: زمین ورزشی
           playground: زمین بازی
           recreation_ground: زمین تفریحی
+          resort: بازمرتب سازی
           sauna: سونا
           slipway: تعميرگاه دريايي
           sports_centre: مرکز ورزشی
@@ -673,8 +679,10 @@ fa:
           "yes": فراغت
         man_made:
           lighthouse: فانوس دریایی
+          pipeline: خط لوله
           tower: برج
           works: کارخانه
+          "yes": ساخت بشر
         military:
           airfield: فرودگاه نظامی
           barracks: پادگان
@@ -735,6 +743,7 @@ fa:
           travel_agent: آژانس مسافرتی
           "yes": دفتر
         place:
+          allotments: سهم
           block: مسدود
           airport: فرودگاه
           city: شهر بزرگ
@@ -1145,10 +1154,19 @@ fa:
       title: به OSM خوش آمدید
       description: با این آموزش ساده که در بر دارنده مبانی OpenStreetMap است آغاز
         کنید.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Fa:Beginners%27_guide
+      title: راهنمای مبتدیان
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: یک سؤال بپرسید یا پاسخ ها را ببینید در سایت پرسش و پاسخ OSM.
+    mailing_lists:
+      title: فهرست ایمیل‌ها
+    irc:
+      title: IRC
+    switch2osm:
+      title: سویچ به OSM
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1176,6 +1194,7 @@ fa:
       شما داده ها را در روش های خاص تغییر دهید یا بسازید، شما باید نتایج را تحت همین
       مجوز توزیع کنید. <a href=''%{copyright_path}''>صفحه ی حق نشر و مجوز</a>  را
       برای راهنمایی ببینید.'
+    legal_title: قانونی
     partners_title: شرکای تجاری
   notifier:
     diary_comment_notification:
@@ -1722,6 +1741,22 @@ fa:
         آنرا مطرح کنید.
       auth failure: پوزش، با این اطلاعات نمی توان وارد شد.
       openid_logo_alt: ورود با OpenID
+      auth_providers:
+        openid:
+          title: ورود با OpenID
+          alt: ورود با نشانی OpenID
+        google:
+          title: ورود با گوگل
+          alt: ورود با OpenID گوگل
+        yahoo:
+          title: ورود با یاهو
+          alt: ورود با OpenID یاهو
+        wordpress:
+          title: ورود با وردپرس
+          alt: ورود با OpenID وردپرس
+        aol:
+          title: ورود با AOL
+          alt: ورود با OpenID AOL
     logout:
       title: خروج
       heading: خروج از OpenStreetMap
@@ -1766,8 +1801,12 @@ fa:
       display name: 'نام نمایشی:'
       display name description: ' نام کاربری شما برای عموم نمایش داده شده. شما می
         توانید بعدا این مورد را در ترجیحات تغییر دهید.'
+      external auth: 'اعتبار طرف سوم:'
       password: 'کلمه عبور:'
       confirm password: 'تأیید گذرواژه:'
+      use external auth: استفاده از طرف سوم برای ورود
+      auth no password: با استفاده از طرف سوم نیازی به گذروآه نیست ولی هنوز نیاز به
+        اتصال به سرور آنهاست.
       continue: ثبت نام
       terms accepted: با تشکر  از پذیرش شرایط شرکت کنندگان تازه!
       terms declined: متاسفیم که تصمیم گرفتید شرایط شرکت کننده تازه را نپذیرید. برای
@@ -2244,6 +2283,7 @@ fa:
         follow: دنبال‌کردن
         start: شروع در انتهای
         destination: ورود به مقصد
+        exit: خروج %{exit}
         unnamed: (بی نام)
         courtesy: جهت از %{link}
       time: مدت

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index aa6e123bf19fbe2ff05fe61ef779082b1ee73519..8f5ac5ec2d4882c8bad73838d37d3ae55e9d5f9b 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -16,6 +16,7 @@
 # Author: Nike
 # Author: Olli
 # Author: Ramilehti
+# Author: Ruila
 # Author: Samoasambia
 # Author: Silvonen
 # Author: Snidata
@@ -1106,11 +1107,18 @@ fi:
       url: /welcome
       title: Tervetuloa OpenStreetMapiin
       description: Opi OpenStreetMapin perusteet tällä helpolla aloitusoppaalla.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Fi:Beginners%27_guide
+      title: Vasta-alkajan opas
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Etsi vastauksia tai esitä oma kysymyksesi OSM:n kysy- ja vastaa
         -sivustolla. Englanninkielinen.
+    mailing_lists:
+      title: Postituslistat
+    irc:
+      title: IRC
     wiki:
       url: http://wiki.openstreetmap.org/wiki/Fi:Main_Page
       title: wiki.openstreetmap.org

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1c50cecc49dcb5722d6455c76fc188f658c4a7a0..f63f6248e1ed416332bee8126cdb8a0c245a7052 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -9,8 +9,10 @@
 # Author: Damouns
 # Author: DavidL
 # Author: Efred
+# Author: Eruedin
 # Author: EtienneChove
 # Author: F.rodrigo
+# Author: Freak2fast4u
 # Author: Gaspard
 # Author: Gileri
 # Author: Gomoko
@@ -21,6 +23,7 @@
 # Author: Jiremek
 # Author: Litlok
 # Author: Ljubinka
+# Author: Lucky
 # Author: McDutchie
 # Author: Metroitendo
 # Author: Momo50WM
@@ -36,6 +39,7 @@
 # Author: Pipo
 # Author: Pyrog
 # Author: Quentinv57
+# Author: Ruila
 # Author: Seb35
 # Author: Sherbrooke
 # Author: Urhixidur
@@ -144,7 +148,7 @@ fr:
     in_changeset: Groupe de modifications
     anonymous: anonyme
     no_comment: (aucun commentaire)
-    part_of: Partie de
+    part_of: Appartient à
     download_xml: Télécharger le XML
     view_history: Afficher l’historique
     view_details: Afficher les détails
@@ -1109,6 +1113,10 @@ fr:
         vous référer à notre <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procédure
         de retrait de données</a> ou notifiez-nous directement à travers notre <a
         href="http://dmca.openstreetmap.org/">formulaire en ligne</a>.
+      trademarks_1_html: OpenStreetMap et le logo loupe sont des marques déposées
+        de la OpenStreetMap Foundation. Si vous avez des questions à propos de l'utilisation
+        de ces marques, merci de prendre contact avec le <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+        Working Group</a>.
   welcome_page:
     title: Bienvenue !
     introduction_html: Bienvenue à OpenStreetMap, la carte du monde libre et éditable.
@@ -1182,11 +1190,31 @@ fr:
       url: /welcome
       title: Bienvenue à OSM
       description: Commencer avec ce guide rapide couvrant les bases d’OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant
+      title: Guide pour débutants
+      description: Guide pour les débutants maintenu par la communauté.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Poser une question ou chercher des réponses sur le site de questions-et-réponses
         d’OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Listes de diffusion
+      description: Poser une question ou discuter de questions intéressantes sur un
+        large éventail de thématiques ou des listes de diffusion régionaux.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Forums
+      description: Des questions et des discussions pour ceux qui préfèrent un interface
+        en style de tableau d'affichage.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1788,6 +1816,11 @@ fr:
         google:
           title: Se connecter avec Google
           alt: Se connecter avec l’OpenID de Google
+        facebook:
+          title: Se connecter avec Facebook
+          alt: Se connecter avec un compte Facebook
+        windowslive:
+          alt: Se connecter avec un compte Windows Live
         yahoo:
           title: Se connecter avec Yahoo
           alt: Se connecter avec l’OpenID de Yahoo
@@ -2099,6 +2132,8 @@ fr:
     auth_failure:
       connection_failed: Échec de la connexion au fournisseur d’authentification
       invalid_credentials: Informations d’authentification non valides
+      no_authorization_code: Pas de code d'autorisation
+      unknown_signature_algorithm: Algorithme de signature inconnu
   user_role:
     filter:
       not_an_administrator: Seuls les administrateurs peuvent gérer les rôles mais

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 1d3bb0071d75fd6d96b99b93a986786743eb0b44..f05255b97d38eb8ba700faf8fa8573fd212c7446 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -984,10 +984,10 @@ gl:
       mapping_link: comezar a contribuír
     legal_babble:
       title_html: Dereitos de autoría e licenza
-      intro_1_html: |-
-        O OpenStreetMap é de <i>datos abertos</i> e atópase baixo a <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+      intro_1_html: "O OpenStreetMap <sup><a href=\"#trademarks\">&reg;</a></sup>
+        está dispoñible baixo <i>datos abertos</i> e atópase baixo a <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open
+        Data\nCommons Open Database License</a> (ODbL) da  <a\t\nhref=\"http://osmfoundation.org/\">Fundación
+        OpenStreetMap</a> (OSMF)."
       intro_2_html: |-
         Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos datos,
         na medida en que acredite o OpenStreetMap e mais os seus
@@ -1021,7 +1021,8 @@ gl:
         title: Exemplo de recoñecemento
       more_title_html: Máis información
       more_1_html: |-
-        Descubra máis sobre como empregar os nosos datos e como acreditarnos nas <a
+        Descubra máis sobre como empregar os nosos datos e como acreditarnos na <a
+        href="http://osmfoundation.org/Licence">páxina de licenza de OSMF</a> e na comunidade de <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">preguntas máis frecuentes
         sobre asuntos legais</a>.
       more_2_html: |-
@@ -1094,6 +1095,11 @@ gl:
         o noso <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedemento
         para retirar datos</a> ou deixe unha notificación no noso
         <a href="http://dmca.openstreetmap.org/">formulario en liña</a>.
+      trademarks_title_html: <span id="trademarks"></span>Marcas rexistadas
+      trademarks_1_html: OpenStreetMap e o logotipo coa lupa son marcas rexistadas
+        da OpenStreetMap Foundation. Se ten algunha pregunta sobre a utilización das
+        marcas, por favor envée as súas cuestión ó <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Grupo
+        de Traballo de Licenzas</a>.
   welcome_page:
     title: Reciba a nosa benvida!
     introduction_html: Dámoslle a benvida ao OpenStreetMap, o mapa do mundo libre
@@ -1166,11 +1172,34 @@ gl:
       url: /welcome
       title: Dámoslle a benvida ao OSM
       description: Comece con esta guía rápida cos principios básicos do OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: Guía do principiante
+      description: Guía para principiantes, mantida pola comunidade.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Formule unha pregunta ou busque respostas no sitio de preguntas
         e respostas do OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Listas de correo
+      description: Pregunta ou conversa sobre temas interesantes nun amplo abano de
+        listas de correo temáticas ou rexionais.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Foros
+      description: Preguntas e conversas para os que prefiren unha interface do estilo
+        carteleira de anuncios.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Chat interactivo en moitos idiomas diferentes e sobre moitos temas.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: Migra a OSM
+      description: Axuda para as empresas e organizacións que migran a mapas e a outros
+        servizos baseados en OpenStreetMap.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1202,6 +1231,12 @@ gl:
       Os datos do OpenStreetMap son <i>datos libres</i>; pode usalos libremente e para calquera finalidade
       sempre que recoñeza ao OpenStreetMap e mailos seus colaboradores como os autores dos datos. Se modifica os datos
       ou os utiliza dalgún xeito para outros fins, pode distribuír o resultado sempre e cando o faga empregando a mesma licenza. Atopará información máis detallada na <a href='%{copyright_path}'>páxina de dereitos de autoría e licenza</a>.
+    legal_title: Legal
+    legal_html: "Este sitio e moitos outros servizos relacionados son manexados pola
+      \ \n<a href='http://osmfoundation.org/'>Fundación OpenStreetMap</a> (OSMF) \nen
+      nome da comunidade.\n<br> \n<a href='http://osmfoundation.org/Contact'>Contacte
+      coa OSMF</a> \nse ten preguntas ou problemas sobre licenzas, dereitos de autor
+      ou outro tema legal."
     partners_title: Socios
   notifier:
     diary_comment_notification:
@@ -1706,7 +1741,7 @@ gl:
       name: Nome
       required: Obrigatorio
       url: URL principal da aplicación
-      callback_url: URL de retorno
+      callback_url: URL de retorno de chamada
       support_url: URL de apoio
       requests: 'Solicitar os seguintes permisos ao usuario:'
       allow_read_prefs: ler as súas preferencias de usuario.
@@ -1758,6 +1793,12 @@ gl:
         google:
           title: Acceder ao sistema co Google
           alt: Acceder ao sistema cun OpenID de Google
+        facebook:
+          title: Acceda co Facebook
+          alt: Iniciar sesión cunha conta de Facebook
+        windowslive:
+          title: Iniciar sesión co Windows Live
+          alt: Iniciar sesión cunha conta de Windows Live
         yahoo:
           title: Acceder ao sistema con Yahoo
           alt: Acceder ao sistema cun OpenID de Yahoo
@@ -2060,6 +2101,9 @@ gl:
     auth_failure:
       connection_failed: Fallou a conexión ó proveedor de autenticación
       invalid_credentials: Credenciais de autenticación inválidas
+      no_authorization_code: Sen código de autorización
+      unknown_signature_algorithm: Algoritmo de sinatura descoñecido
+      invalid_scope: Ámbito inválido
   user_role:
     filter:
       not_an_administrator: Só os administradores poden xestionar os roles dos usuarios,

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6aca2d3bb2996502bed37a2d6172036c27a50d34..c34ac5cbdfa127e7703714bc263d03c7ec45bb0e 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -13,6 +13,7 @@
 # Author: Metraduk
 # Author: Nemo bis
 # Author: Orsa
+# Author: Ruila
 # Author: YaronSh
 # Author: Yona b
 # Author: Ypnypn
@@ -1147,6 +1148,8 @@ he:
       url: /welcome
       title: ברוכים הבאים ל־OSM
       description: תחילת היכרות בעזרת מדריך מהיר שסוקר את היסודות של OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/He:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index c7ee2f14079519f4f8398cbd320962a20696d0f2..6aa672abeb5ac67397704ccf8750b7739c90667a 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -8,6 +8,7 @@
 # Author: Nemo bis
 # Author: Phidrho
 # Author: Roberta F.
+# Author: Ruila
 # Author: SpeedyGonsales
 ---
 hr:
@@ -911,6 +912,8 @@ hr:
   help_page:
     welcome:
       title: Dobrodošao/la na OSM
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Hr:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 338449df6c22c9a03a3aaa15b05244d25ea10eea..5c325275108880a9c84d53d94596a26b375e5bbe 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -13,6 +13,7 @@
 # Author: Misibacsi
 # Author: Nemo bis
 # Author: R-Joe
+# Author: Ruila
 # Author: Samat
 # Author: Sucy
 # Author: Tacsipacsi
@@ -1061,6 +1062,8 @@ hu:
     welcome:
       url: /welcome
       title: Üdvözlünk az OSM-en
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Hu:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 570595a6c2c32e531240ad0acc223efbfb6a01a8..c7435c24f209b798ef405270c99c654c91b232c3 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -27,6 +27,7 @@
 # Author: Raoli
 # Author: Ricordisamoa
 # Author: Rippitippi
+# Author: Ruila
 # Author: Shirayuki
 # Author: Simone
 # Author: SimoneSVC
@@ -1012,8 +1013,8 @@ it:
     legal_babble:
       title_html: Copyright e licenza
       intro_1_html: |-
-        OpenStreetMap è un <i>database aperto</i>, rilasciato in base alla licenza <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
+        OpenStreetMap è <i>open data</i>, e i suoi dati sono distribuiti con licenza <a
+        href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) dalla <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: "Sei libero di copiare, distribuire, trasmettere e adattare i
         nostri dati, finché lo attribuisci a OpenStreetMap e ai suoi contributori.
         Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo sotto
@@ -1035,10 +1036,10 @@ it:
         alt: Esempio di come attribuire ad OpenStreetMap su una pagina web
         title: Esempio di attribuzione
       more_title_html: Per saperne di più
-      more_1_html: |-
-        Per saperne di più su come utilizzare i nostri dati, e come accreditarci, consulta
-        le <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Domande
-        legali frequenti</a>.
+      more_1_html: Per saperne di più su come utilizzare i nostri dati e come citarne
+        correttamente la fonte, consulta la pagina sulla <a href="http://osmfoundation.org/Licence">Licenza
+        OSMF</a> e le <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Domande
+        legali frequenti</a> della community.
       more_2_html: |-
         Anche se i dati OpenStreetMap sono aperti, non possiamo fornire accesso alle API della mappa gratuitamente per gli sviluppatori di terze parti.
         Vedi la nostra <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Politica di utilizzo delle API</a>, la
@@ -1174,11 +1175,34 @@ it:
       url: /welcome
       title: Benvenuti a OSM
       description: Inizia con questa guida rapida che copre le basi di OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide
+      title: Guida per Principianti
+      description: Guida per i principianti gestita dalla community.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Fai una domanda o cerca risposte sul sito di domande e risposte
         di OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Mailing List
+      description: Poni la tua domanda o discuti questioni di interesse su una vasta
+        gamma di mailing list tematiche o regionali.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Forum
+      description: Domande e discussioni per coloro che preferiscono un'interfaccia
+        in stile bacheca (BBS).
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Chat interattiva in molte lingue diverse e su molti argomenti.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Aiuto per imprese e organizzazioni che intendono migrare a mappe
+        e altri servizi basati su OpenStreetMap.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1208,6 +1232,12 @@ it:
       o sviluppi sulla base dei dati in un certo modo, puoi distribuire il risultato
       solo mediante la stessa licenza. Consultare la <a href=''%{copyright_path}''>pagina
       Copyright e Licenza</a> per i dettagli.'
+    legal_title: Note legali
+    legal_html: "Questo sito e molti altri servizi correlati sono formalmente gestiti
+      dalla \n<a href=\"http://osmfoundation.org/\">OpenStreetMap Foundation</a> (OSMF)
+      \nper conto della comunità.\n<br> \nSi prega di <a href=\"http://osmfoundation.org/Contact\">contattare
+      la OSMF</a> \nin caso di dubbi e problemi di licenza, copyright o altre questioni
+      legali."
     partners_title: Partner
   notifier:
     diary_comment_notification:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index fcf12f921a4dc8c21cfceec10b3c7e8d6e8ad6e4..5553f320e43a82cc288577e5b22063f16f9b1399 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -15,6 +15,7 @@
 # Author: Nazotoko
 # Author: Nyampire
 # Author: OKANO Takayoshi
+# Author: Ruila
 # Author: Rxy
 # Author: Schu
 # Author: Shirayuki
@@ -59,8 +60,8 @@ ja:
       trace: トレース
       tracepoint: トレースポイント
       tracetag: トレースのタグ
-      user: ユーザー
-      user_preference: ユーザー設定
+      user: 利用者
+      user_preference: 個人設定
       user_token: ユーザートークン
       way: ウェイ
       way_node: ウェイのノード
@@ -516,7 +517,9 @@ ja:
           "yes": 建造物
         craft:
           photographer: 撮影者
+          "yes": 手芸店
         emergency:
+          ambulance_station: 消防署
           phone: 緊急電話
         highway:
           bridleway: 乗馬道
@@ -582,6 +585,8 @@ ja:
           wayside_cross: 道路際の十字架
           wayside_shrine: 道祖神
           wreck: 沈没船
+        junction:
+          "yes": 交差点
         landuse:
           allotments: 家庭菜園
           basin: 盆地
@@ -1047,10 +1052,17 @@ ja:
       url: /welcome
       title: OSM へようこそ
       description: OpenStreetMap の基礎を網羅しているこのクイック ガイドから始めましょう。
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/JA:%E5%88%9D%E5%BF%83%E8%80%85%E3%82%AC%E3%82%A4%E3%83%89
+      title: 初心者向けの手引き
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: OSM の質問回答サイトで質問したり回答を検索したりする。
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+    irc:
+      title: IRC
     wiki:
       url: http://wiki.openstreetmap.org/wiki/JA:Main_Page
       title: wiki.openstreetmap.org

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index d5af9de49783505ea2cce9d15280b41957f10286..4544b73d64c86cfcf60a4c2be4433bed7be2f942 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -8,9 +8,12 @@
 # Author: Kwj2772
 # Author: Priviet
 # Author: Revi
+# Author: Ruila
+# Author: SeoJeongHo
 # Author: Stleamist
 # Author: Twotwo2019
 # Author: Wrightbus
+# Author: Ysjbserver
 # Author: 아라
 ---
 ko:
@@ -1150,10 +1153,16 @@ ko:
       url: /welcome
       title: OSM에 오신 것을 환영합니다
       description: OpenStreetMap 기초를 다루는 이 퀵 가이드로 시작합니다.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Ko:%EC%B4%88%EB%B3%B4%EC%9E%90_%EC%95%88%EB%82%B4%EC%84%9C
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: OSM의 질문 및 답변 사이트에서 질문하거나 답변을 찾아보세요.
+    forums:
+      title: 포럼들
+    irc:
+      title: IRC
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 97c25e197d43099fa537d276172bd52abb85d8ce..ae7b6ec2d2ff100e05a58d4768c989996d8d7275 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -627,11 +627,22 @@ lb:
     welcome:
       url: /welcome
       title: Wëllkomm bäi OSM
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Stellt eng Fro oder kuckt no Äntwerten um OSM-Site mat de Froen
         an Äntwerten.
+    mailing_lists:
+      title: Mailing-Lëschten
+    forums:
+      title: Forumen
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+    switch2osm:
+      url: https://switch2osm.org/
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -639,6 +650,7 @@ lb:
     next: Weider
     local_knowledge_title: Lokaalt Wëssen
     open_data_title: Open Data
+    legal_title: Legal
     partners_title: Partner
   notifier:
     diary_comment_notification:
@@ -885,6 +897,12 @@ lb:
         google:
           title: Alogge mat Google
           alt: Alogge mat enger Google OpenID
+        facebook:
+          title: Mat Facebook aloggen
+          alt: Mat engem Facebook Benotzerkont aloggen
+        windowslive:
+          title: Mat Windows Live aloggen
+          alt: Mat engem Windows-Live Benotzerkont aloggen
         yahoo:
           title: Alogge mat Yahoo
           alt: Alogge mat enger Yahoo OpenID
@@ -1044,6 +1062,8 @@ lb:
       empty: Et goufe keng sou Benotzer fonnt
     suspended:
       webmaster: Webmaster
+    auth_failure:
+      no_authorization_code: Keen Autorisatiouns-Code
   user_role:
     filter:
       not_an_administrator: Nëmmen Administrateure kënnen d'Gestioun vun de Rolle

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7457b4a31b4067cbd7d7fd35fcfb63cb1d1ecc15..3097277d084ad01690688340affe7427eb11c967 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -9,6 +9,7 @@
 # Author: Pauliuz
 # Author: Pdxx
 # Author: Perkunas
+# Author: Ruila
 ---
 lt:
   time:
@@ -1148,6 +1149,8 @@ lt:
       url: /welcome
       title: Sveiki atvykę į OSM
       description: Pradėkite šiuo greitu vadovu apie OpenStreetMap pagrindus.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Lt:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 699805412f69762dcd38dd9923f3409b3e6bc7b0..849312e94eef948eced4127d1c20bcefc6780a95 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -11,6 +11,7 @@
 # Author: Papuass
 # Author: PeterisP
 # Author: Raitisx
+# Author: Ruila
 # Author: Ttdnet
 ---
 lv:
@@ -538,9 +539,11 @@ lv:
           archaeological_site: Arheoloģisku izrakumu vieta
           battlefield: Kaujas lauks
           boundary_stone: Robežstabs
-          building: Ēka
+          building: Vēsturiska ēka
+          bunker: Bunkurs
           castle: Pils
           church: Baznīca
+          city_gate: Pilsētas vārti
           citywalls: Pilsētas Sienas
           fort: Forts
           house: Māja
@@ -549,7 +552,9 @@ lv:
           memorial: Memoriāls
           mine: Raktuves
           monument: Piemineklis
+          roman_road: Romiešu ceļš
           ruins: Drupas
+          stone: Akmens
           tomb: Kaps
           tower: Tornis
           wayside_cross: Krusts ceļmalā
@@ -1058,6 +1063,8 @@ lv:
       url: /sveicināts
       title: Laipni lūgti iekš OSM
       description: Sāc ar šo īso ceļvedi, kurš aptver OpenStreetMap pamatus.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Lv:Beginners%27_guide
     help:
       url: http://forum.openstreetmap.org/viewforum.php?id=59
       title: help.openstreetmap.org

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 58bd2f6bd88d8e1bf3a268459470b01a6593e563..99c91e5238bc484923db8fae5e52818409e71914 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -985,10 +985,10 @@ mk:
       mapping_link: почнете да ги работите картите
     legal_babble:
       title_html: Авторски права и лиценца
-      intro_1_html: |-
-        OpenStreetMap има <i>отворени податоци</i> под лиценцата <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+      intro_1_html: "OpenStreetMap<sup><a href=\"#trademarks\">&reg;</a></sup> има
+        <i>отворени податоци</i> под лиценцата <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open
+        Data\nCommons Open Database License</a> (ODbL) од <a\n \t+\t\nhref=\"http://osmfoundation.org/\">фондацијата
+        OpenStreetMap</a> (OSMF)."
       intro_2_html: "Нашите податоци слободно можете да ги умножувате, распространувате,
         предавате и менувате, \nдоколку ја наведете OpenStreetMap и нејзините\nучесници.
         Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате
@@ -1020,7 +1020,8 @@ mk:
       more_title_html: Повеќе информации
       more_1_html: |-
         Повеќе за употребата на податоци и како да не наведувате, ќе најдете на <a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Правни ЧПП</a>.
+        href="http://osmfoundation.org/Licence">лиценцната страница на OSMF</a> и <a
+        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Правните ЧПП</a> на заедницата.
       more_2_html: |-
         Иако OpenStreetMap работи со отворени податоци, ние не можеме да понудиме
         бесплатни извршници (API) за карти на трети програмери.
@@ -1085,6 +1086,11 @@ mk:
         href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">процедурата
         \nза отстранување</a> или поднесете жалба на \n<a href=\"http://dmca.openstreetmap.org/\">оваа
         наменска страница</a>."
+      trademarks_title_html: <span id="trademarks"></span>Заштитни знаци
+      trademarks_1_html: OpenStreetMap и логото со лупа се заштитни знаци на фондацијата
+        OpenStreetMap. Ако имате прашања во врска со употребата на знаците, пишете
+        ѝ на <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Работната
+        група за лиценци</a>.
   welcome_page:
     title: Добре дојдовте!
     introduction_html: Добре дојдовте на OpenStreetMap — слободна и уредлива карта
@@ -1152,11 +1158,33 @@ mk:
       url: /welcome
       title: Добре дојдовте на OSM
       description: Започнете со овој брз водич низ основите на OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: Почетен курс
+      description: Напатствија за почетници, напишани од заедницата.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Поставете прашање или побарајте во одговорите на порталот за прашања
         и одговори на OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Поштенски списоци
+      description: Поставете прашање или разговарајте за интересни прашања на широк
+        опсег на тематски и регионални поштенски списоци.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Форуми
+      description: Прашања и разговори за оние кои претпочитаат да општат со објави.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Разговор во живо на најразлични јазици и на многу теми.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: Преод на OSM
+      description: Помош за претпријатија и организации кои преоѓаат на  карти на
+        OpenStreetMap и други услуги.
     wiki:
       url: http://wiki.openstreetmap.org/wiki/Mk:Main_Page
       title: wiki.openstreetmap.org
@@ -1188,6 +1216,12 @@ mk:
       OpenStreetMap е проект со <i>отворени податоци</i>: можете слободно да го користите за било која цел
       доколку ја наведете OpenStreetMap и нејзините учесници. Ако решите да ги менувате податоците или да се надоврзувате на нив, добиеното дело можете да го распространувате исклучиво
       под истата лиценца. Повеќе ќе најдете на страницата <a href='%{copyright_path}'>Авторски права и лиценцирање</a>.
+    legal_title: Правни работи
+    legal_html: "Ова мрежно место и многу други поврзани услуги со кои раководи  \n<a
+      href='http://osmfoundation.org/'>Фондацијата OpenStreetMap</a> (OSMF) \nво име
+      на заедницата.\n<br> \nВе молиме <a href='http://osmfoundation.org/Contact'>контактирајте
+      ја OSMF</a> \nако имате прашања во врска со лиценцирањето, авторките права и
+      други правни прашања и проблеми."
     partners_title: Партнери
   notifier:
     diary_comment_notification:
@@ -1749,6 +1783,12 @@ mk:
         google:
           title: Најава со Google
           alt: Најава со OpenID од Google
+        facebook:
+          title: Најава со Facebook
+          alt: Најава со профил на Facebook
+        windowslive:
+          title: Најава со Windows Live
+          alt: Најава со сметка на Windows Live
         yahoo:
           title: Најава со Yahoo
           alt: Најава со OpenID од Yahoo
@@ -2057,6 +2097,9 @@ mk:
     auth_failure:
       connection_failed: Не успеав да воспоставам врска со услужникот за заверка
       invalid_credentials: Неважечки податоци за заверка
+      no_authorization_code: Нема код за овластување
+      unknown_signature_algorithm: Непознат алгоритам на потпис
+      invalid_scope: Неважечки делокруг
   user_role:
     filter:
       not_an_administrator: Само администраторите можат да раководат со улоги, а вие

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 422bcfb690870ccc7b5380f3a94b1a0982245c36..3e69529a72c474991d26aeec0435b9d5648cef09 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -8,6 +8,7 @@
 # Author: Fruggo
 # Author: Greencaps
 # Author: HanV
+# Author: Hansmuller
 # Author: Jochempluim
 # Author: Ldp
 # Author: M!dgard
@@ -17,6 +18,7 @@
 # Author: Pje335
 # Author: Robin0van0der0vliet
 # Author: Romaine
+# Author: Ruila
 # Author: SPQRobin
 # Author: Shirayuki
 # Author: Siebrand
@@ -1186,11 +1188,26 @@ nl:
       title: Welkom bij OSM
       description: Begin met dit snelle stappenplan dat de basis van OpenSteetMap
         uitlegt.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/NL:Beginnershandleiding
+      title: Handleiding voor beginners
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Stel een vraag op zoek antwoorden op de vraag- en antwoordsite
         van OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Forums
+      description: Vragen en overleg voor als u liever met een interface in bulletin
+        board-stijl werkt
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+    switch2osm:
+      url: https://switch2osm.org/
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1216,6 +1233,7 @@ nl:
       Als u de gegevens wijzigt of uitbouwt op bepaalde manieren, dan mag u het resultaat
       alleen onder dezelfde licentie verder verspreiden. Zie de <a href=''%{copyright_path}''>pagina
       over Auteursrechten en Licentie</a> voor details.'
+    legal_title: Toegestaan
     partners_title: Partners
   notifier:
     diary_comment_notification:

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 2173efc87e590cb9c77b968828247af373de7047..4c784def7eb70cc21c53d39d859828b75af5135e 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -10,6 +10,7 @@
 # Author: Nghtwlkr
 # Author: Njardarlogar
 # Author: Pladask
+# Author: Ruila
 ---
 nn:
   html:
@@ -874,6 +875,9 @@ nn:
         <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">takedown
         \nprosedyre</a> eller direkte til vårt <a href=\"http://dmca.openstreetmap.org/\">online
         skjema</a>."
+  help_page:
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Nn:Beginners%27_guide
   notifier:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} kommenterte på ein oppføring i dagboka di'

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f8f2c2358abc95e063e6519a900b1b9cc951f6ce..89dde0c8ea30a819994bc3d32fe2b30e084986fe 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -25,6 +25,7 @@
 # Author: RafalR
 # Author: Rezonansowy
 # Author: RicoElectrico
+# Author: Ruila
 # Author: Soeb
 # Author: Sp5uhe
 # Author: Ty221
@@ -1165,6 +1166,8 @@ pl:
       url: /welcome
       title: Witamy w OSM
       description: Zacznij od tego krótkiego przewodnika, obejmującego podstawy OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Pl:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: Strona Pomocy OpenStreetMap

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 29af45add82f6fac54cd5cf71df11fe5565ac22f..e03f7440a315c6db80d4409db099d2d3e43d096a 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -20,6 +20,7 @@
 # Author: Nighto
 # Author: Rodrigo Avila
 # Author: Rodrigo codignoli
+# Author: Ruila
 # Author: Tuliouel
 # Author: Vgeorge
 # Author: Wille
@@ -1112,6 +1113,8 @@ pt-BR:
       url: /welcome
       title: Bem vindo ao OSM
       description: Comece por este guia rápido sobre os princípios básicos do OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Pt-br:Beginners%27_guide
     help:
       url: http://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 1390c5636193e6edaefb32913e67f20bea21ec24..8c4675f39014ecc34df12b3521f2f23f758c3bb6 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -13,6 +13,7 @@
 # Author: Jgpacker
 # Author: Jgrocha
 # Author: Luckas
+# Author: Macofe
 # Author: Malafaya
 # Author: McDutchie
 # Author: Nemo bis
@@ -1004,9 +1005,10 @@ pt-PT:
     legal_babble:
       title_html: Licença e Direitos de autor
       intro_1_html: |-
-        O OpenStreetMap é disponibilizado em <i>dados abertos</i>, sob a licença <a
+        O OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> é disponibilizado em <i>dados abertos</i>, sob a licença <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        Commons Open Database License</a> (ODbL) pela  <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: Tem o direito de copiar, distribuir, transmitir e adaptar os nossos
         dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores.
         Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado
@@ -1036,9 +1038,10 @@ pt-PT:
         alt: Exemplo de como indicar os créditos do OpenStreetMap numa página web
         title: Exemplo de atribuição
       more_title_html: Saber mais
-      more_1_html: Leia mais informações sobre a utilização dos nossos dados e como
-        atribuir a autoria em <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Perguntas
-        frequentes - Legais</a> (em inglês).
+      more_1_html: |-
+        Leia mais informações sobre a utilização dos nossos dados e como atribuir a autoria na <a
+        href="http://osmfoundation.org/License">página da licença da OSMF</a> e a página da comunidade <a
+        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Perguntas frequentes - Legais</a> (em inglês).
       more_2_html: Apesar do OpenStreetMap consistir em dados abertos, não podemos
         fornecer um serviço mapa API, livre de encargos, a programadores terceiros.
         Veja a <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Política
@@ -1093,6 +1096,11 @@ pt-PT:
         o <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimento
         para retirar dados protegidos</a> (em inglês) ou preencha os dados diretamente
         no <a href="http://dmca.openstreetmap.org/">formulário</a> (em inglês).
+      trademarks_title_html: <span id="trademarks"></span>Marcas registadas
+      trademarks_1_html: OpenStreetMap e o logotipo com a lupa são marcas registadas
+        da OpenStreetMap Foundation. Se tiver alguma questão sobre a utilização das
+        marcas, por favor envie as suas questões para o <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Grupo
+        de Trabalho de Licenças</a>.
   welcome_page:
     title: Bem-vindo !
     introduction_html: Bem-vindo ao OpenStreetMap, o mapa livre e editável do mundo.
@@ -1161,11 +1169,34 @@ pt-PT:
       url: /welcome
       title: Bem vindo ao OpenStreetMap
       description: Comece por este guia rápido sobre os princípios básicos do OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide
+      title: Guia de Iniciantes
+      description: Guia para iniciantes criado pela comunidade.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Coloque uma questão ou procure por respostas no fórum de perguntas
         e respostas do OpenStreetMap.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Listas de discussão
+      description: Faça uma pergunta ou discuta sobre temas interessantes numa vasta
+        gama de listas de discussão regionais e temáticas.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Fóruns
+      description: Questões e discussões para quem preferir uma área na internet do
+        tipo fórum.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Sala de discussão IRC em várias línguas e vários tópicos.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Informações para empresas e organizações que queiram mudar para
+        os mapas do OpenStreetMap e outros serviços.
     wiki:
       url: http://wiki.openstreetmap.org/wiki/Pt:Main_Page
       title: wiki.openstreetmap.org
@@ -1198,6 +1229,12 @@ pt-PT:
       credite a autoria do OpenStreetMap e os seus colaboradores.
       Se você alterar os dados ou criar algo com os dados, pode distribuir
       o produto resultante apenas sob a mesma licença. Consulte <a href='%{copyright_path}'>a página sobre direitos de autor e licenciamento</a> para mais informações.
+    legal_title: Termos legais
+    legal_html: "Este site e outros serviços relacionados são formalmente geridos
+      pela  \n<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+      \nem nome da comunidade.\n<br> \nPor favor <a href='http://osmfoundation.org/Contact'>contacte
+      a OSMF</a> \nse tiver questões sobre a licença, direitos de autor, questões
+      legais ou problemas."
     partners_title: Parceiros
   notifier:
     diary_comment_notification:
@@ -1764,6 +1801,12 @@ pt-PT:
         google:
           title: Iniciar sessão com Google
           alt: Iniciar sessão com OpenID do Google
+        facebook:
+          title: Iniciar sessão com o Facebook
+          alt: Iniciar sessão com uma conta do Facebook
+        windowslive:
+          title: Iniciar sessão com Windows Live
+          alt: Iniciar sessão com uma conta do Windows Live
         yahoo:
           title: Iniciar sessão com Yahoo
           alt: Iniciar sessão com OpenID Yahoo
@@ -2069,6 +2112,9 @@ pt-PT:
       connection_failed: Não foi possível fazer a ligação ao serviço externo de início
         de sessão
       invalid_credentials: As credenciais de início de sessão não são válidas
+      no_authorization_code: Sem código de autorização
+      unknown_signature_algorithm: Algoritmo de assinatura desconhecido
+      invalid_scope: Âmbito inválido
   user_role:
     filter:
       not_an_administrator: Apenas os administradores podem gerir cargos, e você não
@@ -2337,6 +2383,7 @@ pt-PT:
         stay_roundabout: Mantenha-se na rotunda -
         start: Começar no final da
         destination: Chegada ao destino
+        against_oneway: Ir no sentido contrário a
         end_oneway: Final de via sentido único em
         exit: sair em %{exit}
         unnamed: (sem nome)

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d7a537f9d615bc5fb92d8377e3d7002fe81aa7ca..553784fd0d7f8df336d946123d20cee182ac3cc0 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -32,6 +32,7 @@
 # Author: Okras
 # Author: Putnik
 # Author: Riliam
+# Author: Ruila
 # Author: Santacloud
 # Author: Spider
 # Author: TarzanASG
@@ -40,6 +41,7 @@
 # Author: Yuri Nazarov
 # Author: Zverik
 # Author: Александр Сигачёв
+# Author: Дмитрий
 # Author: Сrower
 ---
 ru:
@@ -1174,10 +1176,27 @@ ru:
       url: /welcome
       title: Добро пожаловать на OSM
       description: Начните с этого краткого руководства, охватывающего основы OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/RU:%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE_%D0%BD%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0
+      title: Руководство для начинающих
+      description: Сообщество поддерживает руководство для начинающих.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Задать вопрос или найти ответы на сайте вопросов и ответов OSM.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Списки рассылок
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Форумы
+    irc:
+      title: IRC
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Помощь компаниям и организациям в переходе на OpenStreetMap карты
+        и другие услуги.
     wiki:
       url: http://wiki.openstreetmap.org/wiki/RU:Main_Page
       title: wiki.openstreetmap.org
@@ -1206,6 +1225,7 @@ ru:
       на них, вы можете распространять свой результат только под той же лицензией.
       Смотрите <a href=''%{copyright_path}''>Авторские права и Страница лицензии</a>
       для более подробной информации.'
+    legal_title: Юридический
     partners_title: Партнёры
   notifier:
     diary_comment_notification:

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 834d4a3d9f2975929d68b77b6e52b7bbb9579f3b..589aa787820e581d7f50e815991687ca92fbe2fc 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -11,6 +11,7 @@
 # Author: Mimarik
 # Author: Nemo bis
 # Author: Rudko
+# Author: Ruila
 # Author: Teslaton
 # Author: Vladolc
 ---
@@ -1022,6 +1023,8 @@ sk:
   help_page:
     welcome:
       title: Vitajte na OSM
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Sk:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index cdaaa49226d2f1b796c23353e33ccf4ae4d3bd95..17a1cead23c848d426c3b6aff40b66b18414693f 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -6,6 +6,7 @@
 # Author: Eleassar
 # Author: Lesko987
 # Author: Mateju
+# Author: Ruila
 # Author: Skalcaa
 # Author: Stefanb
 ---
@@ -952,8 +953,9 @@ sl:
       mapping_link: začnete kartirati
     legal_babble:
       title_html: Avtorske pravice in licenca
-      intro_1_html: OpenStreetMap so <i>prosti podatki</i> z <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
-        Data Commons Open Database License</a> (ODbL) licenco.
+      intro_1_html: OpenStreetMap so <i>prosti podatki</i> z dovoljenjem <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+        Data Commons Open Database License</a> (ODbL) <a href="http://osmfoundation.org/">Fundacije
+        OpenStreetMap</a> (OSMF).
       contributors_title_html: Naši sodelavci
       infringement_title_html: Kršitev avtorskih pravic
   welcome_page:
@@ -1013,6 +1015,8 @@ sl:
     welcome:
       title: Dobrodošli v OSM
       description: Začnite s tem hitrim vodičem, ki zajema osnove OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Sl:Beginners%27_guide
     help:
       description: Zastavite vprašanje ali poiščete odgovore v OSM zbirki vprašanj
         in odgovorov.

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index ba0f4adf416a601999bd7b3269c577b5bf8fc966..8f591f2f4f107d6e77e4947bc91593da099e44ab 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -25,6 +25,7 @@
 # Author: Per
 # Author: Pladask
 # Author: Poxnar
+# Author: Ruila
 # Author: Sannab
 # Author: Sendelbach
 # Author: Sertion
@@ -1016,8 +1017,8 @@ sv:
       title_html: Upphovsrätt och licens
       intro_1_html: |-
         OpenStreetMap är <i>öppen data</i>, gjord tillgänglig under licensen <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) av <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: |-
         Du är fri att kopiera, distribuera, överföra och anpassa vår data,
         så länge du anger OpenStreetMap och dess bidragsgivare som källa.
@@ -1050,7 +1051,8 @@ sv:
         title: Exempel på källhänvisning.
       more_title_html: Mer information
       more_1_html: |-
-        Läs mer om användning av vår data, och hur du anger oss som källa, på vår <a
+        Läs mer om användning av vår data, och hur du anger oss som källa, på <a
+        href="http://osmfoundation.org/Licence">OSMF licenssida</a> och gemenskapens <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">juridiska
         FAQ</a>.
       more_2_html: |-
@@ -1181,11 +1183,34 @@ sv:
       url: /welcome
       title: Välkommen till OSM
       description: Börja med den här snabbguiden som täcker grunderna i OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Sv:Beginners%27_guide
+      title: Guide för nybörjare
+      description: Guide för nybörjare som underhålls av gemenskapen.
     help:
       url: https://help.OpenStreetMap.org/
       title: help.openstreetmap.org
       description: Ställ en fråga eller kolla upp svar på OSM:s sida med svar på ofta
         förekommande frågor.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: E-postlistor
+      description: Ställ en fråga eller diskutera intressanta saker på ett brett utbud
+        av lokala eller regionala e-postlistor.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Forum
+      description: Frågor och diskussioner för de som föredrar ett gränssnitt liknande
+        en anslagstavla.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Interaktiv chatt på flera olika språk rörande mängder av ämnen.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Hjälp för företag och organisationer att byta till OpenStreetMap-baserade
+        kartor och andra tjänster.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1213,6 +1238,7 @@ sv:
       källa. Om du förändrar eller bygger vidare på datan på vissa sätt, kan du endast
       distribuera resultatet under samma licens. Se <a href=''%{copyright_path}''>sidan
       för Upphovsrätt och Licens</a> för detaljer.'
+    legal_title: Juridik
     partners_title: Partners
   notifier:
     diary_comment_notification:
@@ -1319,6 +1345,8 @@ sv:
           du är intresserad av'
         your_changeset: '%{commenter} har lämnat en kommentar på ett av dina ändringsset
           skapas den %{time}'
+        commented_changeset: '%{commenter} har lämnat en kommentar på ändringarna
+          på en karta du bevakar, skapad av %{changeset_author} %{time}'
         partial_changeset_with_comment: med kommentar '%{changeset_comment}'
         partial_changeset_without_comment: utan kommentar
       details: Mer detaljer om ändringssetet finns på %{url}.
@@ -1748,6 +1776,7 @@ sv:
       register now: Registrera dig nu
       with username: 'Har du redan ett OpenStreetMap-konto? Logga in med ditt användarnamn
         och lösenord:'
+      with external: 'Alternativt kan du använda en tredje part för att logga in:'
       new to osm: Ny på OpenStreetMap?
       to make changes: För att göra ändringar i OpenStreetMaps data måste du ha ett
         konto.
@@ -1761,6 +1790,22 @@ sv:
         {webmaster}">webbansvarig</a> om du vill diskutera saken.
       auth failure: Kunde inte logga in med de uppgifterna.
       openid_logo_alt: Logga in med ett OpenID
+      auth_providers:
+        openid:
+          title: Logga in med OpenID
+          alt: Logga in med en OpenID-URL
+        google:
+          title: Logga in med Google
+          alt: Logga in med ett Google OpenID
+        yahoo:
+          title: Logga in med Yahoo
+          alt: Logga in med ett Yahoo OpenID
+        wordpress:
+          title: Logga in med Wordpress
+          alt: Logga in med ett Wordpress OpenID
+        aol:
+          title: Logga in med AOL
+          alt: Logga in med ett AOL OpenID
     logout:
       title: Logga ut
       heading: Logga ut från OpenStreetMap
@@ -1802,8 +1847,12 @@ sv:
       display name: 'Visat namn:'
       display name description: Ditt offentligt visade användarnamn. Du kan ändra
         detta senare i inställningarna.
+      external auth: 'Tredjepartsautentisering:'
       password: 'Lösenord:'
       confirm password: 'Bekräfta lösenord:'
+      use external auth: Alternativt kan du använda en tredje part för att logga in
+      auth no password: Med autentisering av tredje part krävs inte lösenord, men
+        en del extra verktyg eller server kan fortfarande behöva det.
       continue: Skapa ett konto
       terms accepted: Tack för att du accepterat de nya villkoren för bidrag till
         kartan!
@@ -1911,6 +1960,7 @@ sv:
       current email address: 'Nuvarande e-postadress:'
       new email address: 'Ny e-postadress:'
       email never displayed publicly: (visas aldrig offentligt)
+      external auth: 'Extern autentisering:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: vad är detta?
@@ -1991,6 +2041,7 @@ sv:
       button: Bekräfta
       success: Ditt byte av e-postadress har bekräftats!
       failure: En e-postadress har redan bekräftats med den här nyckeln.
+      unknown_token: Den bekräftelsekoden har löpt ut eller existerar inte.
     set_home:
       flash success: Hemposition sparad
     go_public:
@@ -2032,6 +2083,9 @@ sv:
           Detta beslut kommer granskas av en administratör inom kort, eller
           så kan du kontakta %{webmaster} om vill diskutera saken.
         </p>
+    auth_failure:
+      connection_failed: Anslutning till autentiseringsleverantören misslyckades
+      invalid_credentials: Ogiltiga autentiseringsuppgifter
   user_role:
     filter:
       not_an_administrator: Endast adminstratörer kan ändra användares roller och
@@ -2296,6 +2350,7 @@ sv:
         destination: Nå målet
         against_oneway: Kör mot enkelriktat på
         end_oneway: Slutet av en väg på
+        exit: avsluta %{exit}
         unnamed: (namnlös)
         courtesy: Vägbeskrivning med tillstånd av %{link}
       time: Tid

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 4f751379d4229f9045d5d2c12358864ce0c304f2..04f8a20acc3858aa4ccb17419395d8a1f849f338 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -10,6 +10,7 @@
 # Author: Joseph
 # Author: Katpatuka
 # Author: Meelo
+# Author: Ruila
 # Author: SalihB
 # Author: Sayginer
 # Author: Sucsuzz
@@ -945,6 +946,8 @@ tr:
     welcome:
       title: OSM'ye hoşgeldin!
       description: OpenStreetMap temellerini öğrenmek için kısa bir kılavuz ile başla.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Tr:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 2d233da933616eaf268f142789f666517210bbf2..b657063311b483ec3036be9fc2e03b18886befe2 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -17,6 +17,7 @@
 # Author: Olvin
 # Author: Prima klasy4na
 # Author: Riwnodennyk
+# Author: Ruila
 # Author: Sev
 # Author: Shirayuki
 # Author: SteveR
@@ -1159,6 +1160,8 @@ uk:
       url: /welcome
       title: Ласкаво просимо до OSM
       description: Розпочніть з цього короткого посібника, що охоплює основи OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Uk:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 72c20ad50c8a4f1c4bc44ebab1f619785fac4810..723555cde246f387934dda66e6ca39222dbee3bc 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1,9 +1,12 @@
 # Messages for Vietnamese (Tiếng Việt)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Dinhxuanduyet
+# Author: KhangND
 # Author: Minh Nguyen
 # Author: Nemo bis
 # Author: Ninomax
+# Author: Ruila
 # Author: Trần Nguyễn Minh Huy
 ---
 vi:
@@ -981,7 +984,7 @@ vi:
       intro_1_html: |-
         OpenStreetMap là <i>dữ liệu mở</i> được phát hành theo <a
         href="http://opendatacommons.org/licenses/odbl/">Giấy phép Cơ sở dữ liệu Mở của Open Data
-        Commons</a> (ODbL).
+        Commons</a> (ODbL) bởi <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
       intro_2_html: Bạn được tự do sao chép, phân phối, truyền, và tạo ra các tác
         phẩm phái sinh từ các dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap
         và những người đóng góp vào nó. Nếu bạn sửa đổi hoặc tạo sản phẩm dựa trên
@@ -1012,9 +1015,9 @@ vi:
         alt: Ví dụ ghi công OpenStreetMap trên một trang Web
         title: Ví dụ ghi công
       more_title_html: Tìm hiểu thêm
-      more_1_html: Hãy đọc thêm chi tiết về việc sử dụng dữ liệu của chúng tôi và
-        cách ghi công chúng tôi trong <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=vi">Hỏi
-        đáp Pháp lý</a>.
+      more_1_html: |-
+        Hãy đọc thêm chi tiết về việc sử dụng dữ liệu của chúng tôi và cách ghi công chúng tôi tại <a href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
+        <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ?uselang=vi">Hỏi đáp Pháp lý</a>.
       more_2_html: Tuy OpenStreetMap là một nguồn dữ liệu mở, nhưng chúng tôi không
         thể cung cấp API miễn phí cho những nhà phát triển bên thứ ba truy cập bản
         đồ. Hãy xem <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy?uselang=vi">Quy
@@ -1129,11 +1132,16 @@ vi:
       url: /welcome
       title: Chào mừng đến với OSM
       description: Bắt đầu với cẩm nang các điều cơ bản OpenStreetMap.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Hỏi hang hoặc tìm kiếm các câu trả lời tại trung tâm hỏi đáp của
         OSM.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Diễn đàn
     wiki:
       url: http://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi
       title: wiki.openstreetmap.org

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a791224263312c094a34b156db0685a965b44852..82c47c80eee2e75a18b1e0ce6ee03f908fa9659c 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -577,7 +577,7 @@ zh-CN:
           track: 小路
           traffic_signals: 交通信号灯
           trail: 小路
-          trunk: 干道
+          trunk: 主干道路
           trunk_link: 干道
           unclassified: 无等级道路
           unsurfaced: 无铺面道路
@@ -989,8 +989,9 @@ zh-CN:
     legal_babble:
       title_html: 著作权与许可
       intro_1_html: |-
-        OpenStreetMap 是<i>开放数据</i>，采用<a
-        href="http://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a> (ODbL)授权。
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>是<i>开放数据</i>，由<a
+        href="http://osmfoundation.org/">OpenStreetMap基金会</a>（OSMF）采用<a
+        href="http://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a>（ODbL）授权。
       intro_2_html: 只要您表明来源为 OpenStreetMap 及其贡献者，您就可以自由地复制、分发、传送和改编我们的数据。如果您想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表您的作品。完整的<a
         href="http://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了您的权利和义务。
       intro_3_html: 我们的地图图块中的绘图数据以及我们的文档采用<a href="http://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享“署名-相同方式共享
@@ -1009,6 +1010,7 @@ zh-CN:
       more_title_html: 了解更多
       more_1_html: |-
         请在<a
+        href="http://osmfoundation.org/Licence">OSMF许可协议页面</a>和<a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">法律常见问题</a>阅读更多关于使用我们的数据，以及如何表明我们是作者的信息。
       more_2_html: 尽管 OpenStreetMap 开放数据，但是我们无法为第三方开发人员提供免费的地图 API。详见我们的 <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API使用政策</a>、<a
         href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">图块使用政策</a>及<a
@@ -1042,6 +1044,7 @@ zh-CN:
       infringement_1_html: OSM 的贡献者会被提醒，绝不要在没有著作权人的明确许可时添加来自任何有著作权的来源的数据(如谷歌地图或印刷地图)。
       infringement_2_html: 如果您认为版权的材料已被不恰当地添加的 OpenStreetMap 数据库或该网站，请参见我们的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我们的<a
         href="http://dmca.openstreetmap.org/">在线申报页面</a>上提出。
+      trademarks_title_html: <span id="trademarks"></span>商标
   welcome_page:
     title: 欢迎！
     introduction_html: 欢迎访问 OpenStreeMap，自由且可编辑的世界地图。您已经登录，可以开始绘制地图。这里是含有您需要知道的最重要的信息的快速指南。
@@ -1086,10 +1089,25 @@ zh-CN:
       url: /welcome
       title: 欢迎访问 OSM
       description: 本快速指南涵盖了快速入门 OpenStreetMap 的基本知识。
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Zh-hans:Beginners%27_guide
+      title: 初学者指南
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: 在 OSM 的问答网站提问或查找回答。
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: 邮件列表
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: 论坛
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1110,6 +1128,7 @@ zh-CN:
     open_data_title: 开放数据
     open_data_html: OpenStreetMap 是<i>开源数据</i>:只要您表明使用了 OpenStreetMap 并承认其贡献者的工作，您就可以使用
       OpenStreetMap。如果您改变或者使用这些数据，您必须按照相同的版权协议发布结果。详情请参见<a href='%{copyright_path}'>版权协议</a>。
+    legal_title: 法律
     partners_title: 合作伙伴
   notifier:
     diary_comment_notification:
@@ -1302,7 +1321,7 @@ zh-CN:
       table:
         entry:
           motorway: 高速公路
-          trunk: 城市快速道路
+          trunk: 主干道路
           primary: 一级道路
           secondary: 二级道路
           unclassified: 无等级道路
@@ -1608,6 +1627,11 @@ zh-CN:
         google:
           title: 使用Google登录
           alt: 使用Google OpenID登录
+        facebook:
+          title: 使用脸书登录
+        windowslive:
+          title: 使用Windows Live登录
+          alt: 使用一个Windows Live账户登录
         yahoo:
           title: 使用Yahoo登录
           alt: 使用Yahoo OpenID登录
@@ -1654,9 +1678,19 @@ zh-CN:
         title="wiki privacy policy including section on email addresses">隐私政策</a>)
       display name: 显示名称：
       display name description: 您公开显示的用户名。您可以稍后在首选项中进行修改。
+      external auth: 第三方身份验证：
       password: 密码：
       confirm password: 确认密码：
       use external auth: 或者使用第三方服务登录
+      auth association: |-
+        <p>您的ID目前尚未与一个OpenStreetMap账户相关联。</p>
+        <ul>
+          <li>如果您刚刚接触OpenStreetMap，请使用下方的表格创建一个账户。</li>
+          <li>
+            如果您已经拥有了一个账户，您可以使用您的用户名和密码
+            登陆您的账户，之后可以在用户设置中将账户与您的ID关联。
+          </li>
+        </ul>
       continue: 注册
       terms accepted: 感谢您接受新的贡献条款！
       terms declined: 我们很遗憾您已决定不接受新的贡献者条款。有关详细信息，请参阅<a href="%{url}">此 wiki 页面</a>.
@@ -1757,6 +1791,7 @@ zh-CN:
       current email address: 当前电子邮件地址：
       new email address: 新电子邮件地址：
       email never displayed publicly: (从不公开显示)
+      external auth: 外部身份验证：
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: 这是什么？
@@ -1822,6 +1857,7 @@ zh-CN:
       button: 确认
       success: 已确认您对电子邮件地址的更改！
       failure: 具有此令牌的电子邮件地址已经确认过了。
+      unknown_token: 那个确认代码已过期或不存在。
     set_home:
       flash success: 成功保存您所在位置
     go_public:
@@ -1865,6 +1901,7 @@ zh-CN:
         </p>
     auth_failure:
       connection_failed: 连接身份验证提供方失败
+      invalid_credentials: 无效的身份验证凭证
   user_role:
     filter:
       not_an_administrator: 只有管理员可以执行用户角色管理，而您不是管理员。

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 26165e69774f8ffb2764367164bba5831acaa131..d1cdb67b8c5c71a25339fad3f8a1c2c484a34e27 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -15,6 +15,7 @@
 # Author: Mywood
 # Author: Orinx
 # Author: Pesder
+# Author: Ruila
 # Author: Shangkuanlc
 # Author: Simon Shek
 # Author: StephDC
@@ -208,7 +209,7 @@ zh-TW:
     note:
       title: 節點：%{id}
       new_note: 新增節點
-      description: '描述:'
+      description: 描述
       open_title: '未解決的筆記: #%{note_name}'
       closed_title: 已解決的筆記：#%{note_name}
       hidden_title: 已隱藏的筆記：#%{note_name}
@@ -1056,6 +1057,8 @@ zh-TW:
       url: /welcome
       title: 歡迎來到 OSM
       description: 這個快速指南涵蓋了 OpenStreetMap 基礎知識。
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Zh-hant:Beginners%27_guide
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org