Merge branch 'master' into HEAD

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

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index e28e608438484a8fc0bd367bee3195f16ab34b63..1b283b87abb477a8685cff12497dcc5c811994ee 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -1,7 +1,6 @@
 # Messages for Yoruba (Yorùbá)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: Demmy
 ---
 yo:
@@ -30,6 +29,10 @@ yo:
         body: Ara
       user:
         languages: Àwọn èdè
+  accounts:
+    edit:
+      public editing:
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
   diary_entries:
     form:
       use_map_link: Lo map
@@ -49,6 +52,21 @@ yo:
   messages:
     show:
       title: Ka message
+  passwords:
+    lost_password:
+      title: lost password
+      new password button: Fi ọ̀rọ̀ìpamọ́ tuntun ránsẹ́ sí mi
+    reset_password:
+      title: ìtúntò ọ̀rọ̀ìpamọ́
+  sessions:
+    new:
+      title: Wole
+      heading: Wole
+      lost password link: Se eh ti san password nu?
+      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.
   site:
     search:
       where_am_i: Ni bo ni mo wa?
@@ -57,21 +75,4 @@ yo:
     show:
       filename: 'Orúkọ fáìlì:'
       tags: Tags
-  users:
-    login:
-      title: Wole
-      heading: Wole
-      lost password link: Se eh ti san password nu?
-      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
-      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
 ...