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

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

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 7ec493934c973c450dfca18248b04b779d68098a..db03f5a884ccc4d2fcf9d5866efea6130118a884 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
 # Export driver: phpyaml
+# Author: BigDareLibrary
 # Author: Demmy
 ---
 yo:
@@ -22,7 +23,7 @@ yo:
         body: Ara
       diary_entry:
         title: Àkọlé
-        language: Èdè
+        language_code: Èdè
       friend:
         friend: Ore
       message:
@@ -33,29 +34,28 @@ yo:
     form:
       use_map_link: Lo map
     show:
+      discussion: Ijiroro
       login: wole
   layouts:
     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
-  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
+  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?
-      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:
@@ -65,13 +65,4 @@ yo:
     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
 ...