Merge remote-tracking branch 'openstreetmap/pull/1174'

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 6ffb531626b72b066d6e0874a4ea196e7bdb0a8f..901f06d2853cf0382438bfa22122c9bcd48f4232 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -161,7 +161,7 @@ diq:
       no_edits: (vurnayış çıniyo)
     changesets:
       id: ID
-      saved_at: Deme qeydi
+      saved_at: Demê qeydi
       user: Karber
       comment: Mışewre
       area: Erz
@@ -483,7 +483,7 @@ diq:
       outbox: Rışteyan
       from: Kêra
       subject: Mewzu
-      date: Deme
+      date: Dem
     message_summary:
       reply_button: Cewab bıde
       delete_button: Bestere
@@ -497,10 +497,10 @@ diq:
       outbox: Rışteyan
       to: Kêrê
       subject: Mewzu
-      date: Deme
+      date: Dem
     read:
       subject: Mewzu
-      date: Deme
+      date: Dem
       reply_button: Cewab bıde
       to: Kêrê
     sent_message_summary:
@@ -681,7 +681,7 @@ diq:
       traces: rêçi
       remove as friend: Embazan ra vec
       add as friend: Xo rê embaz ke
-      mapper since: 'Demê Xeritoğiney:'
+      mapper since: 'Demê herdnigarwaniye:'
       ago: (%{time_in_words_ago} veror)
       ct undecided: Darıdeyo
       ct declined: Red kerd

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d7917ba2b83e06a5201563fc0487a8fef8f2263f..20d406ebddf84297fdfe5f8ee299d555b4d92f33 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,11 +1,13 @@
 # Messages for British English (British English)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Andibing
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
+# Author: E THP
 # Author: Jagwar
 # Author: Kosovastar
 # Author: Macofe
@@ -173,6 +175,7 @@ en-GB:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     timeout:
       sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
       type:
@@ -180,6 +183,7 @@ en-GB:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     redacted:
       redaction: Redaction %{id}
       message_html: Version %{version} of this %{type} cannot be shown as it has been
@@ -265,6 +269,7 @@ en-GB:
   diary_entry:
     new:
       title: New Diary Entry
+      publish_button: Publish
     list:
       title: Users' diaries
       title_friends: Friends' diaries
@@ -402,8 +407,10 @@ en-GB:
       prefix_format: '%{name}'
       prefix:
         aerialway:
+          cable_car: Cable Car
           chair_lift: Chairlift
           drag_lift: Drag Lift
+          gondola: Gondola Lift
           station: Aerialway Station
         aeroway:
           aerodrome: Aerodrome
@@ -414,6 +421,7 @@ en-GB:
           taxiway: Taxiway
           terminal: Terminal
         amenity:
+          animal_shelter: Animal Shelter
           arts_centre: Arts Centre
           atm: ATM
           bank: Bank
@@ -423,6 +431,7 @@ en-GB:
           bicycle_parking: Cycle Parking
           bicycle_rental: Cycle Rental
           biergarten: Beer Garden
+          boat_rental: Boat Rental
           brothel: Brothel
           bureau_de_change: Bureau de Change
           bus_station: Bus Station
@@ -432,6 +441,7 @@ en-GB:
           car_wash: Car Wash
           casino: Casino
           charging_station: Charging Station
+          childcare: Childcare
           cinema: Cinema
           clinic: Clinic
           clock: Clock
@@ -453,6 +463,7 @@ en-GB:
           food_court: Food Court
           fountain: Fountain
           fuel: Fuel
+          gambling: Gambling
           grave_yard: Graveyard
           gym: Fitness Centre/Gym
           health_centre: Health Centre
@@ -463,11 +474,14 @@ en-GB:
           library: Library
           market: Market
           marketplace: Marketplace
+          monastery: Monastery
+          motorcycle_parking: Motorcycle Parking
           nightclub: Night Club
           nursery: Nursery School
           nursing_home: Nursing Home
           office: Office
           parking: Parking
+          parking_entrance: Parking Entrance
           pharmacy: Pharmacy
           place_of_worship: Place of Worship
           police: Police
@@ -501,6 +515,7 @@ en-GB:
           veterinary: Veterinary Surgery
           village_hall: Village Hall
           waste_basket: bin
+          waste_disposal: Waste Disposal
           youth_centre: Youth Centre
         boundary:
           administrative: Administrative Boundary
@@ -515,14 +530,30 @@ en-GB:
           "yes": Bridge
         building:
           "yes": Building
+        craft:
+          brewery: Brewery
+          carpenter: Carpenter
+          electrician: Electrician
+          gardener: Gardener
+          painter: Painter
+          photographer: Photographer
+          plumber: Plumber
+          shoemaker: Shoemaker
+          tailor: Tailor
+          "yes": Craft Shop
         emergency:
+          ambulance_station: Ambulance Station
+          defibrillator: Defibrillator
+          landing_site: Emergency Landing Site
           phone: Emergency Phone
         highway:
+          abandoned: Abandoned Highway
           bridleway: Bridleway
           bus_guideway: Guided Bus Lane
           bus_stop: Bus Stop
           construction: Highway under construction
           cycleway: Cycle Path
+          elevator: Elevator
           emergency_access_point: Emergency Access Point
           footway: Footpath
           ford: Ford
@@ -813,6 +844,7 @@ en-GB:
           "yes": Shop
         tourism:
           alpine_hut: Alpine Hut
+          apartment: Apartment
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
@@ -820,6 +852,7 @@ en-GB:
           camp_site: Camp Site
           caravan_site: Caravan Site
           chalet: Chalet
+          gallery: Gallery
           guest_house: Guest House
           hostel: Hostel
           hotel: Hotel
@@ -851,6 +884,7 @@ en-GB:
           wadi: Wadi
           waterfall: Waterfall
           weir: Weir
+          "yes": Waterway
       admin_levels:
         level2: Country Boundary
         level4: State Boundary
@@ -1013,6 +1047,11 @@ en-GB:
         2007 (<a href="http://www.and.com">www.and.com</a>)'
       contributors_nz_html: '<strong>New Zealand</strong>: Contains data sourced from
         Land Information New Zealand. Crown Copyright reserved.'
+      contributors_si_html: |-
+        <strong>Slovenia</strong>: Contains data from the
+        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
+        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        (public information of Slovenia).
       contributors_za_html: '<strong>South Africa</strong>: Contains data sourced
         from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
         Information</a>, State copyright reserved.'
@@ -1032,6 +1071,11 @@ en-GB:
         added to the OpenStreetMap database or this site, please refer to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
         filing page</a>.
+      trademarks_title_html: <span id="trademarks"></span>Trademarks
+      trademarks_1_html: OpenStreetMap and the magnifying glass logo are registered
+        trademarks of the OpenStreetMap Foundation. If you have questions about your
+        use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+        Working Group</a>.
   welcome_page:
     title: Welcome!
     introduction_html: Welcome to OpenStreetMap, the free and editable map of the
@@ -1433,7 +1477,7 @@ en-GB:
       second: Second item
       link: Link
       text: Text
-      image: Image
+      image: شکیل
       alt: Alt text
       url: URL
   trace:

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1cf8c38d0c334ef1dc3a90f9732596f4d9476c19..434f026f67d230ab3267544a5776e7213e98c342 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -11,6 +11,7 @@
 # Author: Fortega
 # Author: Guillembb
 # Author: Hereñu
+# Author: Idontknow
 # Author: Invadinado
 # Author: Johnarupire
 # Author: Jynus
@@ -1957,16 +1958,16 @@ es:
         revoke:
           administrator: Revocar acceso de administrador
           moderator: Revocar acceso de moderador
-      block_history: bloqueos recibidos
+      block_history: Bloqueos activos
       moderator_history: Bloqueos impuestos
       comments: Comentarios
-      create_block: bloquear a este usuario
-      activate_user: activar este usuario
-      deactivate_user: desactivar este usuario
+      create_block: Bloquear a este usuario
+      activate_user: Activar este usuario
+      deactivate_user: Desactivar este usuario
       confirm_user: Confirmar este usuario
-      hide_user: esconder este usuario
-      unhide_user: descubrir este usuario
-      delete_user: borrar este usuario
+      hide_user: Ocultar este usuario
+      unhide_user: Mostrar este usuario
+      delete_user: Eliminar este usuario
       confirm: Confirmar
       friends_changesets: conjuntos de cambios realizados por amigos
       friends_diaries: entradas de diarios de amigos

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c935c7be98948433799ef614da11ce4d29f92d98..1776b1a9d3727aee38d1465000248bacc33008f7 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -8,6 +8,7 @@
 # Author: Crochet.david
 # Author: Damouns
 # Author: DavidL
+# Author: E THP
 # Author: Efred
 # Author: Eruedin
 # Author: EtienneChove
@@ -1583,7 +1584,7 @@ fr:
       second: Second élément
       link: Lien
       text: Texte
-      image: Image
+      image: شکیل
       alt: Texte Alternatif
       url: URL
   trace:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 94667571a8a3b48b128c4e2e839b4b9e5f0097fa..570af6bdf9c9a31784196034c2fcd4d8ce5f85d3 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -378,7 +378,7 @@ hu:
       format: 'Formátum:'
       scale: Méretarány
       max: max.
-      image_size: 'Képméret:'
+      image_size: Képméret
       zoom: Nagyítási szint
       add_marker: Jelölő hozzáadása a térképhez
       latitude: 'Földrajzi szélesség:'

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 296f2786af1ebe58df233a8d6c8793e4019a0646..9687026446dd84237bbcaacdd7bee157439a3fb9 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -177,6 +177,7 @@ id:
         way: way/garis
         relation: relasi
         changeset: Set perubahan
+        note: catatan
     timeout:
       sorry: Maaf, data untuk %{type} dengan id %{id}, terlalu lama untuk dibuka.
       type:
@@ -184,6 +185,7 @@ id:
         way: way/garis
         relation: relasi
         changeset: set perubahan
+        note: catatan
     redacted:
       redaction: Redaksi %{id}
       message_html: Versi %{version} %{type} ini tidak dapat ditampilkan karena telah
@@ -274,6 +276,7 @@ id:
   diary_entry:
     new:
       title: Entri Baru Catatan Harian
+      publish_button: Terbitkan
     list:
       title: Catatan harian pengguna
       title_friends: Catatan harian teman
@@ -1209,7 +1212,7 @@ id:
   about_page:
     next: Berikutnya
     copyright_html: <span>&copy;</span>Kontributor<br>OpenStreetMap
-    used_by: Kekuatan %{name} memetakan data pada ratusan situs web, aplikasi seluler,
+    used_by: Kekuatan %{name} memetakan data pada ribuan situs web, aplikasi seluler,
       dan perangkat keras
     lede_text: "OpenStreetMap dibangun oleh komunitas pembuat peta yang berkontribusi
       dan memelihara data \ntentang jalan, jalur, kafe, stasiun kereta api, dan masih
@@ -1232,6 +1235,7 @@ id:
       Jika Anda mengubah atau membangun dari data dengan cara tertentu, Anda dapat
       menyebarkan hasilnya hanya di bawah lisensi yang sama. Lihat <a href=''%{copyright_path}''>halaman
       Hak Cipta dan Lisensi</a> untuk perinciannya.'
+    legal_title: Hukum
     legal_html: |-
       Situs ini dan layanan terkait lainnya dioperasikan secara resmi oleh <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) atas nama komunitas.
       <br>
@@ -1475,6 +1479,7 @@ id:
       table:
         entry:
           motorway: Jalan Tol
+          main_road: Jalan utama
           trunk: Jalan nasional
           primary: Jalan Primer
           secondary: Jalan Sekunder
@@ -1691,6 +1696,7 @@ id:
       allow_read_gpx: baca jejak GPS pribadi Anda.
       allow_write_gpx: unggah jejak GPS.
       allow_write_notes: memodifikasi catatan.
+      grant_access: Ijinkan Akses
     oauthorize_success:
       title: Permintaan otorisasi diperbolehkan
       allowed: Anda telah memberikan aplikasi %{app_name} akses ke akun Anda.
@@ -1895,6 +1901,7 @@ id:
       heading: Pengguna %{user} tidak dapat ditemukan
       body: Maaf, tidak ada pengguna dengan nama %{user}. Silahkan cek kembali ejaan,
         atau mungkin link yang Anda klik salah.
+      deleted: dihapus
     view:
       my diary: Catatan Harian Saya
       new diary entry: Entri baru catatan harian
@@ -1947,16 +1954,16 @@ id:
         revoke:
           administrator: Mencabut akses administrator
           moderator: Mencabut akses moderator
-      block_history: blok diterima
-      moderator_history: blok yang diberikan
+      block_history: Blok Aktif
+      moderator_history: Blok yang Diberikan
       comments: Komentar
-      create_block: Blokir pengguna ini
-      activate_user: aktifkan pengguna ini
-      deactivate_user: nonaktifkan pengguna ini
-      confirm_user: konfirmasi pengguna ini
-      hide_user: sembunyikan pengguna ini
-      unhide_user: munculkan kembali pengguna ini
-      delete_user: hapus pengguna ini
+      create_block: Blokir Pengguna Ini
+      activate_user: Aktifkan Pengguna Ini
+      deactivate_user: Nonaktifkan Pengguna Ini
+      confirm_user: Konfirmasi Pengguna Ini
+      hide_user: Sembunyikan Pengguna Ini
+      unhide_user: Munculkan Kembali Pengguna Ini
+      delete_user: Hapus Pengguna Ini
       confirm: Konfirmasi
       friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman
       friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman
@@ -2096,9 +2103,17 @@ id:
         %{webmaster} jika Anda ingin mendiskusikannya.\n</p>"
     auth_failure:
       connection_failed: Hubungan dengan penyedia autentikasi gagal
+      invalid_credentials: Kredensial otentikasi tidak sah
       no_authorization_code: Tidak ada kode otorisasi
       unknown_signature_algorithm: Algoritma khas tidak dikenal
       invalid_scope: Cakupan tidak sah
+    auth_association:
+      heading: ID Anda tidak diasosiasikan dengan akun OpenStreetMap manapun.
+      option_1: Jika Anda baru menggunakan OpenStreetMap, silakan buat akun baru menggunakan
+        formulir di bawah.
+      option_2: Jika Anda sudah memiliki akun, Anda dapat masuk log ke akun Anda menggunakan
+        nama pengguna dan kata sandi Anda dan lalu asosiasikan akunnya dengan ID Anda
+        di pengaturan pengguna Anda.
   user_role:
     filter:
       not_an_administrator: Hanya administrator yang dapat melakukan peran manajemen
@@ -2346,6 +2361,9 @@ id:
         mapquest_car: Mobil (MapQuest)
         mapquest_foot: Jalan Kaki (MapQuest)
         osrm_car: Mobil (OSRM)
+        mapzen_bicycle: Sepeda (Mapzen)
+        mapzen_car: Mobil (Mapzen)
+        mapzen_foot: Kaki (Mapzen)
       directions: Petunjuk Arah
       distance: Jarak
       errors:

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 70097e076917fca488c83827d4dbc1ee1faf7975..3ae89b27f5ba74f6871dbe3d5d7f45c7b5c27c8a 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1442,7 +1442,7 @@ lt:
       search_results: Paieškos rezultatai
       close: Uždaryti
     search:
-      search: 'Paieška:'
+      search: Paieška
       get_directions: Gauti nurodymus
       get_directions_title: Rasti maršruto nurodymus tarp dviejų taškų
       from: Iš
@@ -1873,6 +1873,7 @@ lt:
       heading: Naudotojas %{user} neegzistuoja
       body: Atsiprašome, bet čia nėra jokio naudotojo vardu „%{user}“. Pasitikrinkite
         rašybą, arba nuoroda, kurią jūs paspaudėte yra klaidinga.
+      deleted: ištrinta
     view:
       my diary: Mano dienoraštis
       new diary entry: naujas dienoraščio įrašas
@@ -1926,14 +1927,14 @@ lt:
           administrator: Atšaukti administratoriaus teises
           moderator: Atšaukti moderatoriaus teises
       block_history: Aktyvūs blokavimai
-      moderator_history: gauti užblokavimai
+      moderator_history: Gauti užblokavimai
       comments: Komentarai
-      create_block: blokuoti šį naudotoją
+      create_block: Blokuoti šį naudotoją
       activate_user: Aktyvuoti šį naudotoją
       deactivate_user: aktyvuoti šį naudotoją
-      confirm_user: patvirtinti šį naudotoją
-      hide_user: slėpti šį naudotoją
-      unhide_user: nebeslėpti šio naudotojo
+      confirm_user: Patvirtinti šį naudotoją
+      hide_user: Paslėpti šį naudotoją
+      unhide_user: Nebeslėpti šio naudotojo
       delete_user: Pašalinti šį naudotoją
       confirm: Patvirtinti
       friends_changesets: draugų keitimai

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index eb674253a8eaaa7de3c096d0f92b6bf073abb934..4ed1c13a888aff8d08dfb73e3461fac9fe7e47af 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1569,7 +1569,8 @@ ms:
     georss:
       title: Jejak OpenStreetMap GPS
     description:
-      description_with_count: GPX fail dengan %{count} mata dari %{user}
+      description_with_count:
+        other: GPX fail dengan %{count} mata dari %{user}
       description_without_count: Fail GPX daripada %{user}
   application:
     require_cookies:

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 5336a6c1d85438816c64cf94e57dbcb494dff1a7..7d014a68bee4bc48e11d06409149836c5961829f 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1116,7 +1116,7 @@ nb:
       title: Grunnleggende termer
       paragraph_1_html: OpenStreetMap har sin egen sjargong. Her er en ordliste som
         kan være nyttig.
-      editor_html: En <strong>editor</strong> er et program eller en nettside som
+      editor_html: En <strong>redigerer</strong> er et program eller en nettside som
         kan brukes til å redigere kartet.
       node_html: En <strong>node</strong> er et enkeltelement på kartet, f.eks. en
         restaurant eller et tre.
@@ -1249,7 +1249,7 @@ nb:
     gpx_notification:
       greeting: Hei,
       your_gpx_file: Det ser ut som GPX-filen din
-      with_description: med beskrivelse
+      with_description: med beskrivelsen
       and_the_tags: 'og følgende merkelapper:'
       and_no_tags: og ingen merkelapper.
       failure:
@@ -1277,7 +1277,7 @@ nb:
       greeting: Hei,
       hopefully_you: Noen (forhåpentligvis deg) ønsker å endre e-postadressen for
         %{server_url} til %{new_address}.
-      click_the_link: Hvis det er deg, klikk lenka nedenfor for å bekrefte endringen.
+      click_the_link: Hvis dette er deg, klikk lenka nedenfor for å bekrefte endringen.
     email_confirm_html:
       greeting: Hei,
       hopefully_you: Noen (forhåpentligvis deg) ønsker å endre e-postadressen for
@@ -1352,7 +1352,7 @@ nb:
       date: Dato
       no_messages_yet: Du har ingen meldinger ennå. Kanskje du kan prøve å komme i
         kontakt med %{people_mapping_nearby_link}?
-      people_mapping_nearby: folk i nærheten som lager kart
+      people_mapping_nearby: folk som kartlegger i nærheten
     message_summary:
       unread_button: Marker som ulest
       read_button: Marker som lest
@@ -1921,11 +1921,11 @@ nb:
         revoke:
           administrator: Fjern administrator-tilgang
           moderator: fjern moderator-tilgang
-      block_history: mottatte blokkeringer
-      moderator_history: tildelte blokkeringer
+      block_history: Aktive Blokkeringer
+      moderator_history: Tildelte Blokkeringer
       comments: Kommentarer
-      create_block: blokker denne brukeren
-      activate_user: aktiver denne brukeren
+      create_block: Blokker Denne Brukeren
+      activate_user: Aktiver denne Brukeren
       deactivate_user: deaktiver denne brukeren
       confirm_user: bekreft denne brukeren
       hide_user: skjul denne brukeren

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 97ca4fcf77d3f229a026cb3014d9842a14f3664a..2a5e7f9dc10578504e64b9a5e4f06d6284ef166a 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1686,7 +1686,7 @@ sr:
       create_block: блокирај овог корисника
       activate_user: активирај овог корисника
       deactivate_user: деактивирај овог корисника
-      confirm_user: потврди овог корисника
+      confirm_user: Ð\9fотврди овог корисника
       hide_user: сакриј овог корисника
       unhide_user: откриј овог корисника
       delete_user: обриши овог корисника

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index b03447d361140aeeef92e490b42e24332dfc9cde..7996c6a2c1770fed9b83263c39d68a858d0fb981 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -25,6 +25,7 @@
 # Author: Per
 # Author: Pladask
 # Author: Poxnar
+# Author: Rockyfelle
 # Author: Ruila
 # Author: Sannab
 # Author: Sendelbach
@@ -1963,16 +1964,16 @@ sv:
         revoke:
           administrator: Återkalla administratörsrättigheter
           moderator: Återkalla moderatorrättigheter
-      block_history: tilldelade blockeringar
-      moderator_history: utdelade blockeringar
+      block_history: Aktiva blockeringar
+      moderator_history: Utdelade blockeringar
       comments: Kommentarer
-      create_block: blockera denna användare
-      activate_user: aktivera denna användare
-      deactivate_user: avaktivera denna användare
-      confirm_user: bekräfta denna användare
-      hide_user: dölj denna användare
-      unhide_user: sluta dölja användaren
-      delete_user: radera denna användare
+      create_block: Blockera denna användare
+      activate_user: Aktivera denna användare
+      deactivate_user: Inaktivera denna användare
+      confirm_user: Bekräfta denna användare
+      hide_user: Dölj denna användare
+      unhide_user: Sluta dölja användaren
+      delete_user: Radera denna användare
       confirm: Bekräfta
       friends_changesets: vänners ändringsset
       friends_diaries: vänners dagboksinlägg

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 24bdc68710cb4615c392f44e4c2acbcb82815225..c70a3c66d353a53a2ee036b97474f3577c30303a 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -61,7 +61,7 @@ uk:
       trace: Трек
       tracepoint: Точка треку
       tracetag: Теґ треку
-      user: Ð\9aоÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87
+      user: УÑ\87аÑ\81ник
       user_preference: Налаштування користувача
       user_token: Код підтвердження користувача
       way: Лінія
@@ -1941,16 +1941,16 @@ uk:
         revoke:
           administrator: Відкликати права адміністратора
           moderator: Відкликати права модератора
-      block_history: оÑ\82Ñ\80Ð¸Ð¼Ð°ні блокування
-      moderator_history: створені блокування
+      block_history: Ð\90кÑ\82Ð¸Ð²ні блокування
+      moderator_history: Створені блокування
       comments: Коментарі
-      create_block: блокÑ\83ваÑ\82и коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87а
-      activate_user: акÑ\82ивÑ\83ваÑ\82и Ñ\86Ñ\8cого коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87а
-      deactivate_user: де-акÑ\82ивÑ\83ваÑ\82и Ñ\86Ñ\8cого коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87а
-      confirm_user: пÑ\96дÑ\82веÑ\80диÑ\82и коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87а
-      hide_user: пÑ\80иÑ\85оваÑ\82и Ñ\86Ñ\8cого коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87а
-      unhide_user: показаÑ\82и Ñ\86Ñ\8cого коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87а
-      delete_user: вилÑ\83Ñ\87иÑ\82и Ñ\86Ñ\8cого коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87а
+      create_block: Ð\97аблокÑ\83ваÑ\82и Ñ\86Ñ\8cого Ñ\83Ñ\87аÑ\81ника
+      activate_user: Ð\90кÑ\82ивÑ\83ваÑ\82и Ñ\86Ñ\8cого Ñ\83Ñ\87аÑ\81ника
+      deactivate_user: Ð\94е-акÑ\82ивÑ\83ваÑ\82и Ñ\86Ñ\8cого Ñ\83Ñ\87аÑ\81ника
+      confirm_user: Ð\9fÑ\96дÑ\82веÑ\80диÑ\82и Ñ\86Ñ\8cого Ñ\83Ñ\87аÑ\81ника
+      hide_user: Ð\9fÑ\80иÑ\85оваÑ\82и Ñ\86Ñ\8cого Ñ\83Ñ\87аÑ\81ника
+      unhide_user: Ð\9fоказаÑ\82и Ñ\86Ñ\8cого Ñ\83Ñ\87аÑ\81ника
+      delete_user: Ð\92илÑ\83Ñ\87иÑ\82и Ñ\86Ñ\8cого Ñ\83Ñ\87аÑ\81ника
       confirm: Підтвердити
       friends_changesets: набори змін друзів
       friends_diaries: записи в щоденниках друзів

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index b2f7c01b043e7821810c1935bc912f687f2b3fa1..2fec258af4855a2cfe0ecd8a54a3fe6f0ee647ad 100644 (file)
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -491,7 +491,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.order(:id => :desc).first
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
     assert_equal "trackable", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
@@ -717,7 +717,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
     assert_equal "trackable", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
@@ -735,7 +735,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
     assert_equal "public", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
@@ -753,7 +753,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
     assert_equal "private", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read