Merge branch 'master' into openstreetbugs

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 8f0a6d1d0696a7b293cb3aec5a14c9a53a5a51eb..3614248e1d96ffd40a2fb822eac1e08bcfd6205b 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -4,9 +4,9 @@
 gcf: 
   browse: 
     changeset: 
 gcf: 
   browse: 
     changeset: 

-      changeset: "Niméwo chanjeman : {{id}}"
+      changeset: "Niméwo chanjeman : %{id}"

       changesetxml: Niméwo Chanjeman XML
       changesetxml: Niméwo Chanjeman XML

-      download: Téléchajé {{changeset_xml_link}} ouben {{osmchange_xml_link}}
+      download: Téléchajé %{changeset_xml_link} ouben %{osmchange_xml_link}

       osmchangexml: osmChanjeman XML
     changeset_details: 
       belongs_to: "Sé ta :"
       osmchangexml: osmChanjeman XML
     changeset_details: 
       belongs_to: "Sé ta :"


@@ -14,9 +14,9 @@ gcf:
       box: bwet
       closed_at: "Fini lè :"
       created_at: "Kréyé lè :"
       box: bwet
       closed_at: "Fini lè :"
       created_at: "Kréyé lè :"

-      has_nodes: "Ti ni sé {{count}} pwen la sa :"
-      has_relations: "Ti ni sé {{count}} rèlasion la sa:"
-      has_ways: "Ti ni sé {{count}} lin la sa :"
+      has_nodes: "Ti ni sé %{count} pwen la sa :"
+      has_relations: "Ti ni sé %{count} rèlasion la sa:"
+      has_ways: "Ti ni sé %{count} lin la sa :"

       no_bounding_box: Pa ti ni karé limit pou niméwo chanjeman la sa.
       show_area_box: Montré karé limit la
     common_details: 
       no_bounding_box: Pa ti ni karé limit pou niméwo chanjeman la sa.
       show_area_box: Montré karé limit la
     common_details: 


@@ -25,26 +25,26 @@ gcf:
       in_changeset: "Adan niméwo chanjeman :"
       version: "Vèsion :"
     containing_relation: 
       in_changeset: "Adan niméwo chanjeman :"
       version: "Vèsion :"
     containing_relation: 

-      entry: Rèlasion {{relation_name}}
-      entry_role: Rèlasion {{relation_name}} (adan wol {{relation_role}})
+      entry: Rèlasion %{relation_name}
+      entry_role: Rèlasion %{relation_name} (adan wol %{relation_role})

     map: 
       deleted: Fasé
       loading: Ka Chajé...
     node: 
     map: 
       deleted: Fasé
       loading: Ka Chajé...
     node: 

-      download: Chajé {{download_xml_link}} ouben {{view_history_link}}
+      download: Chajé %{download_xml_link} ouben %{view_history_link}

       download_xml: Chajé XML
       node: Pwen
       download_xml: Chajé XML
       node: Pwen

-      node_title: "Pwen : {{node_name}}"
+      node_title: "Pwen : %{node_name}"

       view_history: Vwè istwa la
     node_details: 
       part_of: "Adan:"
     node_history: 
       view_history: Vwè istwa la
     node_details: 
       part_of: "Adan:"
     node_history: 

-      download: Chajé {{download_xml_link}} ouben {{view_details_link}}
+      download: Chajé %{download_xml_link} ouben %{view_details_link}

       download_xml: Chajé XML
       node_history: istwa Pwen
       view_details: Vwè plis biten
     not_found: 
       download_xml: Chajé XML
       node_history: istwa Pwen
       view_details: Vwè plis biten
     not_found: 

-      sorry: Woy, pa ti ni {{type}} èvè niméwo {{id}}.
+      sorry: Woy, pa ti ni %{type} èvè niméwo %{id}.

     paging_nav: 
       of: a
       showing_page: Paj la ka vin
     paging_nav: 
       of: a
       showing_page: Paj la ka vin


@@ -53,7 +53,7 @@ gcf:
       part_of: "Adan :"
     relation_history: 
       relation_history: Istwa rèlasion
       part_of: "Adan :"
     relation_history: 
       relation_history: Istwa rèlasion

-      relation_history_title: "Istwa rèlasion: {{relation_name}}"
+      relation_history_title: "Istwa rèlasion: %{relation_name}"

     start: 
       manually_select: Chwazi manielman on dôt zonn
       view_data: Vwè sé doné la asi dènié kat la
     start: 
       manually_select: Chwazi manielman on dôt zonn
       view_data: Vwè sé doné la asi dènié kat la


@@ -69,19 +69,19 @@ gcf:
       manually_select: Chwazi manielman on dot zonn
       private_user: Itilizatè privé
       show_history: Vwè listwa la
       manually_select: Chwazi manielman on dot zonn
       private_user: Itilizatè privé
       show_history: Vwè listwa la

-      unable_to_load_size: "Pa ni moyen chajé sé doné la: karé limit la ka mèziré [[bbox_size]] y tro gran (y dwèt pli piti ki {{max_bbox_size}})"
+      unable_to_load_size: "Pa ni moyen chajé sé doné la: karé limit la ka mèziré [[bbox_size]] y tro gran (y dwèt pli piti ki %{max_bbox_size})"

       wait: Atann...
       zoom_or_select: Gwosi ouben chwazi on zonn asi kat la pou vwèy
   diary_entry: 
     diary_comment: 
       wait: Atann...
       zoom_or_select: Gwosi ouben chwazi on zonn asi kat la pou vwèy
   diary_entry: 
     diary_comment: 

-      comment_from: Komantè a {{link_user}} koté {{comment_created_at}}
+      comment_from: Komantè a %{link_user} koté %{comment_created_at}

     diary_entry: 
       comment_count: 
         one: On Komantè
     diary_entry: 
       comment_count: 
         one: On Komantè

-        other: "{{count}} Komantè"
+        other: "%{count} Komantè"

       comment_link: Palé asi nouvel la sa
       edit_link: Modifié nouvel la sa
       comment_link: Palé asi nouvel la sa
       edit_link: Modifié nouvel la sa

-      posted_by: Sé {{link_user}} ki voyé sa , koté {{created}} i maké an {{language_link}}
+      posted_by: Sé %{link_user} ki voyé sa , koté %{created} i maké an %{language_link}

       reply_link: Réponn nouvel la sa
     edit: 
       body: "Mésaj:"
       reply_link: Réponn nouvel la sa
     edit: 
       body: "Mésaj:"


@@ -103,22 +103,22 @@ gcf:
     new: 
       title: Nouvel nèf an jounal la
     no_such_entry: 
     new: 
       title: Nouvel nèf an jounal la
     no_such_entry: 

-      body: Woy, pa ti ni pon nouvel adan jounal la ouben komantè èvè niméwo la sa {{id}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
-      heading: "Pa ti ni nouvel èvè niméwo la sa : {{id}}"
+      body: Woy, pa ti ni pon nouvel adan jounal la ouben komantè èvè niméwo la sa %{id}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
+      heading: "Pa ti ni nouvel èvè niméwo la sa : %{id}"

     no_such_user: 
     no_such_user: 

-      body: Woy, Pa ti ni pon itilizatè non ay sé {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
+      body: Woy, Pa ti ni pon itilizatè non ay sé %{user}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.

   layouts: 
   layouts: 

-    donate: Ba OpenStreetMap on Fòs, {{link}} Pou fè matériel la vansé.
+    donate: Ba OpenStreetMap on Fòs, %{link} Pou fè matériel la vansé.

     donate_link_text: Bay Chabon
     edit: Modifié
     export: Voyé déwò
     gps_traces: Chimen GPS
     help_wiki: On ti pal & Wiki(koman fè)
     history: Istwa sa ou fè
     donate_link_text: Bay Chabon
     edit: Modifié
     export: Voyé déwò
     gps_traces: Chimen GPS
     help_wiki: On ti pal & Wiki(koman fè)
     history: Istwa sa ou fè

-    inbox: Bwet a let ({{count}})
+    inbox: Bwet a let (%{count})

     intro_1: OpenStreetMap sé on lyannaj a moun kon vou pou fè on Kat lib tou pa tou asi la Tè.
     intro_2: OpenStreetMap ka pewmèt vou vwè, modifié, itilizé doné jéografik tou pa tou asi la Tè.
     intro_1: OpenStreetMap sé on lyannaj a moun kon vou pou fè on Kat lib tou pa tou asi la Tè.
     intro_2: OpenStreetMap ka pewmèt vou vwè, modifié, itilizé doné jéografik tou pa tou asi la Tè.

-    intro_3: OpenStreetMap ka rété pou ayen aka {{ucl}} épi {{bytemark}}.
+    intro_3: OpenStreetMap ka rété pou ayen aka %{ucl} épi %{bytemark}.

     log_in: Rantré
     logout: Chapé
     make_a_donation: 
     log_in: Rantré
     logout: Chapé
     make_a_donation: 


@@ -132,21 +132,13 @@ gcf:
     tag_line: Lyannaj pou kat lib
     user_diaries: Jounal
     view: Vwè
     tag_line: Lyannaj pou kat lib
     user_diaries: Jounal
     view: Vwè

-    welcome_user: Bienvini, {{user_link}}
-  map: 
-    coordinates: Sitiyasion
-    edit: Édité
-    view: Kat
-  notifier: 
-    diary_comment_notification: 
-      banner1: "*            Souplé pa réponn a mésaj la sa.             *"
-      banner2: "*           Sèvi èvè sit a OpenStreetMap pou réponn.           *"
+    welcome_user: Bienvini, %{user_link}

   site: 
     edit: 
       anon_edits_link_text: Ka y ni la.
       flash_player_required: Ou bizwen on lektè Flash pou itilizé Potlatch ki sé éditè Flash a OpenStreetMap. Ou pé<a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>télécharjé Flash Player asi site a Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>Ni dot opsion</a> pour modifié OpenStreetMap.
       not_public: Ou pé pa réglé édision aw pou yo piblik.
   site: 
     edit: 
       anon_edits_link_text: Ka y ni la.
       flash_player_required: Ou bizwen on lektè Flash pou itilizé Potlatch ki sé éditè Flash a OpenStreetMap. Ou pé<a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>télécharjé Flash Player asi site a Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>Ni dot opsion</a> pour modifié OpenStreetMap.
       not_public: Ou pé pa réglé édision aw pou yo piblik.

-      not_public_description: Pou modifié kat la fok édision aw piblik. Ou pé rann édision aw piblik asi {{user_page}}.
+      not_public_description: Pou modifié kat la fok édision aw piblik. Ou pé rann édision aw piblik asi %{user_page}.

       potlatch_unsaved_changes: Ou ti ni modifikasion ou pa anrègistré. (Pou anrègistré adan Potlatch, fow déséleksioné lin la ou pwen ou asiy la,si ou ka édité an mod list. Ouben kliké asi Anregistré si ou ti ni bouton la sa.)
       user_page_link: paj_itilizatè
     index: 
       potlatch_unsaved_changes: Ou ti ni modifikasion ou pa anrègistré. (Pou anrègistré adan Potlatch, fow déséleksioné lin la ou pwen ou asiy la,si ou ka édité an mod list. Ouben kliké asi Anregistré si ou ti ni bouton la sa.)
       user_page_link: paj_itilizatè
     index: 


@@ -155,7 +147,7 @@ gcf:
       js_3: Si ou pé pa sèvi èvè Javascript, eséyé sèvi èvè<a href='http://tah.openstreetmap.org/Browse/'>navigatè fix a Tiles@Home</a>.
       license: 
         license_name: Creative Commons Attribution-Share Alike 2.0
       js_3: Si ou pé pa sèvi èvè Javascript, eséyé sèvi èvè<a href='http://tah.openstreetmap.org/Browse/'>navigatè fix a Tiles@Home</a>.
       license: 
         license_name: Creative Commons Attribution-Share Alike 2.0

-        notice: Asi lisans {{license_name}} pou {{project_name}} èvè moun ay.
+        notice: Asi lisans %{license_name} pou %{project_name} èvè moun ay.

         project_name: projè OpenStreetMap
       permalink: Permalink
     key: 
         project_name: projè OpenStreetMap
       permalink: Permalink
     key: 


@@ -198,9 +190,6 @@ gcf:
       button: Konfirmé
       heading: Konfirmé chanjman a adres imél aw
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé nouvo adres imél aw.
       button: Konfirmé
       heading: Konfirmé chanjman a adres imél aw
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé nouvo adres imél aw.

-    friend_map: 
-      nearby mapper: "Arpantè owa aw: [[nearby_user]]"
-      your location: Koté ou yé

     go_public: 
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     login: 
     go_public: 
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     login: 


@@ -210,7 +199,7 @@ gcf:
       login_button: Konektéw
       lost password link: Ou pèd kòd aw?
       password: "Kòd aw:"
       login_button: Konektéw
       lost password link: Ou pèd kòd aw?
       password: "Kòd aw:"

-      please login: Konectéw souplé ouben {{create_user_link}}.
+      please login: Konectéw souplé ouben %{create_user_link}.

     lost_password: 
       email address: "Adres imél aw :"
       heading: Ou pèd kòd aw?
     lost_password: 
       email address: "Adres imél aw :"
       heading: Ou pèd kòd aw?


@@ -230,19 +219,19 @@ gcf:
       password: "Kòd :"
       signup: Enskriw
     no_such_user: 
       password: "Kòd :"
       signup: Enskriw
     no_such_user: 

-      body: Malérezman, pa ti ni pon itilisatè èvè non la sa {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
+      body: Malérezman, pa ti ni pon itilisatè èvè non la sa %{user}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
+    popup: 
+      nearby mapper: Arpantè owa aw
+      your location: Koté ou yé

     set_home: 
       flash success: La ou ka rété la bien anrèjistré
     view: 
       add as friend: Ajouté on zanmi
     set_home: 
       flash success: La ou ka rété la bien anrèjistré
     view: 
       add as friend: Ajouté on zanmi

-      add image: Ajouté on imaj
-      change your settings: Chanjé opsion aw
-      delete image: Woté on imaj

       description: Deskription
       diary: Jounal
       edits: Édision
       description: Deskription
       diary: Jounal
       edits: Édision

-      if set location: Si ou ka ba on koté ou yé, On bel ti kat ké aprarèt. Ou pé défini koté la ou yé la asi paj aw {{settings_link}}.
-      km away: "{{count}} km"
+      if set location: Si ou ka ba on koté ou yé, On bel ti kat ké aprarèt. Ou pé défini koté la ou yé la asi paj aw %{settings_link}.
+      km away: "%{count} km"

       mapper since: "Arpantè dèpi:"
       my diary: Jounal an mwen
       my edits: Édision an mwen
       mapper since: "Arpantè dèpi:"
       my diary: Jounal an mwen
       my edits: Édision an mwen


@@ -251,13 +240,10 @@ gcf:
       nearby users: "Itilizatè owa aw :"
       new diary entry: On dot nouvel an jounal la
       no friends: Ou poko ni pon zanmi
       nearby users: "Itilizatè owa aw :"
       new diary entry: On dot nouvel an jounal la
       no friends: Ou poko ni pon zanmi

-      no home location: Pa ni pon koté défini.

       no nearby users: Ou poko ni itilizatè owa aw.
       remove as friend: Woté on zanmi
       send message: Voyé on mésaj
       settings_link_text: Opsion
       traces: Chimen
       no nearby users: Ou poko ni itilizatè owa aw.
       remove as friend: Woté on zanmi
       send message: Voyé on mésaj
       settings_link_text: Opsion
       traces: Chimen

-      upload an image: Voyé on imaj
-      user image heading: Foto itilizatè

       user location: Ola itilizatè yé
       your friends: Kanmarad aw
       user location: Ola itilizatè yé
       your friends: Kanmarad aw