Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 73e0085434d4be09bc3bf8a6ba5d77193e3cdca0..2aa2318a0f8e47c42d3a8b6c1e2effd92a49a543 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -103,7 +103,7 @@ af:
         title: Onderwerp
         latitude: Breedtegraad
         longitude: Lengtegraad
         title: Onderwerp
         latitude: Breedtegraad
         longitude: Lengtegraad

-        language: Taal
+        language_code: Taal

       doorkeeper/application:
         name: Naam
         scopes: Regte
       doorkeeper/application:
         name: Naam
         scopes: Regte


@@ -559,13 +559,10 @@ af:
     search:
       title:
         latlon_html: Resultate vanaf <a href="https://openstreetmap.org/">intern</a>
     search:
       title:
         latlon_html: Resultate vanaf <a href="https://openstreetmap.org/">intern</a>

-        ca_postcode_html: Resultate vanaf <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultate vanaf <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultate vanaf <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultate vanaf <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultate vanaf <a href="https://nominatim.openstreetmap.org/">
           OpenStreetMap Nominatim</a>
         osm_nominatim_reverse_html: Resultate vanaf <a href="https://nominatim.openstreetmap.org/">
           OpenStreetMap Nominatim</a>

-        geonames_reverse_html: Uitslae vanaf <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index dc4daf0e16a4dc557e2d4ea30ff4f393b06d0e92..b220674302f6fb12a473eee2c5471a6bc9a6e895 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -81,7 +81,7 @@ aln:
         title: Titulli
         latitude: Gjerësi
         longitude: Gjatësi
         title: Titulli
         latitude: Gjerësi
         longitude: Gjatësi

-        language: Gjuha
+        language_code: Gjuha

       friend:
         user: Përdorues
         friend: Mik
       friend:
         user: Përdorues
         friend: Mik


@@ -296,10 +296,8 @@ aln:
     search:
       title:
         latlon_html: Rezultatet prej <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Rezultatet prej <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Rezultatet prej <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Rezultatet prej <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Rezultatet prej <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Rezultatet prej <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         amenity:
     search_osm_nominatim:
       prefix:
         amenity:

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index b3c93d700aed9d7831952c514935a0e56a8f28c2..bc899a4844802f8deae0b957cd249735aee74eb1 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -139,7 +139,7 @@ ar:
         title: الموضوع
         latitude: خط العرض
         longitude: خط الطول
         title: الموضوع
         latitude: خط العرض
         longitude: خط الطول

-        language: اللغة
+        language_code: اللغة

       doorkeeper/application:
         name: الاسم
         confidential: تطبيق سري؟
       doorkeeper/application:
         name: الاسم
         confidential: تطبيق سري؟


@@ -610,13 +610,10 @@ ar:
     search:
       title:
         latlon_html: نتائج من  <a href="https://openstreetmap.org/">الداخلية</a>
     search:
       title:
         latlon_html: نتائج من  <a href="https://openstreetmap.org/">الداخلية</a>

-        ca_postcode_html: نتائج من <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: نتائج من <a href="https://nominatim.openstreetmap.org/">Nominatim
           خريطة الشارع المفتوحة</a>
         osm_nominatim_html: نتائج من <a href="https://nominatim.openstreetmap.org/">Nominatim
           خريطة الشارع المفتوحة</a>

-        geonames_html: نتائج من <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: نتائج من <a href="https://nominatim.openstreetmap.org/">Nominatim
           خريطة الشارع المفتوحة</a>
         osm_nominatim_reverse_html: نتائج من <a href="https://nominatim.openstreetmap.org/">Nominatim
           خريطة الشارع المفتوحة</a>

-        geonames_reverse_html: نتائج من <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 970c83db68c322dbe885158cdff9e0c7b26e846d..cf65e107c69b72e793f15604cbfea25c0ec2e131 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -69,7 +69,7 @@ arz:
         title: العنوان
         latitude: خط العرض
         longitude: خط الطول
         title: العنوان
         latitude: خط العرض
         longitude: خط الطول

-        language: اللغة
+        language_code: اللغة

       friend:
         user: المستخدم
         friend: صديق
       friend:
         user: المستخدم
         friend: صديق


@@ -259,10 +259,8 @@ arz:
     search:
       title:
         latlon_html: نتائج <a href="http://openstreetmap.org/">داخليًا</a>
     search:
       title:
         latlon_html: نتائج <a href="http://openstreetmap.org/">داخليًا</a>

-        ca_postcode_html: نتائج من <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: نتائج من <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: نتائج من <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: نتائج من <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         amenity:
     search_osm_nominatim:
       prefix:
         amenity:

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 89a7ee5c256649df46a7062bfedc7e77f539fffb..fadeee704813cf6d09267fa09a63d06c2b899dc6 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -91,7 +91,7 @@ ast:
         title: Asuntu
         latitude: Llatitú
         longitude: Llonxitú
         title: Asuntu
         latitude: Llatitú
         longitude: Llonxitú

-        language: Llingua
+        language_code: Llingua

       friend:
         user: Usuariu
         friend: Amigu
       friend:
         user: Usuariu
         friend: Amigu


@@ -527,13 +527,10 @@ ast:
     search:
       title:
         latlon_html: Resultaos <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon_html: Resultaos <a href="https://openstreetmap.org/">internos</a>

-        ca_postcode_html: Resultaos de <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultaos de <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultaos de <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 51291720afe191d363443eb0bbe4ef6941f65e87..9868cb75509656eaf507abfed42535af000604f7 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -88,7 +88,7 @@ az:
         title: Mövzu
         latitude: En dairəsi
         longitude: Uzunluq dairəsi
         title: Mövzu
         latitude: En dairəsi
         longitude: Uzunluq dairəsi

-        language: Dil
+        language_code: Dil

       friend:
         user: İstifadəçi
         friend: Dost
       friend:
         user: İstifadəçi
         friend: Dost


@@ -350,10 +350,8 @@ az:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Daxili nəticələr</a>
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Daxili nəticələr</a>

-        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</a> nəticələri

         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> nəticələri
         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> nəticələri

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> nəticələri

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 02119391d078dd2fa487776ad4577358fd428c35..a312814ef7120e40bed4630e337b7f1e6b484048 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -108,7 +108,7 @@ ba:
         title: Тема
         latitude: Киңлек
         longitude: Оҙонлоҡ
         title: Тема
         latitude: Киңлек
         longitude: Оҙонлоҡ

-        language: Тел
+        language_code: Тел

       doorkeeper/application:
         name: Исем
         redirect_uri: Яңынан йүнәлтеү
       doorkeeper/application:
         name: Исем
         redirect_uri: Яңынан йүнәлтеү


@@ -557,15 +557,10 @@ ba:
         latlon_html: |2-
 
           <a href="http://openstreetmap.org/">эсендәге һөҙөмтәләр</a>
         latlon_html: |2-
 
           <a href="http://openstreetmap.org/">эсендәге һөҙөмтәләр</a>

-        ca_postcode_html: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>алынған
-          һөҙөмтәләр

         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>нан сыҡҡан һөҙөмтәләр
         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>нан сыҡҡан һөҙөмтәләр

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>нан сыҡҡан һөҙөмтәләр

         osm_nominatim_reverse_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>нан һөҙөмтәләр
         osm_nominatim_reverse_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>нан һөҙөмтәләр

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a>нан
-          сыҡҡан һөҙөмтәләр

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 1856c3ea3d38498550c6cae28175bc8645bad83c..3fcf255b4b8aebc21861f181193bb1093bd7f774 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -102,7 +102,7 @@ be-Tarask:
         title: Тэма
         latitude: Шырата
         longitude: Даўгата
         title: Тэма
         latitude: Шырата
         longitude: Даўгата

-        language: Мова
+        language_code: Мова

       doorkeeper/application:
         name: Назва
         redirect_uri: URI перанакіраваньняў
       doorkeeper/application:
         name: Назва
         redirect_uri: URI перанакіраваньняў


@@ -502,10 +502,8 @@ be-Tarask:
     search:
       title:
         latlon_html: Вынікі з <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Вынікі з <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Вынікі з <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Вынікі з <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Вынікі з <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Вынікі з <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 1677803141f3edefe917d22144a5472d4e301935..7f34508285e69b837f6ef4875f9f71456dc8e24e 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -103,7 +103,7 @@ be:
         title: Загаловак
         latitude: Шырата
         longitude: Даўгата
         title: Загаловак
         latitude: Шырата
         longitude: Даўгата

-        language: Мова
+        language_code: Мова

       friend:
         user: Карыстальнік
         friend: Сябар
       friend:
         user: Карыстальнік
         friend: Сябар


@@ -364,8 +364,8 @@ be:
         changeset: пакет правак
         note: заўвага
     timeout:
         changeset: пакет правак
         note: заўвага
     timeout:

-      sorry: Ð\9fÑ\80абаÑ\87Ñ\86е, данÑ\8bÑ\8f длÑ\8f %{type} з Ñ\96дÑ\8dнÑ\82Ñ\8bÑ\84Ñ\96каÑ\82аÑ\80ам %{id} занÑ\8fлÑ\96 Ñ\88маÑ\82 Ñ\87аÑ\81Ñ\83
-        да аÑ\82Ñ\80Ñ\8bманнÑ\8f.
+      sorry: Ð\9fÑ\80абаÑ\87Ñ\86е, аÑ\82Ñ\80Ñ\8bманне данÑ\8bÑ\85 длÑ\8f %{type} з Ñ\96дÑ\8dнÑ\82Ñ\8bÑ\84Ñ\96каÑ\82аÑ\80ам %{id} занÑ\8fла
+        заÑ\88маÑ\82 Ñ\87аÑ\81Ñ\83.

       type:
         node: пункт
         way: лінія
       type:
         node: пункт
         way: лінія


@@ -565,13 +565,10 @@ be:
     search:
       title:
         latlon_html: Вынікі з <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Вынікі з <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Вынікі з <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Вынікі з <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Вынікі з <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 99595ca73227b510e0d4000a58679ed27940496b..38a815df998a6523febb696e994703984512da22 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -107,7 +107,7 @@ bg:
         title: Тема
         latitude: Географска ширина
         longitude: Географска дължина
         title: Тема
         latitude: Географска ширина
         longitude: Географска дължина

-        language: Език
+        language_code: Език

       doorkeeper/application:
         name: Име
       friend:
       doorkeeper/application:
         name: Име
       friend:


@@ -520,13 +520,10 @@ bg:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Вътрешни</a> резултати
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Вътрешни</a> резултати

-        ca_postcode_html: Резултати от <a href="https://geocoder.us/">Geocoder.CA</a>

         osm_nominatim_html: Резултати от <a href="https://nominatim.openstreetmap.org">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Резултати от <a href="https://nominatim.openstreetmap.org">OpenStreetMap
           Nominatim</a>

-        geonames_html: Резултати от <a href="https://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Резултати от <a href="https://nominatim.openstreetmap.org">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Резултати от <a href="https://nominatim.openstreetmap.org">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Резултати от <a href="https://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 149bd9086b4803e63649887e5cd9d2c9aaa4c302..ef5d46df827c1bd8a7b09b91c21ef320f0a9464e 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -121,7 +121,7 @@ bn:
         title: বিষয়
         latitude: অক্ষাংশ
         longitude: দ্রাঘিমাংশ
         title: বিষয়
         latitude: অক্ষাংশ
         longitude: দ্রাঘিমাংশ

-        language: ভাষা
+        language_code: ভাষা

       doorkeeper/application:
         name: নাম
         redirect_uri: ওয়েব ঠিকানা পুনর্নির্দেশ
       doorkeeper/application:
         name: নাম
         redirect_uri: ওয়েব ঠিকানা পুনর্নির্দেশ


@@ -649,14 +649,10 @@ bn:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">অভ্যন্তরীণ</a> থেকে ফলাফলগুলি
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">অভ্যন্তরীণ</a> থেকে ফলাফলগুলি

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> থেকে ফলাফলগুলি

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">ওপেনস্ট্রিটম্যাপ
           নমিনাতিম</a> থেকে ফলাফলগুলি
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">ওপেনস্ট্রিটম্যাপ
           নমিনাতিম</a> থেকে ফলাফলগুলি

-        geonames_html: <a href="http://www.geonames.org/">জিওনেমস</a> থেকে ফলাফল

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">ওপেনস্ট্রিটম্যাপ
           Nominatim</a> থেকে ফলাফল
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">ওপেনস্ট্রিটম্যাপ
           Nominatim</a> থেকে ফলাফল

-        geonames_reverse_html: <a href="http://www.geonames.org/">জিওনেমস</a> থেকে
-          ফলাফল

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 81559766b9ba9c6f2af54b2bf78c8315edf3a3db..677aa0a178a7a9f5e9501fd36ce263268413d281 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -109,7 +109,7 @@ br:
         title: Danvez
         latitude: Lec'hed
         longitude: Hedred
         title: Danvez
         latitude: Lec'hed
         longitude: Hedred

-        language: Yezh
+        language_code: Yezh

       doorkeeper/application:
         name: Anv
         redirect_uri: Adkas an URLoù
       doorkeeper/application:
         name: Anv
         redirect_uri: Adkas an URLoù


@@ -647,13 +647,10 @@ br:
     search:
       title:
         latlon_html: Disoc'hoù diwar <a href="https://openstreetmap.org/">Diabarzh</a>
     search:
       title:
         latlon_html: Disoc'hoù diwar <a href="https://openstreetmap.org/">Diabarzh</a>

-        ca_postcode_html: Disoc'hoù diwar <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 16ad1db35eb398beb00f8f16e26a4386e103eefb..007e3ef08915417b41d06d54efe86c9f11870bdf 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -100,7 +100,7 @@ bs:
         title: Predmet
         latitude: Geografska širina (Latitude)
         longitude: Geografska dužina (Longitude)
         title: Predmet
         latitude: Geografska širina (Latitude)
         longitude: Geografska dužina (Longitude)

-        language: Jezik
+        language_code: Jezik

       doorkeeper/application:
         name: Naziv
       friend:
       doorkeeper/application:
         name: Naziv
       friend:


@@ -404,11 +404,8 @@ bs:
     search:
       title:
         latlon_html: Rezultati sa <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Rezultati sa <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Rezultati sa <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Rezultati sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Rezultati sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Rezultati sa <a href="http://www.geonames.org/">GeoNames</a>
-        geonames_reverse_html: Rezultati sa <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d269eaba3b20beedbd282e8962ed63d352211aba..d27d36a8fe22e82504848dde30e562f002c4f0fc 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -140,7 +140,7 @@ ca:
         title: Tema
         latitude: Latitud
         longitude: Longitud
         title: Tema
         latitude: Latitud
         longitude: Longitud

-        language: Llengua
+        language_code: Llengua

       doorkeeper/application:
         name: Nom
         redirect_uri: Redirigeix URIs
       doorkeeper/application:
         name: Nom
         redirect_uri: Redirigeix URIs


@@ -659,13 +659,10 @@ ca:
     search:
       title:
         latlon_html: Resultats <a href="http://openstreetmap.org/">interns</a>
     search:
       title:
         latlon_html: Resultats <a href="http://openstreetmap.org/">interns</a>

-        ca_postcode_html: Resultats de <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultats d’<a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultats d’<a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultats de <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultats d’<a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultats d’<a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultats de <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 383a59185ccb0714e24974feca891e8a90c96686..a649a783538c3a7f72718bae6eae7d25b18fb4bf 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -79,7 +79,7 @@ ce:
         title: Тема
         latitude: Шоралла
         longitude: Дохалла
         title: Тема
         latitude: Шоралла
         longitude: Дохалла

-        language: Мотт
+        language_code: Мотт

       friend:
         user: Декъашхо
         friend: ДоттагӀ
       friend:
         user: Декъашхо
         friend: ДоттагӀ


@@ -431,13 +431,10 @@ ce:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Чоьхьара хилам</a>
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Чоьхьара хилам</a>

-        ca_postcode_html: Хилам <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Хиламаш бела <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> чура
         osm_nominatim_html: Хиламаш бела <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> чура

-        geonames_html: Хиламаш <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Хиламаш <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Хиламаш <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Хиламаш <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f24d093e4ee74b1b3bc7e8e287b2f95b3a98f8f1..ddb56329c0e554f297f11ef0702afbbe0d6f5b38 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -144,7 +144,7 @@ cs:
         title: Nadpis
         latitude: Šířka
         longitude: Délka
         title: Nadpis
         latitude: Šířka
         longitude: Délka

-        language: Jazyk
+        language_code: Jazyk

       doorkeeper/application:
         name: Název
         redirect_uri: URI pro přesměrování
       doorkeeper/application:
         name: Název
         redirect_uri: URI pro přesměrování


@@ -674,13 +674,10 @@ cs:
     search:
       title:
         latlon_html: Výsledky z <a href="https://openstreetmap.org/">interní databáze</a>
     search:
       title:
         latlon_html: Výsledky z <a href="https://openstreetmap.org/">interní databáze</a>

-        ca_postcode_html: Výsledky z <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Výsledky z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Výsledky z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Výsledky z <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Výsledky z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Výsledky z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Výsledky z <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index e7f66db0d75dfd2ca6b8fed5ec1d8df8f266f8cb..10ced9886751eaecd2c18845bdcbb1fbab479992 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -85,7 +85,7 @@ cy:
         title: Pwnc
         latitude: Lledred
         longitude: Hydred
         title: Pwnc
         latitude: Lledred
         longitude: Hydred

-        language: Iaith
+        language_code: Iaith

       doorkeeper/application:
         name: Enw
       friend:
       doorkeeper/application:
         name: Enw
       friend:


@@ -463,13 +463,10 @@ cy:
     search:
       title:
         latlon_html: Canlyniadau o <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Canlyniadau o <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Canlyniadau o <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Canlyniadau o <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Canlyniadau o <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/da.yml b/config/locales/da.yml
index dfad183caee891ffe81acc0b5dc94a5264ddd468..cb979c5ee7daf4289784755e8cb816827025a9b7 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -129,7 +129,7 @@ da:
         title: Emne
         latitude: Breddegrad
         longitude: Længdegrad
         title: Emne
         latitude: Breddegrad
         longitude: Længdegrad

-        language: Sprog
+        language_code: Sprog

       doorkeeper/application:
         name: Navn
         redirect_uri: Omdirigerings-URI:jer
       doorkeeper/application:
         name: Navn
         redirect_uri: Omdirigerings-URI:jer


@@ -646,13 +646,10 @@ da:
     search:
       title:
         latlon_html: Resultater fra <a href="https://openstreetmap.org/">interne</a>
     search:
       title:
         latlon_html: Resultater fra <a href="https://openstreetmap.org/">interne</a>

-        ca_postcode_html: Resultater fra <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultater fra <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultater fra <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 00cc34a04640924f5c507bb5eaf007e608580579..5971af9756bc8e043f2afbfb446f310405d9b2f1 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -100,9 +100,12 @@
 # Author: Zauberzunge2000
 ---
 de:
 # Author: Zauberzunge2000
 ---
 de:

+  html:
+    dir: ltr

   time:
     formats:
       friendly: '%e. %B %Y um %H:%M Uhr'
   time:
     formats:
       friendly: '%e. %B %Y um %H:%M Uhr'

+      blog: '%e. %B %Y'

   helpers:
     file:
       prompt: Datei auswählen
   helpers:
     file:
       prompt: Datei auswählen


@@ -190,9 +193,10 @@ de:
       diary_entry:
         user: Benutzer
         title: Betreff
       diary_entry:
         user: Benutzer
         title: Betreff

+        body: Inhalt

         latitude: Breitengrad
         longitude: Längengrad
         latitude: Breitengrad
         longitude: Längengrad

-        language: Sprache
+        language_code: Sprache

       doorkeeper/application:
         name: Name
         redirect_uri: 'Weiterleitungs-URIs:'
       doorkeeper/application:
         name: Name
         redirect_uri: 'Weiterleitungs-URIs:'


@@ -372,6 +376,7 @@ de:
       current email address: Aktuelle E-Mail-Adresse
       external auth: Externe Authentifikation
       openid:
       current email address: Aktuelle E-Mail-Adresse
       external auth: Externe Authentifikation
       openid:

+        link: https://wiki.openstreetmap.org/wiki/DE:OpenID

         link text: Was ist das?
       public editing:
         heading: Öffentliches Bearbeiten
         link text: Was ist das?
       public editing:
         heading: Öffentliches Bearbeiten


@@ -698,6 +703,26 @@ de:
       applications:
         create:
           notice: Anwendung registriert.
       applications:
         create:
           notice: Anwendung registriert.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/DE:Kommunikationskan%C3%A4le
+      contact_url_title: Erklärung verschiedener Kontaktkanäle
+      contact: Kontakt
+      contact_the_community_html: Bitte nehmen Sie %{contact_link} mit der OpenStreetMap-Community
+        auf, wenn Sie einen defekten Link / Fehler gefunden haben. Notieren Sie sich
+        die genaue URL Ihrer Anfrage.
+    forbidden:
+      title: Verboten
+      description: Der von Ihnen angeforderte Vorgang auf dem OpenStreetMap-Server
+        ist nur für Administratoren verfügbar (HTTP 403)
+    internal_server_error:
+      title: Anwendungsfehler
+      description: Der OpenStreetMap-Server ist auf eine unerwartete Bedingung gestoßen,
+        die ihn daran gehindert hat, die Anfrage zu erfüllen (HTTP 500)
+    not_found:
+      title: Datei nicht gefunden
+      description: Konnte keine Datei-/Verzeichnis-/API-Operation mit diesem Namen
+        auf dem OpenStreetMap-Server finden (HTTP 404)

   friendships:
     make_friend:
       heading: '%{user} als Freund hinzufügen?'
   friendships:
     make_friend:
       heading: '%{user} als Freund hinzufügen?'


@@ -716,13 +741,10 @@ de:
     search:
       title:
         latlon_html: Suchergebnisse von <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Suchergebnisse von <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Suchergebnisse von <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Suchergebnisse von <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Ergebnisse von <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -2343,6 +2365,7 @@ de:
         description: Mit einer Organisation Pläne machen für OpenStreetMap? Finde
           heraus, was du wissen musst, auf der Willkommensseite.
       wiki:
         description: Mit einer Organisation Pläne machen für OpenStreetMap? Finde
           heraus, was du wissen musst, auf der Willkommensseite.
       wiki:

+        url: https://wiki.openstreetmap.org/wiki/DE:Hauptseite

         title: OpenStreetMap Wiki
         description: Durchsuche das Wiki für eine ausführliche OSM-Dokumentation.
     potlatch:
         title: OpenStreetMap Wiki
         description: Durchsuche das Wiki für eine ausführliche OSM-Dokumentation.
     potlatch:


@@ -3202,6 +3225,9 @@ de:
         graphhopper_bicycle: Fahrrad (GraphHopper)
         graphhopper_car: Auto (GraphHopper)
         graphhopper_foot: Fuß (GraphHopper)
         graphhopper_bicycle: Fahrrad (GraphHopper)
         graphhopper_car: Auto (GraphHopper)
         graphhopper_foot: Fuß (GraphHopper)

+        fossgis_valhalla_bicycle: Fahrrad (Valhalla)
+        fossgis_valhalla_car: Auto (Valhalla)
+        fossgis_valhalla_foot: Fuß (Valhalla)

       descend: Absteigend
       directions: 'Routenanweisungen:'
       distance: Distanz
       descend: Absteigend
       directions: 'Routenanweisungen:'
       distance: Distanz

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 78e74aeccd1ef3fb087d40da4600d88d1e7b4f8c..08c8c20b494a0d8a019b2b1f04152a25d80eb3e7 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -100,7 +100,7 @@ diq:
         title: Mewzu
         latitude: Verıniye
         longitude: Derganiye
         title: Mewzu
         latitude: Verıniye
         longitude: Derganiye

-        language: Zıwan
+        language_code: Zıwan

       friend:
         user: Karber
         friend: Embaz
       friend:
         user: Karber
         friend: Embaz


@@ -364,10 +364,8 @@ diq:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">OSM</a> ra neticey
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">OSM</a> ra neticey

-        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey

         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
           ra neticey
         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
           ra neticey

-        geonames_html: <a href="http://www.geonames.org/">GeoNames.org</a> ra neticey

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index fe288083e5ad13efd3a70d8fdab99205a650913f..feacc67d49c0a8d0439939ca7fca4ad793c5d465 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -76,7 +76,7 @@ dsb:
         title: Tema
         latitude: Šyrina
         longitude: Dlinina
         title: Tema
         latitude: Šyrina
         longitude: Dlinina

-        language: Rěc
+        language_code: Rěc

       friend:
         user: Wužywaŕ
         friend: Pśijaśel
       friend:
         user: Wužywaŕ
         friend: Pśijaśel


@@ -428,13 +428,10 @@ dsb:
     search:
       title:
         latlon_html: Wuslědki z <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Wuslědki z <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Wuslědki z <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Wuslědki z <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Wuslědki z <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 97b6e8a24414ccf2cdf160c44088c2eaa8efafcd..48c88226f78dfbbf865b5d96372c6276ba29baf6 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -132,7 +132,7 @@ el:
         title: Θέμα
         latitude: Γεωγραφικό πλάτος
         longitude: Γεωγραφικό μήκος
         title: Θέμα
         latitude: Γεωγραφικό πλάτος
         longitude: Γεωγραφικό μήκος

-        language: Γλώσσα
+        language_code: Γλώσσα

       doorkeeper/application:
         name: Όνομα
         redirect_uri: Ανακατεύθυνση URIs
       doorkeeper/application:
         name: Όνομα
         redirect_uri: Ανακατεύθυνση URIs


@@ -663,13 +663,10 @@ el:
       title:
         latlon_html: Αποτελέσματα από την <a href="https://openstreetmap.org/">εσωτερική</a>
           βάση δεδομένων
       title:
         latlon_html: Αποτελέσματα από την <a href="https://openstreetmap.org/">εσωτερική</a>
           βάση δεδομένων

-        ca_postcode_html: Αποτελέσματα από <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Αποτελέσματα από το <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Αποτελέσματα από το <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2751c6e66238fd389aa9235beb6fc40bb0f5ec49..8207cbcfda76b16b62cfe4f61078a1e886e395a3 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -125,7 +125,7 @@ en-GB:
         title: Subject
         latitude: Latitude
         longitude: Longitude
         title: Subject
         latitude: Latitude
         longitude: Longitude

-        language: Language
+        language_code: Language

       friend:
         user: User
         friend: Friend
       friend:
         user: User
         friend: Friend


@@ -556,13 +556,10 @@ en-GB:
     search:
       title:
         latlon_html: Results from <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Results from <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Results from <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

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

         osm_nominatim_reverse_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

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

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 66d7c62545ad6b0c8d328260c208cb3275f6e63f..0569e235d8e7acd07a2b3d822bdc9a0f0ef861d6 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -119,7 +119,7 @@ eo:
         title: Temo
         latitude: Latitudo
         longitude: Longitudo
         title: Temo
         latitude: Latitudo
         longitude: Longitudo

-        language: Lingvo
+        language_code: Lingvo

       doorkeeper/application:
         name: Nomo
         redirect_uri: Alidirektaj retejaj adresoj
       doorkeeper/application:
         name: Nomo
         redirect_uri: Alidirektaj retejaj adresoj


@@ -635,13 +635,10 @@ eo:
     search:
       title:
         latlon_html: Rezultoj el <a href="https://openstreetmap.org/">nia retejo</a>
     search:
       title:
         latlon_html: Rezultoj el <a href="https://openstreetmap.org/">nia retejo</a>

-        ca_postcode_html: Rezultoj el <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Rezultoj el <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Rezultoj el <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 68a4125803d0d96b8654dded8d8760f4398cfceb..ed7b8e7b7d128354832b8cd014f67ca6f843a8fc 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -182,7 +182,7 @@ es:
         title: Asunto
         latitude: Latitud
         longitude: Longitud
         title: Asunto
         latitude: Latitud
         longitude: Longitud

-        language: Idioma
+        language_code: Idioma

       doorkeeper/application:
         name: Nombre
         redirect_uri: Redirigir URI
       doorkeeper/application:
         name: Nombre
         redirect_uri: Redirigir URI


@@ -354,12 +354,12 @@ es:
         retain_changeset_discussions: Sus discusiones sobre el conjunto de cambios,
           si las hay, se conservarán.
         retain_email: Su dirección de correo electrónico se conservará.
         retain_changeset_discussions: Sus discusiones sobre el conjunto de cambios,
           si las hay, se conservarán.
         retain_email: Su dirección de correo electrónico se conservará.

-        confirm_delete: ¿Está seguro?
+        confirm_delete: ¿Lo confirma?

         cancel: Cancelar
   accounts:
     edit:
       title: Editar cuenta
         cancel: Cancelar
   accounts:
     edit:
       title: Editar cuenta

-      my settings: Mis preferencias
+      my settings: Mi configuración

       current email address: Dirección de correo electrónico actual
       external auth: Autenticación externa
       openid:
       current email address: Dirección de correo electrónico actual
       external auth: Autenticación externa
       openid:


@@ -678,8 +678,8 @@ es:
         description: Entradas recientes en los diarios de los usuarios de OpenStreetMap
     comments:
       title: Comentarios diarios añadidos por %{user}
         description: Entradas recientes en los diarios de los usuarios de OpenStreetMap
     comments:
       title: Comentarios diarios añadidos por %{user}

-      heading: Comentarios diarios de %{user}
-      subheading_html: Comentarios diarios añadidos por %{user}
+      heading: Comentarios del diario de %{user}
+      subheading_html: Comentarios del diario añadidos por %{user}

       no_comments: Ningún comentario diario
       post: Publicación
       when: Cuando
       no_comments: Ningún comentario diario
       post: Publicación
       when: Cuando


@@ -709,13 +709,10 @@ es:
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>

-        ca_postcode_html: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultados de <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultados de <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -1581,7 +1578,7 @@ es:
         diary_comment:
           spam_label: Este comentario del diario es/contiene spam
           offensive_label: Este comentario del diario es obsceno/ofensivo
         diary_comment:
           spam_label: Este comentario del diario es/contiene spam
           offensive_label: Este comentario del diario es obsceno/ofensivo

-          threat_label: Este comentario diario contiene una amenaza
+          threat_label: Este comentario del diario contiene una amenaza

           other_label: Otro
         user:
           spam_label: Este perfil de usuario es/contiene spam
           other_label: Otro
         user:
           spam_label: Este perfil de usuario es/contiene spam


@@ -2005,6 +2002,7 @@ es:
       suspended: Lo sentimos, su cuenta ha sido suspendida debido a actividad sospechosa.
       contact_support_html: Póngase en contacto con %{support_link} si desea discutir
         sobre esto.
       suspended: Lo sentimos, su cuenta ha sido suspendida debido a actividad sospechosa.
       contact_support_html: Póngase en contacto con %{support_link} si desea discutir
         sobre esto.

+      support: el servicio técnico

   shared:
     markdown_help:
       title_html: Analizado con <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
   shared:
     markdown_help:
       title_html: Analizado con <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 5561aadfb6218368a5bac9ce5764233f1b8d445f..22458a2712f3ebe7704d7f244791f6e11a0ad561 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -96,7 +96,7 @@ et:
         title: Teema
         latitude: Laius
         longitude: Pikkus
         title: Teema
         latitude: Laius
         longitude: Pikkus

-        language: Keel
+        language_code: Keel

       doorkeeper/application:
         name: Nimi
         redirect_uri: Ümbersuunamise URI-d
       doorkeeper/application:
         name: Nimi
         redirect_uri: Ümbersuunamise URI-d


@@ -586,13 +586,10 @@ et:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Sisemised</a> tulemused
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Sisemised</a> tulemused

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> tulemused

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimi</a> tulemused
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimi</a> tulemused

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>i tulemused

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimi</a> tulemused
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimi</a> tulemused

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNamesi</a> tulemused

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index c00d9e3d583ccfbc8f1d08782a16d5e3cd588742..39305d1285ef84508e876d815413fa3aa27b433b 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -113,7 +113,7 @@ eu:
         title: Gaia
         latitude: Latitude
         longitude: Longitude
         title: Gaia
         latitude: Latitude
         longitude: Longitude

-        language: Hizkuntza
+        language_code: Hizkuntza

       doorkeeper/application:
         name: Izena
         redirect_uri: Birbideratu URIak
       doorkeeper/application:
         name: Izena
         redirect_uri: Birbideratu URIak


@@ -644,13 +644,10 @@ eu:
     search:
       title:
         latlon_html: 'Emaitzak hemendik: <a href="http://openstreetmap.org/">Internal</a>'
     search:
       title:
         latlon_html: 'Emaitzak hemendik: <a href="http://openstreetmap.org/">Internal</a>'

-        ca_postcode_html: 'Emaitzak hemendik: <a href="http://geocoder.ca/">Geocoder.CA</a>'

         osm_nominatim_html: 'Emaitzak hemendik: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>'
         osm_nominatim_html: 'Emaitzak hemendik: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>'

-        geonames_html: 'Emaitzak hemendik: <a href="http://www.geonames.org/">GeoNames</a>'

         osm_nominatim_reverse_html: 'Emaitzak hemendik: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>'
         osm_nominatim_reverse_html: 'Emaitzak hemendik: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>'

-        geonames_reverse_html: 'Emaitzak hemendik: <a href="http://www.geonames.org/">GeoNames</a>'

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f4e82219d96c5b4900acb28a16fab3c8ad0f5d15..592e06e043a758909c230537bf8324810ec81141 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -140,7 +140,7 @@ fa:
         title: عنوان
         latitude: عرض جغرافیایی
         longitude: طول جغرافیایی
         title: عنوان
         latitude: عرض جغرافیایی
         longitude: طول جغرافیایی

-        language: زبان
+        language_code: زبان

       doorkeeper/application:
         name: نام
         redirect_uri: URIهای تغییرمسیر
       doorkeeper/application:
         name: نام
         redirect_uri: URIهای تغییرمسیر


@@ -656,13 +656,10 @@ fa:
     search:
       title:
         latlon_html: نتایج <a href="https://openstreetmap.org/">داخلی</a>
     search:
       title:
         latlon_html: نتایج <a href="https://openstreetmap.org/">داخلی</a>

-        ca_postcode_html: نتایج <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: نتایج <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: نتایج <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: نتایج <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: نتایج <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: نتایج <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: نتایج <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 6d9e2b7fbf3e6b772e5385e73542256449227514..ebcab6b3f368bdf80ca257141d38f841913cac45 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -147,7 +147,7 @@ fi:
         title: Aihe
         latitude: Leveyspiiri
         longitude: Pituuspiiri
         title: Aihe
         latitude: Leveyspiiri
         longitude: Pituuspiiri

-        language: Kieli
+        language_code: Kieli

       doorkeeper/application:
         name: Nimi
         confidential: Korkean tietoturvariskin sovellus
       doorkeeper/application:
         name: Nimi
         confidential: Korkean tietoturvariskin sovellus


@@ -654,13 +654,10 @@ fi:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Sisäiset</a> tulokset
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Sisäiset</a> tulokset

-        ca_postcode_html: Tulokset palvelusta <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Tulokset <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>
         osm_nominatim_html: Tulokset <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>

-        geonames_html: Tulokset palvelusta <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Hakutulokset <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>
         osm_nominatim_reverse_html: Hakutulokset <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>

-        geonames_reverse_html: Hakutulokset <a href="http://www.geonames.org/">GeoNamesista</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 177017553e1dac4a2804e5cfeeb29bc34ffce4e9..24b03284e4e2a91afda261a90f095f58ebb0ff1b 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -80,7 +80,7 @@ fit:
         title: Aihe
         latitude: Leveyspiiri
         longitude: Pituuspiiri
         title: Aihe
         latitude: Leveyspiiri
         longitude: Pituuspiiri

-        language: Kieli
+        language_code: Kieli

       friend:
         user: Käyttäjä
         friend: Ystävä
       friend:
         user: Käyttäjä
         friend: Ystävä


@@ -462,13 +462,10 @@ fit:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Sisäiset</a> resyltaatit
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Sisäiset</a> resyltaatit

-        ca_postcode_html: Resyltaatit palvelusta <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resyltaatit <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>
         osm_nominatim_html: Resyltaatit <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>

-        geonames_html: Resyltaatit palvelusta <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Hakuresyltaatit <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>
         osm_nominatim_reverse_html: Hakuresyltaatit <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>

-        geonames_reverse_html: Hakuresyltaatit <a href="http://www.geonames.org/">GeoNamesista</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0c9cd401eaaa13f13a5e094749894dc873ff74aa..085ae6ecc67b0466c4b57957e6aa4bc1488aae34 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -182,9 +182,10 @@ fr:
       diary_entry:
         user: Utilisateur
         title: Sujet
       diary_entry:
         user: Utilisateur
         title: Sujet

+        body: Corps

         latitude: Latitude
         longitude: Longitude
         latitude: Latitude
         longitude: Longitude

-        language: Langue
+        language_code: Langue

       doorkeeper/application:
         name: Nom
         redirect_uri: Rediriger les URI
       doorkeeper/application:
         name: Nom
         redirect_uri: Rediriger les URI


@@ -708,6 +709,26 @@ fr:
       applications:
         create:
           notice: Application inscrite.
       applications:
         create:
           notice: Application inscrite.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/FR:Canaux_de_contact
+      contact_url_title: Différents canaux de contact expliqués
+      contact: contacter
+      contact_the_community_html: N'hésitez pas à %{contact_link} la communauté OpenStreetMap
+        si vous avez trouvé un lien cassé ou une anomalie. Notez l’URL exacte de votre
+        demande.
+    forbidden:
+      title: Interdit
+      description: L’opération que vous avez demandée sur le serveur OpenStreetMap
+        n’est disponible que pour les administrateurs (HTTP 403).
+    internal_server_error:
+      title: Erreur de l’application
+      description: Le serveur d’autorisation a rencontré une condition inattendue
+        qui l’a empêché d’achever la requête (HTTP 500).
+    not_found:
+      title: Fichier introuvable
+      description: Impossible de trouver un fichier, un répertoire ou une opération
+        de l’API portant ce nom sur le serveur OpenStreetMap (HTTP 404).

   friendships:
     make_friend:
       heading: Ajouter %{user} en tant qu’ami(e) ?
   friendships:
     make_friend:
       heading: Ajouter %{user} en tant qu’ami(e) ?


@@ -726,13 +747,10 @@ fr:
     search:
       title:
         latlon_html: Résultats <a href="https://openstreetmap.org/">internes</a>
     search:
       title:
         latlon_html: Résultats <a href="https://openstreetmap.org/">internes</a>

-        ca_postcode_html: Résultats venant de <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Résultats venant de <a href="https://nominatim.openstreetmap.org/">Nominatim
           sur OpenStreetMap</a>
         osm_nominatim_html: Résultats venant de <a href="https://nominatim.openstreetmap.org/">Nominatim
           sur OpenStreetMap</a>

-        geonames_html: Résultats venant de <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Résultats venant de <a href="https://nominatim.openstreetmap.org/">Nominatim
           sur OpenStreetMap</a>
         osm_nominatim_reverse_html: Résultats venant de <a href="https://nominatim.openstreetmap.org/">Nominatim
           sur OpenStreetMap</a>

-        geonames_reverse_html: Résultats venant de <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix_format: '%{name}'
       prefix:
     search_osm_nominatim:
       prefix_format: '%{name}'
       prefix:


@@ -3216,6 +3234,8 @@ fr:
       descend: Décroissant
       directions: Itinéraire
       distance: Distance
       descend: Décroissant
       directions: Itinéraire
       distance: Distance

+      distance_m: '%{distance} m'
+      distance_km: '%{distance} km'

       errors:
         no_route: Impossible de trouver une route entre ces deux lieux.
         no_place: Désolé, impossible de trouver « %{place} ».
       errors:
         no_route: Impossible de trouver une route entre ces deux lieux.
         no_place: Désolé, impossible de trouver « %{place} ».

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 1023859407419871d31727fdf26c3b7c560c966b..d0c3c753a5cc2ba19d6f85a0b1852e3ca7dda33e 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -93,7 +93,7 @@ fur:
         title: Sogjet
         latitude: Latitudin
         longitude: Longjitudin
         title: Sogjet
         latitude: Latitudin
         longitude: Longjitudin

-        language: Lenghe
+        language_code: Lenghe

       doorkeeper/application:
         name: Non
         confidential: Aplicazion confidenziâl?
       doorkeeper/application:
         name: Non
         confidential: Aplicazion confidenziâl?


@@ -542,13 +542,10 @@ fur:
       title:
         latlon_html: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît
           interni</a>
       title:
         latlon_html: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît
           interni</a>

-        ca_postcode_html: Risultâts cjolts di <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Risultâts cjolts di <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Risultâts di <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index c75cd505e868052f205e3ab54bcf859c89691c16..704408d087694e862fd758f2c4bbe67082fed563 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -98,7 +98,7 @@ fy:
         title: Underwerp
         latitude: Breedtegraad
         longitude: Lingtegraad
         title: Underwerp
         latitude: Breedtegraad
         longitude: Lingtegraad

-        language: Taal
+        language_code: Taal

       doorkeeper/application:
         name: Namme
         redirect_uri: Trochferwiis-URI's
       doorkeeper/application:
         name: Namme
         redirect_uri: Trochferwiis-URI's


@@ -612,13 +612,10 @@ fy:
     search:
       title:
         latlon_html: Treffers <a href="https://openstreetmap.org/">yntern</a>
     search:
       title:
         latlon_html: Treffers <a href="https://openstreetmap.org/">yntern</a>

-        ca_postcode_html: Treffers fan <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Treffers fan <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Treffers fan <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Treffers fan <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Treffers fan <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Treffers fan <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Treffers fan <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index c6509a969e5932676ff6f148da454e3bd89d1449..f92fbd4b3095d8083cc731c533918e84c1418ddf 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -96,7 +96,7 @@ ga:
         title: Ábhar
         latitude: Domhanleithead
         longitude: Domhanfhad
         title: Ábhar
         latitude: Domhanleithead
         longitude: Domhanfhad

-        language: Teanga
+        language_code: Teanga

       friend:
         user: Úsáideoir
         friend: Cara
       friend:
         user: Úsáideoir
         friend: Cara


@@ -481,13 +481,10 @@ ga:
     search:
       title:
         latlon_html: Torthaí <a href="https://openstreetmap.org/">Inmheánacha</a>
     search:
       title:
         latlon_html: Torthaí <a href="https://openstreetmap.org/">Inmheánacha</a>

-        ca_postcode_html: Torthaí ó <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Torthaí ó <a href="https://nominatim.openstreetmap.org/">Nominatim
           OpenStreetMap</a>
         osm_nominatim_html: Torthaí ó <a href="https://nominatim.openstreetmap.org/">Nominatim
           OpenStreetMap</a>

-        geonames_html: Torthaí ó <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Torthaí ó <a href="https://nominatim.openstreetmap.org/">Nominatim
           OpenStreetMap</a>
         osm_nominatim_reverse_html: Torthaí ó <a href="https://nominatim.openstreetmap.org/">Nominatim
           OpenStreetMap</a>

-        geonames_reverse_html: Torthaí ó <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 295dbd0e7fef7a91c9de96ae92181f8a76790afa..130969c9cc12037c4e0762b063b79595d3252739 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -76,7 +76,7 @@ gd:
         title: Cuspair
         latitude: Domhan-leud
         longitude: Domhan-fhad
         title: Cuspair
         latitude: Domhan-leud
         longitude: Domhan-fhad

-        language: Cànan
+        language_code: Cànan

       friend:
         user: Cleachdaiche
         friend: Caraid
       friend:
         user: Cleachdaiche
         friend: Caraid


@@ -466,13 +466,10 @@ gd:
     search:
       title:
         latlon_html: Toraidhean on <a href="http://openstreetmap.org/">taobh a-staigh</a>
     search:
       title:
         latlon_html: Toraidhean on <a href="http://openstreetmap.org/">taobh a-staigh</a>

-        ca_postcode_html: Toraidhean o <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Toraidhean o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Toraidhean o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Toraidhean o <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Toraidhean o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Toraidhean o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Toraidhean o <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 8d403e540fb52c1cb57396dcd82ddd75bb44066c..5043e5339e7227ae1ad37e5e4550053261728ae1 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -109,7 +109,7 @@ gl:
         title: Asunto
         latitude: Latitude
         longitude: Lonxitude
         title: Asunto
         latitude: Latitude
         longitude: Lonxitude

-        language: Lingua
+        language_code: Lingua

       doorkeeper/application:
         name: Nome
         redirect_uri: Redirixir URIs
       doorkeeper/application:
         name: Nome
         redirect_uri: Redirixir URIs


@@ -635,13 +635,10 @@ gl:
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>

-        ca_postcode_html: Resultados dende <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultados dende <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultados dende <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultados dende <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultados dende <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultados dende <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultados dende <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index c1b9162237449c981c0e0c71ea8fd3e65d30ef7c..64c030f6b60b02ef67f7cfa3e2e69e6ae77c4730 100644 (file)
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -54,7 +54,7 @@ gsw:
         title: Beträff
         latitude: Geografischi Breit
         longitude: Geografischi Läng
         title: Beträff
         latitude: Geografischi Breit
         longitude: Geografischi Läng

-        language: Sprooch
+        language_code: Sprooch

       friend:
         user: Benutzer
         friend: Fraind
       friend:
         user: Benutzer
         friend: Fraind

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 988abb9ae84803e856fb8d23b857becf99df5fc6..3a3d93ef6cd413ae0d12195b4ace354a16f393e9 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -134,7 +134,7 @@ he:
         title: נושא
         latitude: קו רוחב
         longitude: קו אורך
         title: נושא
         latitude: קו רוחב
         longitude: קו אורך

-        language: שפה
+        language_code: שפה

       doorkeeper/application:
         name: שם
         redirect_uri: כתובת URL של הפניה
       doorkeeper/application:
         name: שם
         redirect_uri: כתובת URL של הפניה


@@ -672,13 +672,10 @@ he:
     search:
       title:
         latlon_html: תוצאות <a href="https://openstreetmap.org/">מתוך האתר הזה</a>
     search:
       title:
         latlon_html: תוצאות <a href="https://openstreetmap.org/">מתוך האתר הזה</a>

-        ca_postcode_html: תוצאות מאתר <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: תוצאות מאתר <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: תוצאות מאתר <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: תוצאות מאתר <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: תוצאות מ־<a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: תוצאות מ־<a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: תוצאות מ־<a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index e49f3f667a64bdf2e999bc02006cd89928f7d11d..4ad091f32968c467e2aa952ed0e2e3becd8e2ceb 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -9,6 +9,7 @@
 # Author: Contrapunctus
 # Author: Danieldegroot2
 # Author: Innocentbunny
 # Author: Contrapunctus
 # Author: Danieldegroot2
 # Author: Innocentbunny

+# Author: McDutchie

 # Author: Nitin1485
 # Author: Prong$31
 # Author: Rajatkatiyar10
 # Author: Nitin1485
 # Author: Prong$31
 # Author: Rajatkatiyar10


@@ -113,7 +114,7 @@ hi:
         title: विषय
         latitude: अक्षांश
         longitude: देशांतर
         title: विषय
         latitude: अक्षांश
         longitude: देशांतर

-        language: भाषा
+        language_code: भाषा

       doorkeeper/application:
         name: नाम
         scopes: अनुमतियां
       doorkeeper/application:
         name: नाम
         scopes: अनुमतियां


@@ -528,6 +529,9 @@ hi:
       comment: टिप्पणी
       newer_comments: नई प्रतिक्रियाएं
       older_comments: पुरनी प्रतिक्रियाएं
       comment: टिप्पणी
       newer_comments: नई प्रतिक्रियाएं
       older_comments: पुरनी प्रतिक्रियाएं

+  errors:
+    contact:
+      contact: संपर्क

   friendships:
     make_friend:
       heading: क्या आप %{user} को दोस्त बनाना चाहेते हैं?
   friendships:
     make_friend:
       heading: क्या आप %{user} को दोस्त बनाना चाहेते हैं?


@@ -544,14 +548,10 @@ hi:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Internal</a> से अंजाम
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Internal</a> से अंजाम

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> से अंजाम

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> से अंजाम
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> से अंजाम

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> से अंजाम

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> से अंजाम
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> से अंजाम

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> से
-          अंजाम

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 64bc60d7c6b004d9695a90311207a2a53aa80fea..ea62106a0570bfc805280022baff506681fd1426 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -103,7 +103,7 @@ hr:
         title: Naslov
         latitude: Geografska širina (Latitude)
         longitude: Geografska dužina (Longitude)
         title: Naslov
         latitude: Geografska širina (Latitude)
         longitude: Geografska dužina (Longitude)

-        language: Jezik
+        language_code: Jezik

       friend:
         user: Korisnik
         friend: Prijatelj
       friend:
         user: Korisnik
         friend: Prijatelj


@@ -553,13 +553,10 @@ hr:
     search:
       title:
         latlon_html: Rezultati sa stranice <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Rezultati sa stranice <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Rezultati sa stranice <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Rezultati sa stranice <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Rezultati sa stranice <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Rezultati iz <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Rezultati sa stranice <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Rezultati sa stranice <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Rezultati sa stranice <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 3f2dc878c15384e08c5b74fff5878c28ca112f56..99c18bf98c27b47b32b4487362c4866162086fee 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -101,7 +101,7 @@ hsb:
         title: Tema
         latitude: Šěrokostnik
         longitude: Dołhostnik
         title: Tema
         latitude: Šěrokostnik
         longitude: Dołhostnik

-        language: Rěč
+        language_code: Rěč

       doorkeeper/application:
         name: Mjeno
         redirect_uri: Dalesposrědkowanske URI
       doorkeeper/application:
         name: Mjeno
         redirect_uri: Dalesposrědkowanske URI


@@ -583,13 +583,10 @@ hsb:
     search:
       title:
         latlon_html: Wuslědki wot <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Wuslědki wot <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Wuslědki wot <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Wuslědki wot <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Wuslědki wot <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 0adf8aaecc7d411df0af697fdab4f86952b4b5aa..7b8356f49b2945f9cec00eb91f2e69e73303c608 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -18,6 +18,7 @@
 # Author: Kempelen
 # Author: Leiric
 # Author: Macofe
 # Author: Kempelen
 # Author: Leiric
 # Author: Macofe

+# Author: McDutchie

 # Author: MeskoBalazs
 # Author: Misibacsi
 # Author: Máté
 # Author: MeskoBalazs
 # Author: Misibacsi
 # Author: Máté


@@ -125,9 +126,10 @@ hu:
       diary_entry:
         user: Felhasználó
         title: Tárgy
       diary_entry:
         user: Felhasználó
         title: Tárgy

+        body: Szöveg

         latitude: Földrajzi szélesség
         longitude: Földrajzi hosszúság
         latitude: Földrajzi szélesség
         longitude: Földrajzi hosszúság

-        language: Nyelv
+        language_code: Nyelv

       doorkeeper/application:
         name: Név
         redirect_uri: URI-k átirányítása
       doorkeeper/application:
         name: Név
         redirect_uri: URI-k átirányítása


@@ -632,6 +634,16 @@ hu:
       applications:
         create:
           notice: Alkalmazás regisztrálva.
       applications:
         create:
           notice: Alkalmazás regisztrálva.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Kapcsolat
+      contact: kapcsolat
+    forbidden:
+      title: Tiltott
+    internal_server_error:
+      title: Alkalmazáshiba
+    not_found:
+      title: Fájl nem található

   friendships:
     make_friend:
       heading: '%{user} hozzáadása ismerősként?'
   friendships:
     make_friend:
       heading: '%{user} hozzáadása ismerősként?'


@@ -650,13 +662,10 @@ hu:
     search:
       title:
         latlon_html: Eredmények az <a href="https://openstreetmap.org/">Internal</a>-ról
     search:
       title:
         latlon_html: Eredmények az <a href="https://openstreetmap.org/">Internal</a>-ról

-        ca_postcode_html: Eredmények a <a href="https://geocoder.ca/">Geocoder.CA</a>-ről

         osm_nominatim_html: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>-ról
         osm_nominatim_html: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>-ról

-        geonames_html: Eredmények a <a href="http://www.geonames.org/">GeoNames</a>-ről

         osm_nominatim_reverse_html: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimról</a>
         osm_nominatim_reverse_html: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimról</a>

-        geonames_reverse_html: Eredmények a <a href="http://www.geonames.org/">GeoNamesről</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -3064,6 +3073,9 @@ hu:
         graphhopper_bicycle: Kerékpár (GraphHopper)
         graphhopper_car: Autó (GraphHopper)
         graphhopper_foot: Gyalog (GraphHopper)
         graphhopper_bicycle: Kerékpár (GraphHopper)
         graphhopper_car: Autó (GraphHopper)
         graphhopper_foot: Gyalog (GraphHopper)

+        fossgis_valhalla_bicycle: Bicikli (Valhalla)
+        fossgis_valhalla_car: Autó (Valhalla)
+        fossgis_valhalla_foot: Gyalog (Valhalla)

       descend: Ereszkedés
       directions: Irányok
       distance: Távolság
       descend: Ereszkedés
       directions: Irányok
       distance: Távolság

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 7aa42eedc9f8d991ff5897f8705e9940a79f29f8..92fe53bff9f09fee0e5d2bc9fbd97f679a258e96 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -17,7 +17,7 @@ ia:
       prompt: Selige file
     submit:
       diary_comment:
       prompt: Selige file
     submit:
       diary_comment:

-        create: Salveguardar
+        create: Commentar

       diary_entry:
         create: Publicar
         update: Actualisar
       diary_entry:
         create: Publicar
         update: Actualisar


@@ -99,9 +99,10 @@ ia:
       diary_entry:
         user: Usator
         title: Subjecto
       diary_entry:
         user: Usator
         title: Subjecto

+        body: Corpore

         latitude: Latitude
         longitude: Longitude
         latitude: Latitude
         longitude: Longitude

-        language: Lingua
+        language_code: Lingua

       doorkeeper/application:
         name: Nomine
         redirect_uri: URIs de redirection
       doorkeeper/application:
         name: Nomine
         redirect_uri: URIs de redirection


@@ -607,6 +608,26 @@ ia:
       applications:
         create:
           notice: Application registrate.
       applications:
         create:
           notice: Application registrate.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+      contact_url_title: Varie canales de contacto explicate
+      contact: contactar
+      contact_the_community_html: Sia libere de %{contact_link} le communitate de
+        OpenStreetMap si tu ha trovate un ligamine rupte o qualcunque anomalia. Nota
+        le URL exacte de tu requesta.
+    forbidden:
+      title: Prohibite
+      description: Le operation que tu ha requestate sur le servitor de OpenStreetMap
+        es disponibile solmente pro le administratores (HTTP 403)
+    internal_server_error:
+      title: Error del application
+      description: Le servitor de OpenStreetMap ha incontrate un condition inexpectate
+        que lo ha impedite de satisfacer le requesta (HTTP 500)
+    not_found:
+      title: File non trovate
+      description: Non poteva trovar un file, directorio o operation API con iste
+        nomine sur le servitor de OpenStreetMap (HTTP 404)

   friendships:
     make_friend:
       heading: Adder %{user} como amico?
   friendships:
     make_friend:
       heading: Adder %{user} como amico?


@@ -625,13 +646,10 @@ ia:
     search:
       title:
         latlon_html: Resultatos <a href="https://openstreetmap.org/">interne</a>
     search:
       title:
         latlon_html: Resultatos <a href="https://openstreetmap.org/">interne</a>

-        ca_postcode_html: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultatos ab <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -3080,6 +3098,8 @@ ia:
       descend: Descender
       directions: Itinerario
       distance: Distantia
       descend: Descender
       directions: Itinerario
       distance: Distantia

+      distance_m: '%{distance}m'
+      distance_km: '%{distance}km'

       errors:
         no_route: Nulle route ha essite trovate inter iste duo locos.
         no_place: '''%{place}'' non poteva esser trovate.'
       errors:
         no_route: Nulle route ha essite trovate inter iste duo locos.
         no_place: '''%{place}'' non poteva esser trovate.'

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 48f356d587db5fb9c3268111cc74e6d9a5a4838d..e2af5e336afc0dfb5adde1443daaf9e6d34671cb 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -134,7 +134,7 @@ id:
         title: Subjek
         latitude: Garis Lintang
         longitude: Garis Bujur
         title: Subjek
         latitude: Garis Lintang
         longitude: Garis Bujur

-        language: Bahasa
+        language_code: Bahasa

       doorkeeper/application:
         name: Nama
         redirect_uri: Alihkan URI
       doorkeeper/application:
         name: Nama
         redirect_uri: Alihkan URI


@@ -644,13 +644,10 @@ id:
     search:
       title:
         latlon_html: Hasil dari <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Hasil dari <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Hasil dari <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Hasil dari <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Hasil dari <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Hasil dari <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Hasil dari <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Hasil dari <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Hasil dari <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 951cfee9b3987feb837fcc361d699d265da69bcb..65f8c215589d1284e77282db378eb8232f845e5a 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -107,7 +107,7 @@ is:
         title: Fyrirsögn
         latitude: Breiddargráða
         longitude: Lengdargráða
         title: Fyrirsögn
         latitude: Breiddargráða
         longitude: Lengdargráða

-        language: Tungumál
+        language_code: Tungumál

       doorkeeper/application:
         name: Nafn
         redirect_uri: Tilvísa tengslar
       doorkeeper/application:
         name: Nafn
         redirect_uri: Tilvísa tengslar


@@ -638,13 +638,10 @@ is:
     search:
       title:
         latlon_html: Niðurstöður frá <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Niðurstöður frá <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Niðurstöður frá <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix_format: '%{name}:'
       prefix:
     search_osm_nominatim:
       prefix_format: '%{name}:'
       prefix:

diff --git a/config/locales/it.yml b/config/locales/it.yml
index d4b64b080cef82139fd6952baa8ed28f658073c4..17c4c6cb1aa81a06df1e3085459793821955a85f 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -154,7 +154,7 @@ it:
         title: Oggetto
         latitude: Latitudine
         longitude: Longitudine
         title: Oggetto
         latitude: Latitudine
         longitude: Longitudine

-        language: Lingua
+        language_code: Lingua

       doorkeeper/application:
         name: Nome
         redirect_uri: URI reindirizzati
       doorkeeper/application:
         name: Nome
         redirect_uri: URI reindirizzati


@@ -662,6 +662,19 @@ it:
       applications:
         create:
           notice: Applicazione registrata.
       applications:
         create:
           notice: Applicazione registrata.

+  errors:
+    forbidden:
+      title: Vietato
+      description: L'operazione che hai richiesto sul server OpenStreetMap è disponibile
+        solo per gli amministratori (HTTP 403)
+    internal_server_error:
+      title: Errore dell'applicazione
+      description: Il server OpenStreetMap ha rilevato una condizione imprevista che
+        gli ha impedito di soddisfare la richiesta (HTTP 500)
+    not_found:
+      title: File non trovato
+      description: Impossibile trovare un file/cartella/operazione API con questo
+        nome sul server OpenStreetMap (HTTP 404)

   friendships:
     make_friend:
       heading: Aggiungere %{user} agli amici?
   friendships:
     make_friend:
       heading: Aggiungere %{user} agli amici?


@@ -680,13 +693,10 @@ it:
     search:
       title:
         latlon_html: Risultati da <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Risultati da <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Risultati da <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Risultati da <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Risultati da <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index cf0dd119fac2f28457d4ad970e677f86b1e2b7ff..4a5da15c9b90ef1ef74a95a5505e85eb4f0bc3af 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -151,7 +151,7 @@ ja:
         title: 件名
         latitude: 緯度
         longitude: 経度
         title: 件名
         latitude: 緯度
         longitude: 経度

-        language: 言語
+        language_code: 言語

       doorkeeper/application:
         name: 名前
         redirect_uri: URIのリダイレクト
       doorkeeper/application:
         name: 名前
         redirect_uri: URIのリダイレクト


@@ -622,6 +622,13 @@ ja:
       applications:
         create:
           notice: アプリケーションが登録されています。
       applications:
         create:
           notice: アプリケーションが登録されています。

+  errors:
+    contact:
+      contact: 連絡先
+    internal_server_error:
+      title: アプリケーションエラー
+    not_found:
+      title: ファイルが見つかりません

   friendships:
     make_friend:
       heading: '%{user} を友達に追加しますか?'
   friendships:
     make_friend:
       heading: '%{user} を友達に追加しますか?'


@@ -639,13 +646,10 @@ ja:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Internal</a>からの結果
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Internal</a>からの結果

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a>からの結果

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> からの結果
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> からの結果

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> からの結果

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> からの結果
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> からの結果

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> からの結果

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 40ae36511ae4affe4ccc745ffcbead25643386bf..863bc95c49fea4b3041ba85fb3fd2f9fac3ea67c 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -72,7 +72,7 @@ ka:
         title: თემა
         latitude: განედი
         longitude: გრძედი
         title: თემა
         latitude: განედი
         longitude: გრძედი

-        language: ენა
+        language_code: ენა

       friend:
         user: მომხმარებელი
         friend: მეგობარი
       friend:
         user: მომხმარებელი
         friend: მეგობარი


@@ -319,10 +319,8 @@ ka:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">შიდა შედეგები</a>
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">შიდა შედეგები</a>

-        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</a>–ს შედეგები

         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>–ის შედეგები
         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>–ის შედეგები

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>–ის შედეგები

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 9ddac16e274cfaff113b1c110d70c91def781488..d805791dd0c8dae40ce828f863d97095f33c1658 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -106,7 +106,7 @@ kab:
         title: Asentel
         latitude: Tarrut
         longitude: Tazegrart
         title: Asentel
         latitude: Tarrut
         longitude: Tazegrart

-        language: Tutlayt
+        language_code: Tutlayt

       doorkeeper/application:
         name: Isem
         redirect_uri: Beddel abrid i tansiwin URI
       doorkeeper/application:
         name: Isem
         redirect_uri: Beddel abrid i tansiwin URI


@@ -505,13 +505,10 @@ kab:
     search:
       title:
         latlon_html: Igmaḍ  seg <a href="https://openstreetmap.org/">igensanen</a>
     search:
       title:
         latlon_html: Igmaḍ  seg <a href="https://openstreetmap.org/">igensanen</a>

-        ca_postcode_html: Igmaḍ si <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Igmaḍ si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Igmaḍ si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Igmaḍ si <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Igmaḍ si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Igmaḍ si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Igmaḍ si <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 4c214f7262d6004cb6c7ab007a206793ad504730..615c9f513b6ea5b96b2899b634f745d6b8f5715b 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -97,7 +97,7 @@ kk-cyrl:
         title: Тақырып
         latitude: Ендік
         longitude: Бойлық
         title: Тақырып
         latitude: Ендік
         longitude: Бойлық

-        language: Тіл
+        language_code: Тіл

       doorkeeper/application:
         name: Атау
         redirect_uri: Өзгертілген URI
       doorkeeper/application:
         name: Атау
         redirect_uri: Өзгертілген URI


@@ -405,13 +405,10 @@ kk-cyrl:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Ішкі нәтижелер</a>
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Ішкі нәтижелер</a>

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> нәтижелері

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> нәтижелері
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> нәтижелері

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> нәтижелері

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> нәтижелері
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> нәтижелері

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> нәтижелері

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 4fb5e8ac147c6d48f4290541eb56c78414a548fd..03f3bdf5216c1e6873d7b9f18c1aea373c261b6e 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -58,7 +58,7 @@ km:
         title: ប្រធានបទ​
         latitude: រយៈកម្ពស់
         longitude: រយៈបណ្ដោយ
         title: ប្រធានបទ​
         latitude: រយៈកម្ពស់
         longitude: រយៈបណ្ដោយ

-        language: ភាសា​
+        language_code: ភាសា​

       friend:
         user: អ្នកប្រើប្រាស់​
         friend: មិត្ត​
       friend:
         user: អ្នកប្រើប្រាស់​
         friend: មិត្ត​


@@ -264,8 +264,6 @@ km:
     search:
       title:
         latlon_html: លទ្ធផលពី <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: លទ្ធផលពី <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: លទ្ធផលពី <a href="http://geocoder.ca/">Geocoder.CA</a>
-        geonames_html: លទ្ធផលពី <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 20ca9af2f6593c720bbb00dd3c70eff5bee9344b..3ea450c470a014a79424fef522570751b6322600 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -73,7 +73,7 @@ kn:
         title: ವಿಷಯ
         latitude: ಅಕ್ಷಾಂಶ
         longitude: ರೇಖಾಂಶ
         title: ವಿಷಯ
         latitude: ಅಕ್ಷಾಂಶ
         longitude: ರೇಖಾಂಶ

-        language: ಭಾಷೆ
+        language_code: ಭಾಷೆ

       doorkeeper/application:
         name: ಹೆಸರು
       friend:
       doorkeeper/application:
         name: ಹೆಸರು
       friend:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 251256613efb35c20893dba1bc00e5560ba66aa7..25e0ed43f6ab83e0aacf15e7fceba120d625e731 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -139,7 +139,7 @@ ko:
         title: 제목
         latitude: 위도
         longitude: 경도
         title: 제목
         latitude: 위도
         longitude: 경도

-        language: 언어
+        language_code: 언어

       doorkeeper/application:
         name: 이름
         redirect_uri: URI 리다이렉트
       doorkeeper/application:
         name: 이름
         redirect_uri: URI 리다이렉트


@@ -587,14 +587,10 @@ ko:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">내부</a> 결과
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">내부</a> 결과

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a>에서의 결과

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a>에서의
-          결과

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 5a5a5f69970e114ad3f438889656336ca49908e2..77993900d3949b6dd8d370cc8a0d996fb43a0007 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -37,7 +37,7 @@ ksh:
         title: Tittel
         latitude: De Breedt om Äädball
         longitude: De Läng om Äädball
         title: Tittel
         latitude: De Breedt om Äädball
         longitude: De Läng om Äädball

-        language: Schprohch
+        language_code: Schprohch

       friend:
         user: Metmaacher
         friend: Fründ
       friend:
         user: Metmaacher
         friend: Fründ

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index ae11dc929f68255ffdd23b15d3fea12d5683d486..07055264535768856225fece959a230984decbea 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -19,7 +19,7 @@ ku-Latn:
       prompt: Dosyeyê bibijêre
     submit:
       diary_comment:
       prompt: Dosyeyê bibijêre
     submit:
       diary_comment:

-        create: Tomar bike
+        create: Şîrove

       diary_entry:
         create: Biweşîne
         update: Rojane bike
       diary_entry:
         create: Biweşîne
         update: Rojane bike


@@ -101,9 +101,10 @@ ku-Latn:
       diary_entry:
         user: Bikarhêner
         title: Mijar
       diary_entry:
         user: Bikarhêner
         title: Mijar

+        body: Nivîs

         latitude: Hêlîpan
         longitude: Hêlîlar
         latitude: Hêlîpan
         longitude: Hêlîlar

-        language: Ziman
+        language_code: Ziman

       doorkeeper/application:
         name: Nav
         redirect_uri: URIyên Beralîkirinê
       doorkeeper/application:
         name: Nav
         redirect_uri: URIyên Beralîkirinê


@@ -626,6 +627,15 @@ ku-Latn:
       applications:
         create:
           notice: Aplîkasyon hate qeydkirin.
       applications:
         create:
           notice: Aplîkasyon hate qeydkirin.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+    internal_server_error:
+      title: Çewtiya sepanê
+      description: Servera OpenStreetMapê bi halekî nehêvîkirî re rû bi rû bû ku rê
+        li ber digire daxwaza te were bicîanîn (HTTP 500)
+    not_found:
+      title: Dosye peyda nebû

   friendships:
     make_friend:
       heading: Bila %{user} li hevalên te were zêdekirin?
   friendships:
     make_friend:
       heading: Bila %{user} li hevalên te were zêdekirin?


@@ -645,13 +655,10 @@ ku-Latn:
     search:
       title:
         latlon_html: Encamên ji <a href="https://openstreetmap.org/"></a>
     search:
       title:
         latlon_html: Encamên ji <a href="https://openstreetmap.org/"></a>

-        ca_postcode_html: Netîceyên ji <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Netîceyên ji <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Netîceyên ji <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Netîceyên ji <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Netîceyên ji <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Netîceyên ji <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Netîceyên ji <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -2429,6 +2436,8 @@ ku-Latn:
         Herwiha mimkin e ku fermî an nefermî bin.
       local_chapters:
         title: Beşên Lokal
         Herwiha mimkin e ku fermî an nefermî bin.
       local_chapters:
         title: Beşên Lokal

+      other_groups:
+        title: Komên din

   traces:
     visibility:
       private: Xisûsî (tenê wekî nuqteyên anonîm û nerêzkirî tê belavkirin)
   traces:
     visibility:
       private: Xisûsî (tenê wekî nuqteyên anonîm û nerêzkirî tê belavkirin)


@@ -2689,6 +2698,7 @@ ku-Latn:
       title: Xwe Qeyd Bike
       no_auto_account_create: Mixabin, em vêga nikarin bi otomatîkî ji bo we hesabekî
         çêbikin.
       title: Xwe Qeyd Bike
       no_auto_account_create: Mixabin, em vêga nikarin bi otomatîkî ji bo we hesabekî
         çêbikin.

+      support: piştgirî

       about:
         header: Belaş e û dikare were sererastkirin
         html: |-
       about:
         header: Belaş e û dikare were sererastkirin
         html: |-


@@ -2822,6 +2832,8 @@ ku-Latn:
       title: Hesab hatiye rawestandin
       heading: Hesab hatiye rawestandin
       support: piştgirî
       title: Hesab hatiye rawestandin
       heading: Hesab hatiye rawestandin
       support: piştgirî

+      automatically_suspended: Bibore, hesaba te ji ber aktîvîteyên şibhedar hatiye
+        rawestandin.

     auth_failure:
       connection_failed: Girêdana bi peydakera teyîdkirina nasnameyê re bi ser neket
       invalid_credentials: Ji bo teyîdkirina nasnameyê agahî nerast in
     auth_failure:
       connection_failed: Girêdana bi peydakera teyîdkirina nasnameyê re bi ser neket
       invalid_credentials: Ji bo teyîdkirina nasnameyê agahî nerast in

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 6f05b10fb1640f7b5219a0409cc8eab6f534dceb..d1948415f92532fe6d62a9b271aa5f1e3f7368ea 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -6,6 +6,7 @@
 # Author: Felix3qH4
 # Author: Helicoducair
 # Author: Les Meloures
 # Author: Felix3qH4
 # Author: Helicoducair
 # Author: Les Meloures

+# Author: McDutchie

 # Author: Robby
 # Author: Soued031
 # Author: Talex42
 # Author: Robby
 # Author: Soued031
 # Author: Talex42


@@ -103,7 +104,7 @@ lb:
         title: Sujet
         latitude: Geografesch Breet
         longitude: Geografesch Längt
         title: Sujet
         latitude: Geografesch Breet
         longitude: Geografesch Längt

-        language: Sprooch
+        language_code: Sprooch

       doorkeeper/application:
         name: Numm
         redirect_uri: Weiderleedungs-URIën
       doorkeeper/application:
         name: Numm
         redirect_uri: Weiderleedungs-URIën


@@ -604,6 +605,14 @@ lb:
       applications:
         create:
           notice: Applikatioun registréiert.
       applications:
         create:
           notice: Applikatioun registréiert.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+      contact: Kontakt
+    forbidden:
+      title: Verbueden
+    not_found:
+      title: Fichier gouf net fonnt

   friendships:
     make_friend:
       heading: '%{user} als Frënd derbäisetzen?'
   friendships:
     make_friend:
       heading: '%{user} als Frënd derbäisetzen?'


@@ -622,13 +631,10 @@ lb:
     search:
       title:
         latlon_html: Resultater vun <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Resultater vun <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Resultater vu <a href="https://geocoder.ca/">Geocoder.ca</a>

         osm_nominatim_html: Resultater vun <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultater vun <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultater vun <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultater vun <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultater vun <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index c97325836f029b1b6414f096f4e6f8b0fb0fb989..a88ba2e19433b6504db001f79ff4e64dca2fbba5 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -113,7 +113,7 @@ lt:
         title: Antraštė
         latitude: Platuma
         longitude: Ilguma
         title: Antraštė
         latitude: Platuma
         longitude: Ilguma

-        language: Kalba
+        language_code: Kalba

       doorkeeper/application:
         name: Vardas
         scopes: Leidimai
       doorkeeper/application:
         name: Vardas
         scopes: Leidimai


@@ -564,13 +564,10 @@ lt:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Vidiniai</a> rezultatai
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Vidiniai</a> rezultatai

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> rezultatai

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> rezultatai
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> rezultatai

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> rezultatai

         osm_nominatim_reverse_html: Rezultatai iš <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Rezultatai iš <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Rezultatai iš <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5edc08816c0c243823ad3e18ddda913a2d0aaf7e..e6077e95c18ad8c3bd39239d47566581d3f98684 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -97,7 +97,7 @@ lv:
         title: Temats
         latitude: Platums
         longitude: Garums
         title: Temats
         latitude: Platums
         longitude: Garums

-        language: Valoda
+        language_code: Valoda

       friend:
         user: Lietotājs
         friend: Draugs
       friend:
         user: Lietotājs
         friend: Draugs


@@ -482,13 +482,10 @@ lv:
     search:
       title:
         latlon_html: Rezultāti no <a href="https://openstreetmap.org/">Iekšējās meklēšanas</a>
     search:
       title:
         latlon_html: Rezultāti no <a href="https://openstreetmap.org/">Iekšējās meklēšanas</a>

-        ca_postcode_html: Rezultāti no <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Rezultāti no <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Rezultāti no <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Rezultāti no <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Rezultāti no <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Rezultāti no <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Rezultāti no <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index e5f22540492c4eb410dee64e0e64ebc8fcbaa93c..7692f6b234764ec7e53cebddf9ac14086cc1e6b4 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -18,7 +18,7 @@ mk:
       prompt: Одберете податотека
     submit:
       diary_comment:
       prompt: Одберете податотека
     submit:
       diary_comment:

-        create: Ð\97аÑ\87Ñ\83вај
+        create: Ð\9aоменÑ\82иÑ\80ај

       diary_entry:
         create: Објави
         update: Поднови
       diary_entry:
         create: Објави
         update: Поднови


@@ -100,9 +100,10 @@ mk:
       diary_entry:
         user: Корисник
         title: Тема
       diary_entry:
         user: Корисник
         title: Тема

+        body: Содржина

         latitude: Гео. ширина
         longitude: Гео. должина
         latitude: Гео. ширина
         longitude: Гео. должина

-        language: Јазик
+        language_code: Јазик

       doorkeeper/application:
         name: Име
         redirect_uri: URI-ја за пренасочување
       doorkeeper/application:
         name: Име
         redirect_uri: URI-ја за пренасочување


@@ -604,6 +605,26 @@ mk:
       applications:
         create:
           notice: Прилогот е пријавен.
       applications:
         create:
           notice: Прилогот е пријавен.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact?uselang=mk
+      contact_url_title: Објаснување на разните контактни канали
+      contact: контакт
+      contact_the_community_html: Слободно стапете во %{contact_link} со заедницата
+        OpenStreetMap ако имате најдено расипана врска или грешка. Забележете ја точната
+        URL на вашето барање.
+    forbidden:
+      title: Забрането
+      description: Постапката која ја побаравте на опслужувачот на OpenStreetMap е
+        достапна само за администратори (HTTP 403)
+    internal_server_error:
+      title: Грешка во прилогот
+      description: Опслужувачот на OpenStreetMap наиде на неочекуван услов кој го
+        спречи исполнувањето на барањето (HTTP 500)
+    not_found:
+      title: Податотеката не е пронајдена
+      description: Не можев да најдам постапка со податотека/папка/приложник со оа
+        име на опслужувачот на OpenStreetMap (HTTP 404)

   friendships:
     make_friend:
       heading: Да го додадам корисникот %{user} како пријател?
   friendships:
     make_friend:
       heading: Да го додадам корисникот %{user} како пријател?


@@ -622,13 +643,10 @@ mk:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Внатрешни</a> исходни ставки
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Внатрешни</a> исходни ставки

-        ca_postcode_html: Исход од <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Исход од <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Исход од <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Исход од <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Исход од <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Исход од <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Исход од <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -3061,6 +3079,8 @@ mk:
       descend: Надолно
       directions: Насоки
       distance: Растојание
       descend: Надолно
       directions: Насоки
       distance: Растојание

+      distance_m: '%{distance} м'
+      distance_km: '%{distance} км'

       errors:
         no_route: Не можев да најдам маршрута помеѓу тие две места.
         no_place: За жал, не можев да го најдам  местото „%{place}“.
       errors:
         no_route: Не можев да најдам маршрута помеѓу тие две места.
         no_place: За жал, не можев да го најдам  местото „%{place}“.

diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index ec677fbbe6125be8c54e3ff32c9cf530ac9c66aa..9181c8a9fe08536eed8329a1aa6ffc58f0ad370f 100644 (file)
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -48,7 +48,7 @@ mo:
         title: Субьект
         latitude: Латитудине
         longitude: Лонӂитудине
         title: Субьект
         latitude: Латитудине
         longitude: Лонӂитудине

-        language: Лимбэ
+        language_code: Лимбэ

       friend:
         user: Утилизатор
         friend: Приетен
       friend:
         user: Утилизатор
         friend: Приетен

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 0d742a20d99a6bf4d5567da513b675e51a0f04a9..998f72a2ef9dcd397e44f53a0bdf0b9e30dd3c25 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -92,7 +92,7 @@ mr:
         title: विषय
         latitude: अक्षांश
         longitude: रेखांश
         title: विषय
         latitude: अक्षांश
         longitude: रेखांश

-        language: भाषा
+        language_code: भाषा

       doorkeeper/application:
         name: नाव
       friend:
       doorkeeper/application:
         name: नाव
       friend:


@@ -392,13 +392,10 @@ mr:
     search:
       title:
         latlon_html: निकाल <a href="https://openstreetmap.org/">अंतर्गत</a>
     search:
       title:
         latlon_html: निकाल <a href="https://openstreetmap.org/">अंतर्गत</a>

-        ca_postcode_html: निकाल <a href="http://geocoder.ca/">जिओकोडर.सीए</a>

         osm_nominatim_html: निकाल <a href="https://nominatim.openstreetmap.org/">ओपनस्ट्रीटमॅप
           नॉमिनॅटिम</a>
         osm_nominatim_html: निकाल <a href="https://nominatim.openstreetmap.org/">ओपनस्ट्रीटमॅप
           नॉमिनॅटिम</a>

-        geonames_html: निकाल <a href="http://www.geonames.org/">जिओनेम्स</a>

         osm_nominatim_reverse_html: निकाल <a href="https://nominatim.openstreetmap.org/">ओपनस्ट्रीटमॅप
           नॉमिनॅटिम</a>
         osm_nominatim_reverse_html: निकाल <a href="https://nominatim.openstreetmap.org/">ओपनस्ट्रीटमॅप
           नॉमिनॅटिम</a>

-        geonames_reverse_html: निकाल <a href="http://www.geonames.org/">जिओनेम्स</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 86dbd6e3e63ac730ac05326cd5a1ff81ef6823de..bbce6bbf915557094cdb5ea3548cffc21d7c47cd 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -98,7 +98,7 @@ ms:
         title: Subjek
         latitude: Garis Lintang
         longitude: Garis Bujur
         title: Subjek
         latitude: Garis Lintang
         longitude: Garis Bujur

-        language: Bahasa
+        language_code: Bahasa

       doorkeeper/application:
         name: Nama
       friend:
       doorkeeper/application:
         name: Nama
       friend:


@@ -508,13 +508,10 @@ ms:
     search:
       title:
         latlon_html: Hasil carian <a href="http://openstreetmap.org/">dalaman</a>
     search:
       title:
         latlon_html: Hasil carian <a href="http://openstreetmap.org/">dalaman</a>

-        ca_postcode_html: Hasil carian <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Hasil Carian <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Hasil Carian <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Hasil carian <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Hasil daripada <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Hasil daripada <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Hasil daripada <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 0d8ec53d312408847bb1d99f1de6305d33e5e295..cd97829bdb72a7897e99bc81c9c6cd3757dcb679 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -45,7 +45,7 @@ my:
         title: အကြောင်းအရာ
         latitude: လတ္တီကျု
         longitude: လောင်ဂျီကျု
         title: အကြောင်းအရာ
         latitude: လတ္တီကျု
         longitude: လောင်ဂျီကျု

-        language: ဘာသာစကား
+        language_code: ဘာသာစကား

       friend:
         user: အသုံးပြုသူ
         friend: သူငယ်ချင်း
       friend:
         user: အသုံးပြုသူ
         friend: သူငယ်ချင်း


@@ -235,14 +235,10 @@ my:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">အတွင်းဘက်</a> မှ ရလဒ်များ
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">အတွင်းဘက်</a> မှ ရလဒ်များ

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> မှ ရလဒ်များ

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> မှ ရလဒ်များ
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> မှ ရလဒ်များ

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> မှ ရလဒ်များ

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> မှ ရလဒ်များ
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> မှ ရလဒ်များ

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> မှ
-          ရလဒ်များ

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index f8b34185ff01e028a3b8ab9c49beeae789fa4261..1f534e27a3c60c656bde1f5a1e6b07918f44d19a 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -122,7 +122,7 @@ nb:
         title: Emne
         latitude: Breddegrad
         longitude: Lengdegrad
         title: Emne
         latitude: Breddegrad
         longitude: Lengdegrad

-        language: Språk
+        language_code: Språk

       doorkeeper/application:
         name: Navn
         redirect_uri: Omdirigerings-URI-er
       doorkeeper/application:
         name: Navn
         redirect_uri: Omdirigerings-URI-er


@@ -601,13 +601,10 @@ nb:
     search:
       title:
         latlon_html: Resultater fra <a href="https://openstreetmap.org/">Internt</a>
     search:
       title:
         latlon_html: Resultater fra <a href="https://openstreetmap.org/">Internt</a>

-        ca_postcode_html: Resultater fra <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultat fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultat fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultat fra <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultater fra <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index ea1437bc379c4cdb9f79a1def7d49c323cd5e915..1ffe0b82ab279552aeba6be2a31cc5b1679da6c3 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -37,7 +37,7 @@ nds:
         title: Titel
         latitude: Bredengraad
         longitude: Längengraad
         title: Titel
         latitude: Bredengraad
         longitude: Längengraad

-        language: Spraak
+        language_code: Spraak

       friend:
         user: Bruker
         friend: Fründ
       friend:
         user: Bruker
         friend: Fründ

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index a13d51d67aa5980fafa1fea1543e530c79bb96fd..2f86d72ddb8d7d2c5c85498cf80dfdb39c8f407f 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -85,7 +85,7 @@ ne:
         title: विषय
         latitude: अक्षांश
         longitude: देशान्तर
         title: विषय
         latitude: अक्षांश
         longitude: देशान्तर

-        language: भाषा
+        language_code: भाषा

       friend:
         user: प्रयोगकर्ता
         friend: साथी
       friend:
         user: प्रयोगकर्ता
         friend: साथी


@@ -415,14 +415,10 @@ ne:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">आन्तरिक</a> बाट नतिजाहरू
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">आन्तरिक</a> बाट नतिजाहरू

-        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</aबाट नतिजाहरू

         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>बाट नतिजाहरू
         osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>बाट नतिजाहरू

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>बाट नतिजाहरू

         osm_nominatim_reverse_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>बाट नतिजाहरू
         osm_nominatim_reverse_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>बाट नतिजाहरू

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a>बाट
-          नतिजाहरू

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d5d8e695e70064c411d55894978bcfd1f0d29580..80b271482420292bb8942829d05330f96184e60f 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -156,7 +156,7 @@ nl:
         title: Onderwerp
         latitude: Breedtegraad
         longitude: Lengtegraad
         title: Onderwerp
         latitude: Breedtegraad
         longitude: Lengtegraad

-        language: Taal
+        language_code: Taal

       doorkeeper/application:
         name: Naam
         redirect_uri: Omleidings-URI's
       doorkeeper/application:
         name: Naam
         redirect_uri: Omleidings-URI's


@@ -683,13 +683,10 @@ nl:
     search:
       title:
         latlon_html: Resultaten van <a href="https://openstreetmap.org/">intern</a>
     search:
       title:
         latlon_html: Resultaten van <a href="https://openstreetmap.org/">intern</a>

-        ca_postcode_html: Resultaten van <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultaten van <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultaten van <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultaten van <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultaten van <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultaten van <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resulaten van <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index da90f30589a0976b46b862428e5deb32210ad9e0..de4bc29cb5199748746c3d26c7e04474cdf6fc2a 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -100,7 +100,7 @@ nn:
         title: 'Emne:'
         latitude: Breiddegrad
         longitude: Lengdegrad
         title: 'Emne:'
         latitude: Breiddegrad
         longitude: Lengdegrad

-        language: Språk
+        language_code: Språk

       friend:
         user: Brukar
         friend: Ven
       friend:
         user: Brukar
         friend: Ven


@@ -494,13 +494,10 @@ nn:
     search:
       title:
         latlon_html: Resultat frå <a href="http://openstreetmap.org/">Internt</a>
     search:
       title:
         latlon_html: Resultat frå <a href="http://openstreetmap.org/">Internt</a>

-        ca_postcode_html: Resultat frå <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultat frå <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultat frå <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultat frå <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultat frå <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultat frå <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultat frå <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index b69b9398eacbe4f7cd043242a22bba05db786e85..8737a4f738cb07b4600c35cb644ce87a6deffe27 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -102,7 +102,7 @@ nqo:
         title: ߝߐߡߊ
         latitude: ߦߙߐ ߘߟߊߕߍ߯ߦߊ߫
         longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ
         title: ߝߐߡߊ
         latitude: ߦߙߐ ߘߟߊߕߍ߯ߦߊ߫
         longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ

-        language: ߞߊ߲
+        language_code: ߞߊ߲

       doorkeeper/application:
         name: ߕߐ߮
         redirect_uri: URLs ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲
       doorkeeper/application:
         name: ߕߐ߮
         redirect_uri: URLs ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲


@@ -540,14 +540,10 @@ nqo:
     search:
       title:
         latlon_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://openstreetmap.org/">ߞߣߐߟߊ</a>
     search:
       title:
         latlon_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://openstreetmap.org/">ߞߣߐߟߊ</a>

-        ca_postcode_html: ߞߐߝߟߌ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ <a href="https://geocoder.ca/">ߘߎ߱ߘߏߞߊ߲</a>

         osm_nominatim_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://nominatim.openstreetmap.org/">ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ</a>
           ߟߊ߫
         osm_nominatim_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://nominatim.openstreetmap.org/">ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ</a>
           ߟߊ߫

-        geonames_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="http://www.geonames.org/">ߘߎ߱ߕߐ߮</a>
-          ߟߊ߫

         osm_nominatim_reverse_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://nominatim.openstreetmap.org/">ߕߐ߯ߦߊߟߌ</a>
           ߟߊ߫
         osm_nominatim_reverse_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="https://nominatim.openstreetmap.org/">ߕߐ߯ߦߊߟߌ</a>
           ߟߊ߫

-        geonames_reverse_html: ߞߐߝߟߌ ߞߊ߬ ߝߘߊ߫ <a href="http://www.geonames.org/">ߘߎ߱ߕߐ߮</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 84c6d9642f703f6ac6cef1f37f9522b5a4e9346a..264f12e1777e464eb8aedb8646b504ba738f1b72 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -106,7 +106,7 @@ oc:
         title: Subjècte
         latitude: Latitud
         longitude: Longitud
         title: Subjècte
         latitude: Latitud
         longitude: Longitud

-        language: Lenga
+        language_code: Lenga

       doorkeeper/application:
         name: Nom
         redirect_uri: Redirigir URIs
       doorkeeper/application:
         name: Nom
         redirect_uri: Redirigir URIs


@@ -632,13 +632,10 @@ oc:
     search:
       title:
         latlon_html: Resultats <a href="https://openstreetmap.org/">intèrnes</a>
     search:
       title:
         latlon_html: Resultats <a href="https://openstreetmap.org/">intèrnes</a>

-        ca_postcode_html: Resultats despuèi <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultats de <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultats de <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 0384728aa44ef0b5b909130e1ca3acb266139607..de39cea2f6f249fb5387c902a8592dfeeebdce63 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -82,7 +82,7 @@ pa:
         title: ਵਿਸ਼ਾ
         latitude: ਅਕਸ਼ਾਂਸ਼
         longitude: ਲੰਬਕਾਰ
         title: ਵਿਸ਼ਾ
         latitude: ਅਕਸ਼ਾਂਸ਼
         longitude: ਲੰਬਕਾਰ

-        language: ਬੋਲੀ
+        language_code: ਬੋਲੀ

       doorkeeper/application:
         name: ਨਾਂ
       friend:
       doorkeeper/application:
         name: ਨਾਂ
       friend:

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index bb17356cbf8a1d4480ec85a5ac5549ac198c4fa5..35116f00f6f694dd5a6781bb7e6af38987cf05cc 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -156,9 +156,10 @@ pl:
       diary_entry:
         user: Użytkownik
         title: Temat
       diary_entry:
         user: Użytkownik
         title: Temat

+        body: Treść

         latitude: Szerokość geograficzna
         longitude: Długość geograficzna
         latitude: Szerokość geograficzna
         longitude: Długość geograficzna

-        language: Język
+        language_code: Język

       doorkeeper/application:
         name: Nazwa
         redirect_uri: URI przekierowań
       doorkeeper/application:
         name: Nazwa
         redirect_uri: URI przekierowań


@@ -711,13 +712,10 @@ pl:
     search:
       title:
         latlon_html: Wyniki z <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Wyniki z <a href="https://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Wyniki z <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Wyniki z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Wyniki z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Wyniki z <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Wyniki z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Wyniki z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Wyniki z <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 135a0fae6b69379f1c49fc6ee007ce2edb3b8674..e686463279331412cca5fe7e063246a8b25657b4 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -101,7 +101,7 @@ pnb:
         title: سرلیکھ
         latitude: اکشانش
         longitude: لبکار
         title: سرلیکھ
         latitude: اکشانش
         longitude: لبکار

-        language: بولی
+        language_code: بولی

       doorkeeper/application:
         name: ناں
         redirect_uri: مڑجوڑ کڑیاں
       doorkeeper/application:
         name: ناں
         redirect_uri: مڑجوڑ کڑیاں


@@ -582,14 +582,10 @@ pnb:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">اندر</a> دے نتیجے
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">اندر</a> دے نتیجے

-        ca_postcode_html: <a href="https://geocoder.ca/">جیوکوڈر کینیڈا</a> توں نتیجے

         osm_nominatim_html: ' <a href="https://nominatim.openstreetmap.org/">نومینیٹم</a>
           دے نتیجے'
         osm_nominatim_html: ' <a href="https://nominatim.openstreetmap.org/">نومینیٹم</a>
           دے نتیجے'

-        geonames_html: <a href="http://www.geonames.org/">جیونامہ</a> توں نتیجے

         osm_nominatim_reverse_html: ' <a href="https://nominatim.openstreetmap.org/">نومینیٹم</a>
           دے نتیجے'
         osm_nominatim_reverse_html: ' <a href="https://nominatim.openstreetmap.org/">نومینیٹم</a>
           دے نتیجے'

-        geonames_reverse_html: <a href="http://www.geonames.org/">جیونامہ</a> توں
-          نتیجے

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 224795b26621d52dfe1de0f27b06305d3932a9d0..90b9f34c7c65ebfbeb15efc5d083fb3589cdbc1c 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -46,7 +46,7 @@ ps:
         title: سکالو
         latitude: لوړوالی
         longitude: اوږدوالی
         title: سکالو
         latitude: لوړوالی
         longitude: اوږدوالی

-        language: ژبه
+        language_code: ژبه

       friend:
         user: کارن
         friend: ملگری
       friend:
         user: کارن
         friend: ملگری

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 8f6ffa880d008e450a3fe188676147bf4427a446..a95a004ec0a269456aceb4f243ad614afef5db26 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -147,7 +147,7 @@ pt-BR:
         title: Assunto
         latitude: Latitude
         longitude: Longitude
         title: Assunto
         latitude: Latitude
         longitude: Longitude

-        language: Idioma
+        language_code: Idioma

       doorkeeper/application:
         name: Nome
         redirect_uri: URIs de redirecionamento
       doorkeeper/application:
         name: Nome
         redirect_uri: URIs de redirecionamento


@@ -668,13 +668,10 @@ pt-BR:
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>

-        ca_postcode_html: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultados do <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultados do <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index aef9ec8b6242934fae745978b2af1e8bece8e888..58cf4e03593bdd2e386e9e5d40107edf4fa8ec6f 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -134,7 +134,7 @@ pt-PT:
         title: Assunto
         latitude: Latitude
         longitude: Longitude
         title: Assunto
         latitude: Latitude
         longitude: Longitude

-        language: Idioma
+        language_code: Idioma

       doorkeeper/application:
         name: Nome
         redirect_uri: Redirecionar URIs
       doorkeeper/application:
         name: Nome
         redirect_uri: Redirecionar URIs


@@ -664,13 +664,10 @@ pt-PT:
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon_html: Resultados <a href="https://openstreetmap.org/">internos</a>

-        ca_postcode_html: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultados de <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultados de <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 5886d0ca48603dc00daa62486801e1f568bfa615..f71e121ebac590d026a560c1b1a252f4681ad209 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -111,7 +111,7 @@ ro:
         title: Subiect
         latitude: Latitudine
         longitude: Longitudine
         title: Subiect
         latitude: Latitudine
         longitude: Longitudine

-        language: Limbă
+        language_code: Limbă

       doorkeeper/application:
         name: Nume
         redirect_uri: Redirectează URI-uri
       doorkeeper/application:
         name: Nume
         redirect_uri: Redirectează URI-uri


@@ -603,13 +603,10 @@ ro:
     search:
       title:
         latlon_html: Rezultate de la <a href="https://openstreetmap.org/">interne</a>
     search:
       title:
         latlon_html: Rezultate de la <a href="https://openstreetmap.org/">interne</a>

-        ca_postcode_html: Rezultate de la <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Rezultate de la <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Rezultate de la <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Rezultate de la <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Rezultate de la <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Rezultate de la <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Rezultate de la <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9b8525cdf4c32c226f99fe1910d1226df68d63d1..edbadd819aeccbe2fb68457662970fe6ec48ed89 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -203,7 +203,7 @@ ru:
         title: Тема
         latitude: Широта
         longitude: Долгота
         title: Тема
         latitude: Широта
         longitude: Долгота

-        language: Язык
+        language_code: Язык

       doorkeeper/application:
         name: имя
         redirect_uri: Перенаправления
       doorkeeper/application:
         name: имя
         redirect_uri: Перенаправления


@@ -747,13 +747,10 @@ ru:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Внутренние результаты</a>
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Внутренние результаты</a>

-        ca_postcode_html: Результаты от <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Результаты от <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Результаты от <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Результаты от <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Результаты от <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Результаты от <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Результаты от <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 3147d0b444f20d76fd39d956c114055d82dc7dd7..2ed8f7c1b81dc4711b2872adb2a3a570ca67d2cf 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -69,7 +69,7 @@ sat:
         title: ᱥᱟᱛᱚᱢ
         latitude: ᱚᱠᱷᱟᱝᱥᱚ
         longitude: ᱫᱨᱟᱜᱷᱤᱢᱟᱝᱥᱚ
         title: ᱥᱟᱛᱚᱢ
         latitude: ᱚᱠᱷᱟᱝᱥᱚ
         longitude: ᱫᱨᱟᱜᱷᱤᱢᱟᱝᱥᱚ

-        language: ᱯᱟᱹᱨᱥᱤ
+        language_code: ᱯᱟᱹᱨᱥᱤ

       doorkeeper/application:
         name: ᱧᱩᱛᱩᱢ
       friend:
       doorkeeper/application:
         name: ᱧᱩᱛᱩᱢ
       friend:

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 223bc187ba78905f779dd0cc556ce6ec4d3a170b..0063c28dd09b2a73951bccf38f418989fedc1c66 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -97,9 +97,10 @@ sc:
       diary_entry:
         user: Utente
         title: 'Sugetu:'
       diary_entry:
         user: Utente
         title: 'Sugetu:'

+        body: Corpus

         latitude: Latitùdine
         longitude: Longitùdine
         latitude: Latitùdine
         longitude: Longitùdine

-        language: Limba
+        language_code: Limba

       doorkeeper/application:
         name: Nùmene
         redirect_uri: Torrare a indiritzare URIs
       doorkeeper/application:
         name: Nùmene
         redirect_uri: Torrare a indiritzare URIs


@@ -631,13 +632,10 @@ sc:
     search:
       title:
         latlon_html: Resurtados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon_html: Resurtados <a href="https://openstreetmap.org/">internos</a>

-        ca_postcode_html: Resurtados dae <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resurtados dae <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resurtados dae <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resurtados dae <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resurtados dae <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resurtados dae <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resurtados dae <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index a91a0b5b358af2a364c44a14b2dc2c7f1e8de338..51f4a1e015b96917cda8ceddc4ee131058fd31fb 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -92,7 +92,7 @@ scn:
         title: Oggettu
         latitude: Latitùdini
         longitude: Loncitùdini
         title: Oggettu
         latitude: Latitùdini
         longitude: Loncitùdini

-        language: Lingua
+        language_code: Lingua

       doorkeeper/application:
         name: Nomu
       friend:
       doorkeeper/application:
         name: Nomu
       friend:


@@ -514,13 +514,10 @@ scn:
     search:
       title:
         latlon_html: Risurtati di <a href="http://openstreetmap.org/">Nternu</a>
     search:
       title:
         latlon_html: Risurtati di <a href="http://openstreetmap.org/">Nternu</a>

-        ca_postcode_html: Risurtati di <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Risurtati di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Risurtati di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Risurtati di <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Risurtati di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Risurtati di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Risurtati di <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 7c6b8bd50abfdd735bcf3891c677670f2132224e..09cfd7ef9017af094301aaae1ca749e16382f1a5 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -57,7 +57,7 @@ sco:
         title: Subject
         latitude: Latitude
         longitude: Longitude
         title: Subject
         latitude: Latitude
         longitude: Longitude

-        language: Leid
+        language_code: Leid

       friend:
         user: Uiser
         friend: Friend
       friend:
         user: Uiser
         friend: Friend


@@ -315,13 +315,10 @@ sco:
     search:
       title:
         latlon_html: Results frae <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon_html: Results frae <a href="http://openstreetmap.org/">Internal</a>

-        ca_postcode_html: Results frae <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Results frae <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Results frae <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 788b75dd6272b456a18b909f1ff57ad014909d0a..b2229f372d4d4901d6fb18dafadc2a63216a0dff 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -119,7 +119,7 @@ sk:
         title: Predmet
         latitude: Zem. šírka
         longitude: Zem. dĺžka
         title: Predmet
         latitude: Zem. šírka
         longitude: Zem. dĺžka

-        language: Jazyk
+        language_code: Jazyk

       doorkeeper/application:
         name: Názov
         redirect_uri: URI pre presmerovanie
       doorkeeper/application:
         name: Názov
         redirect_uri: URI pre presmerovanie


@@ -667,13 +667,10 @@ sk:
     search:
       title:
         latlon_html: Výsledky z <a href="http://openstreetmap.org/">internej databázy</a>
     search:
       title:
         latlon_html: Výsledky z <a href="http://openstreetmap.org/">internej databázy</a>

-        ca_postcode_html: Výsledky z <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Výsledky z <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Výsledky z <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0e31ab181cf95e9e5db4b4e470fa93b1e2c9bdab..f7b17d092b0c6c79d346dbf8c9364dc105a07942 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -89,7 +89,7 @@ sl:
       tracepoint: Točka sledi
       tracetag: Oznaka sledi
       user: Uporabnik
       tracepoint: Točka sledi
       tracetag: Oznaka sledi
       user: Uporabnik

-      user_preference: Uporabniške preference
+      user_preference: Uporabniške prilagoditve

       user_token: Uporabniški žeton
       way: Pot
       way_node: Vozlišče poti
       user_token: Uporabniški žeton
       way: Pot
       way_node: Vozlišče poti


@@ -100,7 +100,7 @@ sl:
         url: URL glavne aplikacije (obvezno)
         callback_url: URL povratnih klicev
         support_url: URL za podporo
         url: URL glavne aplikacije (obvezno)
         callback_url: URL povratnih klicev
         support_url: URL za podporo

-        allow_read_prefs: branje uporabniških preferenc
+        allow_read_prefs: branje uporabniških prilagoditev

         allow_write_prefs: spreminjanje uporabniških nastavitev
         allow_write_diary: ustvarjanje dnevniških zapisov, komentarjev in dodajanje
           prijateljev
         allow_write_prefs: spreminjanje uporabniških nastavitev
         allow_write_diary: ustvarjanje dnevniških zapisov, komentarjev in dodajanje
           prijateljev


@@ -113,9 +113,10 @@ sl:
       diary_entry:
         user: Uporabnik
         title: Zadeva
       diary_entry:
         user: Uporabnik
         title: Zadeva

+        body: Besedilo

         latitude: Zemljepisna širina
         longitude: Zemljepisna dolžina
         latitude: Zemljepisna širina
         longitude: Zemljepisna dolžina

-        language: Jezik
+        language_code: Jezik

       doorkeeper/application:
         name: Ime
         redirect_uri: Preusmerjanje URI-jev
       doorkeeper/application:
         name: Ime
         redirect_uri: Preusmerjanje URI-jev


@@ -180,7 +181,7 @@ sl:
           naš <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Pravilnik
           o zasebnosti OSMF, vključno s poglavjem o e-poštnih naslovih">pravilnik
           o zasebnosti</a>.
           naš <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Pravilnik
           o zasebnosti OSMF, vključno s poglavjem o e-poštnih naslovih">pravilnik
           o zasebnosti</a>.

-        new_email: (nikoli javno objavljen)
+        new_email: (nikoli ni javno prikazan)

   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -301,16 +302,16 @@ sl:
           drugi računi.
         retain_caveats: 'Nekateri podatki o vas se bodo na OpenStreetMap ohranili,
           tudi ko bo vaš račun izbrisan:'
           drugi računi.
         retain_caveats: 'Nekateri podatki o vas se bodo na OpenStreetMap ohranili,
           tudi ko bo vaš račun izbrisan:'

-        retain_edits: Vaša urejanja podatkovne zbirke zemljevidov, če obstajajo, bodo
-          ohranjena.
-        retain_traces: Morebitne sledi, ki ste jih naložili, bodo ohranjene.
-        retain_diary_entries: Vaši dnevniški vnosi in komentarji, če obstajajo, bodo
-          ohranjeni, vendar si jih ne bo mogoče ogledati.
-        retain_notes: Morebitne opombe na zemljevidu in komentarji k opombam bodo
-          ohranjeni, vendar si jih ne bo mogoče ogledati.
-        retain_changeset_discussions: Vaši pogovori o sklopih sprememb, če obstajajo,
-          bodo ohranjeni.
-        retain_email: Vaš e-poštni naslov bo ohranjen.
+        retain_edits: Ohranjena bodo vaša urejanja podatkovne zbirke zemljevidov,
+          če obstajajo.
+        retain_traces: Ohranjene bodo morebitne sledi, ki ste jih naložili.
+        retain_diary_entries: Ohranjeni bodo vaši dnevniški vnosi in komentarji, če
+          obstajajo, vendar si jih ne bo mogoče ogledati.
+        retain_notes: Ohranjeni bodo morebitne opombe na zemljevidu in komentarji
+          k opombam, vendar si jih ne bo mogoče ogledati.
+        retain_changeset_discussions: Ohranjeni bodo vaši pogovori o sklopih sprememb,
+          če obstajajo.
+        retain_email: Ohranjen bo vaš e-poštni naslov.

         confirm_delete: Ali ste prepričani?
         cancel: Prekliči
   accounts:
         confirm_delete: Ali ste prepričani?
         cancel: Prekliči
   accounts:


@@ -346,7 +347,7 @@ sl:
         not yet agreed: Niste še sprejeli novih pogojev sodelovanja.
         review link text: Prosimo sledite tej povezavi, ko imate čas da pregledate
           in sprejmete nove pogoje sodelovanja..
         not yet agreed: Niste še sprejeli novih pogojev sodelovanja.
         review link text: Prosimo sledite tej povezavi, ko imate čas da pregledate
           in sprejmete nove pogoje sodelovanja..

-        agreed_with_pd: Prav tako ste izjavili, da so vaša urejanja v javni lasti.
+        agreed_with_pd: Prav tako ste izjavili, da so vaša urejanja v javni domeni.

         link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Kaj je to?
       save changes button: Shrani spremembe
         link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Kaj je to?
       save changes button: Shrani spremembe


@@ -659,6 +660,25 @@ sl:
       applications:
         create:
           notice: Aplikacija registrirana.
       applications:
         create:
           notice: Aplikacija registrirana.

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+      contact_url_title: Razloženi so različni kontaktni kanali
+      contact: kontaktirati
+      contact_the_community_html: Če ste našli nedelujočo povezavo/hrošča, ne oklevajte
+        %{contact_link} skupnosti OpenStreetMap. Zabeležite si točen URL vašega zahtevka.
+    forbidden:
+      title: Prepovedano
+      description: Operacija, ki ste jo zahtevali v strežniku OpenStreetMap, je na
+        voljo samo administratorjem (HTTP 403)
+    internal_server_error:
+      title: Napaka aplikacije
+      description: Strežnik OpenStreetMap je naletel na nepričakovano stanje, ki mu
+        je preprečilo izpolnitev zahteve (HTTP 500)
+    not_found:
+      title: Datoteka ni bila najdena
+      description: Datoteke/imenika/operacije API-ja s tem imenom v strežniku OpenStreetMap
+        ni bilo mogoče najti (HTTP 404)

   friendships:
     make_friend:
       heading: Dodaj %{user} med prijatelje?
   friendships:
     make_friend:
       heading: Dodaj %{user} med prijatelje?


@@ -677,13 +697,10 @@ sl:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Interni</a> zadetki
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Interni</a> zadetki

-        ca_postcode_html: Zadetki iz <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Zadetki iz <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Zadetki iz <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Zadetki iz <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Zadetki iz <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>-a
         osm_nominatim_reverse_html: Zadetki iz <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>-a

-        geonames_reverse_html: Zadetki iz <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix_format: '%{name}'
       prefix:
     search_osm_nominatim:
       prefix_format: '%{name}'
       prefix:


@@ -791,7 +808,7 @@ sl:
           pub: Pivnica
           public_bath: Kopališče
           public_bookcase: Javna knjižna omara
           pub: Pivnica
           public_bath: Kopališče
           public_bookcase: Javna knjižna omara

-          public_building: Javne zgradba
+          public_building: Javne stavba

           ranger_station: Gozdarska postaja
           recycling: Reciklirna točka
           restaurant: Restavracija
           ranger_station: Gozdarska postaja
           recycling: Reciklirna točka
           restaurant: Restavracija


@@ -846,7 +863,7 @@ sl:
           church: Cerkveno poslopje
           civic: Občinska stavba
           college: VIsokošolska stavba
           church: Cerkveno poslopje
           civic: Občinska stavba
           college: VIsokošolska stavba

-          commercial: Poslovna zgradba
+          commercial: Poslovna stavba

           construction: Stavba v gradnji
           detached: Osamljena hiša
           dormitory: Študentski dom
           construction: Stavba v gradnji
           detached: Osamljena hiša
           dormitory: Študentski dom


@@ -864,9 +881,9 @@ sl:
           hut: Koča
           industrial: Industrijski objekt
           kindergarten: Poslopje vrtca
           hut: Koča
           industrial: Industrijski objekt
           kindergarten: Poslopje vrtca

-          manufacture: Proizvodna zgradba
+          manufacture: Proizvodna stavba

           office: Poslovna stavba
           office: Poslovna stavba

-          public: Javna zgradba
+          public: Javna stavba

           residential: Stanovanjska stavba
           retail: Trgovina na drobno
           roof: Streha
           residential: Stanovanjska stavba
           retail: Trgovina na drobno
           roof: Streha


@@ -882,7 +899,7 @@ sl:
           train_station: Poslopje železniške postaje
           university: Univerza
           warehouse: Skladišče
           train_station: Poslopje železniške postaje
           university: Univerza
           warehouse: Skladišče

-          "yes": Zgradba
+          "yes": Stavba

         club:
           scout: Baza skavtske skupine
           sport: Športni klub
         club:
           scout: Baza skavtske skupine
           sport: Športni klub


@@ -1422,7 +1439,7 @@ sl:
           wilderness_hut: Koča v divjini
           zoo: Živalski vrt
         tunnel:
           wilderness_hut: Koča v divjini
           zoo: Živalski vrt
         tunnel:

-          building_passage: Prehod skozi zgradbo
+          building_passage: Prehod skozi stavbo

           culvert: Podzemni kanal
           "yes": Predor
         waterway:
           culvert: Podzemni kanal
           "yes": Predor
         waterway:


@@ -1891,16 +1908,16 @@ sl:
         naslov URL.
   preferences:
     show:
         naslov URL.
   preferences:
     show:

-      title: Moje preference
+      title: Moje prilagoditve

       preferred_editor: Prednostni urejevalnik
       preferred_languages: Prednostni jeziki
       preferred_editor: Prednostni urejevalnik
       preferred_languages: Prednostni jeziki

-      edit_preferences: Uredi preference
+      edit_preferences: Uredi prilagoditve

     edit:
     edit:

-      title: Urejanje preferenc
-      save: Posodobi preference
+      title: Urejanje prilagoditev
+      save: Posodobi prilagoditve

       cancel: Prekliči
     update:
       cancel: Prekliči
     update:

-      failure: Preferenc ni bilo mogoče posodobiti.
+      failure: Prilagoditev ni bilo mogoče posodobiti.

     update_success_flash:
       message: Nastavitve posodobljene.
   profiles:
     update_success_flash:
       message: Nastavitve posodobljene.
   profiles:


@@ -2020,7 +2037,7 @@ sl:
       community_driven_html: |-
         Skupnost OpenStreetMap je raznolika, zagnana in raste vsak dan.
         Naši sodelavci so strastni kartografi, strokovnjaki za GIS, inženirji,
       community_driven_html: |-
         Skupnost OpenStreetMap je raznolika, zagnana in raste vsak dan.
         Naši sodelavci so strastni kartografi, strokovnjaki za GIS, inženirji,

-        ki upravljajo strežnike OSM, človekoljubi, ki kartirajo prizadeta območja
+        ki upravljajo strežnike OSM, človekoljubi, ki kartirajo prizadeta območja,

         in številni drugi.
         Za več o naši skupnosti glejte
         <a href='https://blog.openstreetmap.org'>Blog OpenStreetMap</a>,
         in številni drugi.
         Za več o naši skupnosti glejte
         <a href='https://blog.openstreetmap.org'>Blog OpenStreetMap</a>,


@@ -2073,7 +2090,7 @@ sl:
         credit_2_1_html: |-
           <ul>
             <li>Pripišite zasluge OpenStreetMap z navedbo našega obvestila o avtorskih pravicah.</li>
         credit_2_1_html: |-
           <ul>
             <li>Pripišite zasluge OpenStreetMap z navedbo našega obvestila o avtorskih pravicah.</li>

-            <li>Pojasnite, da so podatki na voljo pod licenco the Open Database License.</li>
+            <li>Pojasnite, da so podatki na voljo pod licenco Open Database License.</li>

           </ul>
         credit_3_1_html: Za obvestilo o avtorskih pravicah imamo različne zahteve,
           kako naj bo prikazano, odvisno od tega, kako uporabljate naše podatke. Veljajo
           </ul>
         credit_3_1_html: Za obvestilo o avtorskih pravicah imamo različne zahteve,
           kako naj bo prikazano, odvisno od tega, kako uporabljate naše podatke. Veljajo


@@ -2217,8 +2234,8 @@ sl:
           description: Redno posodabljane kopije celotne podatkovne zbirke OpenStreetMap
         overpass:
           title: Overpass API
           description: Redno posodabljane kopije celotne podatkovne zbirke OpenStreetMap
         overpass:
           title: Overpass API

-          description: Prenesi izbrano območje iz zrcalnega strežnika podatkovne zbirke
-            OpenStreetMap
+          description: Prenos izbranega območja iz zrcalnega strežnika podatkovne
+            zbirke OpenStreetMap

         geofabrik:
           title: Prenosi Geofabrik
           description: Redno posodabljani izvlečki celin, držav in izbranih mest
         geofabrik:
           title: Prenosi Geofabrik
           description: Redno posodabljani izvlečki celin, držav in izbranih mest


@@ -2285,7 +2302,7 @@ sl:
       forums:
         title: Forumi (arhiv)
         description: Vprašanja in razprave za tiste, ki jim bolj ustreza forumski
       forums:
         title: Forumi (arhiv)
         description: Vprašanja in razprave za tiste, ki jim bolj ustreza forumski

-          vmesnik.
+          slog.

       community:
         url: https://community.openstreetmap.org/
         title: Forum skupnosti
       community:
         url: https://community.openstreetmap.org/
         title: Forum skupnosti


@@ -2314,7 +2331,7 @@ sl:
         namizno aplikacijo za Mac in Windows</a>.
       id_html: Lahko pa privzeti urejevalnik nastavite na iD, ki se izvaja v vašem
         spletnem brskalniku, tako kot se je Potlatch. <a href="%{settings_url}">Svoje
         namizno aplikacijo za Mac in Windows</a>.
       id_html: Lahko pa privzeti urejevalnik nastavite na iD, ki se izvaja v vašem
         spletnem brskalniku, tako kot se je Potlatch. <a href="%{settings_url}">Svoje

-        preference spremenite tukaj</a>.
+        prilagoditve spremenite tukaj</a>.

     sidebar:
       search_results: Iskalni zadetki
       close: Zapri
     sidebar:
       search_results: Iskalni zadetki
       close: Zapri


@@ -2368,7 +2385,7 @@ sl:
           - Travniki
           - travnik
           - vrt
           - Travniki
           - travnik
           - vrt

-          retail: Trgovsko območje
+          retail: Trgovinsko območje

           industrial: Industrijsko območje
           commercial: Poslovno območje
           heathland: Grmičevje
           industrial: Industrijsko območje
           commercial: Poslovno območje
           heathland: Grmičevje


@@ -2386,7 +2403,7 @@ sl:
           school:
           - Šola
           - univerza
           school:
           - Šola
           - univerza

-          building: Pomembna zgradba
+          building: Pomembna stavba

           station: Železniška postaja
           summit:
           - Vrh
           station: Železniška postaja
           summit:
           - Vrh


@@ -2605,7 +2622,7 @@ sl:
         %{user}. Prosimo, preverite, ali želite aplikaciji omogočiti naslednje zmožnosti.
         Izbirate lahko med poljubnim številom.
       allow_to: 'Dovoli odjemalska aplikaciji dostop:'
         %{user}. Prosimo, preverite, ali želite aplikaciji omogočiti naslednje zmožnosti.
         Izbirate lahko med poljubnim številom.
       allow_to: 'Dovoli odjemalska aplikaciji dostop:'

-      allow_read_prefs: branje vaših uporabniških preferenc.
+      allow_read_prefs: branje vaših uporabniških prilagoditev.

       allow_write_prefs: spreminjanje uporabniških nastavitev.
       allow_write_diary: ustvarjanje dnevniških zapisov, komentarjev in dodajanje
         prijateljev.
       allow_write_prefs: spreminjanje uporabniških nastavitev.
       allow_write_diary: ustvarjanje dnevniških zapisov, komentarjev in dodajanje
         prijateljev.


@@ -2628,7 +2645,7 @@ sl:
     permissions:
       missing: Aplikaciji niste dovolili dostopa do te funkcije
     scopes:
     permissions:
       missing: Aplikaciji niste dovolili dostopa do te funkcije
     scopes:

-      read_prefs: Branje uporabniških preferenc
+      read_prefs: Branje uporabniških prilagoditev

       write_prefs: Spreminjanje uporabniških nastavitev
       write_diary: Ustvarjajte dnevniške zapise, komentarje in sklepajte prijateljstva
       write_api: Spreminjanje zemljevida
       write_prefs: Spreminjanje uporabniških nastavitev
       write_diary: Ustvarjajte dnevniške zapise, komentarje in sklepajte prijateljstva
       write_api: Spreminjanje zemljevida


@@ -2653,11 +2670,11 @@ sl:
       edit: Urejanje podrobnosti
       delete: Izbriši odjemalca
       confirm: Ste prepričani?
       edit: Urejanje podrobnosti
       delete: Izbriši odjemalca
       confirm: Ste prepričani?

-      requests: 'Zahteva dovoljenja za naslednje dostope do uporabnikovih podatkov:'
+      requests: 'Zahtevanje dovoljenja za naslednje dostope do uporabnikovih podatkov:'

     index:
       title: Moje nastavitve OAuth
       my_tokens: Moje pooblaščene aplikacije
     index:
       title: Moje nastavitve OAuth
       my_tokens: Moje pooblaščene aplikacije

-      list_tokens: 'Naslednji žetoni so bili izdani aplikacijam za vaše ime:'
+      list_tokens: 'V vašem imenu so bili aplikacijam izdani naslednji žetoni:'

       application: Ime aplikacije
       issued_at: Izdan
       revoke: Prekliči!
       application: Ime aplikacije
       issued_at: Izdan
       revoke: Prekliči!


@@ -2744,7 +2761,7 @@ sl:
       confirm email address: 'Potrdite naslov e-pošte:'
       display name: 'Prikazano ime:'
       display name description: Vaše javno prikazano uporabniško ime. To lahko spremenite
       confirm email address: 'Potrdite naslov e-pošte:'
       display name: 'Prikazano ime:'
       display name description: Vaše javno prikazano uporabniško ime. To lahko spremenite

-        pozneje v preferencah.
+        pozneje v prilagoditvah.

       external auth: Avtentikacija prek tretje osebe
       use external auth: Lahko pa se prijavite prek tretje osebe
       auth no password: Pri overitvi tretje osebe geslo ni zahtevano, vendar ga bodo
       external auth: Avtentikacija prek tretje osebe
       use external auth: Lahko pa se prijavite prek tretje osebe
       auth no password: Pri overitvi tretje osebe geslo ni zahtevano, vendar ga bodo


@@ -2800,7 +2817,7 @@ sl:
       my profile: Moj profil
       my settings: Moje nastavitve
       my comments: Moji komentarji
       my profile: Moj profil
       my settings: Moje nastavitve
       my comments: Moji komentarji

-      my_preferences: Moje preference
+      my_preferences: Moje prilagoditve

       my_dashboard: Moja pregledna plošča
       blocks on me: Blokiranja mene
       blocks by me: Moja blokiranja
       my_dashboard: Moja pregledna plošča
       blocks on me: Blokiranja mene
       blocks by me: Moja blokiranja


@@ -3038,20 +3055,21 @@ sl:
       custom_dimensions: Nastavitev velikosti po meri
       format: 'Format:'
       scale: 'Merilo:'
       custom_dimensions: Nastavitev velikosti po meri
       format: 'Format:'
       scale: 'Merilo:'

-      image_dimensions: Slika bo prikazala standardni sloj velikosti %{width} x %{height}
+      image_dimensions: Slika bo prikazovala standardni sloj velikosti %{width} x
+        %{height}

       download: Prenesi
       short_url: Kratki URL
       include_marker: Vključi oznako
       center_marker: Osredini zemljevid na oznako
       paste_html: Prilepite HTML za vdelavo v spletno mesto
       view_larger_map: Prikaži večji zemljevid
       download: Prenesi
       short_url: Kratki URL
       include_marker: Vključi oznako
       center_marker: Osredini zemljevid na oznako
       paste_html: Prilepite HTML za vdelavo v spletno mesto
       view_larger_map: Prikaži večji zemljevid

-      only_standard_layer: Samo standardno plast je mogoče izvoziti kot sliko
+      only_standard_layer: Kot sliko je mogoče izvoziti samo standardni sloj

     embed:
       report_problem: Prijavi težavo
     key:
     embed:
       report_problem: Prijavi težavo
     key:

-      title: Legenda zemljevida
-      tooltip: Legenda zemljevida
-      tooltip_disabled: LEgenda zemljevida za to plast ni na voljo
+      title: Legenda
+      tooltip: Legenda
+      tooltip_disabled: Legenda za ta sloj ni na voljo

     map:
       zoom:
         in: Približaj
     map:
       zoom:
         in: Približaj


@@ -3076,12 +3094,12 @@ sl:
         hot: Humanitarno
         opnvkarte: ÖPNVKarte
       layers:
         hot: Humanitarno
         opnvkarte: ÖPNVKarte
       layers:

-        header: Plasti zemljevida
+        header: Sloji zemljevida

         notes: Opombe na zemljevidu
         data: Podatki zemljevida
         gps: Javne sledi GPS
         overlays: Za odpravljanje težav z zemljevidom omogočite prekrivke
         notes: Opombe na zemljevidu
         data: Podatki zemljevida
         gps: Javne sledi GPS
         overlays: Za odpravljanje težav z zemljevidom omogočite prekrivke

-        title: Plasti
+        title: Sloji

       copyright: © <a href='%{copyright_url}'>Sodelavci OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Denarni prispevki</a>
       terms: <a href='%{terms_url}' target='_blank'>Pogoji za uporabo spletnega mesta
       copyright: © <a href='%{copyright_url}'>Sodelavci OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Denarni prispevki</a>
       terms: <a href='%{terms_url}' target='_blank'>Pogoji za uporabo spletnega mesta


@@ -3112,12 +3130,12 @@ sl:
         unhide_comment: razkrij
     notes:
       new:
         unhide_comment: razkrij
     notes:
       new:

-        intro: Ste opazili napako ali pa kaj manjka? Obvestite ostale kartografe o
+        intro: Ste opazili napako ali da kaj manjka? Obvestite druge kartografe o

           tem, da lahko to popravimo. Premaknite oznako na pravilno lokacijo in vpišite
           tem, da lahko to popravimo. Premaknite oznako na pravilno lokacijo in vpišite

-          opombo, kjer pojasnite problem.
-        advice: Vaša opomba je javna in se jo lahko uporabi za posodobitev zemljevida.
-          Ne vnašajte osebnih podatkov, ali podatkov z avtorsko-zaščitenih zemljevidov
-          ali iz imenikov.
+          opombo, v kateri pojasnite problem.
+        advice: Vaša opomba je javna in se lahko uporabi za posodobitev zemljevida.
+          Ne vnašajte osebnih podatkov ali podatkov iz avtorsko zaščitenih zemljevidov
+          ali imenikov.

         add: Dodaj opombo
       show:
         anonymous_warning: To opomba vključuje komentarje anonimnih uporabnikov, ki
         add: Dodaj opombo
       show:
         anonymous_warning: To opomba vključuje komentarje anonimnih uporabnikov, ki


@@ -3149,6 +3167,8 @@ sl:
       descend: Spust
       directions: Navodila
       distance: Razdalja
       descend: Spust
       directions: Navodila
       distance: Razdalja

+      distance_m: '%{distance}&nbsp;m'
+      distance_km: '%{distance}&nbsp;km'

       errors:
         no_route: Ni mogoče najti poti med tema dvema položajema.
         no_place: Žal kraja '%{place}' ni bilo mogoče najti.
       errors:
         no_route: Ni mogoče najti poti med tema dvema položajema.
         no_place: Žal kraja '%{place}' ni bilo mogoče najti.

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 0c1c82337eeff3e6532b7a1cb1992f71fdb1f9ed..944f56e39911eeef820335f1dfc3d9bd17474c02 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -80,7 +80,7 @@ sq:
         title: Titulli
         latitude: Gjerësia Gjeografike
         longitude: Gjatësia Gjeografike
         title: Titulli
         latitude: Gjerësia Gjeografike
         longitude: Gjatësia Gjeografike

-        language: Gjuha
+        language_code: Gjuha

       friend:
         user: Përdoruesi
         friend: Mik
       friend:
         user: Përdoruesi
         friend: Mik


@@ -414,13 +414,10 @@ sq:
     search:
       title:
         latlon_html: Rezultatet e brendshme nga <a href="https://openstreetmap.org/"></a>
     search:
       title:
         latlon_html: Rezultatet e brendshme nga <a href="https://openstreetmap.org/"></a>

-        ca_postcode_html: Rezultatet nga <a href="https://geocoder.ca/">Geocoder.ca</a>

         osm_nominatim_html: Rezultatet nga <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Rezultatet nga <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Rezultate nga <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Rezultatet nga <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Rezultatet nga <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Rezultate nga <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 031f5119bf379f171753b0f1cae323af999318ad..bedda3743d3809a10b299965bbb3c8ba589a619f 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -76,7 +76,7 @@ sr-Latn:
         title: Naslov
         latitude: Geografska širina
         longitude: Geografska dužina
         title: Naslov
         latitude: Geografska širina
         longitude: Geografska dužina

-        language: Jezik
+        language_code: Jezik

       friend:
         user: Korisnik
         friend: Prijatelj
       friend:
         user: Korisnik
         friend: Prijatelj


@@ -328,10 +328,7 @@ sr-Latn:
     search:
       title:
         latlon_html: Rezultati iz <a href="http://openstreetmap.org/">Internala</a>
     search:
       title:
         latlon_html: Rezultati iz <a href="http://openstreetmap.org/">Internala</a>

-        ca_postcode_html: Rezultati iz <a href="http://geocoder.ca/">Geokodera</a>

         osm_nominatim_html: Rezultati iz <a href="http://nominatim.openstreetmap.org/">Nominatima</a>
         osm_nominatim_html: Rezultati iz <a href="http://nominatim.openstreetmap.org/">Nominatima</a>

-        geonames_html: Rezultati iz <a href="http://www.geonames.org/">Geografskih
-          imena</a>

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8eb9f69eab7dd2d8e60a8150e6bad3788f7d4bf1..3bc91da7fdb8d72dbb49aecc7a9762de7a2e0802 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -117,7 +117,7 @@ sr:
         title: Наслов
         latitude: Географска ширина
         longitude: Географска дужина
         title: Наслов
         latitude: Географска ширина
         longitude: Географска дужина

-        language: Језик
+        language_code: Језик

       doorkeeper/application:
         name: Назив
         redirect_uri: Адреса за преусмеравање
       doorkeeper/application:
         name: Назив
         redirect_uri: Адреса за преусмеравање


@@ -522,13 +522,10 @@ sr:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Унутрашњи</a> резултати
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Унутрашњи</a> резултати

-        ca_postcode_html: Резултати са сајта <a href="https://geocoder.ca/">Geocoder.ca</a>

         osm_nominatim_html: Резултати са сајта <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Резултати са сајта <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Резултати са сајта <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Резултати са сајта <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Резултати са сајта <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Резултати са сајта <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 93ba1ea93fc0c030459d313cd90ebd2f4b8de8d7..5b33f7629b720afc91faba6f0ec13b314fcd1d2b 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -144,7 +144,7 @@ sv:
         title: Ämne
         latitude: Latitud
         longitude: Longitud
         title: Ämne
         latitude: Latitud
         longitude: Longitud

-        language: Språk
+        language_code: Språk

       doorkeeper/application:
         name: Namn
         redirect_uri: Omdirigerings-URI:er
       doorkeeper/application:
         name: Namn
         redirect_uri: Omdirigerings-URI:er


@@ -662,13 +662,10 @@ sv:
     search:
       title:
         latlon_html: Resultat från <a href="https://openstreetmap.org/">OpenStreetMap</a>
     search:
       title:
         latlon_html: Resultat från <a href="https://openstreetmap.org/">OpenStreetMap</a>

-        ca_postcode_html: Resultat från <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Resultat från <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Resultat från <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Resultat från <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Resultat från <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Resultat från <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Resultat från <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 36263d984f33add8c9d6a6c148ba1922407b449f..163ca9a8f35498e54079e3a964552fe2a98ea5e7 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -108,7 +108,7 @@ ta:
         title: பொருள்
         latitude: குறுக்குக் கோடு
         longitude: குத்துயரக் கோடு
         title: பொருள்
         latitude: குறுக்குக் கோடு
         longitude: குத்துயரக் கோடு

-        language: மொழி
+        language_code: மொழி

       doorkeeper/application:
         name: பெயர்
         redirect_uri: URI களை திருப்பி விடுங்கள்
       doorkeeper/application:
         name: பெயர்
         redirect_uri: URI களை திருப்பி விடுங்கள்

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 60750cb62554f5542c03f145aaf2decb36763c4b..2a28352715f37924cc52375b521538c187f62d36 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -104,7 +104,7 @@ te:
         title: విషయం
         latitude: అక్షాంశం
         longitude: రేఖాంశం
         title: విషయం
         latitude: అక్షాంశం
         longitude: రేఖాంశం

-        language: భాష
+        language_code: భాష

       doorkeeper/application:
         name: పేరు
         redirect_uri: దారిమార్పు URI లు
       doorkeeper/application:
         name: పేరు
         redirect_uri: దారిమార్పు URI లు


@@ -618,14 +618,10 @@ te:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">అంతర్గత</a> ఫలితాలు
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">అంతర్గత</a> ఫలితాలు

-        ca_postcode_html: <a href="http://geocoder.ca/">Geocoder.CA</a> నుండి ఫలితాలు

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> నుండి ఫలితాలు
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> నుండి ఫలితాలు

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> నుండి ఫలితాలు

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> నుండి ఫలితాలు
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> నుండి ఫలితాలు

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> నుండి
-          ఫలితాలు

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 7f83f82b9f043c50a155b8340432b3029bbf3e79..38b9f6c94f1e0934092b6e47cb1a7b41f0cf9ebe 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -106,7 +106,7 @@ th:
         title: หัวเรื่อง
         latitude: ละติจูด
         longitude: ลองติจูด
         title: หัวเรื่อง
         latitude: ละติจูด
         longitude: ลองติจูด

-        language: ภาษา
+        language_code: ภาษา

       doorkeeper/application:
         name: ชื่อ
       friend:
       doorkeeper/application:
         name: ชื่อ
       friend:


@@ -533,13 +533,10 @@ th:
     search:
       title:
         latlon_html: ผลการค้นหาจาก <a href="https://openstreetmap.org/">เว็บไซต์นี้</a>
     search:
       title:
         latlon_html: ผลการค้นหาจาก <a href="https://openstreetmap.org/">เว็บไซต์นี้</a>

-        ca_postcode_html: ผลการค้นหาจาก <a href="https://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: ผลการค้นหาจาก <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: ผลการค้นหาจาก <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: ผลการค้นหาจาก <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: ผลการค้นหาจาก <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: ผลการค้นหาจาก <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: ผลการค้นหาจาก <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 95ca5951e65fae385e43fc28a50dcb9f5b6ec193..7c0039f9850ae2742d31085434280249032f0f15 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -106,7 +106,7 @@ tl:
         title: Paksa
         latitude: Latitud
         longitude: Longhitud
         title: Paksa
         latitude: Latitud
         longitude: Longhitud

-        language: Wika
+        language_code: Wika

       doorkeeper/application:
         name: Pangalan
         scopes: Mga Pahintulot
       doorkeeper/application:
         name: Pangalan
         scopes: Mga Pahintulot


@@ -567,13 +567,10 @@ tl:
     search:
       title:
         latlon_html: Mga kinalabasan mula sa <a href="http://openstreetmap.org/">Panloob</a>
     search:
       title:
         latlon_html: Mga kinalabasan mula sa <a href="http://openstreetmap.org/">Panloob</a>

-        ca_postcode_html: Mga kinalabasan mula sa <a href="http://geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim
           ng OpenStreetMap</a>
         osm_nominatim_html: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim
           ng OpenStreetMap</a>

-        geonames_html: Mga kinalabasan mula sa <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim
           ng OpenStreetMap</a>
         osm_nominatim_reverse_html: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim
           ng OpenStreetMap</a>

-        geonames_reverse_html: Mga kinalabasan mula sa <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 4ebf5cf11e35d7d184bbad78efea58cd1183ed95..2c37f2497d3aec8b0a7e75406906e55b95a70212 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -145,7 +145,7 @@ tr:
         title: Konu
         latitude: Enlem
         longitude: Boylam
         title: Konu
         latitude: Enlem
         longitude: Boylam

-        language: Dil
+        language_code: Dil

       doorkeeper/application:
         name: Ad
         redirect_uri: Yönlendirme URI'leri
       doorkeeper/application:
         name: Ad
         redirect_uri: Yönlendirme URI'leri


@@ -675,13 +675,10 @@ tr:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">OSM</a> sonuçları
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">OSM</a> sonuçları

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> sonuçları

         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OSM Nominatim</a>
           sonuçları
         osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OSM Nominatim</a>
           sonuçları

-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> sonuçları

         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> sonuçları
         osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> sonuçları

-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> sonuçları

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 01629f409134b594749d053477bb83430a659904..75039397f8c4f84f4a84cbd753bda223b255a7f0 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -62,7 +62,7 @@ tt:
         title: Тема
         latitude: Киңлек
         longitude: Озынлык
         title: Тема
         latitude: Киңлек
         longitude: Озынлык

-        language: Тел
+        language_code: Тел

       friend:
         user: Кулланучы
         friend: Дус
       friend:
         user: Кулланучы
         friend: Дус


@@ -245,11 +245,28 @@ tt:
       comment: Шәрех
       newer_comments: Яңарак шәрехләр
       older_comments: Искерәк шәрехләр
       comment: Шәрех
       newer_comments: Яңарак шәрехләр
       older_comments: Искерәк шәрехләр

+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+      contact: элемтә
+      contact_the_community_html: Әгәр дә сез эшләми торган сылтама / баш тапсагыз,
+        бернинди шиксез OpenStreetMap җәмгыятенә %{contact_link} итегез. Соравыгызга
+        туры килгән URL турында искәрмә ясагыз.
+    forbidden:
+      title: Тыйган
+      description: Сез OpenStreetMap серверыннан сораган гамәл идарәчеләргә генә рөхсәт
+        ителә (HTTP 403)
+    internal_server_error:
+      description: OpenStreetMap серверы көтелмәгән шарт белән очрашты, бу вакыйга
+        сорауга җавап бирергә комачаулады (HTTP 500)
+    not_found:
+      title: Файл табылмады
+      description: Шушы исем буенча OpenStreetMap серверыннан файл/директория/API
+        гамәл табып булмый

   geocoder:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Эчке нәтиҗәләр</a>
   geocoder:
     search:
       title:
         latlon_html: <a href="http://openstreetmap.org/">Эчке нәтиҗәләр</a>

-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> нәтиҗәләре

     search_osm_nominatim:
       prefix:
         aeroway:
     search_osm_nominatim:
       prefix:
         aeroway:


@@ -805,6 +822,8 @@ tt:
       descend: Төшү
       directions: Юнәлешләр
       distance: Ераклык
       descend: Төшү
       directions: Юнәлешләр
       distance: Ераклык

+      distance_m: '%{distance}м'
+      distance_km: '%{distance}км'

       instructions:
         exit_counts:
           first: 1 нче
       instructions:
         exit_counts:
           first: 1 нче

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4f688cd788b7e82643cd319dcb98db765278fe93..938d9ca99011a2f34283142e2c3c8b261fc2df91 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -141,7 +141,7 @@ uk:
         title: Тема
         latitude: Широта
         longitude: Довгота
         title: Тема
         latitude: Широта
         longitude: Довгота

-        language: Мова
+        language_code: Мова

       doorkeeper/application:
         name: Назва
         redirect_uri: URI перенаправлення
       doorkeeper/application:
         name: Назва
         redirect_uri: URI перенаправлення


@@ -700,12 +700,9 @@ uk:
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Внутрішні</a> результати
     search:
       title:
         latlon_html: <a href="https://openstreetmap.org/">Внутрішні</a> результати

-        ca_postcode_html: Результати від <a href="https://geocoder.ca/">Geocoder</a>

         osm_nominatim_html: Результати від <a href="https://nominatim.openstreetmap.org/">Nominatim</a>
         osm_nominatim_html: Результати від <a href="https://nominatim.openstreetmap.org/">Nominatim</a>

-        geonames_html: Результати від <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Результати від <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Результати від <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Результати від <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 02e7abdbb2c978cd2ae17ab5722814a665b27155..366276dae1ff127fdb22aa938de7efba11740c1a 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -117,7 +117,7 @@ vi:
         title: Tiêu đề
         latitude: Vĩ độ
         longitude: Kinh độ
         title: Tiêu đề
         latitude: Vĩ độ
         longitude: Kinh độ

-        language: Ngôn ngữ
+        language_code: Ngôn ngữ

       doorkeeper/application:
         name: Tên
         redirect_uri: URI đổi hướng
       doorkeeper/application:
         name: Tên
         redirect_uri: URI đổi hướng


@@ -632,13 +632,10 @@ vi:
     search:
       title:
         latlon_html: Kết quả <a href="https://www.openstreetmap.org/">nội bộ</a>
     search:
       title:
         latlon_html: Kết quả <a href="https://www.openstreetmap.org/">nội bộ</a>

-        ca_postcode_html: Kết quả <a href="https://www.geocoder.ca/">Geocoder.CA</a>

         osm_nominatim_html: Kết quả <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_html: Kết quả <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_html: Kết quả <a href="http://www.geonames.org/">GeoNames</a>

         osm_nominatim_reverse_html: Kết quả <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         osm_nominatim_reverse_html: Kết quả <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

-        geonames_reverse_html: Kết quả <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 9b2d51900cc8c1e63340b7a0efcafe5b0924acf6..70dd63140fd5f0dd92726a8eb3dcd0abc554e7fd 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -98,7 +98,7 @@ xmf:
         title: 'თემა:'
         latitude: განედი
         longitude: გრძედი
         title: 'თემა:'
         latitude: განედი
         longitude: გრძედი

-        language: ნინა
+        language_code: ნინა

       doorkeeper/application:
         name: ჯოხო
         redirect_uri: URIs გინოწურაფა
       doorkeeper/application:
         name: ჯოხო
         redirect_uri: URIs გინოწურაფა

diff --git a/config/locales/yi.yml b/config/locales/yi.yml
index 7ff1e7a0c31d07480bcbc408ca52bff6e21f0137..7a2c3f76050b89dad0177d7e58faaf8d6f0afae8 100644 (file)
--- a/config/locales/yi.yml
+++ b/config/locales/yi.yml
@@ -32,7 +32,7 @@ yi:
         title: טעמע
         latitude: גארטל־ליניע
         longitude: געאגראַפֿישע לענג
         title: טעמע
         latitude: גארטל־ליניע
         longitude: געאגראַפֿישע לענג

-        language: שפראך
+        language_code: שפראך

       friend:
         user: באַניצער
         friend: פֿרײַנד
       friend:
         user: באַניצער
         friend: פֿרײַנד

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index df86e2d4d9383ee7c9c1e9b5ceecd4377db59cf9..75167dc412ad698771c159f444627e04c5b72f92 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -22,7 +22,7 @@ yo:
         body: Ara
       diary_entry:
         title: Àkọlé
         body: Ara
       diary_entry:
         title: Àkọlé

-        language: Èdè
+        language_code: Èdè

       friend:
         friend: Ore
       message:
       friend:
         friend: Ore
       message:

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 8656e92b953ad353121da5625bd530ba50898653..b269a6fbf9e11232c5dec25dd86f43720234dc49 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -173,7 +173,7 @@ zh-CN:
         title: 主题
         latitude: 纬度
         longitude: 经度
         title: 主题
         latitude: 纬度
         longitude: 经度

-        language: 语言
+        language_code: 语言

       doorkeeper/application:
         name: 名称
         redirect_uri: 重定向URI
       doorkeeper/application:
         name: 名称
         redirect_uri: 重定向URI


@@ -660,14 +660,10 @@ zh-CN:
     search:
       title:
         latlon_html: 来自<a href="https://openstreetmap.org/">内部</a>的结果
     search:
       title:
         latlon_html: 来自<a href="https://openstreetmap.org/">内部</a>的结果

-        ca_postcode_html: 来自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的结果

         osm_nominatim_html: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的结果
         osm_nominatim_html: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的结果

-        geonames_html: 来自 <a href="http://www.geonames.org/">GeoNames</a> 的结果

         osm_nominatim_reverse_html: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的结果
         osm_nominatim_reverse_html: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的结果

-        geonames_reverse_html: 来自 <a href="http://www.geonames.org/">GeoNames</a>
-          的结果

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 1723607fe84f29997254f7b61f293ef6d0abdc1e..b1983d418b471f35a3ce7d8ddf75e3f76f983c2e 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -101,7 +101,7 @@ zh-HK:
         title: 主題
         latitude: 緯度
         longitude: 經度
         title: 主題
         latitude: 緯度
         longitude: 經度

-        language: 語言
+        language_code: 語言

       doorkeeper/application:
         name: 名稱
         redirect_uri: 重新導向 URI
       doorkeeper/application:
         name: 名稱
         redirect_uri: 重新導向 URI


@@ -401,9 +401,6 @@ zh-HK:
     remove_friend:
       heading: 刪除好友%{user}？
   geocoder:
     remove_friend:
       heading: 刪除好友%{user}？
   geocoder:

-    search:
-      title:
-        ca_postcode_html: 來自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的結果

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 47df2dfc888842039accb2dddf7863d45fc95796..76c36d63b41118d97085958fe530e4bc3e79853d 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -140,7 +140,7 @@ zh-TW:
         title: 標題
         latitude: 緯度
         longitude: 經度
         title: 標題
         latitude: 緯度
         longitude: 經度

-        language: 語言
+        language_code: 語言

       doorkeeper/application:
         name: 名稱
         redirect_uri: 重新導向 URI
       doorkeeper/application:
         name: 名稱
         redirect_uri: 重新導向 URI


@@ -627,13 +627,10 @@ zh-TW:
     search:
       title:
         latlon_html: 來自<a href="https://openstreetmap.org/">內部</a>的結果
     search:
       title:
         latlon_html: 來自<a href="https://openstreetmap.org/">內部</a>的結果

-        ca_postcode_html: 來自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的結果

         osm_nominatim_html: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的結果
         osm_nominatim_html: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的結果

-        geonames_html: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果

         osm_nominatim_reverse_html: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的結果
         osm_nominatim_reverse_html: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的結果

-        geonames_reverse_html: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway: