Correct merge issues in the last merge from master

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

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index a23a161d12e0f05597b7d5ccdaa1f3296d68d193..ef81a01746beabfb6cd9db4914f8b49e7afd110d 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -1,4 +1,4 @@
-# Messages for Ripoarisch (Ripoarisch)
+# Messages for Colognian (Ripoarisch)

 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Purodha
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Purodha


@@ -102,13 +102,8 @@ ksh:
     start: 
       osm_xml_data: <i lang="en">OpenStreetMap</i> sing <i lang="en">XML</i> Daate
   layouts: 
     start: 
       osm_xml_data: <i lang="en">OpenStreetMap</i> sing <i lang="en">XML</i> Daate
   layouts: 

-    edit_tooltip: Landkaate ändere

     view_tooltip: Landkaate beloore
     view_tooltip: Landkaate beloore

-  map: 
-    coordinates: "Ko'oodinate:"

   notifier: 
   notifier: 

-    diary_comment_notification: 
-      banner1: "*                  Please do not reply to this <i lang=\"en\">e-mail</i>.                   *"

     email_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     email_confirm_html: 
     email_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     email_confirm_html: 


@@ -117,8 +112,6 @@ ksh:
       hopefully_you_1: Someone (hopefully you) would like to change their Adräß för de <i lang="en">e-mail</i> ändere
     lost_password: 
       subject: "[OpenStreetMap] Aanfrooch: Paßwoot neu säze"
       hopefully_you_1: Someone (hopefully you) would like to change their Adräß för de <i lang="en">e-mail</i> ändere
     lost_password: 
       subject: "[OpenStreetMap] Aanfrooch: Paßwoot neu säze"

-    message_notification: 
-      banner1: "*                  Please do not reply to this <i lang=\"en\">e-mail</i>.                   *"

     signup_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     signup_confirm_html: 
     signup_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     signup_confirm_html: