* Merged from en.yml and translated

 * Translated /user/confirm

diff --git a/config/locales/is.yml b/config/locales/is.yml
index d62acb552021108cbe7499c534dbad809bfe7794..95f699859bc9e2e4b5286c2ec216ca64fdfdaa40 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -163,7 +163,9 @@ is:
     way_details:
       nodes: "Hnútar:"
       part_of: "Hluti af:"
     way_details:
       nodes: "Hnútar:"
       part_of: "Hluti af:"

-      also_part_of: "einnig hluti af {{related_ways}}"
+      also_part_of:
+        one: "einnig hluti af {{related_ways}}"
+        other: "einnig hluti af {{related_ways}}"

     way_history:
       way_history: "Breytingarskrá vegs"
       way_history_title: "Breytingarskrá vegs: {{way_name}}"
     way_history:
       way_history: "Breytingarskrá vegs"
       way_history_title: "Breytingarskrá vegs: {{way_name}}"


@@ -482,6 +484,8 @@ is:
       of: "af"
     trace:
       pending: "Í BIÐ"
       of: "af"
     trace:
       pending: "Í BIÐ"

+      count_points: "{{count}} punktar"
+      ago: "{{time_in_words_ago}} síðan"

       more: "upplýsingar"
       trace_details: "Sýna upplýsingar um ferilinn"
       view_map: "Sjá kort"
       more: "upplýsingar"
       trace_details: "Sýna upplýsingar um ferilinn"
       view_map: "Sjá kort"


@@ -592,9 +596,9 @@ is:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "Stillingarnar þínar voru uppfærðar."
     confirm:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "Stillingarnar þínar voru uppfærðar."
     confirm:

-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
+      heading: "Staðfesta notanda"
+      press confirm button: "Hér getur þú staðfest að þú viljir búa til notanda.."
+      button: "Staðfesta"

     confirm email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
     confirm email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."