Correct merge issues in the last merge from master

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

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index d8acd5cac76c6838dee23b5681bcba4991dc2950..6cc6be64319660c883073d162b2677dafda624ab 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -1,3 +1,6 @@
+# Messages for Yoruba (Yorùbá)
+# Exported from translatewiki.net
+# Export driver: syck

 yo: 
   activerecord: 
     attributes: 
 yo: 
   activerecord: 
     attributes: 


@@ -49,7 +52,6 @@ yo:
     view: 
       login: wole
   layouts: 
     view: 
       login: wole
   layouts: 

-    alt_donation: Da wo si openstreetmap.org

     donate_link_text: idawo
     home: ile
     home_tooltip: Lo si ile
     donate_link_text: idawo
     home: ile
     home_tooltip: Lo si ile


@@ -57,6 +59,8 @@ yo:
     log_in_tooltip: wole pelu with an existing account
     logout: jade
     logout_tooltip: Jade
     log_in_tooltip: wole pelu with an existing account
     logout: jade
     logout_tooltip: Jade

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

     shop: Oja
     shop_tooltip: Oja oni OpenStreetMap
     sotm: Wa si 2009 Ipade OpenStreetMap, The State of the Map, July 10-12 ni ilu  Amsterdam!
     shop: Oja
     shop_tooltip: Oja oni OpenStreetMap
     sotm: Wa si 2009 Ipade OpenStreetMap, The State of the Map, July 10-12 ni ilu  Amsterdam!