Updated translation for mail calendar
authorKristján Bjarni Guðmundsson <kristjanbjarni@gmail.com>
Wed, 21 Dec 2016 10:34:57 +0000
changeset 602 b32d8f1a962cf6147158acf6314b47334f5dfeef
parent 601 ed2f2f9fdc59352e68db58fa5f1c6e77b6331e09
child 603 b7b24ef65e153700422db3ae5e2d299f81efcb14
push id133
push userfrancesco.lodolo@mozillaitalia.org
push dateTue, 24 Jan 2017 17:02:25 +0000
Updated translation for mail calendar
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.properties
calendar/chrome/calendar/preferences/categories.dtd
calendar/chrome/calendar/preferences/general.dtd
calendar/chrome/calendar/timezones.properties
calendar/chrome/lightning/lightning.dtd
calendar/chrome/lightning/lightning.properties
chat/facebook.properties
chat/twitter.properties
chat/yahoo.properties
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-newsblog/newsblog.properties
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/addressbook/abContactsPanel.dtd
mail/chrome/messenger/addressbook/abMailListDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/addressbook/pref-directory-add.dtd
mail/chrome/messenger/addressbook/replicationProgress.properties
mail/chrome/messenger/am-identity-edit.dtd
mail/chrome/messenger/am-smime.dtd
mail/chrome/messenger/am-smime.properties
mail/chrome/messenger/filter.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/newTagDialog.dtd
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/attachmentReminder.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/removeaccount.dtd
mail/chrome/messenger/removeaccount.properties
other-licenses/branding/thunderbird/brand.dtd
other-licenses/branding/thunderbird/brand.properties
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -10,33 +10,37 @@
 <!ENTITY newevent.status.label "Staða">
 <!ENTITY newevent.status.accesskey "S">
 <!ENTITY newevent.eventStatus.none.label "Ekki skilgreint">
 <!ENTITY newevent.eventStatus.none.accesskey "E">
 <!ENTITY newevent.todoStatus.none.label "Ekki skilgreint">
 <!ENTITY newevent.eventStatus.cancelled.label "Hætt við">
 <!ENTITY newevent.eventStatus.cancelled.accesskey "H">
 <!ENTITY newevent.todoStatus.cancelled.label "Hætt við">
-<!ENTITY newevent.status.tentative.label "Óráðið">
+<!ENTITY newevent.status.tentative.label "Með fyrirvara">
 <!ENTITY newevent.status.tentative.accesskey "r">
 <!ENTITY newevent.status.confirmed.label "Samþykkt">
 <!ENTITY newevent.status.confirmed.accesskey "a">
 <!ENTITY newevent.status.needsaction.label "Þarfnast aðgerðar">
 <!ENTITY newevent.status.inprogress.label "Í gangi">
 <!ENTITY newevent.status.completed.label "Lokið þann">
 <!-- The following entity is for New Task dialog only -->
 <!ENTITY newtodo.percentcomplete.label "&#37; lokið">
-<!-- LOCALIZATON NOTE(event.attendees.notify.label,event.attendees.notifyundisclosed.label)
-   - These two labels are displayed side by side in the event dialog, make sure
+<!-- LOCALIZATON NOTE(event.attendees.notify.label,event.attendees.notifyundisclosed.label,
+     event.attendees.disallowcounter.label)
+   - These three labels are displayed side by side in the event dialog, make sure
    - they still fit in. -->
 <!ENTITY event.attendees.notify.label "Tilkynna þátttakendum">
 <!ENTITY event.attendees.notify.accesskey "þ">
 <!ENTITY event.attendees.notifyundisclosed.label "Aðskilja fundarboð á hvern þátttakanda">
 <!ENTITY event.attendees.notifyundisclosed.accesskey "þ">
 <!ENTITY event.attendees.notifyundisclosed.tooltip "Þessi stilling sendir eitt fundarboð á hvern þátttakanda. Hvert fundarboð inniheldur aðeins einn þátttakanda þannig að ekki er birt deili á öðrum þátttakendum.">
+<!ENTITY event.attendees.disallowcounter.label "Ekki leyfa móttilboð">
+<!ENTITY event.attendees.disallowcounter.accesskey "a">
+<!ENTITY event.attendees.disallowcounter.tooltip "Gefur til kynna að þú leyfir ekki mótttilboð">
 <!-- Keyboard Shortcuts -->
 <!ENTITY event.dialog.new.event.key2 "I">
 <!ENTITY event.dialog.new.task.key2 "D">
 <!ENTITY event.dialog.new.message.key2 "N">
 <!ENTITY event.dialog.close.key "W">
 <!ENTITY event.dialog.save.key "S">
 <!ENTITY event.dialog.saveandclose.key "L">
 <!ENTITY event.dialog.print.key "P">
@@ -54,20 +58,32 @@
 <!ENTITY event.menu.item.new.task.label "Verkefni">
 <!ENTITY event.menu.item.new.task.accesskey "V">
 <!ENTITY event.menu.item.new.message.label "Skilaboð">
 <!ENTITY event.menu.item.new.message.accesskey "S">
 <!ENTITY event.menu.item.new.contact.label "Tengiliður í nafnaskrá">
 <!ENTITY event.menu.item.new.contact.accesskey "T">
 <!ENTITY event.menu.item.close.label "Loka">
 <!ENTITY event.menu.item.close.accesskey "L">
+<!-- LOCALIZATION NOTE
+   - event.menu.item.save.accesskey is used for the "Save" menu item
+   - when editing events/tasks in a dialog window.
+   - event.menu.item.save.tab.accesskey is used for the "Save" menu item
+   - when editing events/tasks in a tab. -->
 <!ENTITY event.menu.item.save.label "Vista">
 <!ENTITY event.menu.item.save.accesskey "V">
+<!ENTITY event.menu.item.save.tab.accesskey "a">
+<!-- LOCALIZATION NOTE
+    - event.menu.item.saveandclose.accesskey is used for "Save and Close"
+    - menu item when editing events/tasks in a dialog window.
+    - event.menu.item.saveandclose.tab.accesskey is used for "Save and Close"
+    - when editing events/tasks in a tab. -->
 <!ENTITY event.menu.item.saveandclose.label "Vista og loka">
 <!ENTITY event.menu.item.saveandclose.accesskey "l">
+<!ENTITY event.menu.item.saveandclose.tab.accesskey "z">
 <!ENTITY event.menu.item.delete.label "Eyða…">
 <!ENTITY event.menu.item.delete.accesskey "E">
 <!ENTITY event.menu.item.page.setup.label "Uppsetning síðu">
 <!ENTITY event.menu.item.page.setup.accesskey "U">
 <!ENTITY event.menu.item.print.label "Prenta">
 <!ENTITY event.menu.item.print.accesskey "P">
 <!ENTITY event.menu.edit.label "Breyta">
 <!ENTITY event.menu.edit.accesskey "e">
@@ -129,28 +145,43 @@
 <!ENTITY event.email.attendees.accesskey "a">
 <!ENTITY event.email.tentative.attendees.label "Sníða póst til allra óákveðinna þátttakenda…">
 <!ENTITY event.email.tentative.attendees.accesskey "S">
 <!ENTITY event.remove.attendees.label2 "Fjarlægja alla þátttakendur">
 <!ENTITY event.remove.attendees.accesskey "þ">
 <!ENTITY event.remove.attendee.label "Fjarlægja þátttakanda">
 <!ENTITY event.remove.attendee.accesskey "æ">
 <!-- Toolbar -->
-<!ENTITY event.toolbar.save.label "Vista og loka">
+<!ENTITY event.toolbar.save.label2 "Vista">
+<!ENTITY event.toolbar.saveandclose.label "Vista og loka">
 <!ENTITY event.toolbar.delete.label "Eyða">
 <!ENTITY event.toolbar.attendees.label "Bjóða þátttakendum">
 <!ENTITY event.toolbar.privacy.label "Friðhelgi">
-<!ENTITY event.toolbar.save.tooltip "Vista og loka">
+<!ENTITY event.toolbar.save.tooltip2 "Vista">
+<!ENTITY event.toolbar.saveandclose.tooltip "Vista og loka">
 <!ENTITY event.toolbar.delete.tooltip "Eyða">
 <!ENTITY event.toolbar.attendees.tooltip "Bjóða þátttakendum">
 <!ENTITY event.toolbar.attachments.tooltip "Bæta við viðhengjum">
 <!ENTITY event.toolbar.privacy.tooltip "Breyta friðhelgi">
 <!ENTITY event.toolbar.priority.tooltip "Breyta forgangi">
 <!ENTITY event.toolbar.status.tooltip "Breyta stöðu">
 <!ENTITY event.toolbar.freebusy.tooltip "Breyta laus/upptekin tímum">
+<!-- Counter box -->
+<!-- LOCALIZATON NOTE(counter.button.*)
+   - This is only visible in the UI if you have received a counterproposal before and are going to
+   - reschedule the event from the imipbar in the email view. Clicking on the buttons will only
+   - populate the form fields in the dialog, there's no other immediate action on clicking like with
+   - the imip bar. Rescheduling will happen after clicking on save&close as usual. This screenshot
+   - illustrates how it might look like: https://bugzilla.mozilla.org/attachment.cgi?id=8810121 -->
+<!ENTITY counter.button.proposal.label "Samþykkja tilboð">
+<!ENTITY counter.button.proposal.accesskey "ð">
+<!ENTITY counter.button.proposal.tooltip2 "Svæði í atburði verða útfyllt með gildum frá móttilboðinu, aðeins ef þú vistar með eða án viðbótarbreytingum verður öllum þátttakendum sent tilkynning">
+<!ENTITY counter.button.original.label "Nota upprunaleg gögn">
+<!ENTITY counter.button.original.accesskey "r">
+<!ENTITY counter.button.original.tooltip2 "Svæði verða útfyllt með þeim gildum sem voru í upphaflega atburðinum, áður en móttilboð var gert">
 <!-- Main page -->
 <!ENTITY event.title.textbox.label "Titill:">
 <!ENTITY event.title.textbox.accesskey "T">
 <!ENTITY event.location.label "Staðsetning:">
 <!ENTITY event.location.accesskey "S">
 <!ENTITY event.categories.label "Flokkur:">
 <!ENTITY event.categories.accesskey "F">
 <!ENTITY event.categories.textbox.label "Bæta við nýjum flokki">
@@ -342,11 +373,12 @@
 <!ENTITY read.only.category.label "Flokkur:">
 <!ENTITY read.only.organizer.label "Fundarstjóri:">
 <!ENTITY read.only.reply.label "Svar:">
 <!ENTITY read.only.accept.label "Ég mæti">
 <!ENTITY read.only.decline.label "Ég mæti ekki">
 <!ENTITY read.only.tentative.label "Ég mæti kannski">
 <!ENTITY read.only.needs.action.label "Ég staðfesti seinna">
 <!ENTITY read.only.reminder.label "Áminning:">
+<!ENTITY read.only.attachments.label "Viðhengi:">
 <!ENTITY read.only.attendees.label "Þátttakendur">
 <!ENTITY read.only.description.label "Lýsing">
 <!ENTITY read.only.link.label "Tengdur hlekkur">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -409,8 +409,41 @@ repeatDetailsDay7Plural=Laugardag
 # datepicker, below the minimonth, as an option for the until date.
 eventRecurrenceForeverLabel=Að eilífu
 
 # LOCALIZATION NOTE (eventRecurrenceMonthlyLastDayLabel):
 # Edit dialog recurrence -> Monthly Recurrence pattern -> Monthly daypicker
 # The label on the monthly daypicker's last button that allows to select
 # the last day of the month inside a BYMONTHDAY rule.
 eventRecurrenceMonthlyLastDayLabel=Síðasti dagur
+
+# LOCALIZATION NOTE (counterSummaryAccepted) - this is only visible when opening the dialog from the
+# email summary view after receiving a counter message
+# %1$S - the name or email address of the replying attendee
+counterSummaryAccepted=%1$S samþykkti fundarboðið, en kom með móttilboð:
+
+# LOCALIZATION NOTE (counterSummaryDeclined) - this is only visible when opening the dialog from the
+# email summary view after receiving a counter message
+# %1$S - the name or email address of the replying attendee
+counterSummaryDeclined=%1$S hafnaði fundarboðinu, en kom með móttilboð:
+
+# LOCALIZATION NOTE (counterSummaryDelegated) - this is only visible when opening the dialog from the
+# email summary view after receiving a counter message
+# %1$S - the name or email address of the replying attendee
+counterSummaryDelegated=%1$S áframsendi fundarboðið, en kom með móttilboð:
+
+# LOCALIZATION NOTE (counterSummaryNeedsAction) - this is only visible when opening the dialog from the
+# email summary view after receiving a counter message
+# %1$S - the name or email address of the replying attendee
+counterSummaryNeedsAction=%1$S hefur ekki ákveðið hvort hann vil taka þátt og kom með móttilboð:
+
+# LOCALIZATION NOTE (counterSummaryTentative) - this is only visible when opening the dialog from the
+# email summary view after receiving a counter message
+# %1$S - the name or email address of the replying attendee
+counterSummaryTentative=%1$S samþykkti fundarboð með fyrirvara og kom með móttilboð:
+
+# LOCALIZATION NOTE (counterOnPreviousVersionNotification) - this is only visible when opening the
+# dialog from the email summary view after receiving a counter message
+counterOnPreviousVersionNotification=Þetta er móttilboð fyrir fyrri útgáfu af þessum atburði.
+
+# LOCALIZATION NOTE (counterOnCounterDisallowedNotification) - this is only visible when opening the
+# dialog from the email summary view after receiving a counter message
+counterOnCounterDisallowedNotification=Þú leyfðir ekki móttilboð þegar boðið var sent út.
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -52,16 +52,19 @@ lowPriority=Lágt
 importPrompt=Í hvaða dagatal viltu flytja inn þessa atburði?
 exportPrompt=Hvaða dagatal viltu flytja út?
 publishPrompt=Hvaða dagatal viltu gefa út?
 
 # LOCALIZATION NOTE (importItemsFailed):
 #    %1$S will be replaced with number of failed items
 #    %2$S will be replaced with last error code / error string
 importItemsFailed=Ekki tókst að flytja inn %1$S hluti. Seinasta villa var: %2$S
+# LOCALIZATION NOTE (noItemsInCalendarFile):
+#    %1$S will be replaced with file path
+noItemsInCalendarFile=Tókst ekki að flytja inn frá %1$S. Það eru ekkert til að flytja inn í þessari skrá.
 
 #spaces needed at the end of the following lines
 eventDescription=Lýsing:
 
 unableToRead=Get ekki lesið frá skrá:
 unableToWrite=Get ekki skrifað í skrá:
 defaultFileName=MozillaCalEvents
 HTMLTitle=Mozilla Dagatal
@@ -445,16 +448,20 @@ alarmYesterdayAt=Í gær kl %1$S
 
 # Alarm interface strings
 # LOCALIZATION NOTE: These strings do not get displayed. They are only visible
 # when exporting an item with i.e a DISPLAY alarm, that doesn't have a
 # description set, or an EMAIL alarm that doesn't have a summary set.
 alarmDefaultDescription=Sjálfgefin Mozilla lýsing
 alarmDefaultSummary=Sjálfgefin Mozilla yfirlit
 
+# LOCALIZATION NOTE (alarmSnoozeLimitExceeded): Semi-colon list of plural
+# forms.
+alarmSnoozeLimitExceeded=Þú getur ekki blundað áminningu meira en #1 mánuð.;Þú getur ekki blundað áminningu meira en #1 mánuði.
+
 taskDetailsStatusNeedsAction=Þarfnast samþykkis
 
 # LOCALIZATION NOTE (taskDetailsStatusInProgress):
 # used for a display of how much of a task is completed '25% Complete'
 #    %1$S will be replaced with the number of percentage completed
 taskDetailsStatusInProgress=%1$S%% Lokið
 taskDetailsStatusCompleted=Lokið
 
--- a/calendar/chrome/calendar/preferences/categories.dtd
+++ b/calendar/chrome/calendar/preferences/categories.dtd
@@ -2,19 +2,19 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
-<!ENTITY pref.categories.add.title "Bæta við flokki">
-<!ENTITY pref.categories.addButton.label "Bæta við…">
-<!ENTITY pref.categories.addButton.accesskey "B">
+<!ENTITY pref.categories.new.title "Flokkur">
+<!ENTITY pref.categories.newButton.label "Ný…">
+<!ENTITY pref.categories.newButton.accesskey "N">
 <!ENTITY pref.categories.edit.title "Breyta flokki">
 <!ENTITY pref.categories.editButton.label "Breyta…">
 <!ENTITY pref.categories.editButton.accesskey "r">
 <!ENTITY pref.categories.removeButton.label "Fjarlægja">
 <!ENTITY pref.categories.removeButton.accesskey "F">
 <!ENTITY pref.categories.name.label "Nafn">
 <!ENTITY pref.categories.color.label "Litur">
 <!ENTITY pref.categories.usecolor.label "Nota lit">
--- a/calendar/chrome/calendar/preferences/general.dtd
+++ b/calendar/chrome/calendar/preferences/general.dtd
@@ -29,8 +29,11 @@
 <!ENTITY pref.default_task_offset_start.label "Miðað við byrjunartíma">
 <!ENTITY pref.default_task_offset_next_hour.label "Miðað við næstu klukkustund">
 <!ENTITY pref.calendar.todaypane.agenda.caption "Dagurinn í dag">
 <!ENTITY pref.soondays.label "Næsta svæði sýnir:">
 <!ENTITY pref.soondays.accesskey "æ">
 <!ENTITY pref.accessibility.label "Auðveldað aðgengi">
 <!ENTITY pref.systemcolors.label "Finna bestu liti fyrir aðgengi">
 <!ENTITY pref.systemcolors.accesskey "ð">
+<!ENTITY pref.eventsandtasks.label "Atburðir og verkefni">
+<!ENTITY pref.editInTab.label "Breyta atburðum og verkefnum í flipa í staðinn fyrir í glugga.">
+<!ENTITY pref.editInTab.accesskey "t">
--- a/calendar/chrome/calendar/timezones.properties
+++ b/calendar/chrome/calendar/timezones.properties
@@ -462,8 +462,18 @@ pref.timezone.Pacific.Bougainville=Kyrra
 
 #added with 2.2015g
 pref.timezone.America.Fort_Nelson=Ameríka/Fort Nelson
 
 #added with 2.2016b
 pref.timezone.Europe.Ulyanovsk=Evrópa/Ulyanovsk
 pref.timezone.Europe.Astrakhan=Evrópa/Astrakhan
 pref.timezone.Asia.Barnaul=Asía/Barnaul
+
+#added with 2.2016i
+pref.timezone.Asia.Yangon=Asía/Yangon
+pref.timezone.Asia.Tomsk=Asía/Tomsk
+pref.timezone.Asia.Famagusta=Asía/Famagusta
+pref.timezone.Europe.Kirov=Evrópa/Kirov
+
+#added with 2.2016j
+pref.timezone.Europe.Saratov=Evrópa/Saratov
+pref.timezone.Asia.Atyrau=Asía/Atyrau
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -39,24 +39,28 @@
 <!ENTITY lightning.imipbar.btnAcceptRecurrences.label "Samþykkja alla">
 <!ENTITY lightning.imipbar.btnAcceptRecurrences2.tooltiptext "Samþykkja fundarboð fyrir öll tilvik fundarins">
 <!ENTITY lightning.imipbar.btnAdd.label "Bæta við">
 <!ENTITY lightning.imipbar.btnAdd.tooltiptext "Bæta við atburði í dagatal">
 <!ENTITY lightning.imipbar.btnDecline.label "Hafna">
 <!ENTITY lightning.imipbar.btnDecline2.tooltiptext "Hafna fundarboði">
 <!ENTITY lightning.imipbar.btnDeclineRecurrences.label "Hafna öllu">
 <!ENTITY lightning.imipbar.btnDeclineRecurrences2.tooltiptext "Hafna fundarboði fyrir öll tilvik fundarins">
+<!ENTITY lightning.imipbar.btnDeclineCounter.label "Hafna">
+<!ENTITY lightning.imipbar.btnDeclineCounter.tooltiptext "Hafna mótsvari">
 <!ENTITY lightning.imipbar.btnDelete.label "Eyða">
 <!ENTITY lightning.imipbar.btnDelete.tooltiptext "Eyða úr dagatali">
 <!ENTITY lightning.imipbar.btnDetails.label "Upplýsingar…">
 <!ENTITY lightning.imipbar.btnDetails.tooltiptext "Sýna fundarupplýsingar">
 <!ENTITY lightning.imipbar.btnMore.label "Meira">
 <!ENTITY lightning.imipbar.btnMore.tooltiptext "Smelltu til að sjá fleiri valkosti">
 <!ENTITY lightning.imipbar.btnReconfirm2.label "Endurstaðfesta">
 <!ENTITY lightning.imipbar.btnReconfirm.tooltiptext "Senda endurstaðfestingu til fundarstjóra">
+<!ENTITY lightning.imipbar.btnReschedule.label "Breyta tíma">
+<!ENTITY lightning.imipbar.btnReschedule.tooltiptext "Breyta tíma á atburð">
 <!ENTITY lightning.imipbar.btnSaveCopy.label "Vista afrit">
 <!ENTITY lightning.imipbar.btnSaveCopy.tooltiptext "Vista sérstaklega afrit af atburði í dagatal óháð svari á fundarstjóra. Listinn af þátttakendum verður hreinsaður.">
 <!ENTITY lightning.imipbar.btnTentative.label "Með fyrirvara">
 <!ENTITY lightning.imipbar.btnTentative2.tooltiptext "Samþykkja fundarboð með fyrirvara">
 <!ENTITY lightning.imipbar.btnTentativeRecurrences.label "Allt með fyrirvara">
 <!ENTITY lightning.imipbar.btnTentativeRecurrences2.tooltiptext "Samþykkja fundarboð með fyrirvara fyrir öll tilvik fundarins">
 <!ENTITY lightning.imipbar.btnUpdate.label "Uppfæra">
 <!ENTITY lightning.imipbar.btnUpdate.tooltiptext "Uppfæra atburð í dagatali">
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -109,31 +109,35 @@ imipHtml.attendeeUserType2.RESOURCE=%1$S (tæki)
 # imipHtml.attendeeRole2.*
 # %1$S - email address or common name <email address> representing a room
 imipHtml.attendeeUserType2.ROOM=%1$S (herbergi)
 # LOCALIZATION_NOTE(imipHtml.attendeeUserType2.UNKNOWN): used to compose
 # imipHtml.attendeeRole2.*
 # %1$S - email address or common name <email address> representing an attendee of unknown type
 imipHtml.attendeeUserType2.UNKNOWN=%1$S
 
-imipAddToCalendar.label=Bæta við í dagatal
-imipAddedItemToCal=Atburð bætt í dagatal
-imipCanceledItem=Búinn að eyða atburð
-imipUpdatedItem=Búinn að uppfæra atburð
+imipAddedItemToCal2=Búið er að bæta við atburðinum í dagatalið.
+imipCanceledItem2=Búið er að eyðaatburðinum úr dagatalinu.
+imipUpdatedItem2=Búið er að uppfæra atburðinn.
 imipBarCancelText=Þessi póstur inniheldur ógildingu á atburð.
+imipBarCounterErrorText=Þetta skilaboð inniheldur móttilboð fyrir fundarboð sem er ekki hægt að vinna úr.
+imipBarCounterPreviousVersionText=Þetta skilaboð inniheldur móttilboð fyrir fyrri útgáfu af fundarboði.
+imipBarCounterText=Þetta skilaboð inniheldur móttilboð fyrir fundarboð.
+imipBarDisallowedCounterText=Þetta skilaboð inniheldur móttilboð fyrir fundarboð þótt ekki hafi verið leyft móttilboð fyrir atburð.
+imipBarDeclineCounterText=Þetta skilaboð inniheldur svar við þínu móttilboði.
 imipBarRefreshText=Þessi póstur inniheldur atburðafyrirspurn.
 imipBarPublishText=Þessi póstur inniheldur atburð.
 imipBarRequestText=Þessi tölvupóstur inniheldur fundarboð.
 imipBarSentText=Þessi skilaboð innihalda atburð sem búið er að senda.
 imipBarSentButRemovedText=Þessi skilaboð innihalda atburð sem búið er að senda en er ekki í dagatalinu þínu.
 imipBarUpdateText=Þessi tölvupóstur inniheldur uppfærslu á atburði sem er þegar til.
 imipBarAlreadyProcessedText=Þessi póstur inniheldur atburð sem búið er að meðhöndla.
 imipBarProcessedNeedsAction=Þessi póstur inniheldur atburð sem þú hefur ekki ennþá svarað.
 imipBarReplyText=Þessi tölvupóstur inniheldur svar fyrir fundarboð.
-imipBarReplyToNotExistingItem=Þessi skilaboð innihalda svar sem vísa í atburð sem er ekki til í dagatalinu.                      \u0020
+imipBarReplyToNotExistingItem=Þessi skilaboð innihalda svar sem vísa í atburð sem er ekki til í dagatalinu.
 # LOCALIZATION_NOTE(imipBarReplyToRecentlyRemovedItem):
 # %1$S - datetime of deletion
 imipBarReplyToRecentlyRemovedItem=Þessi skilaboð innihalda svar sem vísa í atburð sem var fjarlægður úr dagatali þann %1$S.
 imipBarUnsupportedText=Þessi tölvupóstur innheldur atburð sem þessi útgáfa af Lightning getur ekki lesið.
 imipBarProcessingFailed=Meðhöndlun á pósti mistókst. Staða: %1$S.
 imipBarNotWritable=Engin skrifanleg dagatöl eru skilgreind fyrir fundarboð, athugaðu stillingar dagatals.
 imipSendMail.title=Tilkynna þátttakendum
 imipSendMail.text=Viltu senda út tilkynningapóst núna?
@@ -147,16 +151,19 @@ itipReplyBodyDecline=%1$S hafnaði fundarboði.
 itipReplySubjectAccept=Svar við fundarboði (Samþykkt): %1$S
 itipReplySubjectDecline=Svar við fundarboði (Hafnað): %1$S
 itipReplySubjectTentative=Svar við fundarboði (Með fyrirvara): %1$S
 itipRequestSubject=Fundarboð: %1$S
 itipRequestUpdatedSubject=Uppfærði fundarboð: %1$S
 itipRequestBody=%1$S hefur boðið þér á fund %2$S
 itipCancelSubject=Hætt við atburð: %1$S
 itipCancelBody=%1$S hefur hætt við atburð: «\u00a0%2$S\u00a0»
+itipCounterBody=%1$S gerði móttilboð fyrir "%2$S":
+itipDeclineCounterBody=%1$S hafnaði móttilboðinu þínu fyrir "%2$S".
+itipDeclineCounterSubject=Móttilboði hafnað: %1$S
 
 confirmProcessInvitation=Þú hefur nýlega eytt þessu, ertu viss um að þú viljir skrá þetta fundarboð?
 confirmProcessInvitationTitle=Skrá fundarboð?
 
 invitationsLink.label=Fundarboð: %1$S
 
 # LOCALIZATION_NOTE(binaryComponentKnown): This is shown when Lightning is
 # missing the binary component and knows how to calculate the expected version
--- a/chat/facebook.properties
+++ b/chat/facebook.properties
@@ -1,7 +1,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-connection.error.useUsernameNotEmailAddress=Notaðu Facebook notandanafnið, ekki tölvupóstfang
-
 facebook.chat.name=Facebook spjall
+facebook.disabled=Facebook Chat er ekki lengur stutt þar sem Facebook slökkti á XMPP gáttinni sinni.
--- a/chat/twitter.properties
+++ b/chat/twitter.properties
@@ -12,16 +12,18 @@ error.tooLong=Staða er yfir 140 stafir.
 # LOCALIZATION NOTE (error.general, error.retweet, error.delete):
 #   %1$S will be either the error string returned by the twitter server,
 #   in English, inside parenthesis, or the empty string if we have no specific
 #   message for the error.
 #   %2$S is the message that caused the error.
 error.general=Upp kom villa %1$S við að senda: %2$S
 error.retweet=Upp kom villa %1$S þegar verið var að endurtísta: %2$S
 error.delete=Upp kom villa %1$S við að eyða: %2$S
+error.like=Upp kom villa %1$S þegar gert var líkar þetta á: %2$S
+error.unlike=Upp kom villa %1$S þegar gert var líkar ekki þetta á: %2$S
 # LOCALIZATION NOTE (error.descriptionTooLong)
 #   %S is the truncated string that was sent to the server.
 error.descriptionTooLong=Lýsing er yfir hámarksstærð (160 stafir), búið er að minnka það niður í: %S.
 
 # LOCALIZATION NOTE (timeline):
 #   This is the title of the conversation tab, %S will be replaced by
 #   @<username>.
 timeline=%S tímalína
@@ -31,16 +33,18 @@ timeline=%S tímalína
 action.copyLink=Afrita tengil í tíst
 action.retweet=Endurtísta
 action.reply=Svara
 action.delete=Eyða
 # LOCALIZATION NOTE (action.follow, action.stopFollowing):
 #  %S will be replaced by the screen name of a twitter user.
 action.follow=Fylgjast með %S
 action.stopFollowing=Hætta að fylgjast með %S
+action.like=Líkar þetta
+action.unlike=Fjarlægja Líkar þetta
 
 # LOCALIZATION NOTE (event.follow, event.unfollow, event.followed):
 #  This will be displayed in system messages inside the timeline conversation.
 #  %S will be replaced by the screen name of a twitter user.
 event.follow=Þú fylgist með %S.
 event.unfollow=Þú fylgist ekki lengur með %S.
 event.followed=%S er að fylgjast með þér.
 # LOCALIZATION NOTE (event.deleted):
--- a/chat/yahoo.properties
+++ b/chat/yahoo.properties
@@ -1,37 +1,5 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-login.error.badCredentials=Notandanafn eða lykilorð er vitlaust.
-login.error.accountLockedFailed=Lokað á reikning vegna of margra misheppnaðra innskráninga.
-login.error.accountLockedGeneral=Lokað á reikning vegna of margra innskráninga.
-login.error.accountDeactivated=Reikningur hefur verið aftengdur.
-login.error.usernameNotExist=Notandanafn er ekki til.
-# The %S will be an error code returned by the server.
-login.error.unknown=Óþekkt villa: %S
-network.error.http=HTTP tengingarvilla.
-
-conference.invite.message=Taktu þátt í fjöldaspjalli.
-
-# Some options are commented out because they aren't used. We do the same thing
-# to their description strings.
-options.pagerPort=Gátt
-options.transferHost=Skráarflutnings netþjónn
-options.transferPort=Skráarflutnings gátt
-options.chatEncoding=Stafatafla
-options.ignoreInvites=Hunsa fundarboð í fjöldaspjall
-
-# In this message, %S is replaced with the username of the user who left.
-system.message.conferenceLogoff=%S er hættur í fjöldaspjalli.
-system.message.conferenceLogon=%S gerðist þátttakandi í fjöldaspjalli.
-
-# LOCALZIATION NOTE (command.*):
-#   These are the help messages for each command, the %S is the command name
-#   Each command first gives the parameter it accepts and then a description of
-#   the command.
-command.help.invite2=%S &lt;notandi1&gt;[,&lt;notandi2&gt;,...] [&lt;bjóða skilaboð&gt;]: bjóða einum eða fleiri notendum í þetta spjall.
-command.help.conference=%S: Búa til nýtt spjallsvæði sem þú getur seinna boðið öðrum notendum inn á.
-
-# LOCALIZATION NOTE (command.feedback.invite):
-#   %S is the user, or comma separated list of users, invited to the conference.
-command.feedback.invite=Þú hefur boðið %S á fjöldaspjall.
+yahoo.disabled=Yahoo Messenger er ekki lengur með stuðning þar sem Yahoo hefur hætt með eldra snið á samskiptareglum.
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -20,19 +20,19 @@
 <!ENTITY enableInlineSpellChecker.label "Athuga stafsetningu í innslætti">
 <!ENTITY enableInlineSpellChecker.accesskey "s">
 <!ENTITY checkSpellingCmd2.label "Yfirfara stafsetningu">
 <!ENTITY checkSpellingCmd2.accesskey "Y">
 <!ENTITY checkSpellingCmd2.key "p">
 <!-- Insert menu items -->
 <!ENTITY insertMenu.label "Setja inn">
 <!ENTITY insertMenu.accesskey "i">
-<!ENTITY insertLinkCmd.label "Tengill…">
-<!ENTITY insertLinkCmd.accesskey "l">
-<!ENTITY insertLinkCmd.key "L">
+<!ENTITY insertLinkCmd2.label "Tengill…">
+<!ENTITY insertLinkCmd2.accesskey "l">
+<!ENTITY insertLinkCmd2.key "K">
 <!ENTITY insertAnchorCmd.label "Nefndur tengill…">
 <!ENTITY insertAnchorCmd.accesskey "N">
 <!ENTITY insertImageCmd.label "Myndir…">
 <!ENTITY insertImageCmd.accesskey "M">
 <!ENTITY insertHLineCmd.label "Lárétt lína">
 <!ENTITY insertHLineCmd.accesskey "r">
 <!ENTITY insertTableCmd.label "Töflu…">
 <!ENTITY insertTableCmd.accesskey "T">
@@ -134,17 +134,16 @@
 <!ENTITY formatRemoveStyles.key "Y">
 <!ENTITY formatRemoveLinks.key "K">
 <!ENTITY formatRemoveNamedAnchors.label "Fjarlægja nefnda tengla">
 <!ENTITY formatRemoveNamedAnchors.accesskey "r">
 <!ENTITY formatRemoveNamedAnchors2.key "R">
 <!ENTITY paragraphMenu.label "Málsgrein">
 <!ENTITY paragraphMenu.accesskey "M">
 <!ENTITY paragraphParagraphCmd.label "Málsgrein">
-  
 <!ENTITY paragraphParagraphCmd.accesskey "M">
 <!ENTITY heading1Cmd.label "Haus 1">
 <!ENTITY heading1Cmd.accesskey "1">
 <!ENTITY heading2Cmd.label "Haus 2">
 <!ENTITY heading2Cmd.accesskey "2">
 <!ENTITY heading3Cmd.label "Haus 3">
 <!ENTITY heading3Cmd.accesskey "3">
 <!ENTITY heading4Cmd.label "Haus 4">
@@ -246,17 +245,17 @@
 <!ENTITY tableAllCells.accesskey "l">
 <!ENTITY tableCellBefore.label "Hólf áður">
 <!ENTITY tableCellBefore.accesskey "H">
 <!ENTITY tableCellAfter.label "Hólf á eftir">
 <!ENTITY tableCellAfter.accesskey "f">
 <!-- Delete SubMenu -->
 <!ENTITY tableDeleteMenu.label "Eyða">
 <!ENTITY tableDeleteMenu.accesskey "E">
-<!-- text for "Join Cells" is in editor.properties 
+<!-- text for "Join Cells" is in editor.properties
      ("JoinSelectedCells" and "JoinCellToRight")
      the access key must exist in both of those strings
      But value must be set here for accesskey to draw properly
 -->
 <!ENTITY tableJoinCells.label "j">
 <!ENTITY tableJoinCells.accesskey "j">
 <!ENTITY tableSplitCell.label "Kljúfa hólf">
 <!ENTITY tableSplitCell.accesskey "K">
--- a/editor/ui/chrome/dialogs/EditorImageProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageProperties.dtd
@@ -6,16 +6,17 @@
 
 <!-- Window title -->
 <!ENTITY windowTitle.label "Mynd eiginleikar">
 <!ENTITY pixelsPopup.value "punktar">
 <!-- These are in the Location tab panel -->
 <!ENTITY locationEditField.label "Staðsetning myndar:">
 <!ENTITY locationEditField.accessKey "m">
 <!ENTITY locationEditField.tooltip "Sláðu inn skráarnafn á mynd eða staðsetningu">
+<!ENTITY locationEditField.shortenedDataURI "Minnkað gagna URI (afritun setur fulla slóð á klemmuspjald)">
 <!ENTITY title.label "Ábending:">
 <!ENTITY title.accessKey "b">
 <!ENTITY title.tooltip "Html 'title' eigindið sem birtist sem ábending">
 <!ENTITY altText.label "Aukatexti:">
 <!ENTITY altText.accessKey "A">
 <!ENTITY altTextEditField.tooltip "Sláðu inn texta til að sýna í staðinn fyrir mynd">
 <!ENTITY noAltText.label "Ekki nota auka texta">
 <!ENTITY noAltText.accessKey "k">
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -18,18 +18,18 @@
 <!ENTITY quickMode.accesskey "h">
 <!ENTITY autotagEnable.label "Búa sjálkrafa til tög frá &lt;flokka&gt; nöfnum straums">
 <!ENTITY autotagEnable.accesskey "B">
 <!ENTITY autotagUsePrefix.label "Setja forskeyti á tög:">
 <!ENTITY autotagUsePrefix.accesskey "S">
 <!ENTITY autoTagPrefix.placeholder "Sláðu inn forskeyti fyrir tög">
 <!ENTITY button.addFeed.label "Bæta við">
 <!ENTITY button.addFeed.accesskey "æ">
-<!ENTITY button.editFeed.label "Breyta">
-<!ENTITY button.editFeed.accesskey "B">
+<!ENTITY button.updateFeed.label "Uppfæra">
+<!ENTITY button.updateFeed.accesskey "U">
 <!ENTITY button.removeFeed.label "Fjarlægja">
 <!ENTITY button.removeFeed.accesskey "F">
 <!ENTITY button.importOPML.label "Flytja inn">
 <!ENTITY button.importOPML.accesskey "i">
 <!ENTITY button.exportOPML.label "Flytja út">
 <!ENTITY button.exportOPML.accesskey "t">
 <!ENTITY button.exportOPML.tooltip "Flytja út strauma með möppulista; ctrl smelltu eða ctrl enter til að flytja út strauma sem lista">
 <!ENTITY cmd.close.commandKey "w">
--- a/mail/chrome/messenger-newsblog/newsblog.properties
+++ b/mail/chrome/messenger-newsblog/newsblog.properties
@@ -8,17 +8,19 @@ subscribe-cancelSubscriptionTitle=Gerast áskrifandi að straumi…
 subscribe-feedAlreadySubscribed=Þú ert þegar áskrifandi að þessum straumi.
 subscribe-errorOpeningFile=Get ekki opnað skrána.
 subscribe-feedAdded=Bætti við straum.
 subscribe-feedUpdated=Uppfærði straum.
 subscribe-feedMoved=Færði áskrift að straumi.
 subscribe-feedCopied=Afritaði straum áskrift.
 subscribe-feedRemoved=Hætti í ásrkift að straumi.
 subscribe-feedNotValid=Tengill straums er ekki gildur straumur.
+subscribe-feedVerified=Straumur er ekki með staðfestingu.
 subscribe-networkError=Ekki tókst að ná í veffangs straums. Athugaðu nafn og reyndu aftur.
+subscribe-noAuthError=Straumur er ekki með aðgang.
 subscribe-loading=Verið er að opna, bíðið…
 
 subscribe-OPMLImportTitle=Veldu OPML skrá til að flytja inn
 ## LOCALIZATION NOTE(subscribe-OPMLExportTitleList):
 ## %S is the name of the feed account folder name.
 subscribe-OPMLExportTitleList=Flytja út %S sem OPML skrá - Straumlisti
 ## LOCALIZATION NOTE(subscribe-OPMLExportTitleStruct):
 ## %S is the name of the feed account folder name.
@@ -61,21 +63,28 @@ subscribe-confirmFeedDeletion=Ertu viss um að þú viljir hætta áskrift að þessum straumi: \n %S?
 ##  - The second %S is the total number of items
 subscribe-gettingFeedItems=Hleð niður straumum (%S af %S)…
 
 newsblog-noNewArticlesForFeed=Það eru engar nýjar greinar fyrir þennan straum.
 ## LOCALIZATION NOTE(newsblog-networkError): %S is the feed URL
 newsblog-networkError=Ekki var hægt að finna %S. Athugaðu nafnið og reyndu aftur.
 ## LOCALIZATION NOTE(newsblog-feedNotValid): %S is the feed URL
 newsblog-feedNotValid=%S er ekki gildur straumur.
+## LOCALIZATION NOTE(newsblog-badCertError): %S is the feed URL host
+newsblog-badCertError=%S notar ógilt öryggisskilríki.
+## LOCALIZATION NOTE(newsblog-noAuthError): %S is the feed URL
+newsblog-noAuthError=%S er ekki með aðgang.
 newsblog-getNewMsgsCheck=Athuga nýtt efni í straumum…
 
 ## LOCALIZATION NOTE(feeds-accountname): This string should be the same as feeds.accountName in am-newsblog.dtd
 feeds-accountname=Blogg & Fréttastraumar
 
+## LOCALIZATION NOTE(externalAttachmentMsg): Content in the MIME part for external link attachments.
+externalAttachmentMsg=Þetta MIME viðhengi er geymt fyrir utan skilaboðin.
+
 ## Import wizard.
 ImportFeedsCreateNewListItem=* Nýr reikningur *
 ImportFeedsNewAccount=Búa til og flytja inn í nýjan straumreikning
 ImportFeedsExistingAccount=Flytja inn í straumreikning sem er þegar til
 ## LOCALIZATION NOTE(ImportFeedsDone):
 ##  - The first %S is the import file name;
 ##  - The second %S is the value of either ImportFeedsNew or ImportFeedsExisting;
 ##  - The third %S is the feed account name.
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -44,14 +44,15 @@
 <!ENTITY fetchFromPOP.label "Ná í frá POP póstþjóni">
 <!ENTITY ignoreThread.label "Hunsa umræðu">
 <!ENTITY ignoreSubthread.label "Hunsa undirumræðu">
 <!ENTITY watchThread.label "Fylgjast með umræðu">
 <!ENTITY stopExecution.label "Stöðva keyrslu síu">
 <!ENTITY addAction.tooltip "Bæta við nýrri aðgerð">
 <!ENTITY removeAction.tooltip "Fjarlægja þessa aðgerð">
 <!-- LOCALIZATION NOTE
-  The values below are used to control the widths of the filter action widgets.
-  Change the values only when the localized strings in the popup menus
-  are truncated in the widgets.
- -->
+     The values below are used to control the widths of the filter action widgets.
+     Change the values only when the localized strings in the popup menus
+     are truncated in the widgets.
+  -->
+<!-- Flex Attribute: https://developer.mozilla.org/docs/XUL/Attribute/flex -->
 <!ENTITY filterActionTypeFlexValue "1">
 <!ENTITY filterActionTargetFlexValue "4">
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -2,16 +2,18 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY window.title "Póstsíur">
 <!ENTITY nameColumn.label "Nafn síu">
 <!ENTITY activeColumn.label "Virk">
 <!ENTITY newButton.label "Ný…">
 <!ENTITY newButton.accesskey "N">
+<!ENTITY newButton.popupCopy.label "Afrita…">
+<!ENTITY newButton.popupCopy.accesskey "A">
 <!ENTITY editButton.label "Breyta…">
 <!ENTITY editButton.accesskey "B">
 <!ENTITY deleteButton.label "Eyða">
 <!ENTITY deleteButton.accesskey "E">
 <!ENTITY reorderTopButton "Færa efst">
 <!ENTITY reorderTopButton.accessKey "o">
 <!ENTITY reorderTopButton.toolTip "Endurraða síu þannig að hún keyri á undan öðrum">
 <!ENTITY reorderUpButton.label "Færa upp">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,20 +1,18 @@
 <!ENTITY aboutDialog.title "Um &brandFullName;">
-<!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
+<!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*):
 # Only one button is present at a time.
 # The button when displayed is located directly under the Thunderbird version in
 # the about dialog.
 -->
 <!ENTITY update.checkForUpdatesButton.label "Leita að uppfærslum">
 <!ENTITY update.checkForUpdatesButton.accesskey "L">
 <!ENTITY update.updateButton.label2 "Endurræstu &brandShortName; til að uppfæra">
 <!ENTITY update.updateButton.accesskey "r">
-<!ENTITY update.applyButtonBillboard.label "Virkja uppfærslu…">
-<!ENTITY update.applyButtonBillboard.accesskey "a">
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version "&brandShortName; er tilraunakenndur og gæti verið óstöðugur.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
 <!ENTITY warningDesc.telemetryDesc "Sent er sjálfkrafa upplýsingar um afkastagetu, vélbúnað, notkun og sérsnið til &vendorShortName; til að hjálpa til með að gera &brandShortName; betri.">
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 <!ENTITY community.exp.start "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.exp.mozillaLink "&vendorShortName;">
--- a/mail/chrome/messenger/addressbook/abContactsPanel.dtd
+++ b/mail/chrome/messenger/addressbook/abContactsPanel.dtd
@@ -1,25 +1,40 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+<!ENTITY propertiesMenu.label "Eiginleikar">
+<!ENTITY propertiesMenu.accesskey "i">
+<!ENTITY propertiesCmd.key "i">
+<!ENTITY abPropertiesMenu.label "Eiginleikar nafnaskrár">
+<!ENTITY abPropertiesMenu.accesskey "i">
+<!ENTITY contactPropertiesMenu.label "Eiginleikar tengiliðs">
+<!ENTITY contactPropertiesMenu.accesskey "i">
+<!ENTITY mailingListPropertiesMenu.label "Eiginleikar póstlista">
+<!ENTITY mailingListPropertiesMenu.accesskey "i">
 <!ENTITY addressbookPicker.label "Nafnaskrá:">
 <!ENTITY addressbookPicker.accesskey "k">
-<!ENTITY searchInput.label "Leita að:">
-<!ENTITY searchInput.accesskey "L">
+<!ENTITY searchContacts.label "Leita að tengiliði:">
+<!ENTITY searchContacts.accesskey "n">
 <!ENTITY SearchNameOrEmail.label "Nafn eða tölvupóstfang">
-<!ENTITY deleteAddrBookCard.label "Eyða">
-<!ENTITY deleteAddrBookCard.accesskey "E">
-<!ENTITY addrBookCardProperties.label "Eiginleikar">
-<!ENTITY addrBookCardProperties.accesskey "E">
 <!ENTITY addtoToFieldMenu.label "Bæta við í Til svæði">
 <!ENTITY addtoToFieldMenu.accesskey "a">
 <!ENTITY addtoCcFieldMenu.label "Bæta við Afrit svæði">
 <!ENTITY addtoCcFieldMenu.accesskey "A">
 <!ENTITY addtoBccFieldMenu.label "Bæta við í Falið afrit svæði">
 <!ENTITY addtoBccFieldMenu.accesskey "B">
+<!ENTITY deleteAddrBookCard.label "Eyða">
+<!ENTITY deleteAddrBookCard.accesskey "E">
+<!ENTITY propertiesContext.label "Eiginleikar">
+<!ENTITY propertiesContext.accesskey "i">
+<!ENTITY abPropertiesContext.label "Eiginleikar">
+<!ENTITY abPropertiesContext.accesskey "i">
+<!ENTITY editContactContext.label "Breyta tengilið">
+<!ENTITY editContactContext.accesskey "e">
+<!ENTITY editMailingListContext.label "Breyta póstlista">
+<!ENTITY editMailingListContext.accesskey "e">
 <!ENTITY toButton.label "Bæta við í Til:">
 <!ENTITY toButton.accesskey "a">
 <!ENTITY ccButton.label "Bæta við í Afrit:">
 <!ENTITY ccButton.accesskey "æ">
 <!ENTITY bccButton.label "Bæta við í falið afrit:">
 <!ENTITY bccButton.accesskey "B">
--- a/mail/chrome/messenger/addressbook/abMailListDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abMailListDialog.dtd
@@ -1,14 +1,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Title -->
-<!ENTITY mailListWindow.title "Notandi Listi">
+<!ENTITY mailListWindowAdd.title "Nýr póstlisti">
 <!-- Labels -->
 <!ENTITY addToAddressBook.label "Bæta við: ">
 <!ENTITY ListName.label "Heiti lista: ">
 <!ENTITY ListNickName.label "Gælunafn lista: ">
 <!ENTITY ListDescription.label "Lýsing: ">
 <!-- See bug 58485, when we implement drag and drop, add 'or drag addresses' back in -->
 <!ENTITY AddressTitle.label "Sláðu inn tölvupóstfang til að bæta við í póstlistann:">
 <!ENTITY UpButton.label "Færa upp">
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -69,19 +69,25 @@
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY searchAddressesCmd.key "f">
 <!ENTITY selectAllCmd.accesskey "j">
 <!ENTITY swapFirstNameLastNameCmd.label "Víxla Eiginnafni/Eftirnafni">
 <!ENTITY swapFirstNameLastNameCmd.accesskey "V">
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY hideSwapFnLnUI "true">
-<!ENTITY propertiesCmd2.label "Eiginleikar">
-<!ENTITY propertiesCmd2.accesskey "i">
+<!ENTITY propertiesMenu.label "Eiginleikar">
+<!ENTITY propertiesMenu.accesskey "i">
 <!ENTITY propertiesCmd.key "i">
+<!ENTITY abPropertiesMenu.label "Eiginleikar nafnaskrár">
+<!ENTITY abPropertiesMenu.accesskey "i">
+<!ENTITY contactPropertiesMenu.label "Eiginleikar tengiliðs">
+<!ENTITY contactPropertiesMenu.accesskey "i">
+<!ENTITY mailingListPropertiesMenu.label "Eiginleikar póstlista">
+<!ENTITY mailingListPropertiesMenu.accesskey "i">
 <!-- View Menu -->
 <!ENTITY viewMenu.label "Skoða
 ">
 <!ENTITY viewMenu.accesskey "k">
 <!ENTITY viewToolbarsMenu.label "Verkfæraslár">
 <!ENTITY viewToolbarsMenu.accesskey "V">
 <!ENTITY menubarCmd.label "Valmynd">
 <!ENTITY menubarCmd.accesskey "m">
@@ -125,30 +131,40 @@ because displayed names don't have the c
 <!ENTITY preferencesCmd2.accesskey "o">
 <!ENTITY preferencesCmdUnix.label "Valkostir">
 <!ENTITY preferencesCmdUnix.accesskey "V">
 <!-- Address Book Toolbar and Context Menus -->
 <!ENTITY newContactButton.label "Nýr tengiliður">
 <!ENTITY newContactButton.accesskey "N">
 <!ENTITY newlistButton.label "Nýr listi">
 <!ENTITY newlistButton.accesskey "l">
-<!ENTITY editButton2.label "Eiginleikar">
-<!ENTITY editButton2.accesskey "i">
+<!ENTITY editPropertiesButton.label "Breyta">
+<!ENTITY propertiesContext.label "Eiginleikar">
+<!ENTITY propertiesContext.accesskey "i">
+<!ENTITY abPropertiesContext.label "Eiginleikar">
+<!ENTITY abPropertiesContext.accesskey "i">
+<!ENTITY editContactContext.label "Breyta tengilið">
+<!ENTITY editContactContext.accesskey "e">
+<!ENTITY editMailingListContext.label "Breyta póstlista">
+<!ENTITY editMailingListContext.accesskey "e">
 <!ENTITY newmsgButton.label "Skrifa">
 <!ENTITY newmsgButton.accesskey "S">
 <!ENTITY newIM.label "Snarboð">
 <!ENTITY newIM.accesskey "n">
 <!ENTITY printButton.label "Prenta…">
 <!ENTITY printButton.accesskey "r">
 <!ENTITY deleteButton2.label "Eyða">
 <!ENTITY deleteButton2.accesskey "E">
 <!-- Address Book Toolbar Tooltips -->
 <!ENTITY newContactButton.tooltip "Búa til nýjan tengilið í nafnaskrá">
 <!ENTITY newlistButton.tooltip "Búa til nýjan lista">
-<!ENTITY editButton2.tooltip "Breyta völdu atriði">
+<!ENTITY editPropertiesButton.tooltip "Breyta völdu atriði">
+<!ENTITY editAbPropertiesButton.tooltip "Breyta gildum fyrir valda nafnabók">
+<!ENTITY editContactPropertiesButton.tooltip "Breyta völdum tengilið">
+<!ENTITY editMailingListPropertiesButton.tooltip "Breyta völdum póstlista">
 <!ENTITY newmsgButton.tooltip "Senda póst">
 <!ENTITY newIM.tooltip "Senda snarboð eða spjall">
 <!ENTITY deleteButton2.tooltip "Eyða völdum hlut">
 <!-- Dir Tree header -->
 <!ENTITY dirTreeHeader.label "Nafnaskrár">
 <!-- Search Bar -->
 <!ENTITY SearchNameOrEmail.label "Nafn eða tölvupóstfang">
 <!ENTITY SearchNameOrEmail.accesskey "N">
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -1,18 +1,21 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the Mailing list dialog
 #
+
+## LOCALIZATION NOTE (mailingListTitleEdit): %S will be replaced by the Mailing List's display name
+mailingListTitleEdit=Breyta %s
 emptyListName=Þú verður að slá inn nafn lista.
 lastFirstFormat=%S, %S
-firstLastFormat=%S %S \u0020
+firstLastFormat=%S %S
 
 allAddressBooks=Allar nafnaskrár
 
 newContactTitle=Nýr tengiliður
 # %S will be the contact's display name
 newContactTitleWithDisplayName=Nýr tengiliður fyrir %S
 editContactTitle=Breyta tengilið
 # %S will be the contact's display name
@@ -101,20 +104,22 @@ ldap_2.servers.pab.description=Einkanafnaskrá
 ldap_2.servers.history.description=Tengiliðasafn
 ## LOCALIZATION NOTE (ldap_2.servers.osx.description is only used on Mac OS X)
 ldap_2.servers.osx.description=Mac OS X nafnaskrá
 
 # status bar stuff
 ## LOCALIZATION NOTE (totalContactStatus):
 ## %1$S is address book name, %2$S is contact count
 totalContactStatus=Heildarfjöldi tengiliða í %1$S: %2$S
-## LOCALIZATION NOTE (matchesFound):  do not localize %S
 noMatchFound=Engin samsvörun fannst
-matchFound=Fann 1 sem passaði
-matchesFound=Fann %S sem pössuðu
+## LOCALIZATION NOTE (matchesFound1):
+## Semicolon-separated list of singular and plural forms.
+## See: https://developer.mozilla.org/docs/Mozilla/Localization/Localization_and_Plurals
+## #1 is the number of matching contacts found
+matchesFound1=Fann #1 niðurstöðu;Fann #1 niðurstöður
 
 ## LOCALIZATION NOTE (contactsCopied): Semi-colon list of plural forms
 ## %1$S is the number of contacts that were copied. This should be used multiple
 ## times wherever you need it. Do not replace by %S.
 contactsCopied=%1$S tengiliður afritaður;%1$S tengiliðir afritaðir
 
 ## LOCALIZATION NOTE (contactsMoved): Semi-colon list of plural forms
 ## %1$S is the number of contacts that were moved. This should be used multiple
@@ -157,18 +162,19 @@ headingHome=Heima
 headingWork=Vinna
 headingOther=Annað
 headingChat=Spjall
 headingPhone=Sími
 headingDescription=Lýsing
 headingAddresses=Heimilisföng
 
 # For address books
-newAddressBookTitle=Ný nafnaskrá
-renameAddressBookTitle=Eiginleikar nafnaskrár
+addressBookTitleNew=Ný nafnaskrá
+## LOCALIZATION NOTE (addressBookTitleEdit): %S will be replaced by the the Address Book's name
+addressBookTitleEdit=%s Eiginleikar
 
 # For corrupt .mab files
 corruptMabFileTitle=Gölluð nafnaskrá
 corruptMabFileAlert=Ekki var hægt að lesa eina af þínum nafnaskrám (%1$S skrá). Ný %2$S skrá verður búinn til og afrit búið til af eldri skránni, sem verður kölluð %3$S, og búinn til í sömu möppu.
 
 # For locked .mab files
 lockedMabFileTitle=Get ekki lesið staðbundna nafnaskrá
 lockedMabFileAlert=Get ekki hlaðið inn nafnaskrá %S. Það gæti verið að skráin væri skrifvarinn, eða læst af öðru forriti. Reyndu aftur seinna.
--- a/mail/chrome/messenger/addressbook/pref-directory-add.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory-add.dtd
@@ -1,13 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY newDirectoryTitle.label "Eigindi möppu á netþjóni">
 <!ENTITY directoryName.label "Nafn: ">
 <!ENTITY directoryName.accesskey "n">
 <!ENTITY directoryHostname.label "Vélarheiti: ">
 <!ENTITY directoryHostname.accesskey "V">
 <!ENTITY directoryBaseDN.label "Grunn DN: ">
 <!ENTITY directoryBaseDN.accesskey "G">
 <!ENTITY findButton.label "Leita">
 <!ENTITY findButton.accesskey "L">
--- a/mail/chrome/messenger/addressbook/replicationProgress.properties
+++ b/mail/chrome/messenger/addressbook/replicationProgress.properties
@@ -9,8 +9,12 @@ replicationCancelled=Hætt við afritun
 # LOCALIZATION NOTE
 # do not localize %S.  %S is the current entry number (an integer)
 currentCount=Afrita möppu: %S
 
 downloadButton=Niðurhala núna
 downloadButton.accesskey=N
 cancelDownloadButton=Hætta við niðurhal
 cancelDownloadButton.accesskey=H
+
+directoryTitleNew=Ný LDAP nafnaskrá
+## LOCALIZATION NOTE (directoryTitleEdit): %S will be replaced by the LDAP directory's display name
+directoryTitleEdit=%s Eiginleikar
--- a/mail/chrome/messenger/am-identity-edit.dtd
+++ b/mail/chrome/messenger/am-identity-edit.dtd
@@ -1,13 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- LOCALIZATION NOTE (identityDialog.style): This value should be roughly
      equal to the value of accountManager.size entity minus the value
      of accountTree.width entity. -->
 <!ENTITY identityDialog.style "min-width: 75ch;">
-<!ENTITY identityTitle.label "Stillingar auðkennis">
 <!ENTITY identityListDesc.label "Stilla stillingar fyrir þetta auðkenni:">
 <!ENTITY settingsTab.label "Stillingar">
 <!ENTITY copiesFoldersTab.label "Afrit og möppur">
 <!ENTITY addressingTab.label "Samsetning og póstföng">
+<!ENTITY publicData.label "Opinber gögn">
+<!ENTITY privateData.label "Persónuleg gögn">
+<!ENTITY identityAlias.label "Auðkennis merking:">
+<!ENTITY identityAlias.accesskey "ð">
--- a/mail/chrome/messenger/am-smime.dtd
+++ b/mail/chrome/messenger/am-smime.dtd
@@ -24,8 +24,12 @@
 <!ENTITY signMessage.label "Skrifa undir póst með rafrænni undirskrift (sjálfgefið)">
 <!ENTITY signMessage.accesskey "d">
 <!ENTITY signingCert.message "Nota þetta skilríki fyrir rafræna undirskrift á pósti sem þú sendir:">
 <!ENTITY certificates.label "Skilríki">
 <!ENTITY manageCerts2.label "Umsýsla skilríkja">
 <!ENTITY manageCerts2.accesskey "m">
 <!ENTITY manageDevices.label "Öryggistæki">
 <!ENTITY manageDevices.accesskey "y">
+<!-- Strings for the cert picker dialog -->
+<!ENTITY certPicker.title "Veldu skilríki">
+<!ENTITY certPicker.info "Skilríki:">
+<!ENTITY certPicker.detailsLabel "Upplýsingar um valið skilríki:">
--- a/mail/chrome/messenger/am-smime.properties
+++ b/mail/chrome/messenger/am-smime.properties
@@ -22,8 +22,20 @@ encryption_wantSame=Viltu nota sama skilríki til að dulkóða og afkóða póst sem er sendur til þín?
 encryption_needCertWantToSelect=Þú ættir einnig að skilgreina skilríki fyrir annað fólk til að nota þegar það sendir þér dulkóðaðan póst. Viltu skilgreina skilríki fyrir dulkóðun núna?
 signing_needCertWantSame=Þú ættir einnig að skilgreina skilríki til að nota fyrir rafrænar undirskriftir. Viltu nota sama skilríki fyrir rafræna undirskrift?
 signing_wantSame=Viltu nota sama skilríki fyrir rafrænar undirskriftir?
 signing_needCertWantToSelect=Þú ættir einnig að skilgreina skilríki til að nota fyrir rafræna undirskriftir. Viltu skilgreina skilríki fyrir rafræna undirskrift núna?
 
 ## Strings used by nsMsgComposeSecure
 mime_smimeEncryptedContentDesc=S/MIME dulkóðaður póstur
 mime_smimeSignatureContentDesc=S/MIME rafræn undirskrift
+
+## Strings used by the cert picker.
+CertInfoIssuedFor=Gefið út fyrir:
+CertInfoIssuedBy=Útgefandi:
+CertInfoValid=Gilt
+CertInfoFrom=frá
+CertInfoTo=til
+CertInfoPurposes=Hlutverk
+CertInfoEmail=Tölvupóstur
+CertInfoStoredIn=Geymsla:
+NicknameExpired=(útrunnið)
+NicknameNotYetValid=(ekki ennþá gilt)
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -19,16 +19,19 @@ filterCustomHeaderOverflow=Síurnar eru yfir 50 sérsniðna hausa hámarkinu. Breyttu msgFilterRules.dat skránni, sem inniheldur síurnar, þannig að færri sérsniðnir hausar séu notaðir.
 invalidCustomHeader=Einhver af síunum þínum notar sérsniðinn haus sem inniheldur ógildan staf, svo sem eins og ':', óprentanlegan staf, staf sem er ekki ascii, eða átta bita ascii staf. Vinsamlega breyttu msgFilterRules.dat skránni, sem inniheldur síurnar þínar, til að fjarlægja ógilda stafi úr sérsniðnum hausum.
 continueFilterExecution=Beiting á síu %S mistókst. Viltu halda áfram að beita síum?
 promptTitle=Keyri síur
 promptMsg=Þú ert nú þegar að keyra síu á póst.\nViltu halda áfram að keyra síur?
 stopButtonLabel=Stöðva
 continueButtonLabel=Áfram
 cannotEnableFilter=Þessi sía var líklega búin til af nýrri útgáfu af mozilla/netscape. Ekki er hægt að virkja þessa síu því ekki er vitað hvernig hún virkar.
 dontWarnAboutDeleteCheckbox=Ekki spyrja aftur
+# LOCALIZATION NOTE(copyToNewFilterName)
+# %S=the name of the filter that is being copied
+copyToNewFilterName=Afrit af %s
 
 # LOCALIZATION NOTE(filterFAilureWarningPrefix)
 # %1$S=filter error action
 # %2$S=error code as hexadecimal string.
 filterFailureWarningPrefix=Síuaðgerð mistókst: "%1$S" með villunúmeri=%2$S þegar reynt var:
 
 searchTermsInvalidTitle=Leitarskilyrði ógilt
 # LOCALIZATION NOTE(searchTermsInvalidRule)
@@ -41,19 +44,20 @@ filterActionOrderExplanation=Þegar póstur passar við þessa síu verða aðgerðirnar keyrðar í eftirfarandi röð:
 filterActionOrderTitle=Raunveruleg aðgerðaröð
 ## LOCALIZATION NOTE(filterActionItem):
 # %1$S=sequence number of the action, %2$S=action text, %3$S=action argument
 filterActionItem=%1$S. %2$S %3$S\n
 
 ## LOCALIZATION NOTE(filterCountVisibleOfTotal):
 # %1$S=number of matching filters, %2$S=total number of filters
 filterCountVisibleOfTotal=%1$S af %2$S
-## LOCALIZATION NOTE(filterCountItems): Semi-colon list of plural forms.
+## LOCALIZATION NOTE(filterCountItems): 
+## Semicolon-separated list of singular and plural forms.
 ## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-## #1 is the count of items in the list.# filterCountItems is a pluralForm - see 
+## #1 is the count of items in the list.
 filterCountItems=#1 hlutur; #1 hlutir
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=Fann ruslpóst frá %1$S - %2$S á %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=færði póstauðkenni = %1$S í %2$S
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -154,16 +154,17 @@
 <!ENTITY unreadFolders.accesskey "l">
 <!ENTITY favoriteFolders.label "Eftirlætismappa">
 <!ENTITY favoriteFolders.accesskey "f">
 <!ENTITY recentFolders.label "Nýlegt">
 <!ENTITY recentFolders.accesskey "N">
 <!ENTITY compactVersion.label "Þjöppuð sýn">
 <!ENTITY compactVersion.accesskey "Þ">
 <!ENTITY folderPaneBar.label "Möppu flipa tækjaslá">
+<!ENTITY folderPaneBar.accesskey "f">
 <!ENTITY folderModeSelector.label "Möppuyfirlit">
 <!-- Sort Menu -->
 <!ENTITY sortMenu.label "Raða eftir">
 <!ENTITY sortMenu.accesskey "R">
 <!ENTITY sortByDateCmd.label "Dagsetningu">
 <!ENTITY sortByDateCmd.accesskey "e">
 <!ENTITY sortByReceivedCmd.label "Móttekið">
 <!ENTITY sortByReceivedCmd.accesskey "M">
@@ -462,37 +463,58 @@
 <!ENTITY filtersApplyToMessage.label "Keyra síur á póst">
 <!ENTITY filtersApplyToMessage.accesskey "e">
 <!ENTITY runJunkControls.label "Keyra ruslpóstsaðgerðir á möppu">
 <!ENTITY runJunkControls.accesskey "u">
 <!ENTITY deleteJunk.label "Eyða öllum merktum ruslpósti í möppu">
 <!ENTITY deleteJunk.accesskey "l">
 <!ENTITY importCmd.label "Flytja inn…">
 <!ENTITY importCmd.accesskey "i">
-<!ENTITY errorConsoleCmd.label "Villugluggi">
-<!ENTITY errorConsoleCmd.accesskey "g">
-<!ENTITY errorConsoleCmd.commandkey "j">
 <!ENTITY clearRecentHistory.label "Hreinsa nýlega ferla…">
 <!ENTITY clearRecentHistory.accesskey "H">
 <!ENTITY accountManagerCmd2.label "Stillingar reiknings">
 <!ENTITY accountManagerCmd2.accesskey "S">
-<!-- LOCALIZATION NOTE (accountManagerCmdUnix2.accesskey): belongs to accountManagerCmd2.label,
-        which is placed under the Edit menu on Unix systems -->
+<!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey):
+     Belongs to accountManagerCmd.label, which is placed under the Edit menu
+     on Unix systems
+  -->
 <!ENTITY accountManagerCmdUnix2.accesskey "A">
-<!ENTITY allowRemoteDebugging.label "Leyfa fjartengda aflúsun">
-<!ENTITY allowRemoteDebugging.accesskey "g">
+<!-- Developer Tools Submenu -->
+<!ENTITY devtoolsMenu.label "Forritunarverkfæri">
+<!ENTITY devtoolsMenu.accesskey "o">
+<!ENTITY devToolboxCmd.label "Forritunarverkfæri">
+<!ENTITY devToolboxCmd.accesskey "t">
+<!ENTITY devToolboxCmd.commandkey "i">
+<!ENTITY addonDebugCmd.label "Aflúsaraviðbót">
+<!ENTITY addonDebugCmd.accesskey "A">
+<!ENTITY tabsDebugCmd.label "Content Frame Debugger">
+<!ENTITY tabsDebugCmd.accesskey "C">
+<!ENTITY errorConsoleCmd.label "Villugluggi">
+<!ENTITY errorConsoleCmd.accesskey "g">
+<!ENTITY errorConsoleCmd.commandkey "j">
+<!ENTITY scratchpadCmd.label "Ritill">
+<!ENTITY scratchpadCmd.accesskey "R">
+<!--LOCALIZATION NOTE (scratchpadCmd.keycode):
+    This should be a key code constant as per
+    https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode#Constants_for_keyCode_value
+    (but without the DOM_ prefix) -->
+<!ENTITY scratchpadCmd.keycode "VK_F4">
+<!--LOCALIZATION NOTE (scratchpadCmd.keytext):
+    This should be the text printed on the key defined in the previous string. -->
+<!ENTITY scratchpadCmd.keytext "F4">
 <!-- Mail Toolbar -->
 <!ENTITY getMsgButton1.label "Ná í póst">
 <!ENTITY newMsgButton.label "Skrifa">
 <!ENTITY replyButton.label "Svara">
 <!ENTITY replyAllButton.label "Svara öllum">
 <!ENTITY replyListButton.label "Svara póstlista">
 <!ENTITY forwardButton.label "Áfram">
 <!ENTITY fileButton.label "Skrá">
 <!ENTITY archiveButton.label "Skjalageymsla">
+<!ENTITY openConversationButton.label "Samtal">
 <!ENTITY nextButton.label "Næsta">
 <!ENTITY nextButtonToolbarItem.label "Næsta ólesið">
 <!ENTITY nextMsgButton.label "Næsti">
 <!ENTITY previousButton.label "Fyrri">
 <!ENTITY previousButtonToolbarItem.label "Fyrri ólesin">
 <!ENTITY previousMsgButton.label "Fyrri">
 <!ENTITY backButton1.label "Til baka">
 <!ENTITY goForwardButton1.label "Áfram">
@@ -524,16 +546,17 @@
 <!ENTITY replyButton.tooltip "Svara pósti">
 <!ENTITY replyAllButton.tooltip "Svara sendanda og öllum viðtakendum">
 <!ENTITY replyListButton.tooltip "Svara póstlista">
 <!ENTITY forwardButton.tooltip "Áframsenda völdum pósti">
 <!ENTITY forwardAsInline.tooltip "Áframsenda valda pósta sem innfelldan texta">
 <!ENTITY forwardAsAttachment.tooltip "Áframsenda valda pósta sem viðhengi">
 <!ENTITY fileButton.tooltip "Vista valinn póst">
 <!ENTITY archiveButton.tooltip "Setja valinn póst í skjalageymslu">
+<!ENTITY openConversationButton.tooltip "Sýna samtal fyrir valin skilaboð">
 <!ENTITY nextButton.tooltip "Fara yfir á næsta ólesna póst">
 <!ENTITY nextMsgButton.tooltip "Fara á næstu skilaboð">
 <!ENTITY previousButton.tooltip "Fara til baka í fyrri ólesin póst">
 <!ENTITY previousMsgButton.tooltip "Fara á fyrri skilaboð">
 <!ENTITY goForwardButton.tooltip "Áfram um einn póst">
 <!ENTITY goBackButton.tooltip "Til baka um einn póst">
 <!ENTITY deleteButton.tooltip "Eyða völdum pósti eða möppu">
 <!ENTITY undeleteButton.tooltip "Endurheimta valdan póst">
@@ -716,108 +739,108 @@
 <!ENTITY contextMoveCopyMsgRecentMenu.accesskey "N">
 <!ENTITY contextCopyMsgMenu.label "Afrita í">
 <!ENTITY contextCopyMsgMenu.accesskey "A">
 <!ENTITY contextKillThreadMenu.label "Hunsa umræðu">
 <!ENTITY contextKillSubthreadMenu.accesskey "æ">
 <!ENTITY contextKillThreadMenu.accesskey "H">
 <!ENTITY contextKillSubthreadMenu.label "Hunsa undirumræðu">
 <!ENTITY contextWatchThreadMenu.label "Fylgjast með umræðu">
-<!--LOCALIZATION NOTE (contextWatchThreadMenu.accesskey):
-   In the en-US locale we ran out of access keys, so there is an empty access key for
-   Watch Thread. Localizers can pick a suitable key
+<!-- LOCALIZATION NOTE (contextWatchThreadMenu.accesskey):
+     In the en-US locale we ran out of access keys, so there is an empty access key for
+     Watch Thread. Localizers can pick a suitable key
   -->
 <!ENTITY contextWatchThreadMenu.accesskey "">
 <!ENTITY contextSaveAs.label "Vista sem…">
 <!ENTITY contextSaveAs.accesskey "s">
 <!ENTITY contextPrint.label "Prenta…">
 <!ENTITY contextPrint.accesskey "P">
 <!ENTITY contextPrintPreview.label "Prentskoðun">
 <!ENTITY contextPrintPreview.accesskey "ð">
 <!-- Thread Pane Column Picker -->
 <!-- LOCALIZATION NOTE (columnPicker.resetToInbox.label):
-   This option in the thread pane column picker causes us to reset the
-   customizations for the thread pane columns in this folder to their default.
+     This option in the thread pane column picker causes us to reset the
+     customizations for the thread pane columns in this folder to their default.
   -->
 <!ENTITY columnPicker.resetToInbox.label "Endurstilla dálka á upphafsgildi">
 <!-- LOCALIZATION NOTE (columnPicker.applyTo.label):
-   This option in the thread pane column picker pops up a sub-menu containing
-   the "columnPicker.applyToFolder.label" and
-   "columnPicker.applyToFolderAndChildren.label" options.  This item indicates
-   a desire to apply the currently displayed set of columns to some other
-   folder(s).  The sub-menu items indicate whether we want to apply it to just
-   a folder or also its children.
+     This option in the thread pane column picker pops up a sub-menu containing
+     the "columnPicker.applyToFolder.label" and
+     "columnPicker.applyToFolderAndChildren.label" options. This item indicates
+     a desire to apply the currently displayed set of columns to some other
+     folder(s). The sub-menu items indicate whether we want to apply it to just
+     a folder or also its children.
   -->
 <!ENTITY columnPicker.applyTo.label "Beita dálkum á…">
 <!-- LOCALIZATION NOTE (columnPicker.applyToFolder.label):
-   This option in the thread pane column picker is found on a sub-menu beneath
-   the "columnPicker.applyTo.label" alongside
-   "columnPicker.applyToFolderAndChildren.label".  It indicates a desire to
-   apply the currently display thread pane column settings to a single folder
-   that the user selects using the same widget as the move to/copy to
-   mechanism (via a series of popups).
+     This option in the thread pane column picker is found on a sub-menu beneath
+     the "columnPicker.applyTo.label" alongside
+     "columnPicker.applyToFolderAndChildren.label". It indicates a desire to
+     apply the currently display thread pane column settings to a single folder
+     that the user selects using the same widget as the move to/copy to
+     mechanism (via a series of popups).
   -->
 <!ENTITY columnPicker.applyToFolder.label "Möppu…">
 <!-- LOCALIZATION NOTE (columnPicker.applyToFolderAndChildren.label):
-   This option in the thread pane column picker is found on a sub-menu beneath
-   the "columnPicker.applyTo.label" alongside
-   "columnPicker.applyToFolder.label".  It indicates a desire to
-   apply the currently display thread pane column settings to a folder and all
-   of its descendents.  The user selects the folder using the same widget as the
-   move to/copy to mechanism (via a series of popups).
+     This option in the thread pane column picker is found on a sub-menu beneath
+     the "columnPicker.applyTo.label" alongside
+     "columnPicker.applyToFolder.label". It indicates a desire to
+     apply the currently display thread pane column settings to a folder and all
+     of its descendents. The user selects the folder using the same widget as the
+     move to/copy to mechanism (via a series of popups).
   -->
 <!ENTITY columnPicker.applyToFolderAndChildren.label "Möppu og undirmöppur…">
 <!-- LOCALIZATION NOTE (columnPicker.thisFolder.label):
-   This is used in the folder selection widget for the
-   "columnPicker.applyToFolder.label" and
-   "columnPicker.applyToFolderAndChildren.label" menu options.  Whenever
-   a folder has children, it results in a menu popup; the first menu item
-   in that popup is given this label to indicate that that folder should be
-   selected.  For example, if folder "A" has two children, "B" and "C", then
-   when the user hovers over "A", a new popup menu will be displayed whose
-   items are "This folder", "B", and "C".  This is the equivalent of the
-   "File here" option for the move to/copy to widge.t
+     This is used in the folder selection widget for the
+     "columnPicker.applyToFolder.label" and
+     "columnPicker.applyToFolderAndChildren.label" menu options. Whenever
+     a folder has children, it results in a menu popup; the first menu item
+     in that popup is given this label to indicate that that folder should be
+     selected. For example, if folder "A" has two children, "B" and "C", then
+     when the user hovers over "A", a new popup menu will be displayed whose
+     items are "This folder", "B", and "C". This is the equivalent of the
+     "File here" option for the move to/copy to widget.
   -->
 <!ENTITY columnPicker.thisFolder.label "Þessi mappa">
 <!-- Media (video/audio) controls -->
 <!ENTITY contextPlay.label "Spila">
 <!ENTITY contextPlay.accesskey "S">
 <!ENTITY contextPause.label "Bið">
 <!ENTITY contextPause.accesskey "B">
 <!ENTITY contextMute.label "Hljóðdeyfa">
 <!ENTITY contextMute.accesskey "H">
 <!ENTITY contextUnmute.label "Virkja hljóð">
 <!ENTITY contextUnmute.accesskey "V">
 <!-- Quick Search Bar -->
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
      not changed
-     -->
+  -->
 <!ENTITY quickSearchCmd.key "k">
 <!-- LOCALIZATION NOTE (search.label.base1):
-     This is the base of the empty text for the global search box.  We replace
+      This is the base of the empty text for the global search box. We replace
      #1 with the contents of the appropriate search.keyLabel.* value for the
      platform.
      The goal is to convey to the user that typing in the box will allow them
      to search for messages globally and that there is a hotkey they can press
-     to get to the box faster.  If the global indexer is disabled, the search
+     to get to the box faster. If the global indexer is disabled, the search
      box will be collapsed and the user will never see this message.
-     -->
+  -->
 <!ENTITY search.label.base1 "Leita #1">
 <!-- LOCALIZATION NOTE (search.keyLabel.nonmac):
      The description of the key-binding to get into the global search box on
-     windows and linux (which use the control key).  We use the key defined in
+     windows and linux (which use the control key). We use the key defined in
      the quickSearchCmd.key entity defined above, the letter should match it.
-     -->
+  -->
 <!ENTITY search.keyLabel.nonmac "&lt;Ctrl+K&gt;">
 <!-- LOCALIZATION NOTE (search.keyLabel.mac):
      The description of the key-binding to get into the global search box on mac
-     systems.  We use the key defined in the quickSearchCmd.key entity defined
+     systems. We use the key defined in the quickSearchCmd.key entity defined
      above, the letter should match it.
-     -->
+  -->
 <!ENTITY search.keyLabel.mac "&lt;&#x2318;K&gt;">
 <!-- Message Header Context Menu -->
 <!ENTITY AddToAddressBook.label "Bæta við nafnaskrá…">
 <!ENTITY AddToAddressBook.accesskey "B">
 <!ENTITY AddDirectlyToAddressBook.label "Bæta við nafnaskrá">
 <!ENTITY AddDirectlyToAddressBook.accesskey "B">
 <!ENTITY EditContact1.label "Breyta tengilið">
 <!ENTITY EditContact1.accesskey "e">
@@ -858,17 +881,17 @@
 <!ENTITY reloadCmd.label "Endurnýja">
 <!ENTITY reloadCmd.accesskey "E">
 <!ENTITY openInBrowser.label "Opna í vafra">
 <!ENTITY openInBrowser.accesskey "O">
 <!ENTITY openLinkInBrowser.label "Opna tengil í vafra">
 <!ENTITY openLinkInBrowser.accesskey "O">
 <!-- Statusbar -->
 <!ENTITY statusText.label "Ljúka">
-<!--  Mac OS X Window Menu -->
+<!-- Mac OS X Window Menu -->
 <!ENTITY minimizeWindow.label "Minnka">
 <!ENTITY minimizeWindow.key "m">
 <!ENTITY bringAllToFront.label "Endurheimta">
 <!ENTITY zoomWindow.label "Aðdráttur">
 <!-- Mac OS X Application Menu (Cocoa widgets) -->
 <!ENTITY preferencesCmdMac2.label "Valkostir">
 <!ENTITY preferencesCmdMac.commandkey ",">
 <!ENTITY preferencesCmdMac.modifiers "accel">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -191,17 +191,19 @@ priorityLow=Lágt
 priorityNormal=Venjulegt
 priorityHigh=Hátt
 priorityHighest=Hæst
 
 #Group by date thread pane titles
 today=Í dag
 yesterday=Í gær
 lastWeek=Í síðustu viku
+last7Days=Síðustu 7 dagar
 twoWeeksAgo=Fyrir tveim vikum
+last14Days=Síðustu 14 dagar
 older=Gamall póstur
 futureDate=Framtíð
 
 #Grouped By Tags
 untaggedMessages=Óflokkaður póstur
 
 # Grouped by status
 messagesWithNoStatus=Engin staða
@@ -806,8 +808,16 @@ saveAsType=%S skrá
 # search for.
 openSearch.label=Leita í %1$S að "%2$S"
 
 # LOCALIZATION NOTE (openSearch.label.truncated): The label used in the
 # autocomplete widget to refer to a search on the web for a short string
 # containing more than 15 characters. %1$S is the search provider to use. %2$S
 # is the string to search for, truncated to 15 characters.
 openSearch.label.truncated=Leita í %1$S að "%2$S…"
+
+# LOCALIZATION NOTE (aboutDialog.architecture.*):
+# The sixtyFourBit and thirtyTwoBit strings describe the architecture of the
+# current Thunderbird build: 32-bit or 64-bit. These strings are used in parentheses
+# after the Thunderbird version in the About dialog,
+# e.g.: "48.0.2 (32-bit)" or "51.0a1 (2016-09-05) (64-bit)".
+aboutDialog.architecture.sixtyFourBit=64-bita
+aboutDialog.architecture.thirtyTwoBit=32-bita
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -167,19 +167,29 @@ attachmentCount=#1 viðhengi;#1 viðhengi
 ## String used by the Initialization Error dialog
 initErrorDlogTitle=Búa til póst
 initErrorDlgMessage=Villa kom upp við að búa til nýjan póstglugga. Vinsamlega reyndu aftur.
 
 ## String used if a file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=Viðhengi
 
-## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
+## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name.
 errorFileAttachMessage=Skráin %1$S er ekki til og er þess vegna ekki bæta henni við póstinn.
 
+## String used if a file to serve as message body does not exist or cannot be loaded when passed
+## as a command line argument
+errorFileMessageTitle=Póstskrá
+
+## LOCALIZATION NOTE (errorFileMessageMessage): %1$S will be replaced by the non-existent file name.
+errorFileMessageMessage=Skráin %1$S er ekki til og er ekki hægt að nota sem meginmál.
+
+## LOCALIZATION NOTE (errorLoadFileMessageMessage): %1$S will be replaced by the name of the file that can't be loaded.
+errorLoadFileMessageMessage=Ekki tókst að hlaða inn skrá %1$S sem meginmál.
+
 ## Strings used by the Save as Draft/Template dialog
 SaveDialogTitle=Vista póst
 
 ## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
 SaveDialogMsg=Búið er að vist póstinn þinn í möppu %1$S undir %2$S.
 CheckMsg=Ekki sýna þennan glugga aftur.
 
 ## Strings used by the prompt when Quitting while in progress
@@ -258,17 +268,17 @@ renameAttachmentMessage=Nýtt nafn á viðhengi:
 ## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
 ## words that should trigger an attachment reminder.
 mail.compose.attachment_reminder_keywords=.doc,.pdf,.xls,.ppt,.rtf,.pps,viðhengi,viðhengt,fylgja með,fylgir með,ferilskrá,forsíða
 
 addAttachmentButton=Bæta við viðhengi…
 addAttachmentButton.accesskey=a
 remindLaterButton=Minna mig á seinna
 remindLaterButton.accesskey=M
-
+disableAttachmentReminderButton=Slökkva á áminningu fyrir viðhengi fyrir núverandi skilaboð
 attachmentReminderTitle=Áminning fyrir viðhengi
 attachmentReminderMsg=Gleymdirðu nokkuð að bæta við viðhengi?
 
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of keywords
 attachmentReminderKeywordsMsgs=Fann #1 stikkorð fyrir viðhengi:;Fann #1 stikkorð fyrir viðhengi:
 attachmentReminderOptionsMsg=Hægt er að stilla stikkorð fyrir áminningar í valkostum
@@ -387,8 +397,26 @@ cloudAttachmentListItem=* %1$S (%2$S) staðsett á %3$S: %4$S
 
 ## LOCALIZATION NOTE(stopShowingUploadingNotification): This string is used in the Filelink
 ## upload notification bar to allow the user to dismiss the notification permanently.
 stopShowingUploadingNotification.accesskey=n
 stopShowingUploadingNotification.label=Aldrei sýna þetta aftur
 replaceButton.label=Breyta…
 replaceButton.accesskey=B
 replaceButton.tooltip=Sýna leita og skipta út glugga
+
+## LOCALIZATION NOTE(blockedAllowResource): %S is the URL to load.
+blockedAllowResource=Opna fyrir %S
+## LOCALIZATION NOTE (blockedContentMessage): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## %S will be replaced by brandShortName.
+## Files must be unblocked individually, therefore the plural form reads:
+## Unblocking a file (one of several) will include it (that one file) in your sent message.
+## In other words:
+## Unblocking one/several file(s) will include it/them in your message.
+blockedContentMessage=%S kom í veg fyrir að skrá frá pósti væri hlaðið inn. Ef þú opnar fyrir þessa skrá þá verður hún send með póstinum.;%S kom í veg fyrir að skrám frá pósti væri hlaðið inn. Ef þú opnar fyrir þessar skrár þá verða þær sendar með póstinum.
+
+blockedContentPrefLabel=Valkostir
+blockedContentPrefAccesskey=O
+
+blockedContentPrefLabelUnix=Valkostir
+blockedContentPrefAccesskeyUnix=P
+
--- a/mail/chrome/messenger/messengercompose/sendProgress.dtd
+++ b/mail/chrome/messenger/messengercompose/sendProgress.dtd
@@ -1,8 +1,8 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
+<!--LOCALIZATION NOTE sendProgress.dtd Main UI for Send Message Progress Dialog -->
 <!ENTITY sendDialog.title "Skrái skilaboð">
 <!ENTITY status.label "Staða:">
 <!ENTITY progress.label "Framvinda:">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -1,31 +1,34 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY toField4.label "Til">
 <!ENTITY fromField4.label "Frá">
 <!ENTITY senderField4.label "Sendandi">
+<!ENTITY author.label "Höfundur">
 <!ENTITY organizationField4.label "Fyrirtæki/Stofnun">
 <!ENTITY replyToField4.label "Svara á">
 <!ENTITY subjectField4.label "Efni">
 <!ENTITY ccField4.label "Cc">
 <!ENTITY bccField4.label "Bcc">
 <!ENTITY newsgroupsField4.label "Fréttahópa">
 <!ENTITY followupToField4.label "Áframsending á">
 <!ENTITY tagsHdr4.label "Flokkar">
 <!ENTITY dateField4.label "Dagsetning">
 <!ENTITY userAgentField4.label "Notandaauðkenni">
 <!ENTITY referencesField4.label "Tilvitnanir">
 <!ENTITY messageIdField4.label "Auðkenni skeytis">
 <!ENTITY inReplyToField4.label "Svar við">
 <!ENTITY originalWebsite4.label "Vefsvæði">
 <!ENTITY hdrArchiveButton1.label "Skjalageymsla">
 <!ENTITY hdrArchiveButton1.tooltip "Setja póst í skjalageymslu">
+<!ENTITY hdrOpenConversationButton1.label "Samtal">
+<!ENTITY hdrOpenConversationButton1.tooltip "Sýna samtal fyrir skilaboð">
 <!ENTITY hdrSmartReplyButton1.label "Snjallsvar">
 <!ENTITY hdrReplyButton1.label "Svara">
 <!ENTITY hdrReplyButton2.tooltip "Svara sendanda þessa skeytis">
 <!ENTITY hdrReplyAllButton1.label "Svara öllum">
 <!ENTITY hdrReplyAllButton1.tooltip "Svara sendanda og öllum viðtakendum">
 <!ENTITY hdrReplyListButton1.label "Svarlisti">
 <!ENTITY hdrReplyListButton1.tooltip "Svara póstlista">
 <!ENTITY hdrFollowupButton1.label "Eftirfylgni">
--- a/mail/chrome/messenger/newTagDialog.dtd
+++ b/mail/chrome/messenger/newTagDialog.dtd
@@ -1,8 +1,8 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- New Tag Dialog -->
-<!ENTITY newTagDialog.title "Búa til nýjan flokk">
+<!ENTITY newTagDialog1.title "Nýtt tag">
 <!ENTITY name.label "Nafn flokks:">
 <!ENTITY name.accesskey "f">
--- a/mail/chrome/messenger/preferences/applications.dtd
+++ b/mail/chrome/messenger/preferences/applications.dtd
@@ -14,18 +14,18 @@
 <!ENTITY alwaysAsk.label "Alltaf spyrja hvar á að vista skrár">
 <!ENTITY alwaysAsk.accesskey "A">
 <!ENTITY chooseFolderWin.label "Velja…">
 <!ENTITY chooseFolderWin.accesskey "V">
 <!ENTITY chooseFolderMac.label "Velja…">
 <!ENTITY chooseFolderMac.accesskey "V">
 <!ENTITY attachments.incoming.label "Utanaðkomandi">
 <!ENTITY attachments.outgoing.label "Útsent">
-<!ENTITY addCloudFileAccount.label "Bæta við">
-<!ENTITY addCloudFileAccount.accesskey "a">
+<!ENTITY addCloudFileAccount1.label "Bæta við…">
+<!ENTITY addCloudFileAccount1.accesskey "a">
 <!ENTITY addCloudFileAccount.description "Bæta við nýrri geymsluþjónustu fyrir skrár">
 <!ENTITY removeCloudFileAccount.label "Fjarlægja">
 <!ENTITY removeCloudFileAccount.accesskey "r">
 <!ENTITY authRequired.description "Þarfnast auðkenningar til að sjá stillingar fyrir þessa geymsluþjónustu.">
 <!ENTITY authRequired.button.label "Heimila">
 <!ENTITY authRequired.button.accesskey "H">
 <!ENTITY enableCloudFileAccountOffer.label "Bjóðast til að deila stærri skrám en">
 <!ENTITY enableCloudFileAccountOffer.mb "MB">
--- a/mail/chrome/messenger/preferences/attachmentReminder.dtd
+++ b/mail/chrome/messenger/preferences/attachmentReminder.dtd
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY attachmentReminderDialog.title "Stikkorð fyrir viðhengis áminningu">
 <!ENTITY attachKeywordText.label "&brandShortName; mun vara þig við ef þú hefur gleymt að bæta við viðhengi í póst sem inniheldur eitthvað af þessum stikkorðum.">
-<!ENTITY addKeywordButton.label "Bæta við">
-<!ENTITY addKeywordButton.accesskey "a">
-<!ENTITY editKeywordButton.label "Breyta">
-<!ENTITY editKeywordButton.accesskey "e">
+<!ENTITY newKeywordButton.label "Ný…">
+<!ENTITY newKeywordButton.accesskey "N">
+<!ENTITY editKeywordButton1.label "Breyta…">
+<!ENTITY editKeywordButton1.accesskey "e">
 <!ENTITY removeKeywordButton.label "Eyða">
 <!ENTITY removeKeywordButton.accesskey "y">
--- a/mail/chrome/messenger/preferences/display.dtd
+++ b/mail/chrome/messenger/preferences/display.dtd
@@ -20,20 +20,20 @@
 <!ENTITY quotedTextColor.accesskey "L">
 <!ENTITY displayWidth.label "Ósniðinn textapóstur">
 <!ENTITY displayText.label "Þegar birtur er ósniðinn texti með tilvitnun:">
 <!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
 <!ENTITY convertEmoticons.label "Birta broskalla sem myndir">
 <!ENTITY convertEmoticons.accesskey "m">
 <!-- labels -->
 <!ENTITY displayTagsText.label "Hægt er að nota flokka til að flokka og forgangsraða póstum.">
-<!ENTITY addTagButton.label "Bæta við">
-<!ENTITY addTagButton.accesskey "B">
-<!ENTITY editTagButton.label "Breyta">
-<!ENTITY editTagButton.accesskey "e">
+<!ENTITY newTagButton.label "Ný…">
+<!ENTITY newTagButton.accesskey "N">
+<!ENTITY editTagButton1.label "Breyta…">
+<!ENTITY editTagButton1.accesskey "e">
 <!ENTITY removeTagButton.label "Eyða">
 <!ENTITY removeTagButton.accesskey "y">
 <!-- Fonts and Colors -->
 <!ENTITY fontsAndColors1.label "Letur og litir">
 <!ENTITY defaultFont.label "Sjálfgefin leturgerð:">
 <!ENTITY defaultFont.accesskey "j">
 <!ENTITY defaultSize.label "Stærð:">
 <!ENTITY defaultSize.accesskey "S">
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -37,17 +37,17 @@
 <!ENTITY font.langGroup.canadian "Unified Canadian Syllabary">
 <!ENTITY font.langGroup.ethiopic "Eþíópískt">
 <!ENTITY font.langGroup.georgian "Georgíska">
 <!ENTITY font.langGroup.gujarati "Gujarati">
 <!ENTITY font.langGroup.gurmukhi "Gurmukhi">
 <!ENTITY font.langGroup.khmer "Kmer">
 <!ENTITY font.langGroup.malayalam "Malayanskt">
 <!ENTITY font.langGroup.math "Stærðfræði">
-<!ENTITY font.langGroup.oriya "Oriya">
+<!ENTITY font.langGroup.odia "Odia">
 <!ENTITY font.langGroup.telugu "Telugu">
 <!ENTITY font.langGroup.kannada "Kannada">
 <!ENTITY font.langGroup.sinhala "Sinhala">
 <!ENTITY font.langGroup.tibetan "Tibetan">
 <!-- Minimum font size -->
 <!ENTITY minSize.label "Lágmarks leturstærð:">
 <!ENTITY minSize.accesskey "æ">
 <!ENTITY minSize.none "Engin">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -10,26 +10,26 @@
 <!ENTITY useDefault.label "Endurheimta sjálfgildi">
 <!ENTITY useDefault.accesskey "E">
 <!ENTITY changeDockIconOptions.label "Breyta stillingum fyrir app icon">
 <!ENTITY dockOptions.label "App Icon valkostir…">
 <!ENTITY dockOptions.accesskey "n">
 <!ENTITY newMessagesArrive.label "Þegar nýr póstur er móttekin:">
 <!ENTITY playSound.label "Spila hljóð">
 <!ENTITY playSound1.accesskey "h">
+<!ENTITY playSoundMac.label "Spila eftirfarandi hljóðskrá:">
+<!ENTITY playSoundMac.accesskey "d">
 <!ENTITY showAnimatedAlert.label "Sýna glugga">
 <!ENTITY showAnimatedAlert.accesskey "g">
-<!ENTITY notificationAlertSettings.label "Hægt er að gera viðvaranir óvirkar á tilkynningarflipa í kerfisvalkostum.">
+<!ENTITY notificationAlertSettings2.label "Hægt er loka á áminningar og sjálfgefið hljóð í tilkynningaflipa í kerfisstillingum.">
 <!ENTITY customizeMailAlert.label "Sérsníða…">
 <!ENTITY customizeMailAlert.accesskey "S">
 <!ENTITY showTrayIcon.label "Sýna sem táknmynd í bakka">
 <!ENTITY showTrayIcon.accesskey "t">
 <!ENTITY play.label "Spila">
 <!ENTITY play.accesskey "S">
 <!ENTITY systemsound.label "Sjálfgefið hljóð fyrir nýjan póst">
-<!ENTITY systemsoundMac.label "Kerfisviðvörunarhljóð">
-<!ENTITY systemsoundMac.accesskey "K">
 <!ENTITY systemsound.accesskey "y">
 <!ENTITY customsound.label "Nota hljóðskrá">
 <!ENTITY customsound.accesskey "N">
 <!ENTITY browse.label "Velja…">
 <!ENTITY browse.accesskey "V">
 <!ENTITY defaultSearchEngine.label "Sjálfgefin leitarvél">
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -57,18 +57,18 @@ typeDetailsWithTypeOrExt=(%1$S)
 # %2$S = extensions (for example ".pdf, .pdfx")
 typeDetailsWithTypeAndExt=(%1$S: %2$S)
 
 #### Sound Notifications
 soundFilePickerTitle=Veldu hljóð
 soundFilesDescription=Hljóðskrár
 
 #### Attachment Reminder
-attachmentReminderAddDialogTitle=Bæta við stikkorði
-attachmentReminderAddText=Stikkorð:
+attachmentReminderNewDialogTitle=Nýtt stikkorð
+attachmentReminderNewText=Stikkorð:
 attachmentReminderEditDialogTitle=Breyta stikkorði
 attachmentReminderEditText=Stikkorð:
 
 #### Remote content
 imagepermissionstext=Þú getur skilgreint hvaða vefsvæði hafa leyfi til að ná myndir og annað efni frá fjarlægum miðlum. Þú getur einnig leyft allt efni út frá tölvupóstfangi. Sláðu inn vefsvæði eða tölvupóstfang sem þú vilt vinna með og smelltu svo á Leyfa eða Hafna.
 imagepermissionstitle=Undantekningar - Fjarlægt innihald
 
 #### Cookies
@@ -95,8 +95,16 @@ cookiesFiltered=Eftirfarandi smákökur passa við leitina:
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # If you need to display the number of selected elements in your language,
 # you can use #1 in your localization as a placeholder for the number.
 # For example this is the English string with numbers:
 # removeSelectedCookies=Remove #1 Selected;Remove #1 Selected
 removeSelectedCookies=Fjarlægja valið;Fjarlægja valið
 defaultUserContextLabel=Enginn
+
+####Preferences::Advanced::Network
+#LOCALIZATION NOTE: The next string is for the disk usage of the cache.
+#   e.g., "Your cache is currently using 200 MB"
+#   %1$S = size
+#   %2$S = unit (MB, KB, etc.)
+actualDiskCacheSize=Skyndiminnið er að nota %1$S %2$S af diskplássi
+actualDiskCacheSizeCalculated=Reikna út stærð skyndiminnis…
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -25,19 +25,16 @@ localDirectoryNotAllowed=Staðbundna mappan "%1$S" er ekki nothæf fyrir skilaboðageymslu. Veldu aðra möppu.
 # do not localize "\n\n"
 cancelWizard=Ertu viss um að þú viljir loka reikningahjálpinni?\n\nEf þú lokar núna, munu allar þær upplýsingar sem þú slóst inn tapast og engir reikningar verða búnir til.
 accountWizard=Reikningahjálp
 WizardExit=Loka
 WizardContinue=Hætta við
 # when the wizard already has a domain (Should we say something different?)
 enterValidServerName=Sláðu inn nafn á netþjóni.
 failedRemoveAccount=Gat ekki fjarlægt þennan reikning.
-#LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
-confirmRemoveAccount=Ertu viss um að þú viljir eyða þessum reikningi "%S"?
-confirmRemoveAccountTitle=Fjarlægja reikning
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 # LOCALIZATION NOTE: confirmDeferAccountWarning: do not localize "\n\n", it means a new empty line in the string.
 confirmDeferAccountWarning=Ef þú geymir nýjan póst fyrir þennan reikning í innhólfi á öðrum reikningi, muntu ekki lengur hafa aðgang að þeim pósti sem þegar hefur verið náð í. Ef þú ert með einhvern póst í þessum reikningi, afritaðu póstinn þá fyrst yfir í annann reikning.\n\nEf þú ert með síur sem sía póst fyrir þennan reikning, er betra að taka þær af eða breyta endamöppu. Ef einhverjir reikningar eru með sérstakar möppur á þessum reikningi (Sent, Drög, Sniðmát, Skjalageymsla, Rusl), ættirðu að breyta þeim þannig að þær séu í öðrum reikningi.\n\nViltu samt geyma póstinn sem er í þessum reikningi í öðrum reikningi?
 confirmDeferAccountTitle=Flytja reikning annað?
 
 directoryAlreadyUsedByOtherAccount=Mappan sem er skilgreind í stillingum fyir staðbundna möppu er þegar í notkun af "%S" reikningnum. Veldu aðra möppu.
@@ -61,16 +58,20 @@ prefPanel-addressing=Samsetning bréfa og póstföng
 prefPanel-junk=Ruslpóstsstillingar
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
 prefPanel-smtp=Póstþjónn út (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S
 identity-list-title=Auðkenni fyrir %1$S
 
+identityDialogTitleAdd=Nýtt auðkenni
+## LOCALIZATION NOTE (identityDialogTitleEdit): %S is the identity name
+identityDialogTitleEdit=Breyta %s
+
 identity-edit-req=Þú verður að skilgreina gilt tölvupóstfang fyrir þetta skilríki.
 identity-edit-req-title=Villa við að búa til auðkenni
 
 ## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
 # and should be put on a new line. The new line is produced with the "\n" string.
 identity-delete-confirm=Ertu viss um að þú viljir eyða auðkenni\n%S?
 ## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
 identity-delete-confirm-title=Eyði auðkenni fyrir %S
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/removeaccount.dtd
@@ -0,0 +1,19 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY dialogTitle "Fjarlægja reikning og gögn">
+<!ENTITY removeButton.label "Fjarlægja">
+<!ENTITY removeButton.accesskey "r">
+<!ENTITY removeAccount.label "Fjarlægja upplýsingar reiknings">
+<!ENTITY removeAccount.accesskey "a">
+<!ENTITY removeAccount.desc "Fjarlægir aðeins upplýsingar sem &brandShortName; hefur fyrir þennan reikning. Hefur ekki áhrif á reikninginn sjálfan á netþjóninum.">
+<!ENTITY removeData.label "Fjarlægja gögn fyrir skilaboð">
+<!ENTITY removeData.accesskey "ð">
+<!ENTITY removeDataLocalAccount.desc "Fjarlægir öll skilaboð, möppur og síur fyrir þennan reikning frá staðbundnum diski. Þetta hefur ekki áhrif á skilaboð sem gætu ennþá verið á netþjóni. Ekki velja þetta ef þú ætlar að geyma staðbundin gögn eða endurnota þau í &brandShortName; seinna.">
+<!ENTITY removeDataServerAccount.desc "Fjarlægir öll skilaboð, möppur og síur fyrir þennan reikning frá staðbundnum diski. Skilaboð og möppur verða ennþá til á netþjóni.">
+<!ENTITY showData.label "Sýna staðsetningu gagna">
+<!ENTITY showData.accesskey "S">
+<!ENTITY progressPending "Fjarlægi valin gögn…">
+<!ENTITY progressSuccess "Tókst að fjarlægja.">
+<!ENTITY progressFailure "Ekki tókst að fjarlægja.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/removeaccount.properties
@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+removeQuestion=Ertu viss um að þú viljir eyða þessum reikningi "%S"?
--- a/other-licenses/branding/thunderbird/brand.dtd
+++ b/other-licenses/branding/thunderbird/brand.dtd
@@ -1,8 +1,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!ENTITY brandShortName "Thunderbird">
+<!ENTITY brandShorterName "Thunderbird">
 <!ENTITY brandFullName "Mozilla Thunderbird">
 <!ENTITY vendorShortName "Mozilla">
 <!ENTITY trademarkInfo.part1 "Mozilla Thunderbird og Thunderbird nafnmerkið
                                  eru vörumerki Mozilla stofnunarinnar.">
--- a/other-licenses/branding/thunderbird/brand.properties
+++ b/other-licenses/branding/thunderbird/brand.properties
@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 brandShortName=Thunderbird
+brandShorterName=Thunderbird
 brandFullName=Mozilla Thunderbird
 vendorShortName=Mozilla