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

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

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index df86e2d4d9383ee7c9c1e9b5ceecd4377db59cf9..99bb6c4901d2a97d9d0582cb7a5062f144191442 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,13 +38,8 @@ 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


@@ -59,9 +54,6 @@ yo:
       title: Wole
       heading: Wole
       lost password link: Se eh ti san password nu?
       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: