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

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

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 7ec493934c973c450dfca18248b04b779d68098a..7edd241cbcac3a93d214e376336bc00d6778042f 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -22,7 +22,7 @@ yo:
         body: Ara
       diary_entry:
         title: Àkọlé
         body: Ara
       diary_entry:
         title: Àkọlé

-        language: Èdè
+        language_code: Èdè

       friend:
         friend: Ore
       message:
       friend:
         friend: Ore
       message:


@@ -38,24 +38,22 @@ yo:
     home: ibùdó
     logout: jade
     log_in: Ìjáwọlé
     home: ibùdó
     logout: jade
     log_in: Ìjáwọlé

-    log_in_tooltip: wole pelu with an existing account

     make_a_donation:
       text: Da wo si openstreetmap.org
     make_a_donation:
       text: Da wo si openstreetmap.org

-  user_mailer:
-    gpx_success:
-      loaded_successfully:
-        other: ókan=ó jẹ́ gbígbéjáde láṣeyorí pẹ̀lú %{trace_points} nínú iye 1

   messages:
     show:
       title: Ka message
   messages:
     show:
       title: Ka message

+  passwords:
+    new:
+      title: lost password
+      new password button: Fi ọ̀rọ̀ìpamọ́ tuntun ránsẹ́ sí mi
+    edit:
+      title: ìtúntò ọ̀rọ̀ìpamọ́

   sessions:
     new:
       title: Wole
       heading: Wole
       lost password link: Se eh ti san password nu?
   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:
       auth failure: Pele, e le wole pelu details yi.
   site:
     search:


@@ -65,13 +63,4 @@ yo:
     show:
       filename: 'Orúkọ fáìlì:'
       tags: Tags
     show:
       filename: 'Orúkọ fáìlì:'
       tags: Tags

-  users:
-    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

 ...
 ...