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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index fddcd757a080b67d40a89efe31afdf164eb3a623..a5b35ef01365c0718fc15429a977cbb1548b9fd9 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -413,6 +413,7 @@ fur:
     contact:
       km away: '%{count}km di distance'
       m away: '%{count}m di distance'
     contact:
       km away: '%{count}km di distance'
       m away: '%{count}m di distance'

+      latest_edit_html: 'Ultin cambiament (%{ago}):'

     popup:
       your location: La tô posizion
       nearby mapper: Mapadôr dongje
     popup:
       your location: La tô posizion
       nearby mapper: Mapadôr dongje


@@ -1054,18 +1055,20 @@ fur:
     destroy:
       destroyed: Messaç eliminât
   passwords:
     destroy:
       destroyed: Messaç eliminât
   passwords:

-    lost_password:
+    new:

       title: Password pierdude
       heading: Âstu pierdût la password?
       email address: 'Direzion di pueste:'
       new password button: Azere la password
       help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti
         e ti mandarin un leam par tornâ a impuestâ la tô password.
       title: Password pierdude
       heading: Âstu pierdût la password?
       email address: 'Direzion di pueste:'
       new password button: Azere la password
       help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti
         e ti mandarin un leam par tornâ a impuestâ la tô password.

+    create:

       notice email cannot find: No vin podût cjatâ la tô direzion di pueste, nus displâs.
       notice email cannot find: No vin podût cjatâ la tô direzion di pueste, nus displâs.

-    reset_password:
+    edit:

       title: Azere la password
       heading: Azere la password par %{user}
       reset: Azere la password
       title: Azere la password
       heading: Azere la password par %{user}
       reset: Azere la password

+    update:

       flash changed: La tô password e je stade cambiade.
   preferences:
     show:
       flash changed: La tô password e je stade cambiade.
   preferences:
     show:


@@ -1267,21 +1270,19 @@ fur:
           unclassified: Strade no classificade
           rail: Ferade
           subway: Metropolitane
           unclassified: Strade no classificade
           rail: Ferade
           subway: Metropolitane

-          tram:
-          - Metropolitana leggera
-          - tram

           runway:
           - Piste dal aeropuart
           apron:
             1: terminâl
           admin: Confin aministratîf
           runway:
           - Piste dal aeropuart
           apron:
             1: terminâl
           admin: Confin aministratîf

-          forest: Bosc
+          forest:
+          - Bosc

           golf: Troi di golf
           park: Parc
           golf: Troi di golf
           park: Parc

-          resident: Zone residenziâl

           common:
           - Comugnâi
           - prâts
           common:
           - Comugnâi
           - prâts

+          resident: Zone residenziâl

           retail: Zone di buteghis
           industrial: Zone industriâl
           commercial: Aree comerciâl
           retail: Zone di buteghis
           industrial: Zone industriâl
           commercial: Aree comerciâl


@@ -1529,7 +1530,6 @@ fur:
       ct status: 'Tiermins par contribuî:'
       ct undecided: Nol à decidût
       ct declined: Refudâts
       ct status: 'Tiermins par contribuî:'
       ct undecided: Nol à decidût
       ct declined: Refudâts

-      latest edit: 'Ultin cambiament (%{ago}):'

       email address: 'Direzion di pueste:'
       created from: 'Creât di:'
       status: 'Stât:'
       email address: 'Direzion di pueste:'
       created from: 'Creât di:'
       status: 'Stât:'


@@ -1589,7 +1589,7 @@ fur:
       heading: Liste dai blocs dal utent
       empty: No son stâts metûts blocs fin cumò.
     revoke:
       heading: Liste dai blocs dal utent
       empty: No son stâts metûts blocs fin cumò.
     revoke:

-      time_future: Chest bloc al finìs ca di %{time}.
+      time_future_html: Chest bloc al finìs ca di %{time}.

       revoke: Revoche!
     helper:
       time_future_html: Finìs ca di %{time}.
       revoke: Revoche!
     helper:
       time_future_html: Finìs ca di %{time}.