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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 64f20fed561088939536ccbf39b615645c4b22fc..c87a81354284bde6c82682dc8e85606287b6c135 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -84,11 +84,6 @@ gcf:
       my settings: Mes options
       openid:
         link text: Ka sa yé?
       my settings: Mes options
       openid:
         link text: Ka sa yé?

-      public editing:
-        enabled: Aktif. Y pa anonnim, y pé édité doné.
-        enabled link text: Ka sa yé?
-        disabled: Inaktif y pé pa édité doné ; tout édision pasé anonim.
-        disabled link text: Pouki an pé pa modifyé?

       contributor terms:
         link text: Ka sa yé?
       save changes button: Enrèjisré tout chanjman
       contributor terms:
         link text: Ka sa yé?
       save changes button: Enrèjisré tout chanjman


@@ -171,10 +166,7 @@ gcf:
     popup:
       your location: Koté ou yé
       nearby mapper: Arpantè owa aw
     popup:
       your location: Koté ou yé
       nearby mapper: Arpantè owa aw

-      friend: Zanmi

     show:
     show:

-      my friends: Zanmi a-w
-      no friends: Ou poko ni pon zanmi

       nearby users: 'Itilizatè owa a-w :'
       no nearby users: Ou poko ni itilizatè owa a-w.
   diary_entries:
       nearby users: 'Itilizatè owa a-w :'
       no nearby users: Ou poko ni itilizatè owa a-w.
   diary_entries:


@@ -212,30 +204,12 @@ gcf:
       comment_from_html: Komantè a %{link_user} koté %{comment_created_at}
       hide_link: Dévwè komantasyon-lasa
       confirm: Konfirmé
       comment_from_html: Komantè a %{link_user} koté %{comment_created_at}
       hide_link: Dévwè komantasyon-lasa
       confirm: Konfirmé

-  diary_comments:
-    page:
-      comment: Komantasyon

   doorkeeper:
     scopes:
       phone: Vwè liméwo a téléfòn a-w
   errors:
     forbidden:
       title: Défandi
   doorkeeper:
     scopes:
       phone: Vwè liméwo a téléfòn a-w
   errors:
     forbidden:
       title: Défandi

-  friendships:
-    make_friend:
-      heading: Mèt %{user} adan sé zanmi a-w la?
-      button: Jouté on zanmi
-      success: Alè-la %{name} sé sendika a-w la!
-      failed: Malérèzsò, Zingchap toupannan joutaj a %{name} adan sé zanmi a-w la
-      already_a_friend: '%{name} ja zanmi a-w'
-      limit_exceeded: |-
-        Pa ni enpé tan ou jwenn zanmi kon tilili.
-        Atann tibwen avan ou ka séyé trapé dòt ankò.
-    remove_friend:
-      heading: Kasé-lo èvè %{user}?
-      button: Woté on zanmi
-      success: '%{name} pa zanmi a-w ankò.'
-      not_a_friend: '%{name} pa zanmi a-w'

   geocoder:
     search_osm_nominatim:
       prefix:
   geocoder:
     search_osm_nominatim:
       prefix:


@@ -464,10 +438,8 @@ gcf:
       hi: Yéla %{to_user},
     message_notification:
       hi: Yéla %{to_user},
       hi: Yéla %{to_user},
     message_notification:
       hi: Yéla %{to_user},

-    friendship_notification:
+    follow_notification:

       hi: Yéla %{to_user},
       hi: Yéla %{to_user},

-      subject: '[OpenStreetMap] %{user} jouté-w kon on zanmi'
-      had_added_you: '%{user} jouté-w kontèl on zanmi adan OpenStreetMap.'

     gpx_failure:
       hi: Yéla %{to_user},
     gpx_success:
     gpx_failure:
       hi: Yéla %{to_user},
     gpx_success:


@@ -643,12 +615,13 @@ gcf:
       diary: Jounal
       edits: Édision
       traces: Chimen
       diary: Jounal
       edits: Édision
       traces: Chimen

-      remove as friend: Woté on zanmi
-      add as friend: Ajouté on zanmi

       mapper since: 'Arpantè dèpi:'
       comments: Komantasyon
     go_public:
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
       mapper since: 'Arpantè dèpi:'
       comments: Komantasyon
     go_public:
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.

+    changeset_comments:
+      page:
+        comment: Komantasyon

     suspended:
       support: janmdifòs
   user_mutes:
     suspended:
       support: janmdifòs
   user_mutes: