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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 000c2d051a88de7a61627413a7df037570397fa3..247206245e8823fc9bbfbbc4dc91b0aa80a68815 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -420,9 +420,6 @@ gcf:
         level8: Lizyè a konmin
         level9: Lizyè a vilaj
         level10: Lizyè a sèksyon
         level8: Lizyè a konmin
         level9: Lizyè a vilaj
         level10: Lizyè a sèksyon

-      types:
-        cities: Vil prensipal
-        towns: Vil

     results:
       no_results: Yo pa jwenn p'on rézilta
   issues:
     results:
       no_results: Yo pa jwenn p'on rézilta
   issues:


@@ -495,7 +492,6 @@ gcf:
           ou konmanté. Maké-la ora a %{place}.'
     changeset_comment_notification:
       hi: Yéla %{to_user},
           ou konmanté. Maké-la ora a %{place}.'
     changeset_comment_notification:
       hi: Yéla %{to_user},

-      greeting: Yéla,

       commented:
         subject_own: '[OpenStreetMap] %{commenter} voyé on komantasyon asi yonn a
           krèy a modifikasyon a-w'
       commented:
         subject_own: '[OpenStreetMap] %{commenter} voyé on komantasyon asi yonn a
           krèy a modifikasyon a-w'