Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index f9766db6b9e722aa368b87a3cddb014c10fec18a..608a48872dda13ac6f785e39dc3bac9af8213276 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -933,10 +933,6 @@ ast:
       text: Fai un donativu
     learn_more: Más información
     more: Más
       text: Fai un donativu
     learn_more: Más información
     more: Más

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8ª Conferencia Añal
-    sotm_line_2: 7-9 de payares de 2014
-    sotm_line_3: Buenos Aires, Arxentina

   license_page:
     foreign:
       title: Tocante a esta traducción
   license_page:
     foreign:
       title: Tocante a esta traducción

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 6d60f526d91a52dd850441641fb822fac36be91a..4b5f785011c5ee01f262f7baca10b6ad53efe9cd 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -941,10 +941,6 @@ br:
       text: Ober un donezon
     learn_more: Gouzout hiroc'h
     more: Muioc'h
       text: Ober un donezon
     learn_more: Gouzout hiroc'h
     more: Muioc'h

-    sotm_header: Stad kartenn 2014
-    sotm_line_1: 8vet Prezegenn vloaziek
-    sotm_line_2: 7-9 a viz Du 2014
-    sotm_line_3: Buenos Aires, Arc'hantina

   license_page:
     foreign:
       title: Diwar-benn an droidigezh-mañ
   license_page:
     foreign:
       title: Diwar-benn an droidigezh-mañ

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e925e908808312a3599c97445634401fb166f254..c0d443a2b4c500f7e13cd7fa7ce8a71f3a9fbed2 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -964,9 +964,6 @@ ca:
       text: Feu una donació
     learn_more: Aprèn-ne més
     more: Més
       text: Feu una donació
     learn_more: Aprèn-ne més
     more: Més

-    sotm_line_1: 8a Conferència Annual
-    sotm_line_2: 7-9 de novembre de 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: Quant a la traducció
   license_page:
     foreign:
       title: Quant a la traducció

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bdada882a1416d3600752005eb3bd8665fc4ad08..d2ef72f4a2a70fc90ebfc990e06f02e0b0fcc732 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -953,10 +953,6 @@ cs:
       text: Pošlete příspěvek
     learn_more: Více informací
     more: Další
       text: Pošlete příspěvek
     learn_more: Více informací
     more: Další

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. výroční konference
-    sotm_line_2: 7.–9. listopadu 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: O tomto překladu
   license_page:
     foreign:
       title: O tomto překladu

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 85a678adbcd8f0ece747875bbbb86b06e052b190..ffda5693bbf20dc88fb2d4d11ca39c9fbc7e2cc8 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -951,10 +951,6 @@ da:
       text: Donér
     learn_more: Lær mere
     more: Mere
       text: Donér
     learn_more: Lær mere
     more: Mere

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. årlige konference
-    sotm_line_2: 7. til 9. november 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: Om denne oversættelse
   license_page:
     foreign:
       title: Om denne oversættelse

diff --git a/config/locales/de.yml b/config/locales/de.yml
index c1393c7bd4d0079c8fa7bdf968ce4f8e89f00374..9e8b1c6d2e1f008c2d5dfee5d977371826aef286 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -977,10 +977,6 @@ de:
       text: Spenden
     learn_more: Mehr erfahren
     more: Mehr
       text: Spenden
     learn_more: Mehr erfahren
     more: Mehr

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. Jahreskonferenz
-    sotm_line_2: 7. bis 9. November 2014
-    sotm_line_3: Buenos Aires, Argentinien

   license_page:
     foreign:
       title: Über diese Übersetzung
   license_page:
     foreign:
       title: Über diese Übersetzung

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 36218f4120463a1e334602bd22dfb4b021fbfa35..bd0c6b7b282ea789eab806c6f6332a175444adde 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -967,10 +967,6 @@ es:
       text: Hacer una donación
     learn_more: Más información
     more: Más
       text: Hacer una donación
     learn_more: Más información
     more: Más

-    sotm_header: Estado del mapa 2014
-    sotm_line_1: 8.ª Conferencia Anual
-    sotm_line_2: 7-9 de noviembre de 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: Acerca de esta traducción
   license_page:
     foreign:
       title: Acerca de esta traducción

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 7157e75d625d52f19d832deb5ed1d5f8262c1460..5fa02ba6e82d6f26a99011984ffce9085a132aa5 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -952,10 +952,6 @@ fa:
       text: کمک مالی
     learn_more: اطلاعات بیشتر
     more: بیشتر
       text: کمک مالی
     learn_more: اطلاعات بیشتر
     more: بیشتر

-    sotm_header: وضعیت نقشهٔ ۲۰۱۴
-    sotm_line_1: هشتمین کنفرانس سالانه
-    sotm_line_2: ۷ تا ۹ نوامبر ۲۰۱۴
-    sotm_line_3: بوینس‌آیرس، آرژانتین

   license_page:
     foreign:
       title: درباره این ترجمه‌ها
   license_page:
     foreign:
       title: درباره این ترجمه‌ها

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c129174820e98b73ff5a3b60a489eea1d3b7474c..910de55559a42d6e253c911fc2c21c50831ceaf7 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -956,10 +956,6 @@ fi:
       text: Lahjoita
     learn_more: Lisätietoja
     more: Lisää
       text: Lahjoita
     learn_more: Lisätietoja
     more: Lisää

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. vuosikokous
-    sotm_line_2: 7.-9.11.2014
-    sotm_line_3: Buenos Aires, Argentiina

   license_page:
     foreign:
       title: Tietoja tästä käännöksestä
   license_page:
     foreign:
       title: Tietoja tästä käännöksestä

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f4d900d15bbc88697b4df466b50234f0ef5431e9..1d5eeed27bcc51ee5d5c352ad13b0ea325ab808e 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -978,10 +978,6 @@ fr:
       text: Faire un don
     learn_more: En savoir plus
     more: Plus
       text: Faire un don
     learn_more: En savoir plus
     more: Plus

-    sotm_header: État de la carte 2014
-    sotm_line_1: 8e Conférence Annuelle
-    sotm_line_2: 7-9 novembre 2014
-    sotm_line_3: Buenos Aires, Argentine

   license_page:
     foreign:
       title: À propos de cette traduction
   license_page:
     foreign:
       title: À propos de cette traduction

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 4e668c474e654afde355ae495cf26fba1960b5b4..de48df9348d3003d45005974360cf03086d9ea7b 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -174,7 +174,9 @@ fur:
       wiki_link:
         key: La pagjine de vichi cu la descrizion de etichete %{key}.
         tag: La pagjine de vichi cu la descrizion de etichete %{key}=%{value}
       wiki_link:
         key: La pagjine de vichi cu la descrizion de etichete %{key}.
         tag: La pagjine de vichi cu la descrizion de etichete %{key}=%{value}

+      wikidata_link: L'element %{page} su Wikidata

       wikipedia_link: La vôs su %{page} te Vichipedie
       wikipedia_link: La vôs su %{page} te Vichipedie

+      telephone_link: Clame %{phone_number}

     note:
       title: 'Note: %{id}'
       new_note: Gnove note
     note:
       title: 'Note: %{id}'
       new_note: Gnove note


@@ -217,6 +219,9 @@ fur:
       empty: Nissun grup di cambiaments cjatât.
       empty_area: Nissun grup di cambiaments in cheste zone.
       empty_user: Nissun grup di cambiaments par chest utent.
       empty: Nissun grup di cambiaments cjatât.
       empty_area: Nissun grup di cambiaments in cheste zone.
       empty_user: Nissun grup di cambiaments par chest utent.

+      no_more: Nissun altri grup di cambiaments cjatât.
+      no_more_area: Nissun altri grup di cambiaments in cheste zone cjatât.
+      no_more_user: Nissun altri grup di cambiaments par chest utent.

       load_more: Cjame di plui
     timeout:
       sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je
       load_more: Cjame di plui
     timeout:
       sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je


@@ -309,6 +314,8 @@ fur:
         body: Cheste aree e je masse grande par espuartâle come dâts XML di OpenStreetMap.
           Par plasê incrès il zoom, sielç une aree plui piçule o dopre une des sorzints
           ca sot par discjamâ un grum di dâts.
         body: Cheste aree e je masse grande par espuartâle come dâts XML di OpenStreetMap.
           Par plasê incrès il zoom, sielç une aree plui piçule o dopre une des sorzints
           ca sot par discjamâ un grum di dâts.

+        overpass:
+          title: API Overpass

         other:
           title: Altris sorzints
           description: Altris sorzints elencadis su la wiki di OpenStreetMap
         other:
           title: Altris sorzints
           description: Altris sorzints elencadis su la wiki di OpenStreetMap


@@ -362,6 +369,7 @@ fur:
           cinema: Cine
           clinic: Cliniche
           community_centre: Centri civic
           cinema: Cine
           clinic: Cliniche
           community_centre: Centri civic

+          crematorium: Crematori

           dentist: Dentist
           doctors: Dotôrs
           dormitory: Dormitori
           dentist: Dentist
           doctors: Dotôrs
           dormitory: Dormitori


@@ -381,6 +389,7 @@ fur:
           kindergarten: Scuelute
           library: Biblioteche
           market: Marcjât
           kindergarten: Scuelute
           library: Biblioteche
           market: Marcjât

+          nightclub: Club noturni

           office: Ufizi
           park: Parc
           parking: Parcament
           office: Ufizi
           park: Parc
           parking: Parcament


@@ -597,6 +606,7 @@ fur:
           travel_agency: Agjenzie di viaçs
           "yes": Buteghe
         tourism:
           travel_agency: Agjenzie di viaçs
           "yes": Buteghe
         tourism:

+          attraction: Atrazion

           hostel: Ostel
           hotel: Hotel
           information: Informazions
           hostel: Ostel
           hotel: Hotel
           information: Informazions


@@ -1028,6 +1038,8 @@ fur:
       allow_write_prefs: modificâ lis tôs preferencis dal utent.
       allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs.
       allow_write_api: modificâ la mape.
       allow_write_prefs: modificâ lis tôs preferencis dal utent.
       allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs.
       allow_write_api: modificâ la mape.

+      allow_read_gpx: lei i tiei percors GPS privâts.
+      allow_write_gpx: cjamâ percors GPS.

       allow_write_notes: cambiâ lis notis.
     oauthorize_success:
       verification: Il codiç di verifiche al è %{code}.
       allow_write_notes: cambiâ lis notis.
     oauthorize_success:
       verification: Il codiç di verifiche al è %{code}.


@@ -1481,7 +1493,8 @@ fur:
       new:
         intro: Âstu cjatât un erôr o alc ch'al mancje? Informe i altris mapadôrs cussì
           che al podedi jessi corezût. Sposte il segnalut te posizion juste e inserìs
       new:
         intro: Âstu cjatât un erôr o alc ch'al mancje? Informe i altris mapadôrs cussì
           che al podedi jessi corezût. Sposte il segnalut te posizion juste e inserìs

-          une note par spiegâ il probleme. (Par plasê no stâ zontâ informazions personâls).
+          une note par spiegâ il probleme. (Par plasê no stâ zontâ informazions personâls
+          ni informazions che a vegnin di mapis cuviertis pal copyright o di elencs).

         add: Zonte une note
       show:
         anonymous_warning: Cheste note e inclût coments di utents anonims che a varessin
         add: Zonte une note
       show:
         anonymous_warning: Cheste note e inclût coments di utents anonims che a varessin

diff --git a/config/locales/he.yml b/config/locales/he.yml
index f4e02fcee35883e398d7d10cb98cfc80a6aad82f..691e2f464b8c2f8c15498415d29c14d2a46ce862 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -947,10 +947,6 @@ he:
       text: תרומה
     learn_more: מידע נוסף
     more: עוד
       text: תרומה
     learn_more: מידע נוסף
     more: עוד

-    sotm_header: State of the Map 2014
-    sotm_line_1: הכנס השמיני השנתי
-    sotm_line_2: 7–9 בנובמבר 2014
-    sotm_line_3: בואנוס איירס, ארגנטינה

   license_page:
     foreign:
       title: אודות תרגום זה
   license_page:
     foreign:
       title: אודות תרגום זה

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 315734c77e5648633302e78a705fbc257a10ce9b..5017d8148000333daa1a6a614f927b38b8fe190c 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -944,9 +944,6 @@ hu:
       text: Adományozz
     learn_more: További info
     more: Több
       text: Adományozz
     learn_more: További info
     more: Több

-    sotm_line_1: 8. éves konferencia
-    sotm_line_2: 2014. november 7-9.
-    sotm_line_3: Buenos Aires, Argentína

   license_page:
     foreign:
       title: Erről a fordításról
   license_page:
     foreign:
       title: Erről a fordításról

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 8a031e75b11931c8bd33771c9ae4edae1fdf8817..00ea28758eb8e71c894634468bb4d8cc30253e7f 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -179,6 +179,7 @@ ia:
       wiki_link:
         key: Le pagina wiki que describe le etiquetta %{key}
         tag: Le pagina wiki que describe le etiquetta %{key}=%{value}
       wiki_link:
         key: Le pagina wiki que describe le etiquetta %{key}
         tag: Le pagina wiki que describe le etiquetta %{key}=%{value}

+      wikidata_link: Le elemento %{page} in Wikidatos

       wikipedia_link: Le articulo %{page} in Wikipedia
       telephone_link: Telephonar %{phone_number}
     note:
       wikipedia_link: Le articulo %{page} in Wikipedia
       telephone_link: Telephonar %{phone_number}
     note:


@@ -1129,6 +1130,11 @@ ia:
       contribue e mantene datos sur stratas, sentieros, cafés, stationes ferroviari
       e multo plus, in tote le mundo.
     local_knowledge_title: Cognoscentia local
       contribue e mantene datos sur stratas, sentieros, cafés, stationes ferroviari
       e multo plus, in tote le mundo.
     local_knowledge_title: Cognoscentia local

+    local_knowledge_html: |-
+      OpenStreetMap mitte le emphase sur le cognoscentia local. Contributores usa
+      imageria aeree, apparatos GPS e cartas ordinari de terreno pro verificar que OSM
+      es accurate e actual.
+    community_driven_title: Dirigite per le communitate

   notifier:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commentava un entrata de tu diario'
   notifier:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commentava un entrata de tu diario'

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3283d8b9f010edddaf60d6ecfe1d619182fa455d..e1f2a5625d38e93a5d678e33418dd7f07adef9d0 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -550,7 +550,7 @@ it:
           primary_link: Strada primaria
           proposed: Strada proposta
           raceway: Pista
           primary_link: Strada primaria
           proposed: Strada proposta
           raceway: Pista

-          residential: Residenziale
+          residential: Strada residenziale

           rest_area: Area di Sosta
           road: Strada generica
           secondary: Strada secondaria
           rest_area: Area di Sosta
           road: Strada generica
           secondary: Strada secondaria


@@ -964,10 +964,6 @@ it:
       text: Fai una donazione
     learn_more: Ulteriori informazioni
     more: Altro
       text: Fai una donazione
     learn_more: Ulteriori informazioni
     more: Altro

-    sotm_header: Stato della mappa 2014
-    sotm_line_1: 8ª conferenza annuale
-    sotm_line_2: 7-9 novembre 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: A proposito di questa traduzione
   license_page:
     foreign:
       title: A proposito di questa traduzione

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2873060f6f453876114455608b6df4d96f3e45c1..42a3352fc6cd3b38dfd73210db93c69514d0155e 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -934,8 +934,6 @@ ja:
       text: 寄付
     learn_more: 詳細
     more: その他
       text: 寄付
     learn_more: 詳細
     more: その他

-    sotm_line_2: 2014年11月7日-9日
-    sotm_line_3: アルゼンチン ブエノスアイレス

   license_page:
     foreign:
       title: この翻訳について
   license_page:
     foreign:
       title: この翻訳について

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 58358d1af7bfe32c6b1885a7bb5e20c9972484b5..d016492c1ced6bb9e458f94d805ddce34fb776ec 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -931,10 +931,6 @@ ko:
       text: 기부하기
     learn_more: 더 알아보기
     more: 더 보기
       text: 기부하기
     learn_more: 더 알아보기
     more: 더 보기

-    sotm_header: 지도의 나라 2014
-    sotm_line_1: 8차 연례 회의
-    sotm_line_2: 2014년 11월 7일~9일
-    sotm_line_3: 아르헨티나, 부에노스 아이레스

   license_page:
     foreign:
       title: 이 번역에 대한 정보
   license_page:
     foreign:
       title: 이 번역에 대한 정보

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 59dae1ceaefb729021458cf6559fdde3bb0b2e0e..24e1ff6a6cf2bfa1f3ac4edd554122fdfaf6c4d4 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -942,10 +942,6 @@ lv:
       text: Ziedot attīstībai
     learn_more: Uzzināt Vairāk
     more: Vairāk
       text: Ziedot attīstībai
     learn_more: Uzzināt Vairāk
     more: Vairāk

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. ikgadējā konference
-    sotm_line_2: 2014. gada 7.-9. novembris
-    sotm_line_3: Buenosairesa, Argentīna

   license_page:
     foreign:
       title: Par šo tulkojumu
   license_page:
     foreign:
       title: Par šo tulkojumu

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 6c0207ee14e15cd6e9045021109e84012d6edd13..9ee556d78105bc1fced9f4e9f68d1017e20fe1af 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -941,10 +941,6 @@ mk:
       text: Дарувајте
     learn_more: Дознајте повеќе
     more: Повеќе
       text: Дарувајте
     learn_more: Дознајте повеќе
     more: Повеќе

-    sotm_header: Состојба на картата 2014 г.
-    sotm_line_1: XVIII Годишна конференција
-    sotm_line_2: 7-9 ноември 2014 г.
-    sotm_line_3: Буенос Аирес, Аргентина

   license_page:
     foreign:
       title: За овој превод
   license_page:
     foreign:
       title: За овој превод

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a07c9b6564d3a1fd0cf7634cc921e6b6df7efb69..41da79b7175da3a1ccf3dcde5223ed97d3e73b20 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -939,9 +939,6 @@ ms:
       text: Derma
     learn_more: Ketahui Lebih Lanjut
     more: Selebihnya
       text: Derma
     learn_more: Ketahui Lebih Lanjut
     more: Selebihnya

-    sotm_header: State of the Map 2014
-    sotm_line_2: 7-9 November 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: Perihal terjemahan ini
   license_page:
     foreign:
       title: Perihal terjemahan ini

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d54e19b4b407fe7a1ff3c2f3440d470f298e95a4..a1a5beddc2a778c2fab9a19043682d1d98163018 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -406,7 +406,7 @@ nl:
           apron: Platform
           gate: Gate
           helipad: Helikopterplatform
           apron: Platform
           gate: Gate
           helipad: Helikopterplatform

-          runway: Start-en landingsbaan
+          runway: Start- en landingsbaan

           taxiway: Taxibaan
           terminal: Terminal
         amenity:
           taxiway: Taxibaan
           terminal: Terminal
         amenity:


@@ -963,10 +963,6 @@ nl:
       text: Doneren
     learn_more: Meer lezen
     more: Meer
       text: Doneren
     learn_more: Meer lezen
     more: Meer

-    sotm_header: Staat van de kaart 2014
-    sotm_line_1: 8e jaarlijkse conferentie
-    sotm_line_2: 7-9 november 2014
-    sotm_line_3: Buenos Aires, Argentinië

   license_page:
     foreign:
       title: Over deze vertaling
   license_page:
     foreign:
       title: Over deze vertaling


@@ -1020,7 +1016,7 @@ nl:
       more_title_html: Meer informatie
       more_1_html: |-
         U kunt meer lezen over het gebruik van onze gegevens en hoe naamsvermelding toe te passen in de <a
       more_title_html: Meer informatie
       more_1_html: |-
         U kunt meer lezen over het gebruik van onze gegevens en hoe naamsvermelding toe te passen in de <a

-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Veel gestelde juridische
+        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Veelgestelde juridische

         vragen</a>.
       more_2_html: |-
         Hoewel OpenStreetMap open data is, kunnen we geen gratis
         vragen</a>.
       more_2_html: |-
         Hoewel OpenStreetMap open data is, kunnen we geen gratis


@@ -1707,14 +1703,14 @@ nl:
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden
       register now: Nu inschrijven
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden
       register now: Nu inschrijven

-      with username: 'Hebt u al een account bij OpenStreetMap? Meld aan met uw gebruikersnaam
+      with username: 'Hebt u al een gebruiker bij OpenStreetMap? Meld aan met uw gebruikersnaam

         en wachtwoord:'
       with openid: 'U kunt ook aanmelden met uw OpenID:'
       new to osm: Is OpenStreetMap nieuw voor u?
       to make changes: Om wijzigingen in OpenStreetMap te maken, moet u een gebruiker
         hebben.
       create account minute: Maak een gebruiker aan. Dat is snel gebeurd.
         en wachtwoord:'
       with openid: 'U kunt ook aanmelden met uw OpenID:'
       new to osm: Is OpenStreetMap nieuw voor u?
       to make changes: Om wijzigingen in OpenStreetMap te maken, moet u een gebruiker
         hebben.
       create account minute: Maak een gebruiker aan. Dat is snel gebeurd.

-      no account: Hebt u geen account?
+      no account: Hebt u geen gebruiker?

       account not active: Uw gebruiker is helaas nog niet actief.<br />Klik op de
         koppeling in de bevestiging om deze te activeren of <a href="%{reconfirm}">vraag
         een nieuwe bevestiging per e-mail aan</a>.
       account not active: Uw gebruiker is helaas nog niet actief.<br />Klik op de
         koppeling in de bevestiging om deze te activeren of <a href="%{reconfirm}">vraag
         een nieuwe bevestiging per e-mail aan</a>.


@@ -1793,12 +1789,12 @@ nl:
       openid no password: Met OpenID is een wachtwoord niet verplicht, maar sommige
         extra hulpmiddelen of servers kunnen het nog steeds nodig hebben.
       openid association: |-
       openid no password: Met OpenID is een wachtwoord niet verplicht, maar sommige
         extra hulpmiddelen of servers kunnen het nog steeds nodig hebben.
       openid association: |-

-        <p>Uw OpenID is nog niet gekoppeld aan een OpenStreetMap-account.</p>
+        <p>Uw OpenID is nog niet gekoppeld aan een OpenStreetMapgebruiker.</p>

         <ul>
         <ul>

-          <li>Als u nieuw bent bij OpenStreetMap, maak dan een account aan met behulp van het onderstaande formulier.</li>
+          <li>Als u nieuw bent bij OpenStreetMap, maak dan een gebruiker aan met behulp van het onderstaande formulier.</li>

           <li>
           <li>

-            Als u al een account heeft, kunt u zich aanmelden met uw gebruikersnaam en wachtwoord
-            en daarna uw account koppelen aan uw OpenID in uw gebruikersinstellingen.
+            Als u al een gebruiker heeft, kunt u zich aanmelden met uw gebruikersnaam en wachtwoord
+            en daarna uw gebruiker koppelen aan uw OpenID in uw gebruikersinstellingen.

           </li>
         </ul>
       continue: Registreren
           </li>
         </ul>
       continue: Registreren


@@ -1866,7 +1862,7 @@ nl:
       user location: Gebruikerslocatie
       if set location: Stel uw thuislocatie in via de pagina %{settings_link} om gebruikers
         in uw buurt te zien.
       user location: Gebruikerslocatie
       if set location: Stel uw thuislocatie in via de pagina %{settings_link} om gebruikers
         in uw buurt te zien.

-      settings_link_text: voorkeuren
+      settings_link_text: instellingen

       your friends: Uw vrienden
       no friends: U hebt nog geen vrienden toegevoegd.
       km away: '%{count} km verwijderd'
       your friends: Uw vrienden
       no friends: U hebt nog geen vrienden toegevoegd.
       km away: '%{count} km verwijderd'

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 03d8405174afe1c5d2e1b6a58971c0823d924ef3..baf76788003be82ef5854ae4fcf6197db3fd6ed1 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -682,9 +682,6 @@ pa:
       text: ਦਾਨ ਦਿਉ
     learn_more: ਹੋਰ ਜਾਣੋ
     more: ਹੋਰ
       text: ਦਾਨ ਦਿਉ
     learn_more: ਹੋਰ ਜਾਣੋ
     more: ਹੋਰ

-    sotm_line_1: ੮ਵਾਂ ਸਲਾਨਾ ਸੰਮੇਲਨ
-    sotm_line_2: ੭-੯ ਨਵੰਬਰ ੨੦੧੪
-    sotm_line_3: ਬੁਏਨਸ ਆਇਰਸ, ਅਰਜਨਟੀਨਾ

   license_page:
     foreign:
       title: ਇਸ ਤਰਜਮੇ ਬਾਰੇ
   license_page:
     foreign:
       title: ਇਸ ਤਰਜਮੇ ਬਾਰੇ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7c4d99c0bed5b3dc225ae2a2ff4b4bf996ec3d56..e5759547256f02fc5f8449c88549ea002efb6129 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2,12 +2,14 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Ajank
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Ajank

+# Author: Alan ffm

 # Author: Andrzej aa
 # Author: BdgwksxD
 # Author: BeginaFelicysym
 # Author: Chrumps
 # Author: Cysioland
 # Author: Dalis
 # Author: Andrzej aa
 # Author: BdgwksxD
 # Author: BeginaFelicysym
 # Author: Chrumps
 # Author: Cysioland
 # Author: Dalis

+# Author: Darellur

 # Author: Debeet
 # Author: Deejay1
 # Author: Ireun
 # Author: Debeet
 # Author: Deejay1
 # Author: Ireun


@@ -46,22 +48,22 @@ pl:
       message: Wiadomość
       node: Węzeł
       node_tag: Znacznik węzła
       message: Wiadomość
       node: Węzeł
       node_tag: Znacznik węzła

-      notifier: Notifier
+      notifier: Zgłaszający

       old_node: Wcześniejszy węzeł
       old_node_tag: Tag wcześniejszego węzła
       old_relation: Stara relacja
       old_node: Wcześniejszy węzeł
       old_node_tag: Tag wcześniejszego węzła
       old_relation: Stara relacja

-      old_relation_member: Członek wcześniejszej relacji
+      old_relation_member: Członek starej relacji

       old_relation_tag: Tag wcześniejszej relacji
       old_way: Wcześniejsza droga
       old_relation_tag: Tag wcześniejszej relacji
       old_way: Wcześniejsza droga

-      old_way_node: Węzeł wcześniejszej linii
-      old_way_tag: Tag wcześniejszej linii
+      old_way_node: Węzeł starej linii
+      old_way_tag: Tag starej linii

       relation: Relacja
       relation_member: Członek relacji
       relation: Relacja
       relation_member: Członek relacji

-      relation_tag: Znacznik relacji
+      relation_tag: Tag relacji

       session: Sesja
       trace: Ślad
       tracepoint: Punkt śladu
       session: Sesja
       trace: Ślad
       tracepoint: Punkt śladu

-      tracetag: Znacznik śladu
+      tracetag: Tag śladu

       user: Użytkownik
       user_preference: Preferencje użytkownika
       user_token: Token użytkownika
       user: Użytkownik
       user_preference: Preferencje użytkownika
       user_token: Token użytkownika


@@ -97,7 +99,7 @@ pl:
       user:
         email: E-mail
         active: Aktywny
       user:
         email: E-mail
         active: Aktywny

-        display_name: Publiczna nazwa
+        display_name: Wyświetlana nazwa

         description: Opis
         languages: Języki
         pass_crypt: Hasło
         description: Opis
         languages: Języki
         pass_crypt: Hasło


@@ -114,9 +116,9 @@ pl:
       description: Potlatch 2 (w przeglądarce)
     remote:
       name: Zdalne sterowanie
       description: Potlatch 2 (w przeglądarce)
     remote:
       name: Zdalne sterowanie

-      description: JOSM lub Markaartor
+      description: Zdalne sterowanie (JOSM lub Merkaartor)

   browse:
   browse:

-    created: Utworzenie
+    created: Utworzone

     closed: Zamknięte
     created_html: Utworzone <abbr title='%{title}'>%{time} temu</abbr>
     closed_html: Zamknięte <abbr title='%{title}'>%{time} temu</abbr>
     closed: Zamknięte
     created_html: Utworzone <abbr title='%{title}'>%{time} temu</abbr>
     closed_html: Zamknięte <abbr title='%{title}'>%{time} temu</abbr>


@@ -961,7 +963,6 @@ pl:
       text: Przekaż darowiznę
     learn_more: Dowiedz się więcej
     more: Więcej
       text: Przekaż darowiznę
     learn_more: Dowiedz się więcej
     more: Więcej

-    sotm_line_3: Buenos Aires, Argentyna

   license_page:
     foreign:
       title: Informacje o tłumaczeniu
   license_page:
     foreign:
       title: Informacje o tłumaczeniu


@@ -1579,7 +1580,7 @@ pl:
       description_without_count: Plik GPX od %{user}
   application:
     require_cookies:
       description_without_count: Plik GPX od %{user}
   application:
     require_cookies:

-      cookies_needed: Wydaje się, że masz wyłączoną obsługę ciasteczek (cookies) w
+      cookies_needed: Wydaje się, że masz wyłączoną obsługę cookies (ciasteczek) w

         swojej przeglądarce internetowej – włącz ją, zanim przejdziesz dalej.
     require_moderator:
       not_a_moderator: Musisz być moderatorem, aby wykonać tą akcję.
         swojej przeglądarce internetowej – włącz ją, zanim przejdziesz dalej.
     require_moderator:
       not_a_moderator: Musisz być moderatorem, aby wykonać tą akcję.

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index f538c10f58a65fbf66d9fc823d69341d51410de0..7eb27fd036132ac731e7bf166b42bba905b8b60f 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -20,6 +20,7 @@
 # Author: Rodrigo Avila
 # Author: Tuliouel
 # Author: Vgeorge
 # Author: Rodrigo Avila
 # Author: Tuliouel
 # Author: Vgeorge

+# Author: Wille

 # Author: 555
 ---
 pt-BR:
 # Author: 555
 ---
 pt-BR:


@@ -965,10 +966,6 @@ pt-BR:
       text: Faça uma doação
     learn_more: Saiba mais
     more: Mais
       text: Faça uma doação
     learn_more: Saiba mais
     more: Mais

-    sotm_header: Estado do Mapa 2014
-    sotm_line_1: 8ª Conferência anual
-    sotm_line_2: De 7 a 9 de novembro de 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: Sobre esta tradução
   license_page:
     foreign:
       title: Sobre esta tradução


@@ -1826,7 +1823,7 @@ pt-BR:
       legale_names:
         france: França
         italy: Itália
       legale_names:
         france: França
         italy: Itália

-        rest_of_world: Resto do mundo
+        rest_of_world: Outros países

     no_such_user:
       title: Usuário não existe
       heading: O usuário %{user} não existe
     no_such_user:
       title: Usuário não existe
       heading: O usuário %{user} não existe

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9121b403f8bf61b90e343994c51c06b8f7cf8e6e..1f9b02f6b554e846ca58673aff848588a7bff500 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -31,6 +31,7 @@
 # Author: Santacloud
 # Author: Spider
 # Author: TarzanASG
 # Author: Santacloud
 # Author: Spider
 # Author: TarzanASG

+# Author: XAN

 # Author: Yuri Nazarov
 # Author: Zverik
 # Author: Александр Сигачёв
 # Author: Yuri Nazarov
 # Author: Zverik
 # Author: Александр Сигачёв


@@ -894,7 +895,7 @@ ru:
         level2: Граница страны
         level4: Граница штата, субъекта
         level5: Граница региона
         level2: Граница страны
         level4: Граница штата, субъекта
         level5: Граница региона

-        level6: Ð\93Ñ\80аниÑ\86а Ñ\81Ñ\82Ñ\80анÑ\8b
+        level6: Ð\93Ñ\80аниÑ\86а Ñ\80айона

         level8: Граница города
         level9: Граница села, деревни
         level10: Граница пригорода
         level8: Граница города
         level9: Граница села, деревни
         level10: Граница пригорода


@@ -972,10 +973,6 @@ ru:
       text: Поддержать проект
     learn_more: Узнать больше
     more: Ещё
       text: Поддержать проект
     learn_more: Узнать больше
     more: Ещё

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8-я ежегодная конференция
-    sotm_line_2: 7—9 ноября 2014 года
-    sotm_line_3: Буэнос-Айрес, Аргентина

   license_page:
     foreign:
       title: Об этом переводе
   license_page:
     foreign:
       title: Об этом переводе

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 9f83bc0693d6e6f1c68ca4a4b651b153cdfefa52..5933e1d8658603049c57bb23881ba240a4dbe1b4 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -967,10 +967,6 @@ sv:
       text: Donera
     learn_more: Läs mer
     more: Mer
       text: Donera
     learn_more: Läs mer
     more: Mer

-    sotm_header: State of the Map 2014
-    sotm_line_1: 8:e årliga konferensen
-    sotm_line_2: 7-9 november 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: Om denna översättning
   license_page:
     foreign:
       title: Om denna översättning

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7cb2bea2fa1ad0a7993dfd64c4d964fa2fa91254..25dc451fd7c0eddbc38a38d596097eb360e033cc 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -47,6 +47,7 @@ tr:
       relation: İlişki
       relation_member: Relasyon Üyesi
       session: Oturum
       relation: İlişki
       relation_member: Relasyon Üyesi
       session: Oturum

+      trace: Rota

       tracepoint: İzleme Noktası
       tracetag: İzleme Etiketi
       user: Kullanıcı
       tracepoint: İzleme Noktası
       tracetag: İzleme Etiketi
       user: Kullanıcı


@@ -321,6 +322,8 @@ tr:
           diğer kaynakları kullan.
         planet:
           title: OSM Gezegeni
           diğer kaynakları kullan.
         planet:
           title: OSM Gezegeni

+        overpass:
+          title: Overpass API

         geofabrik:
           title: Geofabrik İndirmeleri
         metro:
         geofabrik:
           title: Geofabrik İndirmeleri
         metro:


@@ -906,8 +909,6 @@ tr:
       text: Bağış Yapın
     learn_more: Daha Fazla Bilgi
     more: Daha fazla
       text: Bağış Yapın
     learn_more: Daha Fazla Bilgi
     more: Daha fazla

-    sotm_line_2: 7-9 Kasım 2014
-    sotm_line_3: Buenos Aires, Arjantin

   license_page:
     foreign:
       title: Bu çeviri hakkında
   license_page:
     foreign:
       title: Bu çeviri hakkında


@@ -976,6 +977,7 @@ tr:
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

+      description: Bir soru sor veya OSM'ın soru-ve-cevap sitesinde yanıtları ara.

     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org


@@ -983,6 +985,8 @@ tr:
     next: İleri
     copyright_html: <span>&copy;</span>OpenStreetMap<br>katkıda bulunanları
     local_knowledge_title: Yerel Bilgi
     next: İleri
     copyright_html: <span>&copy;</span>OpenStreetMap<br>katkıda bulunanları
     local_knowledge_title: Yerel Bilgi

+    community_driven_title: Katılım Kaynaklı
+    open_data_title: Açık Veri

     partners_title: Ortaklar
   notifier:
     diary_comment_notification:
     partners_title: Ortaklar
   notifier:
     diary_comment_notification:


@@ -1096,6 +1100,8 @@ tr:
       permalink: Kalıcı Bağlantı
       shortlink: Kısa Bağlantı
       createnote: Bir not ekle
       permalink: Kalıcı Bağlantı
       shortlink: Kısa Bağlantı
       createnote: Bir not ekle

+      license:
+        copyright: Telif Hakkı OpenStreetMap ve katılımcılar, açık lisans altında

     edit:
       user_page_link: kullanıcı sayfası
       anon_edits: (%{link})
     edit:
       user_page_link: kullanıcı sayfası
       anon_edits: (%{link})


@@ -1282,6 +1288,8 @@ tr:
       message: GPX dosya gönderme sistemi şu anda kullanılamıyor
     offline:
       heading: GPX Yükleme Servisi Çevrimdışı
       message: GPX dosya gönderme sistemi şu anda kullanılamıyor
     offline:
       heading: GPX Yükleme Servisi Çevrimdışı

+    georss:
+      title: OpenStreetMap GPS İzleri

   oauth:
     oauthorize_success:
       verification: Doğrulama kodu %{code}.
   oauth:
     oauthorize_success:
       verification: Doğrulama kodu %{code}.

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 3b636088c584db52305789abf04fbe1bee967504..8d5b32a1b2afaaa639a7fd431b1b755edd25c170 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -959,10 +959,6 @@ uk:
       text: Підтримайте проект
     learn_more: Дізнатись більше
     more: Більше
       text: Підтримайте проект
     learn_more: Дізнатись більше
     more: Більше

-    sotm_header: Мапа за станом на 2014 рік
-    sotm_line_1: 8-ма щорічна конференція
-    sotm_line_2: 7-9 листопада 2014 року
-    sotm_line_3: Буенос-Айрес, Аргентина

   license_page:
     foreign:
       title: Про цей переклад
   license_page:
     foreign:
       title: Про цей переклад

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index cbe65cf30b1c90a3f04f8dd10bb1f5598dc5d56c..5e327164c88ebe5c74257f1a284aae1d35d2046c 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -935,10 +935,6 @@ vi:
       text: Quyên góp
     learn_more: Tìm hiểu Thêm
     more: Thêm
       text: Quyên góp
     learn_more: Tìm hiểu Thêm
     more: Thêm

-    sotm_header: Tình trạng Bản đồ 2014
-    sotm_line_1: Hội nghị Hàng năm Lần thứ 8
-    sotm_line_2: Ngày 7–9 tháng 11 năm 2014
-    sotm_line_3: Buenos Aires, Argentina

   license_page:
     foreign:
       title: Thông tin về bản dịch này
   license_page:
     foreign:
       title: Thông tin về bản dịch này

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 187b08369e10f4f7c79b71bb06dc84245cd33dac..79fc030f6592d0f596543c04ff67e44a8ac11523 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -946,10 +946,6 @@ zh-CN:
       text: 捐款
     learn_more: 了解更多
     more: 更多
       text: 捐款
     learn_more: 了解更多
     more: 更多

-    sotm_header: 2014年地图状态
-    sotm_line_1: 第8届年会
-    sotm_line_2: 2014年11月7~9日
-    sotm_line_3: 阿根廷布宜诺斯

   license_page:
     foreign:
       title: 关于本译文
   license_page:
     foreign:
       title: 关于本译文


@@ -1493,7 +1489,7 @@ zh-CN:
       support_notice: 我们支持HMAC-SHA1（推荐）和RSA-SHA1签名。
       edit: 编辑详细信息
       delete: 删除客户端
       support_notice: 我们支持HMAC-SHA1（推荐）和RSA-SHA1签名。
       edit: 编辑详细信息
       delete: 删除客户端

-      confirm: 你确定吗？
+      confirm: 您确定吗？

       requests: 向用户请求以下权限：
       allow_read_prefs: 读取他们的用户设置。
       allow_write_prefs: 修改他们的用户设置。
       requests: 向用户请求以下权限：
       allow_read_prefs: 读取他们的用户设置。
       allow_write_prefs: 修改他们的用户设置。


@@ -1634,7 +1630,7 @@ zh-CN:
       title: 贡献者条款
       heading: 贡献者条款
       read and accept: 请阅读下面的协议并按同意按钮，以确认为你现有的和将来的贡献接受本协议的条款。
       title: 贡献者条款
       heading: 贡献者条款
       read and accept: 请阅读下面的协议并按同意按钮，以确认为你现有的和将来的贡献接受本协议的条款。

-      consider_pd: 除了上述协议，我同意将我的贡献授权为公共领域
+      consider_pd: 除了上述协议，我同意将我的贡献授权为公有领域

       consider_pd_why: 这是什么？
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 帮助理解这些条款的信息：一个<a href="%{summary}">可读的摘要</a>和一些<a href="%{translations}">非正式翻译</a>
       consider_pd_why: 这是什么？
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 帮助理解这些条款的信息：一个<a href="%{summary}">可读的摘要</a>和一些<a href="%{translations}">非正式翻译</a>


@@ -1905,7 +1901,7 @@ zh-CN:
       show: 显示
       edit: 编辑
       revoke: 撤销！
       show: 显示
       edit: 编辑
       revoke: 撤销！

-      confirm: 你确定吗？
+      confirm: 您确定吗？

       display_name: 封禁的用户
       creator_name: 创建者
       reason: 封禁的原因
       display_name: 封禁的用户
       creator_name: 创建者
       reason: 封禁的原因


@@ -1936,7 +1932,7 @@ zh-CN:
       show: 显示
       edit: 编辑
       revoke: 撤销！
       show: 显示
       edit: 编辑
       revoke: 撤销！

-      confirm: 你确定吗？
+      confirm: 您确定吗？

       reason: 封禁的原因：
       back: 查看所有封禁
       revoker: 撤销者：
       reason: 封禁的原因：
       back: 查看所有封禁
       revoker: 撤销者：


@@ -2058,7 +2054,7 @@ zh-CN:
       user: 创建者：
       edit: 编辑该修订
       destroy: 删除该修订
       user: 创建者：
       edit: 编辑该修订
       destroy: 删除该修订

-      confirm: 你确定吗？
+      confirm: 您确定吗？

     create:
       flash: 修订已创建。
     update:
     create:
       flash: 修订已创建。
     update:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 23538ac1e2ce5cb707792a7b06ae5da96a9619e0..53d52bad561c11d84911d114c66bf9a166089543 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -402,7 +402,7 @@ zh-TW:
           biergarten: 啤酒花園
           brothel: 妓院
           bureau_de_change: 找換店
           biergarten: 啤酒花園
           brothel: 妓院
           bureau_de_change: 找換店

-          bus_station: 巴士總站
+          bus_station: 客é\81\8b站

           cafe: 咖啡廳
           car_rental: 租車
           car_sharing: 汽車共用
           cafe: 咖啡廳
           car_rental: 租車
           car_sharing: 汽車共用


@@ -937,10 +937,6 @@ zh-TW:
       text: 進行捐款
     learn_more: 了解更多
     more: 更多
       text: 進行捐款
     learn_more: 了解更多
     more: 更多

-    sotm_header: State of the Map 2014
-    sotm_line_1: 第8屆年會
-    sotm_line_2: 2014年11月7~9日
-    sotm_line_3: 阿根庭布宜諾艾莉絲

   license_page:
     foreign:
       title: 關於這個翻譯
   license_page:
     foreign:
       title: 關於這個翻譯


@@ -1527,7 +1523,7 @@ zh-TW:
       application: 應用程式名稱
       issued_at: 簽發於
       revoke: 註銷！
       application: 應用程式名稱
       issued_at: 簽發於
       revoke: 註銷！

-      my_apps: 我的客戶端應用程式
+      my_apps: 我的用戶端應用程式

       no_apps: 您是否有想要註冊以使用於 %{oauth} 標準的應用程式？您必須先註冊您的網頁應用程式，才能對這個服務進行 OAuth 要求。
       registered_apps: 您已經註冊下列客戶端應用程式：
       register_new: 註冊您的應用程式
       no_apps: 您是否有想要註冊以使用於 %{oauth} 標準的應用程式？您必須先註冊您的網頁應用程式，才能對這個服務進行 OAuth 要求。
       registered_apps: 您已經註冊下列客戶端應用程式：
       register_new: 註冊您的應用程式


@@ -1550,7 +1546,7 @@ zh-TW:
     create:
       flash: 註冊資訊成功
     update:
     create:
       flash: 註冊資訊成功
     update:

-      flash: 更新客戶端資訊成功
+      flash: 更新用戶端資訊成功

     destroy:
       flash: 已銷毀此客戶端應用程式註冊
   user:
     destroy:
       flash: 已銷毀此客戶端應用程式註冊
   user: