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

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

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 884990de0ed3f60981ddd14f56843fc41df20384..5239bfff962428d6da5a38dda6b6c227aa3abeed 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -118,6 +118,9 @@ fy:
       area: Gebiet
     index:
       load_more: Mear laden
+  dashboards:
+    popup:
+      friend: Freon
   diary_entries:
     form:
       location: 'Lokaasje:'
@@ -440,6 +443,9 @@ fy:
   passwords:
     lost_password:
       email address: 'E-mailadres:'
+  profiles:
+    edit:
+      image: 'Ôfbylding:'
   sessions:
     new:
       password: 'Wachtwurd:'
@@ -534,15 +540,11 @@ fy:
       email address: 'E-mailadres:'
       status: 'Status:'
       description: Beskriuwing
-      settings_link_text: ynstellingen
-    popup:
-      friend: Freon
     account:
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
       public editing:
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-      image: 'Ôfbylding:'
     index:
       title: Meidoggers
       heading: Meidoggers