Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index f8dc51b224f14945e3082112c232cb519cb54300..d0e9f358da08599a80ed9e8cc834646ece69699b 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1,7 +1,6 @@
 # Messages for Asturian (asturianu)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Asturian (asturianu)
 # Exported from translatewiki.net
 # Export driver: phpyaml

-# Author: Amire80

 # Author: Danieldegroot2
 # Author: Enolp
 # Author: Fitoschido
 # Author: Danieldegroot2
 # Author: Enolp
 # Author: Fitoschido

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index d00801025cfdc7e79a5f30b72b1bf2391f809759..2b9da91afb1c1374434454bddab0a658056ca962 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -2,7 +2,6 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: AiseluRB
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: AiseluRB

-# Author: Amire80

 # Author: Bashkorttan
 # Author: Lizalizaufa
 # Author: MR973
 # Author: Bashkorttan
 # Author: Lizalizaufa
 # Author: MR973

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 7abcaeb3c48e2305f40292f326a0b2c706fd7663..bd6e870821731ec073e9a7db4964f2f0dbf18f9d 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1738,7 +1738,7 @@ bn:
           university: বিশ্ববিদ্যালয়
           hospital: হাসপাতাল
           station: রেল স্টেশন
           university: বিশ্ববিদ্যালয়
           hospital: হাসপাতাল
           station: রেল স্টেশন

-          railway_halt: রà§\87লপথ বনà§\8dধ
+          railway_halt: রà§\87লà¦\93য়à§\87 সà§\8dà¦\9fপ

           subway_station: সাবওয়ে স্টেশন
           tram_stop: ট্রাম স্টপ
           peak: শৃঙ্গ
           subway_station: সাবওয়ে স্টেশন
           tram_stop: ট্রাম স্টপ
           peak: শৃঙ্গ

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 6ce6bf59b12afe5cbad5f530e91c91c76e7ea6dc..f90707719d85ae5865a5bdaf86e710dad6820d96 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2,7 +2,6 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Adriendelucca
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Adriendelucca

-# Author: Amire80

 # Author: Dishual
 # Author: Fohanno
 # Author: Fulup
 # Author: Dishual
 # Author: Fohanno
 # Author: Fulup

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 66c1545063df4b71f50faf5ebebfb906e8b58ec9..32ad27ecafef4b29766a29ea97e261734a78f702 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2,7 +2,6 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: AlesFiala2002
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: AlesFiala2002

-# Author: Amire80

 # Author: Bilbo
 # Author: Bilykralik16
 # Author: Chmee2
 # Author: Bilbo
 # Author: Bilykralik16
 # Author: Chmee2


@@ -168,7 +167,7 @@ cs:
         longitude: Zeměpisná délka
         public: Veřejná
         description: Popis
         longitude: Zeměpisná délka
         public: Veřejná
         description: Popis

-        gpx_file: Vyberte soubor GPS trasování
+        gpx_file: Vyberte soubor s GPS stopou

         visibility: Viditelnost
         tagstring: Značky
       message:
         visibility: Viditelnost
         tagstring: Značky
       message:


@@ -497,7 +496,7 @@ cs:
       enclosing: Umístění prvku
   nodes:
     timeout:
       enclosing: Umístění prvku
   nodes:
     timeout:

-      sorry: Promiňte, ale načítání dat pro uzel s id %{id} trvalo příliš dlouho.
+      sorry: Promiňte, ale načítání dat uzlu s id %{id} trvalo příliš dlouho.

   old_nodes:
     not_found:
       sorry: 'Je nám líto, ale verze %{version} uzlu #%{id} nebyla nalezena.'
   old_nodes:
     not_found:
       sorry: 'Je nám líto, ale verze %{version} uzlu #%{id} nebyla nalezena.'


@@ -1741,10 +1740,10 @@ cs:
         %{trace_description} a bez značek
     gpx_failure:
       hi: Ahoj, %{to_user},
         %{trace_description} a bez značek
     gpx_failure:
       hi: Ahoj, %{to_user},

-      failed_to_import: 'se nepodařilo nahrát. Zkontrolujte si prosím, zda váš soubor
-        je platný soubor GPX nebo archiv obsahující GPX soubor(y) v podporovaném formátu
-        (.tar.gz, tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Možná je u vašeho souboru
-        problém s formátem nebo syntaxí? Zde je chyba importu:'
+      failed_to_import: 'se nepodařilo naimportovat jako GPS stopu. Zkontrolujte si
+        prosím, zda váš soubor je platný soubor GPX nebo archiv obsahující GPX soubor(y)
+        v podporovaném formátu (.tar.gz, tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2).
+        Možná je u vašeho souboru problém s formátem nebo syntaxí? Zde je chyba importu:'

       more_info: Více informací o chybách při importu GPX a jak se jim vyhnout, najdete
         na %{url}.
       more_info_html: Více informací o chybách při importu GPX a jak se jim vyhnout,
       more_info: Více informací o chybách při importu GPX a jak se jim vyhnout, najdete
         na %{url}.
       more_info_html: Více informací o chybách při importu GPX a jak se jim vyhnout,


@@ -2581,7 +2580,7 @@ cs:
       identifiable: Identifikovatelná (zobrazuje se v seznamu a jako identifikovatelné
         uspořádané body s časovou značkou)
     new:
       identifiable: Identifikovatelná (zobrazuje se v seznamu a jako identifikovatelné
         uspořádané body s časovou značkou)
     new:

-      upload_trace: Nahrát GPS trasu
+      upload_trace: Nahrát GPS stopu

       visibility_help: co tohle znamená?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=cs
       help: Nápověda
       visibility_help: co tohle znamená?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=cs
       help: Nápověda


@@ -2729,7 +2728,7 @@ cs:
       read_gpx: Číst soukromé GPS stopy
       write_gpx: Nahrávat GPS stopy
       write_notes: Měnit poznámky
       read_gpx: Číst soukromé GPS stopy
       write_gpx: Nahrávat GPS stopy
       write_notes: Měnit poznámky

-      write_redactions: Upravte mapová data
+      write_redactions: Skrývat mapová data

       read_email: Přečíst e-mailovou adresu uživatele
       consume_messages: Číst, aktualizovat stav a mazat zprávy uživatelů
       send_messages: Posílat soukromé zprávy jiným uživatelům
       read_email: Přečíst e-mailovou adresu uživatele
       consume_messages: Číst, aktualizovat stav a mazat zprávy uživatelů
       send_messages: Posílat soukromé zprávy jiným uživatelům


@@ -2992,7 +2991,7 @@ cs:
       title: Upravit blok na uživatele %{name}
       heading_html: Úprava bloku na %{name}
       period: Jak dlouho (od nynějška) bude uživatel blokován z užívání API.
       title: Upravit blok na uživatele %{name}
       heading_html: Úprava bloku na %{name}
       period: Jak dlouho (od nynějška) bude uživatel blokován z užívání API.

-      revoke: Odstranit blokování
+      revoke: Odvolat blokování

     filter:
       block_period: Doba bloku musí být jedna z těch, které obsahuje rozevírací seznam.
     create:
     filter:
       block_period: Doba bloku musí být jedna z těch, které obsahuje rozevírací seznam.
     create:


@@ -3368,9 +3367,9 @@ cs:
       heading: Upravit redakci
       title: Upravit redakci
     index:
       heading: Upravit redakci
       title: Upravit redakci
     index:

-      empty: Žádné opravy k ukázání.
-      heading: Seznam oprav
-      title: Seznam oprav
+      empty: Žádné redakce k ukázání.
+      heading: Seznam redakcí
+      title: Seznam redakcí

       new: Nová redakce
     new:
       heading: Zadejte informace k nové redakci
       new: Nová redakce
     new:
       heading: Zadejte informace k nové redakci

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 8b2499bde3fd526296351a4e5eed36a1e79bfe42..8a924c591e6f0ee3a5338635917aaa72ee5cef81 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1,7 +1,6 @@
 # Messages for Danish (dansk)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Danish (dansk)
 # Exported from translatewiki.net
 # Export driver: phpyaml

-# Author: Amire80

 # Author: Antonla
 # Author: Brufnus
 # Author: Christian List
 # Author: Antonla
 # Author: Brufnus
 # Author: Christian List


@@ -3118,7 +3117,7 @@ da:
       image_dimensions: Billedet vil vise laget %{layer} i %{width} x %{height}
       download: Hent
       short_url: Kort URL
       image_dimensions: Billedet vil vise laget %{layer} i %{width} x %{height}
       download: Hent
       short_url: Kort URL

-      include_marker: Tilføj markør
+      include_marker: Medtag markør

       center_marker: Centrér kortet på markøren
       paste_html: Indsæt HTML som skal indlejres i websiden
       view_larger_map: Vis større kort
       center_marker: Centrér kortet på markøren
       paste_html: Indsæt HTML som skal indlejres i websiden
       view_larger_map: Vis større kort

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 01ed85fb23a9ee4146abed300d2d8643b1f906b0..ce7f9d925f9de3c06533a1fbd9406f8e1e0abba2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,7 +3,6 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar

-# Author: Amire80

 # Author: Andibing
 # Author: BEANS
 # Author: Back ache
 # Author: Andibing
 # Author: BEANS
 # Author: Back ache

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 12245e6efbbf36faddabb2dbbc615f994188fca5..26b0e2cc75fd8360bbaaa8619826bb68b22cc9b8 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -6,7 +6,6 @@
 # Author: Agent
 # Author: Aguslr
 # Author: Alberto Chung
 # Author: Agent
 # Author: Aguslr
 # Author: Alberto Chung

-# Author: Amire80

 # Author: Anarhistička Maca
 # Author: Angoca
 # Author: AnupamM
 # Author: Anarhistička Maca
 # Author: Angoca
 # Author: AnupamM

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c7a1268f0652d733f8d90fd8a384f2ad4b95f585..e3dd9ed20b84eaa22cf63c905ff273bc9a2e972d 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -3,7 +3,6 @@
 # Export driver: phpyaml
 # Author: Ahangarha
 # Author: Alirezaaa
 # Export driver: phpyaml
 # Author: Ahangarha
 # Author: Alirezaaa

-# Author: Amire80

 # Author: Amirsara
 # Author: Arash.pt
 # Author: Arian Ar
 # Author: Amirsara
 # Author: Arash.pt
 # Author: Arian Ar

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index b1f42e1c7314e4f657b519112427df4d12174eaf..1c091e9b3db2f76b2996b5303277c1ef90dfb4ef 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1424,6 +1424,7 @@ fi:
     page:
       user_not_found: Käyttäjää ei löydy
       issues_not_found: Tapahtumia ei löytynyt
     page:
       user_not_found: Käyttäjää ei löydy
       issues_not_found: Tapahtumia ei löytynyt

+      reported_user: Ilmiannettu käyttäjä

       status: Tila
       reports: Ilmiannot
       last_updated: Päivitetty
       status: Tila
       reports: Ilmiannot
       last_updated: Päivitetty


@@ -1805,6 +1806,7 @@ fi:
       lost password link: Unohditko salasanasi?
       login_button: Kirjaudu sisään
       with external: 'tai kirjaudu jonkun muun palvelun tunnuksilla:'
       lost password link: Unohditko salasanasi?
       login_button: Kirjaudu sisään
       with external: 'tai kirjaudu jonkun muun palvelun tunnuksilla:'

+      or: tai

       auth failure: Kirjautuminen epäonnistui.
     destroy:
       title: Kirjaudu ulos
       auth failure: Kirjautuminen epäonnistui.
     destroy:
       title: Kirjaudu ulos


@@ -2363,6 +2365,7 @@ fi:
       oauth2_authorizations: OAuth 2 -käyttöoikeudet
       muted_users: Hiljennetyt käyttäjät
     auth_providers:
       oauth2_authorizations: OAuth 2 -käyttöoikeudet
       muted_users: Hiljennetyt käyttäjät
     auth_providers:

+      openid_url: OpenID-URL

       openid_login_button: Jatka
       openid:
         title: Kirjaudu sisään OpenID:llä
       openid_login_button: Jatka
       openid:
         title: Kirjaudu sisään OpenID:llä


@@ -2468,6 +2471,7 @@ fi:
         privacy_policy: tietosuojakäytäntö
         html: Osoitetta ei näytetä julkisesti, lisätietoja on sivulla %{privacy_policy_link}.
       consider_pd_html: Pidän tuotoksiani %{consider_pd_link}.
         privacy_policy: tietosuojakäytäntö
         html: Osoitetta ei näytetä julkisesti, lisätietoja on sivulla %{privacy_policy_link}.
       consider_pd_html: Pidän tuotoksiani %{consider_pd_link}.

+      or: tai

       use external auth: Kirjaudu toisen palvelun tunnuksilla
     terms:
       title: Ehdot
       use external auth: Kirjaudu toisen palvelun tunnuksilla
     terms:
       title: Ehdot


@@ -2490,6 +2494,7 @@ fi:
       informal_translations: epäviralliset käännökset
       continue: Seuraava
       declined: https://wiki.openstreetmap.org/wiki/Fi:Contributor_Terms_Declined
       informal_translations: epäviralliset käännökset
       continue: Seuraava
       declined: https://wiki.openstreetmap.org/wiki/Fi:Contributor_Terms_Declined

+      cancel: Peruuta

       you need to accept or decline: Ennen jatkamista lue läpi osallistumisehdot ja
         hyväksy tai hylkää se.
       legale_select: 'Valitse asuinmaasi:'
       you need to accept or decline: Ennen jatkamista lue läpi osallistumisehdot ja
         hyväksy tai hylkää se.
       legale_select: 'Valitse asuinmaasi:'


@@ -2740,6 +2745,8 @@ fi:
       add: Lähetä ilmoitus
     notes_paging_nav:
       showing_page: Sivu %{page}
       add: Lähetä ilmoitus
     notes_paging_nav:
       showing_page: Sivu %{page}

+      next: Seuraava
+      previous: Edellinen

   javascripts:
     close: Sulje
     share:
   javascripts:
     close: Sulje
     share:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c1c986a84e7ccac2821ecaddb5eb938f070fadf3..d3bc5c54989cdfeade88698d5639d2ec755fbb8c 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -6,7 +6,6 @@
 # Author: Adriendelucca
 # Author: Ajeje Brazorf
 # Author: Alno
 # Author: Adriendelucca
 # Author: Ajeje Brazorf
 # Author: Alno

-# Author: Amire80

 # Author: Antimuonium
 # Author: BlueCamille
 # Author: Boniface
 # Author: Antimuonium
 # Author: BlueCamille
 # Author: Boniface

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 8f8fb9b8865adc4d6aea26ac6117cb1dffe8d121..cc09459225c14b77b2055d886a56323a8259b60c 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -2,7 +2,6 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Akerbeltz
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Akerbeltz

-# Author: Amire80

 # Author: Cuan
 # Author: Dimitar
 # Author: GunChleoc
 # Author: Cuan
 # Author: Dimitar
 # Author: GunChleoc

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index b77514c58a3a821d688ab07b86cf8d4fdc5c1e8f..d6968c849abced4a091b8d0002a503adcaef6090 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1,7 +1,6 @@
 # Messages for Upper Sorbian (hornjoserbsce)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Upper Sorbian (hornjoserbsce)
 # Exported from translatewiki.net
 # Export driver: phpyaml

-# Author: Amire80

 # Author: J budissin
 # Author: Macofe
 # Author: McDutchie
 # Author: J budissin
 # Author: Macofe
 # Author: McDutchie

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index bf53e65133650a3ee97607f645d773faaf44b96c..7ee065dfeed4fff5f069a59430664ab79340b61a 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -5,7 +5,6 @@
 # Author: Aefgh39622
 # Author: Afaz
 # Author: Ajeje Brazorf
 # Author: Aefgh39622
 # Author: Afaz
 # Author: Ajeje Brazorf

-# Author: Amire80

 # Author: Aphaia
 # Author: Atysn
 # Author: Chqaz
 # Author: Aphaia
 # Author: Atysn
 # Author: Chqaz

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 15e8826f226fc7c9fe9926cf5347799412d348c9..1ba56971f85f34f07005aba0331055f210c92ed7 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1,7 +1,6 @@
 # Messages for Malay (Bahasa Melayu)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Malay (Bahasa Melayu)
 # Exported from translatewiki.net
 # Export driver: phpyaml

-# Author: Amire80

 # Author: Anakmalaysia
 # Author: Hakimi97
 # Author: Izing
 # Author: Anakmalaysia
 # Author: Hakimi97
 # Author: Izing

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index cc88f7056523f2f6a402eefcb1701029fb326e0a..c8c922764c9e80c6bed75b5617f84cb44540df4d 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -3,7 +3,6 @@
 # Export driver: phpyaml
 # Author: 6400
 # Author: Abaksle
 # Export driver: phpyaml
 # Author: 6400
 # Author: Abaksle

-# Author: Amire80

 # Author: Bjorni
 # Author: Danieldegroot2
 # Author: Dimitar
 # Author: Bjorni
 # Author: Danieldegroot2
 # Author: Dimitar

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e6182497c5c98f093f16ae37895d09261d0b4d88..99817ea5edd9125f71758eb42659a9b8f01d03bf 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2,7 +2,6 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Aceman444
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Aceman444

-# Author: Amire80

 # Author: Chiak
 # Author: Dušan Kreheľ
 # Author: Filip009
 # Author: Chiak
 # Author: Dušan Kreheľ
 # Author: Filip009


@@ -142,7 +141,7 @@ sk:
         longitude: Zem. dĺžka
         public: Verejné
         description: Popis
         longitude: Zem. dĺžka
         public: Verejné
         description: Popis

-        gpx_file: Nahrať GPX súbor
+        gpx_file: Vyberte súbor GPS

         visibility: Viditeľnosť
         tagstring: Značky
       message:
         visibility: Viditeľnosť
         tagstring: Značky
       message:

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index fcdd8e67042261a6fe1def4bf1b34c007ab6859c..4265d53a84f42dd5e541050833f3ad916990ea11 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2,7 +2,6 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: 123wiki456pedija789
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: 123wiki456pedija789

-# Author: Amire80

 # Author: Damjang
 # Author: Dbc334
 # Author: Eleassar
 # Author: Damjang
 # Author: Dbc334
 # Author: Eleassar

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 0d7c091da3ad753db155a29a3259ecaa2925b238..2640125c2f4af376cfdd5314f21850c8f387aa50 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -6,7 +6,6 @@
 # Author: Alerque
 # Author: Alidemirtas
 # Author: Alpkant
 # Author: Alerque
 # Author: Alidemirtas
 # Author: Alpkant

-# Author: Amire80

 # Author: Archaeodontosaurus
 # Author: Asma
 # Author: BaRaN6161 TURK
 # Author: Archaeodontosaurus
 # Author: Asma
 # Author: BaRaN6161 TURK

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 36c54ede5a45993319d9b46f43c4adb9cca5d266..62fa504e979c2d64953bf20dbad353cca18a3375 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -4,7 +4,6 @@
 # Author: AS
 # Author: Alex Blokha
 # Author: Alex Khimich
 # Author: AS
 # Author: Alex Blokha
 # Author: Alex Khimich

-# Author: Amire80

 # Author: Andrew J.Kurbiko
 # Author: Andriykopanytsia
 # Author: Andygol
 # Author: Andrew J.Kurbiko
 # Author: Andriykopanytsia
 # Author: Andygol

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index bebcb2af886f4e328fac8c7358da04926113f275..999f177bb40e2abddf6c4f15134e3ff952cfa3b0 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -23,6 +23,7 @@
 # Author: Trần Nguyễn Minh Huy
 # Author: Trọng Đặng
 # Author: Vinhtantran
 # Author: Trần Nguyễn Minh Huy
 # Author: Trọng Đặng
 # Author: Vinhtantran

+# Author: XDO

 # Author: 予弦
 # Author: 神樂坂秀吉
 ---
 # Author: 予弦
 # Author: 神樂坂秀吉
 ---


@@ -141,7 +142,7 @@ vi:
         longitude: Kinh độ
         public: Công khai
         description: Miêu tả
         longitude: Kinh độ
         public: Công khai
         description: Miêu tả

-        gpx_file: Tải lên Tập tin GPX
+        gpx_file: Chọn tệp Tuyến đường GPS

         visibility: 'Mức độ truy cập:'
         tagstring: 'Thẻ:'
       message:
         visibility: 'Mức độ truy cập:'
         tagstring: 'Thẻ:'
       message:


@@ -384,7 +385,8 @@ vi:
         note: ghi chú
     timeout:
       title: Lỗi Hết Thời gian Chờ
         note: ghi chú
     timeout:
       title: Lỗi Hết Thời gian Chờ

-      sorry: Rất tiếc, đã chờ lấy dữ liệu của %{type} có ID %{id} quá lâu.
+      sorry: Rất tiếc, việc lấy dữ liệu loại %{type} có ID %{id} vượt quá thời gian
+        cho phép.

       type:
         node: nốt
         way: lối
       type:
         node: nốt
         way: lối


@@ -400,9 +402,8 @@ vi:
         way: lối
         relation: quan hệ
     start_rjs:
         way: lối
         relation: quan hệ
     start_rjs:

-      feature_warning: Đang tải %{num_features} đối tượng, điều này sẽ chậm lại trình
-        duyệt của bạn hoặc làm nó không phản hồi. Bạn có chắc chắn muốn hiển thị toàn
-        bộ dữ liệu này?
+      feature_warning: Việc tải %{num_features} đối tượng có thể làm trình duyệt của
+        bạn bị chậm hoặc đơ. Bạn có chắc chắn muốn hiển thị dữ liệu này không?

       load_data: Tải Dữ liệu
       loading: Đang tải…
     tag_details:
       load_data: Tải Dữ liệu
       loading: Đang tải…
     tag_details:


@@ -421,9 +422,16 @@ vi:
       introduction: Nhấn chuột vào bản đồ để tìm những yếu tố lân cận.
       nearby: Yếu tố lân cận
       enclosing: Yếu tố bao gồm
       introduction: Nhấn chuột vào bản đồ để tìm những yếu tố lân cận.
       nearby: Yếu tố lân cận
       enclosing: Yếu tố bao gồm

+  nodes:
+    timeout:
+      sorry: Rất tiếc, việc lấy dữ liệu cho node có ID %{id} vượt quá thời gian cho
+        phép.

   old_nodes:
     not_found:
       sorry: 'Rất tiếc, không tìm thấy nốt #%{id} phiên bản %{version}.'
   old_nodes:
     not_found:
       sorry: 'Rất tiếc, không tìm thấy nốt #%{id} phiên bản %{version}.'

+    timeout:
+      sorry: Rất tiếc, việc lấy lịch sử cho node có ID %{id} vượt quá thời gian cho
+        phép.

   old_ways:
     not_found:
       sorry: 'Rất tiếc, không tìm thấy lối #%{id} phiên bản %{version}.'
   old_ways:
     not_found:
       sorry: 'Rất tiếc, không tìm thấy lối #%{id} phiên bản %{version}.'

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d3d0edeaaeb07e2afacd69d76874db68df9af368..5c7b3045e263998953b63caa27ddede195799579 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -5,7 +5,6 @@
 # Author: 500000000006城
 # Author: A Chinese Wikipedian
 # Author: A Retired User
 # Author: 500000000006城
 # Author: A Chinese Wikipedian
 # Author: A Retired User

-# Author: Amire80

 # Author: Anakmalaysia
 # Author: Angrydog001
 # Author: Anterdc99
 # Author: Anakmalaysia
 # Author: Angrydog001
 # Author: Anterdc99