Merge remote-tracking branch 'upstream/pull/2837'

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

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 7176f1c8ba2adb03fc1b2d12c9ee056d32116481..49d04d28ecf30fd259b83cc2cefaf58c2eccdaf1 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -1,25 +1,14 @@
 # Messages for Yoruba (Yorùbá)
 # Exported from translatewiki.net
-# Export driver: syck-pecl
+# Export driver: spyc
 # Author: Demmy
-yo: 
-  activerecord: 
-    attributes: 
-      diary_comment: 
-        body: Ara
-      diary_entry: 
-        language: Ede
-        title: oyéorúkôàmì ìdá nkan sötõoríkì
-      friend: 
-        friend: Ore
-      message: 
-        body: Ara
-      user: 
-        languages: Ede
-    models: 
+---
+yo:
+  activerecord:
+    models:
       country: Orile Ede
       friend: Ore
-      language: Ede
+      language: Èdè
       message: ihinoroiye riran
       old_relation: ìsötàn agba
       old_relation_member: aráìbátançbíiyèkan agba
@@ -28,77 +17,70 @@ yo:
       relation_member: aráìbátançbíiyèkan
       session: ìjokòó àwñn onídàájô
       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:"
-    node: 
-      download: "%{download_xml_link} or %{view_history_link}"
-    start_rjs: 
-      object_list: 
-        selected: 
-          type: 
-            way: Ona %{id}
-        type: 
-          way: Ona
-      wait: Duro...
-    way: 
-      download: "%{download_xml_link} or %{view_history_link}"
-  diary_entry: 
-    edit: 
-      body: "Ara:"
-      language: "ede:"
+    attributes:
+      diary_comment:
+        body: Ara
+      diary_entry:
+        title: Àkọlé
+        language: Èdè
+      friend:
+        friend: Ore
+      message:
+        body: Ara
+      user:
+        languages: Àwọn èdè
+  diary_entry:
+    edit:
+      body: 'Ara:'
+      language: 'ede:'
       use_map_link: Lo map
-    view: 
+    view:
       login: wole
-  layouts: 
-    donate_link_text: idawo
-    home: ile
-    home_tooltip: Lo si ile
-    log_in: Wole
-    log_in_tooltip: wole pelu with an existing account
+  layouts:
+    home: ibùdó
     logout: jade
-    logout_tooltip: Jade
-    make_a_donation: 
+    log_in: Ìjáwọlé
+    log_in_tooltip: wole pelu with an existing account
+    make_a_donation:
       text: Da wo si openstreetmap.org
-    view: wo
-    view_tooltip: wo maps
-    welcome_user: Kabo, %{user_link}
-  message: 
-    outbox: 
-      you_have_sent_messages: O ni %{count} sent messages
-    read: 
-      back_to_inbox: Pada si inbox
-      back_to_outbox: Pad si outbox
-      reading_your_messages: Ka messages eh
-      reading_your_sent_messages: Ka sent messages
+  notifier:
+    gpx_notification:
+      success:
+        loaded_successfully: |
+          loaded successfully with %{trace_points} out of a possible
+          %{possible_points} points.
+  message:
+    read:
       title: Ka message
-  notifier: 
-    gpx_notification: 
-      success: 
-        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.)
-    search: 
-      submit_text: Lo
+  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.)
+    search:
       where_am_i: Ni bo ni mo wa?
-  trace: 
-    view: 
+      submit_text: Lo
+  trace:
+    view:
       tags: Tags
-  user: 
-    account: 
-      public editing: 
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-    login: 
-      account not active: Pele, account yin ko wa active .<br />Jo eh te link ni nu account confirmation email lati tan account eh.
-      auth failure: Pele, e le wole pelu details yi.
+  user:
+    login:
+      title: Wole
       heading: Wole
       lost password link: Se eh ti san password nu?
-      title: Wole
-    lost_password: 
-      new password button: Fi ọ̀rọ̀ìpamọ́ tuntun ránsẹ́ sí mi
+      account not active: 'Àforjìn, àkópamọ́ yín kò tí ì bẹ̀rẹ̀ ìṣẹ́ báyìí.<br />Ẹ jọ̀wọ́ ẹ lo àjápọ̀ tó wà nínú e-mail ìmúdájú àkòpamọ́ lati bẹ̀rẹ̀ àkópamọ́ yín, tàbí <a href="%{reconfirm}">kí ẹ tọrọ e-mail ìmúdájú tuntun</a>.'
+      auth failure: Pele, e le wole pelu details yi.
+    lost_password:
       title: lost password
-    reset_password: 
+      new password button: >
+        Fi ọ̀rọ̀ìpamọ́ tuntun
+        ránsẹ́ sí mi
+    reset_password:
       title: ìtúntò ọ̀rọ̀ìpamọ́
+    account:
+      public editing:
+        enabled link: >
+          http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits