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 b79640af501089cb15c1cc6105cb7f6947a5df52..ef81a01746beabfb6cd9db4914f8b49e7afd110d 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -1,3 +1,7 @@
+# Messages for Colognian (Ripoarisch)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Purodha

 ksh: 
   activerecord: 
     attributes: 
 ksh: 
   activerecord: 
     attributes: 


@@ -8,6 +12,7 @@ ksh:
         friend: Fründ
         user: Metmaacher
       trace: 
         friend: Fründ
         user: Metmaacher
       trace: 

+        name: Name

         user: Metmaacher
       user: 
         display_name: Name för zem Aanzeije
         user: Metmaacher
       user: 
         display_name: Name för zem Aanzeije


@@ -97,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: 


@@ -112,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: 


@@ -123,6 +121,8 @@ ksh:
     oauthorize: 
       allow_write_api: donn de Landkaat ändere
   oauth_clients: 
     oauthorize: 
       allow_write_api: donn de Landkaat ändere
   oauth_clients: 

+    form: 
+      name: Name

     show: 
       edit: Einzelheite ändere
   trace: 
     show: 
       edit: Einzelheite ändere
   trace: