Merge branch 'master' into overpass

[rails.git] / config / locales / yo.yml

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 6cc6be64319660c883073d162b2677dafda624ab..7176f1c8ba2adb03fc1b2d12c9ee056d32116481 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -1,6 +1,7 @@
 # Messages for Yoruba (Yorùbá)
 # Exported from translatewiki.net
 # Messages for Yoruba (Yorùbá)
 # Exported from translatewiki.net

-# Export driver: syck
+# Export driver: syck-pecl
+# Author: Demmy

 yo: 
   activerecord: 
     attributes: 
 yo: 
   activerecord: 
     attributes: 


@@ -29,21 +30,21 @@ yo:
       user: Oniti nlo nykan
   browse: 
     changeset_details: 
       user: Oniti nlo nykan
   browse: 
     changeset_details: 

-      has_nodes: "Has the following {{count}} nodes:"
-      has_relations: "Has the following {{count}} relations:"
-      has_ways: "Has the following {{count}} ways:"
+      has_nodes: "Has the following %{count} nodes:"
+      has_relations: "Has the following %{count} relations:"
+      has_ways: "Has the following %{count} ways:"

     node: 
     node: 

-      download: "{{download_xml_link}} or {{view_history_link}}"
+      download: "%{download_xml_link} or %{view_history_link}"

     start_rjs: 
       object_list: 
         selected: 
           type: 
     start_rjs: 
       object_list: 
         selected: 
           type: 

-            way: Ona [[id]]
+            way: Ona %{id}

         type: 
           way: Ona
       wait: Duro...
     way: 
         type: 
           way: Ona
       wait: Duro...
     way: 

-      download: "{{download_xml_link}} or {{view_history_link}}"
+      download: "%{download_xml_link} or %{view_history_link}"

   diary_entry: 
     edit: 
       body: "Ara:"
   diary_entry: 
     edit: 
       body: "Ara:"


@@ -61,15 +62,12 @@ yo:
     logout_tooltip: Jade
     make_a_donation: 
       text: Da wo si openstreetmap.org
     logout_tooltip: Jade
     make_a_donation: 
       text: Da wo si openstreetmap.org

-    shop: Oja
-    shop_tooltip: Oja oni OpenStreetMap
-    sotm: Wa si 2009 Ipade OpenStreetMap, The State of the Map, July 10-12 ni ilu  Amsterdam!

     view: wo
     view_tooltip: wo maps
     view: wo
     view_tooltip: wo maps

-    welcome_user: Kabo, {{user_link}}
+    welcome_user: Kabo, %{user_link}

   message: 
     outbox: 
   message: 
     outbox: 

-      you_have_sent_messages: O ni {{count}} sent messages
+      you_have_sent_messages: O ni %{count} sent messages

     read: 
       back_to_inbox: Pada si inbox
       back_to_outbox: Pad si outbox
     read: 
       back_to_inbox: Pada si inbox
       back_to_outbox: Pad si outbox


@@ -79,7 +77,7 @@ yo:
   notifier: 
     gpx_notification: 
       success: 
   notifier: 
     gpx_notification: 
       success: 

-        loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
+        loaded_successfully: "loaded successfully with %{trace_points} out of a possible\n%{possible_points} points."

   site: 
     edit: 
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
   site: 
     edit: 
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)


@@ -98,10 +96,9 @@ yo:
       auth failure: Pele, e le wole pelu details yi.
       heading: Wole
       lost password link: Se eh ti san password nu?
       auth failure: Pele, e le wole pelu details yi.
       heading: Wole
       lost password link: Se eh ti san password nu?

-      please login: Ejo e Wolw abi {{create_user_link}}.

       title: Wole
     lost_password: 
       title: Wole
     lost_password: 

-      new password button: Send me a new password
+      new password button: Fi ọ̀rọ̀ìpamọ́ tuntun ránsẹ́ sí mi

       title: lost password
     reset_password: 
       title: lost password
     reset_password: 

-      title: reset password
+      title: ìtúntò ọ̀rọ̀ìpamọ́