Sync with en-US
authorKevin Scannell <kscanne@gmail.com>
Tue, 05 Oct 2010 00:19:23 -0500
changeset 132 675bc939abdb4788079f8a4dd1ea675943c40480
parent 125 45fcc8b31418c66e5e4b2b0c8522debb3a149f68
child 133 3a8510b34858fa8e97f3b36fdc68bac12be6a92f
push id108
push userkscanne@gmail.com
push dateTue, 05 Oct 2010 05:18:44 +0000
Sync with en-US
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/pageReportFirstTime.dtd
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/search.properties
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/overrides/netError.dtd
browser/feedback/main.dtd
dom/chrome/dom/dom.properties
dom/chrome/netError.dtd
other-licenses/branding/firefox/brand.dtd
security/manager/chrome/pipnss/nsserrors.properties
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/commonDialogs.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/chrome/passwordmgr/passwordmgr.properties
toolkit/crashreporter/crashreporter.ini
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,11 +1,56 @@
 <!ENTITY aboutDialog.title "Maidir le &brandFullName;">
-<!ENTITY copyright "Admhálacha">
-<!ENTITY copyright.accesskey "C">
-<!ENTITY copyrightGNOME.accesskey "r">
-<!ENTITY aboutLink "&lt; Maidir le &brandFullName;">
-<!ENTITY aboutLink.accesskey "W">
-<!ENTITY aboutVersion "leagan">
-<!ENTITY closeCmdGNOME.label "Dún">
-<!ENTITY closeCmdGNOME.accesskey "D">
-<!ENTITY licenseLinkText "Ceadúnú">
-<!ENTITY licenseLinkSuffix ".">
+
+<!ENTITY community.start2 "Bhí &brandShortName; cruthaithe ag ">
+<!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.mozillaLink "&vendorShortName;">
+<!ENTITY community.middle2 ", ">
+<!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
+<!ENTITY community.creditsLink "comhphobal domhanda">
+<!ENTITY community.end2 " atá ag cur le chéile chun feabhas a chur ar an Idirlíon.  Creidimid gur chóir don Idirlíon a bheith oscailte, poiblí, agus ar fáil do chách gan srian ar bith.">
+
+<!ENTITY contribute.start "Suimiúil? ">
+<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY contribute.getInvolvedLink "Bí linn!">
+<!ENTITY contribute.end "">
+<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
+
+<!ENTITY bottomLinks.license "Maidir leis an gCeadúnas">
+<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
+
+<!ENTITY bottomLinks.rights "Cearta an Úsáideora">
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+
+<!ENTITY bottomLinks.privacy "Polasaí Príobháideachta">
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.checkingForUpdates "Nuashonruithe á lorg…">
+<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingAddonCompat "Comhoiriúnacht na mBreiseán á Seiceáil…">
+<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.noUpdatesFound "Tá &brandShortName; cothrom le dáta">
+<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.adminDisabled "Tá nuashonruithe bogearra díchumasaithe ag riarthóir do chórais">
+<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
+     update.failed.start, update.failed.linkText, and update.failed.end all go into
+     one line with linkText being wrapped in an anchor that links to a site to download
+     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
+     one line, try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.failed.start "Theip ar an nuashonrú. ">
+<!ENTITY update.failed.linkText "Íosluchtaigh an leagan is déanaí">
+<!ENTITY update.failed.end "">
+<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
+     all go into one line and have an anchor in between with text that is the same as the link to a site
+     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
+     try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.manual.start "Nuashonruithe ar fáil ó ">
+<!ENTITY update.manual.end "">
+<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
+     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
+     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
+     the "em dash" (long dash).
+     example: Downloading update — 111 KB of 13 MB -->
+
+<!ENTITY update.downloading.start "Nuashonrú á íosluchtú — ">
+<!ENTITY update.downloading.end "">
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,19 +1,27 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 <!-- These strings are used in the about:home page -->
 
 
 <!ENTITY abouthome.pageTitle "Leathanach Tosaigh &brandFullName;">
-<!ENTITY abouthome.brandLogo.title "Lógó &brandFullName;">
-<!-- LOCALIZATION NOTE (brandStart): brandShortName must be in a <span/> -->
+<!-- LOCALIZATION NOTE (abouthome.brandStart):
+     brandShortName must be in a <span/>
+-->
 
 <!ENTITY abouthome.brandStart "Tosach <span>&brandShortName;</span>">
 
-<!ENTITY abouthome.searchEngineLogo.title "Lógó innill chuardaigh">
-
 <!ENTITY abouthome.searchEngineButton.label "Cuardach">
 
 <!ENTITY abouthome.searchEngineLinks.advanced "Cuardach Casta">
 <!ENTITY abouthome.searchEngineLinks.preferences "Sainroghanna">
 
 <!ENTITY abouthome.aboutMozilla "Maidir le Mozilla">
+<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
+     text in <a/> will be linked to the Firefox features page on mozilla.com
+-->
+
+<!ENTITY abouthome.defaultSnippet1.v1 "Go raibh maith agat as Firefox a roghnú!  Leis an tairbhe is mó a bhaint as do bhrabhsálaí, féach ar <a>na gnéithe is déanaí</a>.">
+<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
+     text in <a/> will be linked to the featured add-ons on addons.mozilla.org
+-->
+<!ENTITY abouthome.defaultSnippet2.v1 "Cuir Firefox in oiriúint duit féin. <a>Roghnaigh ó na mílte breiseán</a>.">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -9,14 +9,16 @@
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryAfter): include a starting space as needed -->
 
 <!ENTITY privatebrowsingpage.clearRecentHistoryBefore "B'fhéidir gur cheart duit tosú trí ">
 <!ENTITY privatebrowsingpage.clearRecentHistoryInner "do stair le déanaí a ghlanadh">
 <!ENTITY privatebrowsingpage.clearRecentHistoryAfter ".">
 
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.label "Tosaigh Brabhsáil Phríobháideach">
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey "P">
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->
 
-<!ENTITY privatebrowsingpage.howToStop "Chun Brabhsáil Phríobháideach a stopadh, roghnaigh &toolsMenu.label; &gt; &privateBrowsingCmd.stop.label;, nó dún &brandShortName;.">
-<!ENTITY privatebrowsingpage.howToStart "Chun Brabhsáil Phríobhaideach a thosú, is féidir leat &toolsMenu.label; &gt; &privateBrowsingCmd.start.label; a roghnú freisin.">
+<!ENTITY privatebrowsingpage.howToStop2 "Chun Brabhsáil Phríobháideach a stopadh, roghnaigh &basePBMenu.label; &gt; &privateBrowsingCmd.stop.label;, nó dún &brandShortName;.">
+<!ENTITY privatebrowsingpage.howToStart2 "Chun Brabhsáil Phríobháideach a thosú, is féidir leat &basePBMenu.label; &gt; &privateBrowsingCmd.start.label; a roghnú freisin.">
 
 <!ENTITY privatebrowsingpage.moreInfo "Cé nach mbeidh taifead de do stair bhrabhsála ar an ríomhaire seo, is féidir le do sholáthraí seirbhíse Idirlín nó d'fhostóir bheith ag breathnú ar na leathanaigh a thugann tú cuairt orthu.">
 <!ENTITY privatebrowsingpage.learnMore "Faigh Tuilleadh Eolais">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -12,16 +12,18 @@
 <!ENTITY helpMenuWin.accesskey "h">
 <!ENTITY aboutProduct.label "Maidir le &brandShortName;">
 <!ENTITY aboutProduct.accesskey "M">
 <!ENTITY productHelp.label "Cabhair &brandShortName;">
 <!ENTITY productHelp.accesskey "h">
 <!ENTITY helpForIEUsers.label "D'úsáideoirí Internet Explorer">
 <!ENTITY helpForIEUsers.accesskey "I">
 <!ENTITY helpMac.commandkey "?">
+<!ENTITY helpSafeMode.label "Atosaigh gan aon bhreiseáin…">
+<!ENTITY helpSafeMode.accesskey "A">
 
 <!ENTITY helpReleaseNotes.label "Nótaí Eisiúna">
 <!ENTITY helpReleaseNotes.accesskey "N">
 
 <!ENTITY helpTroubleshootingInfo.label "Fabhtcheartú">
 <!ENTITY helpTroubleshootingInfo.accesskey "t">
 
 <!ENTITY helpFeedbackPage.label "Seol Aiseolas Chugainn…">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -13,27 +13,31 @@
 <!-- Tab context menu -->
 
 <!ENTITY reloadTab.label "Athluchtaigh Cluaisín">
 <!ENTITY reloadTab.accesskey "A">
 <!ENTITY reloadAllTabs.label "Athluchtaigh Gach Cluaisín">
 <!ENTITY reloadAllTabs.accesskey "G">
 <!ENTITY closeOtherTabs.label "Dún Cluaisíní Eile">
 <!ENTITY closeOtherTabs.accesskey "E">
-<!ENTITY openTabInNewWindow.label "Oscail i bhFuinneog Nua">
-<!ENTITY openTabInNewWindow.accesskey "F">
-<!ENTITY pinTab.label "Déan Feidhmchluaisín As">
-<!ENTITY pinTab.accesskey "F">
-<!ENTITY unpinTab.label "Déan Gnáthchluaisín As">
-<!ENTITY unpinTab.accesskey "G">
+<!-- LOCALIZATION NOTE (pinAppTab.label, unpinAppTab.label): "Pin" is being
+used as a metaphor for expressing the fact that these tabs are "pinned" to the
+left edge of the tabstrip. Really we just want the string to express the idea
+that this is a lightweight and reversible action that keeps your tab where you
+can reach it easily. -->
+
+<!ENTITY pinAppTab.label "Déan Feidhmchluaisín As">
+<!ENTITY pinAppTab.accesskey "F">
+<!ENTITY unpinAppTab.label "Déan Gnáthchluaisín As">
+<!ENTITY unpinAppTab.accesskey "G">
 <!ENTITY moveToGroup.label "Bog go Grúpa">
 <!ENTITY moveToGroup.accesskey "B">
 <!ENTITY moveToNewGroup.label "Grúpa Nua">
-<!ENTITY bookmarkThisTab.label "Cruthaigh Leabharmharc don Chluaisín Seo">
-<!ENTITY bookmarkThisTab.accesskey "b">
+<!ENTITY moveToNewWindow.label "Bog go Fuinneog Nua">
+<!ENTITY moveToNewWindow.accesskey "N">
 <!ENTITY bookmarkAllTabs.label "Leabharmharcáil Gach Cluaisín…">
 <!ENTITY bookmarkAllTabs.accesskey "C">
 <!ENTITY undoCloseTab.label "Cealaigh Dúnadh an Chluaisín">
 <!ENTITY undoCloseTab.accesskey "C">
 <!ENTITY closeTab.label "Dún Cluaisín">
 <!ENTITY closeTab.accesskey "D">
 
 <!ENTITY listAllTabs.label "Liostaigh gach cluaisín">
@@ -61,18 +65,18 @@
 
 <!ENTITY menubarCmd.label "Barra Roghchláir">
 <!ENTITY menubarCmd.accesskey "B">
 <!ENTITY navbarCmd.label "Barra Nascleanúna">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Barra Leabharmharc">
 <!ENTITY personalbarCmd.accesskey "B">
 <!ENTITY bookmarksToolbarItem.label "Rudaí ar an Bharra Leabharmharc">
-<!ENTITY taskbarCmd.label "Barra Stádais">
-<!ENTITY taskbarCmd.accesskey "B">
+<!ENTITY addonBarCmd.label "Barra na mBreiseán">
+<!ENTITY addonBarCmd.accesskey "B">
 
 <!ENTITY pageSourceCmd.label "Foinse an Leathanaigh">
 <!ENTITY pageSourceCmd.accesskey "F">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Eolas Leathanaigh">
 <!ENTITY pageInfoCmd.accesskey "s">
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY fullScreenCmd.label "Lánscáileán">
@@ -94,17 +98,17 @@
 
 <!ENTITY bookmarksMenu.label "Leabharmharcanna">
 <!ENTITY bookmarksMenu.accesskey "L">
 <!ENTITY bookmarkThisPageCmd.label "Cruthaigh Leabharmharc don Leathanach Seo">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY subscribeToPageMenupopup.label "Liostáil leis an Leathanach Seo">
 <!ENTITY subscribeToPageMenuitem.label "Liostáil leis an Leathanach Seo…">
 <!ENTITY addCurPagesCmd.label "Leabharmharcáil Gach Cluaisín…">
-<!ENTITY organizeBookmarks.label "Eagraigh Leabharmharcanna…">
+<!ENTITY showAllBookmarks.label "Taispeáin Gach Leabharmharc…">
 <!ENTITY bookmarkAllCmd.label "Leabharmharcáil Gach Cluaisín…">
 <!ENTITY bookmarksToolbarChevron.tooltip "Tuilleadh leabharmharcanna">
 
 <!ENTITY backCmd.label "Siar">
 <!ENTITY backCmd.accesskey "S">
 <!ENTITY backButton.tooltip "Leathanach amháin siar">
 <!ENTITY forwardCmd.label "Ar Aghaidh">
 <!ENTITY forwardCmd.accesskey "A">
@@ -113,30 +117,35 @@
 <!ENTITY reloadCmd.label "Athluchtaigh">
 <!ENTITY reloadCmd.accesskey "A">
 <!ENTITY reloadButton.tooltip "Athluchtaigh an leathanach reatha">
 <!ENTITY stopCmd.label "Stad">
 <!ENTITY stopCmd.accesskey "S">
 <!ENTITY stopCmd.macCommandKey ".">
 <!ENTITY stopButton.tooltip "Éirigh as an leathanach seo a luchtú">
 <!ENTITY goEndCap.tooltip "Téigh go dtí an seoladh atá sa Bharra Suímh">
-<!ENTITY feedButton.tooltip "Liostáil leis an leathanach seo…">
 <!ENTITY printButton.label "Priontáil">
 <!ENTITY printButton.tooltip "Priontáil an leathanach seo">
 
 <!ENTITY backForwardItem.title "Siar/Ar Aghaidh">
 <!ENTITY locationItem.title "Suíomh">
 <!ENTITY searchItem.title "Cuardach">
 <!ENTITY throbberItem.title "Táscaire Gníomhaíochta">
 <!ENTITY bookmarksItem.title "Leabharmharcanna">
 <!-- Toolbar items --> 
 
+<!ENTITY appMenuButton.label "Roghchlár">
+<!ENTITY appMenuButton.tooltip "Oscail roghchlár &brandShortName;">
 <!ENTITY homeButton.label "Baile">
-<!ENTITY tabViewButton2.label "Grúpaí Cluaisíní">
-<!ENTITY tabViewButton2.tooltip "Grúpáil Do Chluaisíní">
+
+<!ENTITY tabGroupsButton.label "Grúpaí Cluaisíní">
+<!ENTITY tabGroupsButton.tooltip "Grúpáil do chuid cluaisíní">
+
+<!ENTITY feedButton.label "Liostáil">
+<!ENTITY feedButton.tooltip "Liostáil leis an leathanach seo…">
 
 <!ENTITY bookmarksButton.label "Leabharmharcanna">
 <!ENTITY bookmarksButton.tooltip "Taispeáin do leabharmharcanna">
 <!ENTITY bookmarksButton.accesskey "L">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label "Leabharmharcanna">
 <!ENTITY bookmarksMenuButton.tooltip "Taispeáin do leabharmharcanna">
@@ -163,16 +172,17 @@
 <!ENTITY search.accesskey "C">
 <!ENTITY downloads.label "Íosluchtú">
 <!ENTITY downloads.tooltip "Léiríonn dul chun cinn na luchtuithe reatha">
 <!ENTITY downloads.accesskey "l">
 <!ENTITY downloads.commandkey "j">
 <!ENTITY downloadsUnix.commandkey "y">
 <!ENTITY addons.label "Breiseáin">
 <!ENTITY addons.accesskey "B">
+<!ENTITY addons.commandkey "A">
 
 <!ENTITY errorConsoleCmd.label "Consól Earráide">
 <!ENTITY errorConsoleCmd.accesskey "E">
 <!ENTITY errorConsoleCmd.commandkey "j">
 
 <!ENTITY webConsoleCmd.label "Consól Gréasáin">
 <!ENTITY webConsoleCmd.accesskey "G">
 <!ENTITY webConsoleCmd.commandkey "k">
@@ -239,76 +249,78 @@
 <!ENTITY privateBrowsingCmd.start.label "Tosaigh Brabhsáil Phríobháideach">
 <!ENTITY privateBrowsingCmd.start.accesskey "P">
 <!ENTITY privateBrowsingCmd.stop.label "Stop Brabhsáil Phríobháideach">
 <!ENTITY privateBrowsingCmd.stop.accesskey "P">
 <!ENTITY privateBrowsingCmd.commandkey "R">
 
 <!ENTITY viewMenu.label "Amharc">
 <!ENTITY viewMenu.accesskey "A">
-<!ENTITY showTabView2.label "Grúpáil Do Chluaisíní…">
-<!ENTITY showTabView2.accesskey "G">
+<!ENTITY viewTabGroups.label "Grúpaí Cluaisíní">
+<!ENTITY viewTabGroups.accesskey "G">
 <!ENTITY viewToolbarsMenu.label "Barraí Uirlisí">
 <!ENTITY viewToolbarsMenu.accesskey "U">
 <!ENTITY viewSidebarMenu.label "Barra Taoibh">
 <!ENTITY viewSidebarMenu.accesskey "T">
 <!ENTITY viewCustomizeToolbar.label "Saincheap…">
 <!ENTITY viewCustomizeToolbar.accesskey "c">
 <!ENTITY viewTabsOnTop.label "Cluaisíní ar Barr">
 <!ENTITY viewTabsOnTop.accesskey "C">
 
 <!ENTITY historyMenu.label "Stair">
 <!ENTITY historyMenu.accesskey "i">
 <!ENTITY historyUndoMenu.label "Cluaisíní a Dúnadh Le Déanaí">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "Fuinneoga a Dúnadh Le Déanaí">
+<!ENTITY historyRestoreLastSession.label "Athchóirigh an Seisiún Roimhe Seo">
 
 <!ENTITY historyHomeCmd.label "Baile">
 <!ENTITY showAllHistoryCmd2.label "Taispeáin an Stair Iomlán">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
+<!ENTITY appMenuEdit.label "Eagar">
 <!ENTITY appMenuCustomize.label "Saincheap">
 <!ENTITY appMenuToolbarLayout.label "Leagan Amach an Bharra Uirlisí…">
 <!ENTITY appMenuSidebars.label "Barraí Taoibh">
 <!ENTITY appMenuFind.label "Aimsigh…">
 <!ENTITY appMenuUnsorted.label "Leabharmharcanna Gan Sórtáil">
+<!ENTITY appMenuWebDeveloper.label "Forbróir Gréasáin">
 <!ENTITY appMenuGettingStarted.label "Tús Maith">
-
-<!ENTITY developerMenu.label "Forbróir">
+<!ENTITY appMenuSafeMode.label "Atosaigh gan aon bhreiseáin…">
+<!ENTITY appMenuSafeMode.accesskey "A">
 
 <!ENTITY openCmd.commandkey "l">
 <!ENTITY urlbar.placeholder "Téigh go Suíomh Gréasáin">
 <!ENTITY urlbar.accesskey "m">
 <!ENTITY urlbar.switchToTab.label "Téigh go cluaisín:">
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
 
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
-  Mac:  Ctrl+K (cross platform binding)
+  Mac:  Cmd+K (cross platform binding)
+        Cmd+Opt+F (platform convention)
   Win:  Ctrl+K (cross platform binding)
-        Ctrl+E (IE compat) 
 
   We support Ctrl+K on all platforms now and advertise it in the menu since it is
   our standard - it is a "safe" choice since it is near no harmful keys like "W" as
   "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
   system setting to use emacs emulation, and we should respect it. Focus-Search-Box
   is a fundamental keybinding and we are maintaining a XP binding so that it is easy
   for people to switch to Linux.
 
-  Do *not* tamper with these values without talking to ben@mozilla.org
-
  -->
 
 <!ENTITY searchFocus.commandkey "k">
-<!ENTITY searchFocus.commandkey2 "e">
 <!ENTITY searchFocusUnix.commandkey "j">
 
+<!ENTITY tabView.commandkey "e">
+
 <!ENTITY openLinkCmdInTab.label "Oscail an Nasc i gCluaisín Nua">
 <!ENTITY openLinkCmdInTab.accesskey "C">
 <!ENTITY openLinkCmd.label "Oscail an Nasc i bhFuinneog Nua">
 <!ENTITY openLinkCmd.accesskey "F">
 <!ENTITY openLinkCmdInCurrent.label "Oscail Nasc">
 <!ENTITY openLinkCmdInCurrent.accesskey "O">
 <!ENTITY openFrameCmdInTab.label "Oscail an Fráma i gCluaisín Nua">
 <!ENTITY openFrameCmdInTab.accesskey "C">
@@ -439,18 +451,23 @@ you can use these alternative items. Oth
 
 <!ENTITY newTabButton.tooltip "Oscail cluaisín nua">
 <!ENTITY newWindowButton.tooltip "Oscail fuinneog nua">
 <!ENTITY sidebarCloseButton.tooltip "Dún an barra taoibh">
 
 <!ENTITY cutButton.tooltip "Gearr">
 <!ENTITY copyButton.tooltip "Cóipeáil">
 <!ENTITY pasteButton.tooltip "Greamaigh">
+
 <!ENTITY fullScreenButton.tooltip "Taispeáin an fhuinneog sa scáileán iomlán">
 
+<!ENTITY zoomOutButton.tooltip "Súmáil amach">
+<!ENTITY zoomInButton.tooltip "Súmáil isteach">
+<!ENTITY zoomControls.label "Rialtáin Súmála">
+
 <!ENTITY quitApplicationCmdWin.label "Scoir">
 <!ENTITY quitApplicationCmdWin.accesskey "S">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY quitApplicationCmd.label "Scoir">
 <!ENTITY quitApplicationCmd.accesskey "S">
 <!ENTITY quitApplicationCmdMac.label "Scoir &brandShortName;">
 <!ENTITY quitApplicationCmdMac.key "Q">
@@ -473,17 +490,17 @@ you can use these alternative items. Oth
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
 <!ENTITY editPopupSettingsUnix.label "Eagraigh Sainroghanna do Bhacadh na bPreabfhuinneog…">
 <!ENTITY editPopupSettings.label "Eagraigh Roghanna do Bhacadh na bPreabfhuinneog…">
 <!ENTITY editPopupSettings.accesskey "E">
 <!ENTITY dontShowMessage.accesskey "D">
 
 <!ENTITY bidiSwitchPageDirectionItem.label "Athraigh Treo an Leathanaigh">
-<!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
+<!ENTITY bidiSwitchPageDirectionItem.accesskey "L">
 <!ENTITY bidiSwitchTextDirectionItem.label "Athraigh Treo an Téacs">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey "T">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
 
 <!ENTITY findOnCmd.label "Aimsigh sa Leathanach Seo…">
 <!ENTITY findOnCmd.accesskey "A">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label "Aimsigh Arís">
@@ -526,20 +543,13 @@ just addresses the organization to follo
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Cluaisíní brabhsálaí">
 <!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
 
 <!ENTITY syncTabsMenu.label "Cluaisíní ó Ríomhairí Eile">
 
 <!ENTITY syncBrand.shortName.label "Sync">
 
-<!ENTITY syncMenu.label "&syncBrand.shortName.label;">
-<!-- LOCALIZATION NOTE (sync.menu.accesskey): This is part of the tools menu, so
-                                              don't use a conflicting access key -->
-<!ENTITY syncMenu.accesskey "Y">
 <!ENTITY syncSetup.label "Socraigh &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey "Y">
-<!ENTITY syncLogInItem.label "Ceangail">
-<!ENTITY syncLogInItem.accesskey "C">
-<!ENTITY syncLogOutItem.label "Dícheangail">
-<!ENTITY syncLogOutItem.accesskey "D">
 <!ENTITY syncSyncNowItem.label "Sioncrónaigh Anois">
 <!ENTITY syncSyncNowItem.accesskey "S">
+<!ENTITY syncToolbarButton.label "Sync">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -28,16 +28,26 @@ xpinstallPromptAllowButton=Ceadaigh
 # Be sure you do not choose an accesskey that is used elsewhere in the active context (e.g. main menu bar, submenu of the warning popup button)
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey=A
 xpinstallDisabledMessageLocked=Tá suiteáil bhogearraí díchumasaithe ag riarthóir do chórais.
 xpinstallDisabledMessage=Tá suiteáil bhogearraí díchumasaithe faoi láthair. Cliceáil Cumasaigh agus déan iarracht eile.
 xpinstallDisabledButton=Cumasaigh
 xpinstallDisabledButton.accesskey=n
 
+# LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
+addonDownloading=Add-on downloading;Add-ons downloading
+addonDownloadCancelled=Add-on download cancelled.;Add-on downloads cancelled.
+addonDownloadRestart=Restart Download;Restart Downloads
+addonDownloadRestart.accessKey=R
+addonDownloadCancelTooltip=Cealaigh
+
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 addonsInstalled=D'éirigh le suiteáil #1.;D'éirigh le suiteáil #2 bhreiseán.;D'éirigh le suiteáil #2 bhreiseán.;D'éirigh le suiteáil #2 mbreiseán.;D'éirigh le suiteáil #2 breiseán.
 addonsInstalledNeedsRestart=Beidh #1 suiteáilte tar éis duit #3 a atosú.;Beidh #2 bhreiseán suiteáilte tar éis duit #3 a atosú;Beidh #2 bhreiseán suiteáilte tar éis duit #3 a atosú;Beidh #2 mbreiseán suiteáilte tar éis duit #3 a atosú;Beidh #2 breiseán suiteáilte tar éis duit #3 a atosú
 addonInstallRestartButton=Atosaigh Anois
 addonInstallRestartButton.accesskey=R
@@ -68,26 +78,31 @@ lwthemeInstallRequest.allowButton=Ceadai
 lwthemeInstallRequest.allowButton.accesskey=a
 
 lwthemePostInstallNotification.message=Suiteáladh téama nua.
 lwthemePostInstallNotification.undoButton=Cealaigh
 lwthemePostInstallNotification.undoButton.accesskey=U
 lwthemePostInstallNotification.manageButton=Bainistigh Téamaí…
 lwthemePostInstallNotification.manageButton.accesskey=B
 
+# LOCALIZATION NOTE (lwthemeNeedsRestart.message):
+# %S will be replaced with the new theme name.
+lwthemeNeedsRestart.message=Beidh %S suiteáilte tar éis duit atosú.
+lwthemeNeedsRestart.button=Atosaigh Anois
+lwthemeNeedsRestart.accesskey=A
+
 popupWarning=Níor lig %S don suíomh seo preabfhuinneog a oscailt.
 popupWarningMultiple=Níor lig %S don suíomh seo %S preabfhuinneog a oscailt.
 popupWarningButton=Roghanna
 popupWarningButton.accesskey=O
 popupWarningButtonUnix=Sainroghanna
 popupWarningButtonUnix.accesskey=R
 popupAllow=Ceadaigh preabfhuinneoga do %S
 popupBlock=Cuir cosc ar phreabfhuinneoga do %S
 popupWarningDontShowFromMessage=Ná taispeáin an teachtaireacht seo má tá cosc ar phreabfhuinneoga
-popupWarningDontShowFromStatusbar=Ná taispeáin teachtaireacht eolais má tá cosc ar phreabfhuinneoga
 popupShowPopupPrefix=Taispeáin "%S"
 
 # missing plugin installer
 missingpluginsMessage.title=Tá forlíontáin eile ag teastáil chun na meáin uile ar an leathanach seo a thaispeáint.
 missingpluginsMessage.button.label=Suiteáil na forlíontáin ar iarraidh…
 missingpluginsMessage.button.accesskey=I
 outdatedpluginsMessage.title=Tá cuid de na forlíontáin a úsáideann an leathanach seo as dáta.
 outdatedpluginsMessage.updateButton.label=Nuashonraigh Forlíontáin…
@@ -119,27 +134,46 @@ sanitizeEverythingWarning2=Glanfar an stair go léir.
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=Glanfar gach mír roghnaithe.
 
 # Check for Updates
 # LOCALIZATION NOTE (updatesItem_*): these are alternative labels for Check for Update item in Help menu.
 # Which one is used depends on Update process state.
 updatesItem_default=Lorg Nuashonruithe…
 updatesItem_defaultFallback=Lorg Nuashonruithe…
-updatesItem_default.accesskey=C
+updatesItem_default.accesskey=L
 updatesItem_downloading=%S á íosluchtú…
 updatesItem_downloadingFallback=Nuashonrú á Íosluchtú…
-updatesItem_downloading.accesskey=D
+updatesItem_downloading.accesskey=L
 updatesItem_resume=Lean le híosluchtú %S…
 updatesItem_resumeFallback=Lean le híosluchtú an nuashonraithe…
 updatesItem_resume.accesskey=D
 updatesItem_pending=Cuir an nuashonrú íosluchtaithe i bhfeidhm anois…
 updatesItem_pendingFallback=Cuir an nuashonrú íosluchtaithe i bhfeidhm anois…
 updatesItem_pending.accesskey=D
 
+# Check for Updates in the About Dialog - button labels and accesskeys
+# LOCALIZATION NOTE - all of the following update buttons labels will only be
+# displayed one at a time. So, if a button is displayed nothing else will
+# be displayed alongside of the button. The button when displayed is located
+# directly under the Firefox version in the about dialog (see bug 596813 for
+# screenshots).
+update.checkInsideButton.label=Lorg Nuashonruithe
+update.checkInsideButton.accesskey=L
+update.resumeButton.label=Lean le híosluchtú %S…
+update.resumeButton.accesskey=L
+update.openUpdateUI.applyButton.label=Cuir Nuashonrú i bhFeidhm…
+update.openUpdateUI.applyButton.accesskey=F
+update.restart.applyButton.label=Cuir Nuashonrú i bhFeidhm
+update.restart.applyButton.accesskey=F
+update.openUpdateUI.upgradeButton.label=Uasghrádaigh Anois…
+update.openUpdateUI.upgradeButton.accesskey=U
+update.restart.upgradeButton.label=Uasghrádaigh Anois
+update.restart.upgradeButton.accesskey=U
+
 # RSS Pretty Print
 feedShowFeedNew=Liostáil le "%S"…
 
 menuOpenAllInTabs.label=Oscail gach rud i gcluaisíní
 
 # History menu
 menuRestoreAllTabs.label=Athchóirigh Gach Cluaisín
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
@@ -151,16 +185,19 @@ menuRestoreAllWindows.label=Athchóirigh Gach Fuinneog
 menuUndoCloseWindowLabel=#1 (agus #2 chluaisín eile);#1 (agus #2 chluaisín eile);#1 (agus #2 chluaisín eile);#1 (agus #2 gcluaisín eile);#1 (agus #2 cluaisín eile)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
 tabHistory.current=Fan ar an leathanach seo
 tabHistory.goBack=Téigh siar chuig an leathanach seo
 tabHistory.goForward=Téigh ar aghaidh chuig an leathanach seo
 
+# URL Bar
+pasteAndGo.label=Greamaigh agus Téigh
+
 # Block autorefresh
 refreshBlocked.goButton=Ceadaigh
 refreshBlocked.goButton.accesskey=A
 refreshBlocked.refreshLabel=Níor lig %S don leathanach seo athluchtú go huathoibríoch.
 refreshBlocked.redirectLabel=Níor lig %S don leathanach seo athstiúradh go leathanach eile go huathoibríoch.
 
 # Star button
 starButtonOn.tooltip=Cuir an leabharmharc seo in eagar
@@ -174,16 +211,20 @@ offlineApps.never=Choíche don Suíomh Seo
 offlineApps.neverAccessKey=l
 offlineApps.notNow=Níos Déanaí
 offlineApps.notNowAccessKey=N
 
 offlineApps.usage=Tá an suíomh Gréasáin seo (%S) ag stóráil níos mó ná %SMB de sonraí ar do ríomhaire le haghaidh úsáide as líne.
 offlineApps.manageUsage=Taispeáin socruithe
 offlineApps.manageUsageAccessKey=S
 
+# LOCALIZATION NOTE (indexedDB.usage): %1$S is the website host name
+# %2$S a number of megabytes.
+indexedDB.usage=Tá an suíomh Gréasáin seo (%1$S) ag iarraidh níos mó ná %2$S MB de sonraí a stóráil ar do ríomhaire le haghaidh úsáide as líne.
+
 identity.identified.verifier=Cinntithe ag: %S
 identity.identified.verified_by_you=Chuir tú eisceacht slándála leis an suíomh seo.
 identity.identified.state_and_country=%S, %S
 
 identity.encrypted=Tá do cheangal leis an suíomh Gréasáin seo criptithe le bac a chur ar chúléisteacht.
 identity.unencrypted=Níl do cheangal leis an suíomh Gréasáin seo criptithe.
 identity.mixed_content=Níl do cheangal leis an suíomh seo criptithe go hiomlan agus níl bac ar chúléisteacht.
 
@@ -273,8 +314,23 @@ ctrlTab.showAll.label=;Taispeáin an dá chluaisín;Taispeáin na #1 chluaisín go léir;Taispeáin na #1 gcluaisín go léir;Taispeáin na #1 cluaisín go léir
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Cuardaigh %S
 
 # TabView
 tabView2.title=%S - Grúpáil Do Chluaisíní
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Réamhshocrú
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=An téama réamhshocraithe.
+
+# safeModeRestart
+safeModeRestartPromptTitle=Atosaigh gan aon bhreiseáin
+safeModeRestartPromptMessage=An bhfuil tú cinnte gur mian leat gach breiseán a dhíchumasú agus an brabhsálaí a atosú?
+
+# LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
+# "true" (spelled and capitalized exactly that way) to show the "Character
+# Encoding" menu in the main Firefox button on Windows. Any other value will
+# hide it. Regardless of the value of this setting, the "Character Encoding"
+# menu will always be accessible via the "Web Developer" menu.
+# This is not a string to translate; it just controls whether the menu shows
+# up in the Firefox button. If users frequently use the "Character Encoding"
+# menu, set this to "true". Otherwise, you can leave it as "false".
+browser.menu.showCharacterEncoding=bréagach
+
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -94,16 +94,20 @@
 <!ENTITY permBlock "Coisc">
 <!ENTITY permissionsFor "Ceadanna le haghaidh:">
 <!ENTITY permImage "Luchtaigh Íomhánna">
 <!ENTITY permPopup "Oscail Preabfhuinneoga">
 <!ENTITY permCookie "Socraigh Fianáin">
 <!ENTITY permInstall "Suiteáil Eisínteachtaí nó Téamaí">
 <!ENTITY permGeo "Ceadaigh">
 
+<!ENTITY permIndexedDB "Coinnigh Stóras As Líne">
+<!ENTITY permClearStorage "Glan an Stóras">
+<!ENTITY permClearStorage.accesskey "G">
+
 <!ENTITY securityTab "Slándáil">
 <!ENTITY securityTab.accesskey "S">
 <!ENTITY securityHeader "Eolas slándála maidir leis an leathanach seo">
 <!ENTITY securityView.certView "Taispeáin an Teastas">
 <!ENTITY securityView.accesskey "V">
 <!ENTITY securityView.unknown "Anaithnid">
 
 
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -74,8 +74,15 @@ generalSiteIdentity=Is le %S an suíomh Gréasáin seo\nTá sé seo fíoraithe ag %S
 
 feedRss=RSS
 feedAtom=Atom
 feedXML=XML
 
 securityNoOwner=Ní sholáthraíonn an suíomh seo faisnéis maidir lena úinéirí.
 securityOneVisit=Uair amháin
 securityNVisits=%S uaire
+
+# LOCALIZATION NOTE: The next string is for the disk usage of the
+# database
+#   e.g. indexedDBUsage : "50.23 MB"
+#   %1$S = size (in bytes or megabytes, ...)
+#   %2$S = unit of measure (bytes, KB, MB, ...)
+indexedDBUsage=Tá an suíomh seo ag baint úsáide as %1$S %2$S
--- a/browser/chrome/browser/pageReportFirstTime.dtd
+++ b/browser/chrome/browser/pageReportFirstTime.dtd
@@ -1,7 +1,7 @@
-<!ENTITY startDescription.label "Thug Suíomh Gréasáin iarracht preabfhuinneog a oscailt ar neamhchead duit. Dhruid &brandShortName; an phreabfhuinneog sin go huathoibríoch.  Feicfidh tú deilbhín i mbarra an stádais agus &brandShortName; tar éis cosc a chur ar phreabfhuinneog mar sin.">
+<!ENTITY startDescriptionText.label "Thug Suíomh Gréasáin iarracht preabfhuinneog a oscailt ar neamhchead duit. Dhruid &brandShortName; an phreabfhuinneog sin go huathoibríoch.">
 
 <!ENTITY endDescription.label "Cliceáil ar an deilbhín seo chun na suíomh ar chuir &brandShortName; cosc orthu a fheiceáil, agus chun an cosc sin a bhaint díobh, chun go mbeidh siad in ann preabfhuinneoga a oscailt i gcás go mbíonn a leithéidí riachtanach chun an suíomh a chur ag obair i gceart.">
 
 <!ENTITY caption.label "Maidir le Cosc Preabfhuinneog">
 
 <!ENTITY done.label "Déanta">
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -41,12 +41,8 @@
 <!ENTITY allowScripts.label "Ceadaigh scripteanna chun:">
 
 <!ENTITY moveResizeWindows.label "Fuinneoga reatha a aistriú nó a méid a athrú">
 <!ENTITY moveResizeWindows.accesskey "F">
 <!ENTITY raiseLowerWindows.label "Fuinneoga a ardú nó a ísliú">
 <!ENTITY raiseLowerWindows.accesskey "r">
 <!ENTITY disableContextMenus.label "Roghchláir chomhthéacs a dhíchumasú nó a ionadú">
 <!ENTITY disableContextMenus.accesskey "d">
-<!ENTITY hideStatusBar.label "An barra stádais a fholú">
-<!ENTITY hideStatusBar.accesskey "h">
-<!ENTITY changeStatusBar.label "Téacs an bharra stádais a athrú">
-<!ENTITY changeStatusBar.accesskey "c">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -12,16 +12,18 @@
 <!ENTITY blockAutoRefresh.accesskey "b">
 
 <!ENTITY browsing.label "Brabhsáil">
 
 <!ENTITY useAutoScroll.label "Úsáid uathscrollú">
 <!ENTITY useAutoScroll.accesskey "a">
 <!ENTITY useSmoothScrolling.label "Úsáid mínscrollú">
 <!ENTITY useSmoothScrolling.accesskey "m">
+<!ENTITY allowHWAccel.label "Úsáid luasghéarú crua-earraí más féidir">
+<!ENTITY allowHWAccel.accesskey "h">
 <!ENTITY checkSpelling.label "Litriú beo">
 <!ENTITY checkSpelling.accesskey "b">
 
 <!ENTITY systemDefaults.label "Réamhshocrú an Chórais">
 <!--XXX-->
 <!ENTITY alwaysCheckDefault.label "Seiceáil i gcónaí ag am tosaithe an é &brandShortName; an brabhsálaí réamhshocraithe">
 <!ENTITY alwaysCheckDefault.accesskey "g">
 <!ENTITY checkNow.label "Seiceáil Anois">
@@ -34,27 +36,29 @@
 <!ENTITY connection.label "Ceangal">
 
 <!ENTITY connectionDesc.label "Cumraigh conas a cheanglófar &brandShortName; leis an Idirlíon">
 <!ENTITY connectionSettings.label "Socruithe…">
 <!ENTITY connectionSettings.accesskey "e">
 
 <!ENTITY offlineStorage.label "Stóras As Líne">
 <!-- LOCALIZATION NOTE:
-  The entities useCacheBefore.label and useCacheAfter.label appear on a single
+  The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
-  &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
+  &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->
 
-<!ENTITY useCacheBefore.label "Úsáid suas le">
-<!ENTITY useCacheBefore.accesskey "s">
-<!ENTITY useCacheAfter.label "MB spás don taisce">
+<!ENTITY limitCacheSizeBefore.label "Cuir teorainn leis an taisce">
+<!ENTITY limitCacheSizeBefore.accesskey "l">
+<!ENTITY limitCacheSizeAfter.label "MB">
 <!ENTITY clearCacheNow.label "Bánaigh Anois">
 <!ENTITY clearCacheNow.accesskey "B">
+<!ENTITY overrideSmartCacheSize.label "Sáraigh bainistíocht uathoibríoch na taisce">
+<!ENTITY overrideSmartCacheSize.accesskey "S">
 
 <!ENTITY updateTab.label "Nuashonrú">
 
 <!ENTITY autoCheck.label "Déan nuashonruithe a lorg go huathoibríoch i gcomhair:">
 <!ENTITY enableAppUpdate.label "&brandShortName;">
 <!ENTITY enableAppUpdate.accesskey "F">
 <!ENTITY enableAddonsUpdate2.label "Breiseáin">
 <!ENTITY enableAddonsUpdate2.accesskey "n">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,17 +1,17 @@
 <!ENTITY startup.label "Tosú">
 
 <!ENTITY startupPage.label "Agus &brandShortName; á thosú:">
 <!ENTITY startupPage.accesskey "s">
 <!ENTITY startupHomePage.label "Taispeáin mo leathanach baile">
 <!ENTITY startupBlankPage.label "Taispeáin leathanach folamh">
 <!ENTITY startupLastSession.label "Taispeáin mo chuid fuinneog agus cluaisíní ón seisiún roimhe seo">
-<!ENTITY location.label "Leathanach Baile:">
-<!ENTITY location.accesskey "h">
+<!ENTITY homepage.label "Leathanach Baile:">
+<!ENTITY homepage.accesskey "B">
 <!ENTITY useCurrentPage.label "Úsáid an Leathanach Reatha">
 <!ENTITY useCurrentPage.accesskey "R">
 <!ENTITY useMultiple.label "Úsáid na Leathanaigh Reatha">
 <!ENTITY useBookmark.label "Úsáid Leabharmharc">
 <!ENTITY useBookmark.accesskey "b">
 <!ENTITY restoreDefault.label "Cuir na réamhshocruithe ar ais">
 <!ENTITY restoreDefault.accesskey "r">
 
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -99,16 +99,22 @@ offlineAppRemoveConfirm=Bain sonraí as líne
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 offlineAppUsage=%1$S %2$S
 
 offlinepermissionstext=Níl cead ag na suímh Ghréasáin seo a leanas sonraí a stóráil le haghaidh úsáide as líne:
 offlinepermissionstitle=Sonraí As Líne
 
+####Preferences::Advanced::Network
+#LOCALIZATION NOTE: The next string is for the disk usage of the http cache.
+#   e.g., "Your cache is currently using 200 MB"
+#   %1$S = size
+#   %2$S = unit (MB, KB, etc.)
+actualCacheSize=Tá do thaisce ag úsáid %1$S %2$S ar an diosca faoi láthair
 
 #### Syncing
 connect.label=Ceangail
 disconnect.label=Dícheangail
 
-differentAccount.title=An bhfuil fonn ort cuntas eile a úsáid?
+stopUsingAccount.title=An bhfuil tú ag iarraidh an cuntas seo a dhúnadh?
 differentAccount.label=Athshocraíonn sé seo faisnéis do chuntais Sync agus do chuid sainroghanna.
 differentAccountConfirm.label=Athshocraigh an fhaisnéis go léir
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -1,44 +1,43 @@
 <!-- The page shown when not logged in... -->
 <!ENTITY setupButton.label "Socraigh &syncBrand.fullName.label;">
 <!ENTITY setupButton.accesskey "S">
 <!ENTITY weaveDesc.label "Le &syncBrand.fullName.label; is féidir leat do stair, leabharmharcanna, focail fhaire agus cluaisíní a rochtain ar gach gléas atá agat.">
 <!-- The page shown when logged in... -->
 
 <!ENTITY accountGroupboxCaption.label "Cuntas &syncBrand.fullName.label;">
-<!ENTITY currentUser.label "Úsáideoir Reatha:">
+<!ENTITY currentAccount.label "Cuntas Reatha:">
 <!-- Login error feedback -->
 
 <!ENTITY updatePass.label "Nuashonrú">
 <!ENTITY resetPass.label "Bánaigh">
 <!-- Manage Account -->
 
 <!ENTITY manageAccount.label "Bainistigh Do Chuntas">
 <!ENTITY manageAccount.accesskey "C">
+<!ENTITY viewQuota.label "Féach ar Chuóta">
 <!ENTITY changePassword.label "Athraigh an Focal Faire">
-<!ENTITY changePassphrase.label "Athraigh an Frása Faire">
+<!ENTITY mySyncKey.label "M'Eochair Sync">
 <!ENTITY resetSync.label "Athshocraigh Sync">
-<!ENTITY differentAccount.label "Úsáid Cuntais Eile">
+<!ENTITY stopUsingAccount.label "Dún an Cuntas Seo">
 <!-- Sync Settings -->
 
 <!ENTITY syncPrefsCaption.label "Sioncrónú Brabhsálaí">
 <!ENTITY syncComputerName.label "Ainm an Ríomhaire:">
 <!ENTITY syncComputerName.accesskey "A">
-<!ENTITY syncModeSwitchDesc.label "Cad is mian leat &brandShortName; a dhéanamh?">
-<!ENTITY syncModeSwitchDesc.accesskey "w">
-<!ENTITY syncEverything.label "Sioncrónaigh Gach Rud">
-<!ENTITY customSync.label "Úsáid socruithe saincheaptha">
-<!ENTITY syncEverythingDescription.label "Beidh do chuid leabharmharcanna, stair, focail fhaire, sainroghanna, agus cluaisíní sioncrónaithe.">
-<!ENTITY syncItem.bookmarks.label "Sioncrónaigh Leabharmharcanna">
-<!ENTITY syncItem.bookmarks.accesskey "m">
-<!ENTITY syncItem.tabs.label "Sioncrónaigh Cluaisíní">
-<!ENTITY syncItem.tabs.accesskey "C">
-<!ENTITY syncItem.history.label "Sioncrónaigh Stair">
-<!ENTITY syncItem.history.accesskey "r">
-<!ENTITY syncItem.passwords.label "Sioncrónaigh Focail Fhaire">
-<!ENTITY syncItem.passwords.accesskey "F">
-<!ENTITY syncItem.prefs.label "Sioncrónaigh Sainroghanna">
-<!ENTITY syncItem.prefs.accesskey "S">
+
+<!ENTITY syncMy.label "Sioncrónaigh Mo Chuid">
+<!ENTITY engine.bookmarks.label "Leabharmharcanna">
+<!ENTITY engine.bookmarks.accesskey "L">
+<!ENTITY engine.tabs.label "Cluaisíní">
+<!ENTITY engine.tabs.accesskey "C">
+<!ENTITY engine.history.label "Stair">
+<!ENTITY engine.history.accesskey "r">
+<!ENTITY engine.passwords.label "Focal Faire">
+<!ENTITY engine.passwords.accesskey "F">
+<!ENTITY engine.prefs.label "Sainroghanna">
+<!ENTITY engine.prefs.accesskey "S">
 <!-- Footer stuff -->
 
+
 <!ENTITY prefs.tosLink.label "Téarmaí Seirbhíse">
 <!ENTITY prefs.ppLink.label "Polasaí Príobháideachta">
--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -1,10 +1,14 @@
 searchtip=Cuardaigh le %S
 
+# LOCALIZATION NOTE (cmd_pasteAndSearch): "Search" is a verb, this is the
+# search bar equivalent to the url bar's "Paste & Go"
+cmd_pasteAndSearch=Greamaigh agus Cuardaigh
+
 cmd_clearHistory=Bánaigh Stair an Chuardaigh
 cmd_clearHistory_accesskey=H
 
 cmd_showSuggestions=Taispeáin Moltaí
 cmd_showSuggestions_accesskey=S
 
 cmd_addFoundEngine=Cuir "%S" Leis
 
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -1,37 +1,35 @@
 # LOCALIZATION NOTE (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
 change.password.title = Athraigh d'Fhocal Faire
 change.password.acceptButton = Athraigh an Focal Faire
 change.password.status.active = Focal faire á athrú…
 change.password.status.success = Athraíodh d'fhocal faire.
 change.password.status.error = Tharla earráid agus d'fhocal faire á athrú.
 
-change.password.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your secret phrase.
-change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
+change.password2.introText = Ní mór 8 gcarachtar a bheith san fhocal faire ar a laghad.  Níl cead agat d'ainm úsáideora ná d'eochair Sync a úsáid mar fhocal faire.
+change.password.warningText = Fainic: Ní bheidh do ghléasanna eile in ann ceangal le do chuntas tar éis duit an focal faire seo a athrú.
 
-change.passphrase.title = Athraigh do Fhrása Faire
-change.passphrase.acceptButton = Athraigh an Frása Faire
-change.passphrase.label = Frása faire á athrú agus sonraí logánta á n-uasluchtú, fan go fóill…
-change.passphrase.error = Tharla earráid agus do fhrása faire á athrú!
-change.passphrase.success = D'éirigh le hathrú do fhrása faire!
+change.synckey.title = Athraigh d'Eochair Sync
+change.synckey.acceptButton = Athraigh Eochair Sync
+change.synckey.label = Eochair Sync á athrú agus sonraí logánta á n-uasluchtú, fan go fóill…
+change.synckey2.error = Tharla earráid agus d'Eochair Sync á athrú!
+change.synckey2.success = D'éirigh le hathrú d'Eochair Sync!
 
-# LOCALIZATION NOTE (change.passphrase.introText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
-change.passphrase.introText = Your secret phrase must be at least 12 characters long.  Sync uses this phrase as part of encrypting your data.
-# LOCALIZATION NOTE (change.passphrase.introText2) "Firefox Sync" should match syncBrand.fullName.label from syncBrand.dtd
-change.passphrase.introText2 = Ba chóir duit an fhaisnéis seo a bhreacadh, mar nach seolfar tríd an Idirlíon é, agus ní dhéanann Firefox Sync cúltaca air, de bharr cúrsaí slándála.
-# LOCALIZATION NOTE (change.passphrase.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
-change.passphrase.warningText = Note: This will erase all data stored on the Sync server and upload new data secured by this phrase. Your other devices will not sync until the secret phrase is entered for that device.
+change.synckey.introText = Tá do phríobháideacht tábhachtach dúinn
+change.synckey.introText2 = Le do phríobháideacht a chinntiú, uasluchtófar do chuid sonraí i bhfoirm chriptithe. Ní uasluchtófar an eochair dhíchriptithe riamh.
+# LOCALIZATION NOTE (change.synckey2.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
+change.synckey2.warningText = Nóta: Má athraíonn tú é seo, léirscriosfar na sonraí go léir ar an bhfreastalaí Sync agus uasluchtófar sonraí nua cosanta ag an Eochair seo. Ní shioncrónóidh do ghléasanna eile go dtí go gcuirfidh tú an Eochair nua iontu freisin.
+
+new.synckey.label = D'Eochair Sync
 
 # LOCALIZATION NOTE (new.password.title): This (and associated new.password/passphrase) are used on a second computer when it detects that your password or passphrase has been changed on a different device.
 new.password.title            = Nuashonraigh an Focal Faire
 new.password.introText        = Diúltaigh an freastalaí d'fhocal faire, nuashonraigh é anois.
 new.password.label            = Iontráil focal faire nua
 new.password.confirm          = Dearbhaigh an focal faire nua
 new.password.acceptButton     = Nuashonraigh an Focal Faire
 new.password.status.incorrect = Focal faire mícheart, bain triail eile as.
 
-new.passphrase.title            = Nuashonraigh an Frása Faire
-new.passphrase.introText        = Athraíodh do fhrása faire, iontráil an frása faire nua
-new.passphrase.label            = Frása faire nua
-new.passphrase.confirm          = Dearbhaigh an frása faire
-new.passphrase.acceptButton     = Nuashonraigh an Frása Faire
-new.passphrase.status.incorrect = Frása faire mícheart, bain triail eile as.
+new.synckey.title          = Nuashonraigh Eochair Sync
+new.synckey.introText        = Athraíodh d'Eochair Sync, iontráil an Eochair nua
+new.synckey.acceptButton     = Nuashonraigh Eochair Sync
+new.synckey.status.incorrect = Eochair Sync mhícheart, bain triail eile as.
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,98 +1,104 @@
 <!ENTITY accountSetupTitle.label "Socrú &syncBrand.fullName.label;">
 <!-- First page of the wizard -->
 
 
+<!ENTITY setup.pickSetupType.description "Fáilte romhat, murar bhain tú úsáid as &syncBrand.fullName.label; riamh, ní mór duit cuntas nua a chruthú.">
+<!ENTITY button.createNewAccount.label "Cruthaigh Cuntas Nua">
+<!ENTITY button.haveAccount.label "Tá cuntas &syncBrand.fullName.label; agam">
+
 <!ENTITY setup.choicePage.title.label "Ar bhain tú úsáid as &syncBrand.fullName.label; riamh?">
 <!ENTITY setup.choicePage.new.label "Níor bhain mé úsáid as &syncBrand.fullName.label; riamh">
 <!ENTITY setup.choicePage.existing.label "Tá mé ag baint úsáide as &syncBrand.fullName.label; ar ríomhaire eile">
 <!-- New Account AND Existing Account -->
 
-<!ENTITY connectTo.label "Ceangail le">
+<!ENTITY server.label "Freastalaí">
 <!ENTITY serverType.main.label "Freastalaí &syncBrand.fullName.label;">
 <!ENTITY serverType.custom.label "Úsáid freastalaí saincheaptha">
-<!ENTITY signIn.username.label "Ainm Úsáideora">
-<!ENTITY signIn.username.accesskey "A">
+<!ENTITY signIn.account.label "Seoladh Ríomhphoist / Ainm Úsáideora">
+<!ENTITY signIn.account.accesskey "S">
 <!ENTITY signIn.password.label "Focal Faire">
 <!ENTITY signIn.password.accesskey "F">
 <!ENTITY signIn.serverURL.label "URL an Fhreastalaí">
 <!ENTITY signIn.serverURL.accesskey "L">
 <!-- New Account Page 1: Basic Account Info -->
 
-<!ENTITY setup.newAccountPage.title.label "Cruthaigh do Chuntas &syncBrand.shortName.label;">
+<!ENTITY setup.newAccountDetailsPage.title.label "Mionsonraí an Chuntais">
 <!ENTITY setup.confirmPassword.label "Dearbhaigh an Focal Faire">
 <!ENTITY setup.confirmPassword.accesskey "b">
 <!ENTITY setup.emailAddress.label "Seoladh Ríomhphoist">
 <!ENTITY setup.emailAddress.accesskey "e">
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label "Glacaim leis na">
 <!ENTITY setup.tosAgree1.accesskey "a">
 <!ENTITY setup.tosLink.label "Téarmaí Seirbhíse">
 <!ENTITY setup.tosAgree2.label "agus an">
 <!ENTITY setup.ppLink.label "Polasaí Príobháideachta">
 <!ENTITY setup.tosAgree3.label "">
 <!ENTITY setup.tosAgree2.accesskey "">
-<!-- New Account Page 2: Passphrase Entry -->
-
-<!ENTITY setup.newPPPage.title.label "Iontráil do Fhrása Faire">
-<!ENTITY passphraseDesc.label "Cuir frása faire isteach. Úsáidfear é seo chun do chuid sonraí go léir a chriptiú sa chaoi nach mbeidh aon duine eile in ann féachaint orthu. Ní shábháiltear ar an bhfreastalaí é - ná caill é!">
-<!ENTITY passphraseDesc2.label "This must be at least 12 characters long and cannot match your account password.">
-<!ENTITY passphraseEntry.label "Frása Faire">
-<!ENTITY passphraseEntry.accesskey "s">
-<!ENTITY passphraseConfirm.label "Dearbhaigh">
-<!ENTITY passphraseConfirm.accesskey "b">
-<!-- New Account Page 3: Sync Type Options -->
+<!-- New Account Page 2: Sync Key -->
 
-<!ENTITY setup.newAccountPrefs2.title.label "Sainroghanna Sync">
-<!ENTITY syncComputerName.label "Ainm an Ríomhaire:">
-<!ENTITY syncComputerName.accesskey "A">
-<!ENTITY syncModeSwitchDesc.label "Cad is mian leat &brandShortName; a dhéanamh?">
-<!ENTITY syncModeSwitchDesc.accesskey "w">
-<!ENTITY syncEverything.label "Sioncrónaigh Gach Rud">
-<!ENTITY customSync.label "Úsáid socruithe saincheaptha">
-<!ENTITY syncEverythingDescription.label "Beidh do chuid leabharmharcanna, stair, focail fhaire, sainroghanna, agus cluaisíní sioncrónaithe.">
-<!ENTITY syncItem.bookmarks.label "Sioncrónaigh Leabharmharcanna">
-<!ENTITY syncItem.bookmarks.accesskey "m">
-<!ENTITY syncItem.tabs.label "Sioncrónaigh Cluaisíní">
-<!ENTITY syncItem.tabs.accesskey "C">
-<!ENTITY syncItem.history.label "Sioncrónaigh Stair">
-<!ENTITY syncItem.history.accesskey "r">
-<!ENTITY syncItem.passwords.label "Sioncrónaigh Focail Fhaire">
-<!ENTITY syncItem.passwords.accesskey "F">
-<!ENTITY syncItem.prefs.label "Sioncrónaigh Sainroghanna">
-<!ENTITY syncItem.prefs.accesskey "S">
-<!-- New Account Page 4: Captcha -->
+<!ENTITY setup.newSyncKeyPage.title.label "&brandShortName;: Tá do phríobháideacht tábhachtach dúinn">
+<!ENTITY setup.newSyncKeyPage.description.label "Le do phríobháideacht a chinntiú, uasluchtófar do chuid sonraí i bhfoirm chriptithe. Ní uasluchtófar an eochair Sync a úsáidtear chun do sonraí a dhíchriptiú.">
+<!ENTITY syncKeyEntry.label "D'Eochair Sync">
+<!ENTITY syncKeyEntry.accesskey "c">
+<!ENTITY syncKeyGenerate.label "Cruthaigh">
+<!ENTITY syncKeyStrength.label "Neart:">
+<!ENTITY syncKeyHelp.label "Cad is brí don neart?">
+<!ENTITY syncKeyBackup.description "Teastaíonn uait an Eochair Sync chun &syncBrand.fullName.label; a rochtain ó ríomhairí eile.  Déan cúltaca di - ní bheimid in ann d'Eochair Sync a fháil ar ais má chailleann tú í.">
 
-<!ENTITY setup.captchaPage.title.label "Dearbhaigh nach róbat thú, le do thoil ;)">
+<!ENTITY button.syncKeyBackup.print.label "Priontáil…">
+<!ENTITY button.syncKeyBackup.print.accesskey "P">
+<!ENTITY button.syncKeyBackup.save.label "Sábháil…">
+<!ENTITY button.syncKeyBackup.save.accesskey "S">
+<!-- New Account Page 3: Captcha -->
+
+<!ENTITY setup.captchaPage2.title.label "Deimhnigh nach róbat thú">
 <!-- Existing Account Page 1: Login -->
 
 <!ENTITY setup.existingAccount.title.label "Iontráil d'Fhaisnéis Chuntais">
 <!ENTITY resetPassword.label "Athshocraigh Focal Faire">
 <!ENTITY connecting.label "Á Cheangal…">
-<!-- Existing Account Page 2: Passphrase -->
+<!-- Existing Account Page 2: Sync Key -->
 
-<!ENTITY passphraseGroupbox.label "Iontráil Frása Faire">
-<!ENTITY passphraseDesc3.label "Please enter your secret phrase. This must be the same secret phrase that you used to encrypt your data.">
-<!ENTITY passphraseHelp.label "Your secret phrase is at least 12 characters long and is not your password. You can find your saved secret phrase by going to your other computer and checking the Saved Passwords under Security. If you still cannot get the correct secret phrase, you can choose to reset it, but you will lose any data stored on the server.">
-<!ENTITY changePassphrase.label "Athraigh an Frása Faire">
+<!ENTITY setup.existingSyncKeyPage.title "Cuir isteach d'Eochair Sync">
+<!ENTITY setup.existingSyncKeyPage.description "The Sync Key was generated for you, or you entered your own, when you first signed up for &syncBrand.fullName.label;. It is not the same as your password.">
+<!ENTITY existingSyncKeyHelp.description "You can find your saved Sync Key by going to your other computer and checking the Saved Passwords under Security. If you still cannot get the correct Sync Key, you can choose to reset it, but you will lose any data stored on the server.">
+<!ENTITY lostSyncKey.label "Chaill mé m'Eochair Sync">
 <!ENTITY verifying.label "Á Dheimhniú…">
-<!-- New & Existing Account: Merge Options -->
+<!-- Sync Options -->
+
+<!ENTITY setup.optionsPage.title "Roghanna Sync">
+<!ENTITY syncComputerName.label "Ainm an Ríomhaire:">
+<!ENTITY syncComputerName.accesskey "A">
 
-<!ENTITY setup.mergeChoicePage.title.label "Cad é ba mhaith leat a dhéanamh ar dtús?">
-<!ENTITY choice.merge.main.label "Cumaisc na sonraí ar an ríomhaire seo le do chuid sonraí &syncBrand.shortName.label;">
-<!ENTITY choice.merge.recommend.label "Molann Mozilla an rogha seo go láidir do gach úsáideoir.">
-<!ENTITY choice.client.main.label "Cuir do chuid sonraí &syncBrand.fullName.label; in áit na sonraí ar an ríomhaire seo">
-<!ENTITY choice.server.main.label "Cuir na sonraí logánta in áit na sonraí ar gach gléas eile">
-<!-- New & Existing Account: Confirm Merge Options -->
+<!ENTITY syncMy.label "Sioncrónaigh Mo Chuid">
+<!ENTITY engine.bookmarks.label "Leabharmharcanna">
+<!ENTITY engine.bookmarks.accesskey "L">
+<!ENTITY engine.tabs.label "Cluaisíní">
+<!ENTITY engine.tabs.accesskey "C">
+<!ENTITY engine.history.label "Stair">
+<!ENTITY engine.history.accesskey "r">
+<!ENTITY engine.passwords.label "Focal Faire">
+<!ENTITY engine.passwords.accesskey "F">
+<!ENTITY engine.prefs.label "Sainroghanna">
+<!ENTITY engine.prefs.accesskey "S">
 
-<!ENTITY confirm.caption.label "Dearbhaigh do rogha">
-<!ENTITY confirm.merge.label "You have chosen to merge your data on this computer with the data on your other devices running &syncBrand.fullName.label;.">
+<!ENTITY choice2.merge.main.label "Cumaisc na sonraí ar an ríomhaire seo le mo chuid sonraí &syncBrand.shortName.label;">
+<!ENTITY choice2.merge.recommended.label "Molta:">
+<!ENTITY choice2.client.main.label "Cuir mo chuid sonraí &syncBrand.shortName.label; in áit na sonraí ar an ríomhaire seo">
+<!ENTITY choice2.server.main.label "Cuir na sonraí ar an ríomhaire seo in áit na sonraí ar gach gléas eile">
+<!-- Confirm Merge Options -->
+
+<!ENTITY setup.optionsConfirmPage.title "Dearbhaigh">
+<!ENTITY confirm.merge.label "&syncBrand.fullName.label; will now merge all this computer's browser data into your Sync account.">
 <!ENTITY confirm.client.label "Scriosfar na sonraí &brandShortName; go léir ar an ríomhaire seo, na sonraí seo a leanas san áireamh:">
 <!ENTITY confirm.client.moreinfo.label "Cóipeálfaidh &brandShortName; do chuid sonraí &syncBrand.fullName.label; go dtí an ríomhaire seo.">
 <!ENTITY confirm.client.warning.label "RABHADH: Scriosfar na sonraí &brandShortName; go léir ón ríomhaire seo!">
 <!ENTITY confirm.server.label "Forscríobhfar na gléasanna seo a leanas leis na sonraí logánta:">
 <!ENTITY confirm.server.warning.label "RABHADH: Cuirfear do chuid sonraí logánta in áit na sonraí &brandShortName; go léir ar na gléasanna seo!">
 <!-- New & Existing Account: Setup Complete -->
 
-<!ENTITY setup.successPage.title.label "Tá an socrú críochnaithe!">
-<!ENTITY setup.successPage.desc.label "Comhghairdeas! Sioncrónóidh &brandShortName; do chuid sonraí go huathoibríoch as seo amach.  Ná dearmad &syncBrand.fullName.label; a shocrú ar do ghléasanna go léir. Anois lean ort agus bain úsáid as &brandShortName;.">
+<!ENTITY setup.successPage.title "Críochnaithe">
+<!ENTITY changeOptions.label "Is féidir an sainrogha seo a athrú trí Roghanna Sync thíos.">
+<!ENTITY continueUsing.label "You may now continue using &brandShortName;.">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -1,16 +1,42 @@
-cancelSetup.label           = Cealaigh an Socrú
-errorCreatingAccount.title  = Earráid agus Cuntas á Chruthú
+button.syncOptions.label       = Roghanna Sync
+button.syncOptionsDone.label   = Déanta
+button.syncOptionsCancel.label = Cealaigh
 
 invalidEmail.label          = Seoladh ríomhphoist neamhbhailí
 serverInvalid.label         = Cuir isteach URL bailí don bhfreastalaí
 usernameNotAvailable.label  = In úsáid cheana
 
-# LOCALIZATION NOTE (additionalClients.label, bookmarkCount.label, historyCount.label, passwordCount.label).
-# We'll fix the lack of PluralForms in bug 583661.
-additionalClients.label     = agus %S gléas eile
-bookmarkCount.label         = %S leabharmharc
-historyCount.label          = %S lá staire
-passwordCount.label         = %S focal faire
+verifying.label = Á Dheimhniú…
+
+# LOCALIZATION NOTE (additionalClientCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of additional clients (was %S for a short while, use #1 instead, even if both work)
+additionalClientCount.label = agus #1 ghléas eile;agus #1 ghléas eile;agus #1 ghléas eile;agus #1 ngléas eile;agus #1 gléas eile
+# LOCALIZATION NOTE (bookmarksCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of bookmarks (was %S for a short while, use #1 instead, even if both work)
+bookmarksCount.label        = #1 leabharmharc;#1 leabharmharc;#1 leabharmharc;#1 leabharmharc;#1 leabharmharc
+# LOCALIZATION NOTE (historyDaysCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
+historyDaysCount.label      = #1 lá staire;#1 lá staire;#1 lá staire;#1 lá staire;#1 lá staire
+# LOCALIZATION NOTE (passwordsCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
+passwordsCount.label        = #1 fhocal faire;#1 fhocal faire;#1 fhocal faire;#1 bhfocal faire;#1 focal faire
+
+save.synckey.title = Sábháil an Eochair Sync
+
+newAccount.action.label = Tá Firefox Sync socraithe agus déanfaidh sé sioncrónú uathoibríoch ar do chuid sonraí brabhsálaí.
+newAccount.change.label = You can choose exactly what to sync by selecting Sync Options below.
+resetClient.change.label = Firefox Sync will now merge all this computer's browser data into your Sync account.
+wipeClient.change.label = Cuirfidh Firefox Sync na sonraí i do chuntas Sync in áit na sonraí ar an ríomhaire seo anois.
+wipeRemote.change.label = Cuirfidh Firefox Sync na sonraí ar an ríomhaire seo in áit na sonraí i do chuntas Sync.
+existingAccount.change.label = Is féidir an sainrogha seo a athrú trí Roghanna Sync thíos.
 
 # Several other strings are used (via Weave.Status.login), but they come from
-#  /services/sync */
+#  /services/sync
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -25,17 +25,24 @@
 
 <!ENTITY malformedURI.title "Níl an seoladh bailí">
 <!ENTITY malformedURI.longDesc "<ul> <li>De ghnáth scríobhtar seoltaí Gréasáin mar seo <strong>http://www.sampla.com/</strong></li> <li>Bí cinnte gur tulslaiseanna atá agat (.i. <strong>/</strong>).</li></ul>">
 
 <!ENTITY netInterrupt.title "Idirbhriseadh an ceangal">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
 <!ENTITY netOffline.title "Mód as líne">
-<!ENTITY netOffline.longDesc '<ul> <li>Díroghnaigh &quot;Oibrigh As Líne&quot; sa roghchlár "Comhad", agus ansin bain triail eile as.</li></ul>'>
+<!-- LOCALIZATION NOTE (netOffline.overrideLongDesc) - This string should
+     indicate that "Work Offline" is a menu item without being too specific,
+     since it could be in either the normal menu (Mac/Linux) or the Firefox button
+     menu (Windows).
+-->
+<!ENTITY netOffline.overrideLongDesc "<ul> 
+<li>Díroghnaigh &quot;Oibrigh As Líne&quot;, agus ansin bain triail eile as.</li> 
+</ul>">
 
 <!ENTITY contentEncodingError.title "Earráid Ionchódaithe Inneachair">
 <!ENTITY contentEncodingError.longDesc "<ul> <li>Téigh i dteagmháil le húinéirí an tsuímh ghréasáin leis an bhfadhb a chur in iúl dóibh, le do thoil.</li> </ul>">
 
 <!ENTITY unsafeContentType.title "Cineál Comhaid Baolach">
 <!ENTITY unsafeContentType.longDesc "<ul> <li>Téigh i dteagmháil le húinéirí an tsuímh ghréasáin leis an bhfadhb a chur in iúl dóibh, le do thoil.</li> </ul>">
 
 <!ENTITY netReset.title "Athshocraíodh an ceangal">
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -1,10 +1,9 @@
 <!ENTITY testpilot.brand.label "Test Pilot">
-<!-- browser window: menu and status bar -->
 <!ENTITY testpilot.settings.label "Socruithe">
 <!ENTITY testpilot.settings.dataSubmission.label "Seoladh Sonraí">
 <!ENTITY testpilot.settings.notifications.label "Fógraí">
 <!ENTITY testpilot.settings.notifyWhen.label "Cuir in iúl dom…">
 <!ENTITY testpilot.settings.readyToSubmit.label "Nuair a bheidh staidéar réidh le seoladh">
 <!ENTITY testpilot.settings.newStudy.label "Nuair a bheidh staidéar nua ann">
 <!ENTITY testpilot.settings.hasNewResults.label "Nuair a bheidh torthaí nua ag staidéar">
 <!ENTITY testpilot.settings.alwaysSubmitData.label "Seol mo chuid sonraí go huathoibríoch (ná fiafraigh díom)">
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -41,35 +41,39 @@ KillScriptMessage=Tá script ar an leathanach seo a d'fhéadfadh bheith gnóthach, nó gan freagairt. Tig leat an script a stopadh anois, nó is féidir leanadh ar aghaidh le feiceáil an gcríochnóidh an script.
 KillScriptWithDebugMessage=D'fhéadfadh script sa leathanach seo a bheith gnóthach, nó b'fhéidir nach bhfuil sí ag freagairt. Tig leat an script a stopadh anois, nó í a oscailt sa dífhabhtóir, nó ligean léi dul ar aghaidh.
 KillScriptLocation=Script: %S
 StopScriptButton=Stop an script
 DebugScriptButton=Dífhabhtaigh an script
 WaitForScriptButton=Ar Aghaidh
 DontAskAgain=&Ná fiafraigh díom arís
 JSURLLoadBlockedWarning=Chuir bainisteoir na slándála bac ar iarracht URL "javascript:" a luchtú ó ósta amháin i bhfuinneog ina bhfuil ábhar ó ósta eile á thaispeáint.
 WindowCloseBlockedWarning=Níl cead ag scripteanna fuinneoga nár oscail siad a dhúnadh.
-OnBeforeUnloadPreMessage=An bhfuil tú cinnte gur mian leat imeacht ón leathanach seo?
-OnBeforeUnloadPostMessage=Cliceáil "OK" chun leanúint, nó "Cealaigh" chun fanacht ar an leathanach reatha.
+OnBeforeUnloadTitle=An bhfuil tú cinnte?
+OnBeforeUnloadMessage=This page is asking you to confirm that you want to leave - data you have entered may not be saved.
+OnBeforeUnloadStayButton=Fan Anseo
+OnBeforeUnloadLeaveButton=Fág an Leathanach
 DocumentAllUsed=Úsáideadh an t-airí neamhchaighdeánach "document.all". Úsáid leagan caighdeánach an W3C "document.getElementById()" ina áit.
 GlobalScopeElementReference=Déantar tagairt ar eilimint le ID/NAME sa scóip chomhchoiteann. Úsáid document.getElementById() de réir chaighdeán an W3C ina háit.
 UseOfCaptureEventsWarning=Ní moltar captureEvents() a úsáid a thuilleadh. Chun do chuid cóid a uasghrádú, úsáid an modh DOM 2 addEventListener(). Le haghaidh tuilleadh cabhrach, téigh chuig http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 UseOfReleaseEventsWarning=Ní moltar releaseEvents() a úsáid a thuilleadh. Chun do chuid cóid a uasghrádú, úsáid an modh DOM 2  removeEventListener(). Le haghaidh tuilleadh cabhrach, téigh chuig http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 UseOfRouteEventWarning=Ní moltar routeEvent() a úsáid a thuilleadh. Chun do chuid cóid a uasghrádú, úsáid an modh DOM 2  dispatchEvent(). Le haghaidh tuilleadh cabhrach, téigh chuig http://developer.mozilla.org/en/docs/DOM:element.dispatchEvent
 UseOfPreventBubbleWarning=Teagmhas=%S, ní mholtar úsáid preventBubble(). Úsáid stopPropagation() caighdeánaithe ag an W3C ina áit.
 UseOfPreventCaptureWarning=Teagmhas=%S, ní mholtar úsáid preventCapture(). Úsáid stopPropagation() caighdeánaithe ag an W3C ina aít.
 UseOfDOM3LoadMethodWarning=Ní moltar Document.load() a úsáid a thuilleadh. Chun do chuid cóid a uasghrádú, úsáid an réad DOM XMLHttpRequest. Le haghaidh tuilleadh cabhrach, féach ar https://developer.mozilla.org/en/XMLHttpRequest
 UnexpectedCanvasVariantStyle=canvas: tugadh neamhaird ar iarracht luach a chur ar strokeStyle nó fillStyle nach teaghrán, CanvasGradient nó CanvasPattern é.
 EmptyGetElementByIdParam=Tugadh teaghrán folamh do getElementById().
 LowMemoryTitle=Rabhadh: Easpa cuimhne
 LowMemoryMessage=Stopadh script ar an leathanach seo de bharr easpa cuimhne.
 WrongEventPropertyAccessWarning=Ní cheart an t-airí '%S' de imeacht '%S' a úsáid. Níl brí ag an luach.
 SpeculationFailed=Scríobhadh crann neamhchothromaithe le document.write() agus bhí sonraí ón líonra athpharsáilte dá bharr sin.   Tuilleadh eolais: https://developer.mozilla.org/en/Optimizing_Your_Pages_for_Speculative_Parsing
 DocumentWriteIgnored=Rinneadh neamhaird de ghlao document.write() ó script sheachtrach a bhí luchtaithe go haisioncrónach.
-ElementSuffersFromBeingTooLong=The text is too long. It is %S characters long and the limit is %S.
-TextElementSuffersFromBeingMissing=Tá an réimse seo riachtanach.  Caithfidh tú é a líonadh isteach.
-CheckboxElementSuffersFromBeingMissing=Tá an ticbhosca seo riachtanach, caithfidh tú tic a chur leis.
-RadioElementSuffersFromBeingMissing=Caithfidh tú ceann de na roghanna seo a roghnú.
-FileElementSuffersFromBeingMissing=Caithfidh tú comhad a roghnú.
-ElementSuffersFromInvalidEmail=The entered email address is not valid.
-ElementSuffersFromInvalidURL=Níl an URL bailí.
-ElementSuffersFromPatternMismatch=The field value is not in the requested format.
-ElementSuffersFromPatternMismatchWithTitle=The field value is not in the requested format. %S
-
+FormValidationTextTooLong=Please shorten this text to %S characters or less (you are currently using %S characters).
+FormValidationValueMissing=Líon isteach an réimse seo.
+FormValidationCheckboxMissing=Cuir tic sa bhosca seo más mian leat dul ar aghaidh.
+FormValidationRadioMissing=Roghnaigh ceann de na roghanna seo.
+FormValidationFileMissing=Roghnaigh comhad.
+FormValidationSelectMissing=Roghnaigh mír ón liosta.
+FormValidationInvalidEmail=Cuir isteach seoladh ríomhphoist.
+FormValidationInvalidURL=Cuir isteach URL.
+FormValidationPatternMismatch=Please match the requested format.
+FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
+UseOfDocumentWidthWarning=Úsáideadh athróg neamhchaighdeánach document.width.  Ba chóir document.body.clientWidth a úsáid.
+UseOfDocumentHeightWarning=Non-standard document.height was used. Use standard document.body.clientHeight instead.
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -21,16 +21,17 @@
 <!ENTITY malformedURI.title "Seoladh Neamhbhailí">
 <!ENTITY malformedURI.longDesc "<p>Ní aithnítear formáid an tseolta sonraithe. Féach an bhfuil botúin i mbarra na suíomhanna agus bain triail eile as.</p>">
 
 <!ENTITY netInterrupt.title "Briseadh Tarchur na Sonraí">
 <!ENTITY netInterrupt.longDesc "<p>D'éirigh leis an mbrabhsálaí ceangal a bhunú ach idirbhriseadh an ceangal le linn traschur na faisnéise. Triail arís é le do thoil.</p><ul><li>Mura bhfuil tú in ann suímh eile a bhrabhsáil, déan seiceáil ar cheangal líonra do ríomhaire.</li><li>An bhfuil fadhbanna agat fós? Téigh i dteagmháil le do riarthóir líonra nó le do sholáthraí Idirlín le haghaidh cabhrach.</li></ul>">
 
 <!ENTITY netOffline.title "Mód As Líne">
 <!ENTITY netOffline.longDesc "<p>Tá an brabhsálaí sa mhód as líne agus ní féidir ceangal leis an mhír iarrtha.</p><ul><li>An bhfuil an ríomhaire ceangailte le líonra gníomhach?</li><li>Cuir an brabhsálaí sa mhód ar líne agus triail arís é.</li></ul>">
+<!ENTITY netOffline.overrideLongDesc "<p>Tá an brabhsálaí sa mhód as líne agus ní féidir ceangal leis an mhír iarrtha.</p><ul><li>An bhfuil an ríomhaire ceangailte le líonra gníomhach?</li><li>Cuir an brabhsálaí sa mhód ar líne agus triail arís é.</li></ul>">
 
 <!ENTITY contentEncodingError.title "Earráid Ionchódaithe Inneachair">
 <!ENTITY contentEncodingError.longDesc "<p>An leathanach atá tú ag iarraidh a amharc, ní féidir é a thaispeáint, agus comhbhrú ann nach bhfuil bailí nó nach bhfuil tacaíocht leis.</p><ul><li>Téigh i dteagmháil le húinéirí an tsuímh ghréasáin leis an bhfadhb a chur in iúl dóibh, le do thoil.</li></ul>">
 
 <!ENTITY unsafeContentType.title "Cineál Comhaid Baolach">
 <!ENTITY unsafeContentType.longDesc "<ul> <li>Téigh i dteagmháil le húinéirí an tsuímh ghréasáin leis an bhfadhb a chur in iúl dóibh, le do thoil.</li> </ul>">
 
 <!ENTITY netReset.title "Idirbhriseadh an Ceangal">
--- a/other-licenses/branding/firefox/brand.dtd
+++ b/other-licenses/branding/firefox/brand.dtd
@@ -1,5 +1,5 @@
 <!ENTITY brandShortName "Firefox">
 <!ENTITY brandFullName "Mozilla Firefox">
 <!ENTITY vendorShortName "Mozilla">
-<!-- LOCALIZATION NOTE (trademarkInfo): note that there is no space between licenseLinkText (and its trailing licenseLinkSuffix entity) and this entity, so if your locale needs a space between sentences, you need to put it at the start of this entity. -->
-<!ENTITY trademarkInfo " Is trádmharcanna de chuid Fondúireacht Mozilla iad Firefox agus suaitheantais Firefox.  Tá roinnt cearta trádmharc á n-úsáid faoi cheadúnas ón Charlton Company.">
+<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY trademarkInfo.part2 "Some of the trademarks used under license from The Charlton Company.">
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -105,16 +105,17 @@ SSL_ERROR_UNRECOGNIZED_NAME_ALERT=Níl teastas ag an gcomhghleacaí SSL don ainm DNS iarrtha.
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=Ní raibh an comhghleacaí SSL in ann freagra OCSP a fháil dá theastas.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=Thug an comhghleacaí SSL tuairisc ar dhroch-luach haise teastais.
 SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.                             
 SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.                                
 SSL_ERROR_DECOMPRESSION_FAILURE=SSL received a compressed record that could not be decompressed.                                        
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiation is not allowed on this SSL socket.                                                    
 SSL_ERROR_UNSAFE_NEGOTIATION=Peer attempted old style (potentially vulnerable) handshake.
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL received an unexpected uncompressed record.
+SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL received a weak ephemeral Diffie-Hellman key in Server Key Exchange handshake message.
 SEC_ERROR_IO=Tharla earráid I/A le linn údarú slándála.
 SEC_ERROR_LIBRARY_FAILURE=Teip sa leabharlann slándála.
 SEC_ERROR_BAD_DATA=leabharlann slándála: fuarthas sonraí mícheart.
 SEC_ERROR_OUTPUT_LEN=leabharlann slándála: earráid fhaid aschuir.
 SEC_ERROR_INPUT_LEN=earráid fhaid ionchuir sa leabharlann slándála.
 SEC_ERROR_INVALID_ARGS=leabharlann slándála: argóintí neamhbhailí.
 SEC_ERROR_INVALID_ALGORITHM=leabharlann slándála: algartam neamhbhailí.
 SEC_ERROR_INVALID_AVA=leabharlann slándála: AVA neamhbhailí.
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -14,52 +14,72 @@
 
 <!ENTITY rights.intro-point1a "&brandShortName; is made available to you under the terms of the ">
 <!ENTITY rights.intro-point1b "Mozilla Public License">
 <!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
 
 <!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found ">
 <!ENTITY rights.intro-point2-b "here">
 <!ENTITY rights.intro-point2-c ".">
+<!-- point 2.5 text for official branded builds -->
+
+<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.">
 <!-- point 3 text for official branded builds -->
 
-<!ENTITY rights.intro-point3a "Privacy policies for &vendorShortName;'s products may be found ">
-<!ENTITY rights.intro-point3b "here">
+<!ENTITY rights2.intro-point3a "How we use your personal information and feedback submitted to &vendorShortName; through &brandShortName; is described in the ">
+<!ENTITY rights2.intro-point3b "Polasaí Príobháideachais &brandShortName;">
 <!ENTITY rights.intro-point3c ".">
 <!-- point 3 text for unbranded builds -->
 
 <!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">
 <!-- point 4 text for official branded builds -->
 
-<!ENTITY rights.intro-point4a "&brandShortName; also offers optional web site information services, such as the SafeBrowsing service; however, we cannot guarantee they are 100&#37; accurate or error-free. More details, including information on how to disable the services, can be found in the ">
+<!ENTITY rights2.intro-point4a "Some &brandShortName; features make use of web-based information services, however, we cannot guarantee they are 100&#37; accurate or error-free. More details, including information on how to disable the features that use these services, can be found in the ">
 <!ENTITY rights.intro-point4b "service terms">
 <!ENTITY rights.intro-point4c ".">
 <!-- point 4 text for unbranded builds -->
 
 <!ENTITY rights.intro-point4a-unbranded "If this product incorporates web services, any applicable service terms for the service(s) should be linked to the ">
 <!ENTITY rights.intro-point4b-unbranded "Web Site Services">
 <!ENTITY rights.intro-point4c-unbranded " section.">
 
-<!ENTITY rights.webservices-header "&brandFullName; Web Site Services">
+<!ENTITY rights2.webservices-header "&brandFullName; Web-Based Information Services">
 <!-- Note that this paragraph references a couple of entities from
      preferences/security.dtd, so that we can refer to text the user sees in
      the UI, without this page being forgotten every time those strings are
      updated.  -->
 <!-- intro paragraph for branded builds -->
 
-<!ENTITY rights.webservices-a "&brandFullName; uses web site information services (&quot;Services&quot;), such as the SafeBrowsing service, that are available for your use with this binary version of &brandShortName; as described below. If you do not want to use the Services or the terms below are unacceptable, you may disable the SafeBrowsing service by opening the application preferences, selecting the ">
-<!ENTITY rights.webservices-b "Slándáil">
-<!ENTITY rights.webservices-c " section, and unchecking the options for &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
+<!ENTITY rights2.webservices-a "&brandFullName; uses web-based information services (&quot;Services&quot;) to provide some of the features provided for your use with this binary version of &brandShortName; under the terms described below. If you do not want to use one or more of the Services or the terms below are unacceptable, you may disable the feature or Service(s). Instructions on how to disable a particular feature or Service may be found ">
+<!ENTITY rights2.webservices-b "anseo">
+<!ENTITY rights2.webservices-c ".">
+<!-- safe browsing points for branded builds -->
+
+<!ENTITY rights.safebrowsing-a "SafeBrowsing: ">
+<!ENTITY rights.safebrowsing-b "Disabling the Safe Browsing feature is not recommended as it may result in you going to unsafe sites.  If you wish to disable the feature completely, follow these steps:">
+<!ENTITY rights.safebrowsing-term1 "Open the application preferences">
+<!ENTITY rights.safebrowsing-term2 "Select the Security selection">
+<!ENTITY rights.safebrowsing-term3 "Uncheck the options to &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
+<!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled">
+<!-- location aware browsing points for branded builds -->
+
+<!ENTITY rights.locationawarebrowsing-a "Location Aware Browsing: ">
+<!ENTITY rights.locationawarebrowsing-b "is always opt-in.  No location information is ever sent without your permission.  If you wish to disable the feature completely, follow these steps:">
+<!ENTITY rights.locationawarebrowsing-term1a "In the URL bar, type ">
+<!ENTITY rights.locationawarebrowsing-term1b "about:config">
+<!ENTITY rights.locationawarebrowsing-term2 "Type geo.enabled">
+<!ENTITY rights.locationawarebrowsing-term3 "Double click on the geo.enabled preference">
+<!ENTITY rights.locationawarebrowsing-term4 "Location-Aware Browsing is now disabled">
 <!-- intro paragraph for unbranded builds -->
 
 <!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
 <!-- point 1 text for unbranded builds -->
 
 <!ENTITY rights.webservices-term1-unbranded "Any applicable service terms for this product should be listed here.">
 <!-- points 1-7 text for branded builds -->
 
-<!ENTITY rights.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date phishing and malware information. However, they cannot guarantee that this information is comprehensive and error-free: some risky sites may not be identified and some safe sites may be identified in error.">
+<!ENTITY rights2.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date Services.  However, we cannot guarantee that this information is comprehensive and error-free.  For example, the Safe Browsing Service may not identify some risky sites and may identify some safe sites in error and the Location Aware Service all locations returned by our service providers are estimates only and neither we nor our service providers guarantee the accuracy of the locations provided.">
 <!ENTITY rights.webservices-term2 "&vendorShortName; may discontinue or change the Services at its discretion.">
-<!ENTITY rights.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and you have all the rights necessary to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
+<!ENTITY rights2.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and &vendorShortName; grants you its rights to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
 <!ENTITY rights.webservices-term4 "The Services are provided &quot;as-is.&quot;  &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes.  You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
 <!ENTITY rights.webservices-term5 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services.  The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
 <!ENTITY rights.webservices-term6 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or canceled without &vendorShortName;'s written agreement.">
 <!ENTITY rights.webservices-term7 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -10,28 +10,27 @@
 <!ENTITY aboutSupport.extensionId "Aitheantas">
 
 <!ENTITY aboutSupport.appBasicsTitle "Buntús an Fheidhmchláir">
 <!ENTITY aboutSupport.appBasicsName "Ainm">
 <!ENTITY aboutSupport.appBasicsVersion "Leagan">
 <!ENTITY aboutSupport.appBasicsProfileDir "Comhadlann Phróifíle">
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Forlíontáin Chumasaithe">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Cumraíocht Tógála">
+<!ENTITY aboutSupport.appBasicsUserAgent "User Agent">
 
 <!ENTITY aboutSupport.show.label "Oscail an Fillteán ina bhfuil sé">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.show.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
 
 <!ENTITY aboutSupport.showMac.label "Taispeáin sa Finder">
 
 <!ENTITY aboutSupport.modifiedPrefsTitle "Sainroghanna Athraithe">
 <!ENTITY aboutSupport.modifiedPrefsName "Ainm">
 <!ENTITY aboutSupport.modifiedPrefsValue "Luach">
 
 <!ENTITY aboutSupport.graphicsTitle "Grafaic">
-<!-- LOCALIZATION NOTE In the following string, "Direct2D" is a proper noun and should not be translated -->
-<!ENTITY aboutSupport.graphicsDirect2DEnabled "Direct2D Cumasaithe">
 
 <!ENTITY aboutSupport.installationHistoryTitle "Stair Suiteála">
 <!ENTITY aboutSupport.updateHistoryTitle "Stair na Nuashonruithe">
 
 <!ENTITY aboutSupport.copyToClipboard.label "Cóipeáil gach rud go dtí an Ghearrthaisce">
--- a/toolkit/chrome/global/commonDialogs.properties
+++ b/toolkit/chrome/global/commonDialogs.properties
@@ -9,16 +9,18 @@ OK=OK
 Cancel=Cealaigh
 Yes=&Tá
 No=&Níl
 Save=&Sábháil
 Revert=&Fill
 DontSave=&Ná Sábháil
 ScriptDlgGenericHeading=[Feidhmchlár JavaScript]
 ScriptDlgHeading=Deir an leathanach ag %S:
+ScriptDialogLabel=Prevent this page from creating additional dialogs
+ScriptDialogPreventTitle=Confirm Dialog Preference
 # LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy):
 # %1 is an untrusted string provided by a remote server. It could try to
 # take advantage of sentence structure in order to mislead the user (see
 # bug 244273). %1 should be integrated into the translated sentences as
 # little as possible. %2 is the url of the site being accessed.
 EnterLoginForRealm=Tá %2$S ag iarraidh ainm úsáideora agus focal faire. Deir an suíomh: "%1$S"
 EnterLoginForProxy=Tá an seachfhreastalaí %2$S ag iarraidh ainm úsáideora agus focal faire. Deir an suíomh: "%1$S"
 EnterUserPasswordFor=Iontráil ainm úsáideora agus focal faire do %1$S
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -28,17 +28,18 @@ btnConsoleInfo=Eolas
 tipConsoleInfo=Logáil glaonna ar console.info()
 btnConsoleWarnings=Rabhaidh
 tipConsoleWarnings=Logáil glaonna ar console.warn()
 btnConsoleLog=Logáil
 tipConsoleLog=Logáil glaonna ar console.log()
 btnGlobal=Teachtaireachtaí Comhchoiteanna
 tipGlobal=Scoránaigh logáil Teachtaireachtaí Comhchoiteanna
 localConsole=Consól Logánta
-itemClear=Bánaigh an Consól
+clearConsoleCmd.label=Bánaigh an Consól
+clearConsoleCmd.accesskey=l
 stringFilter=Scagaire
 close.button=Dún
 close.accesskey=C
 update.button=Nuashonrú
 update.accesskey=U
 # LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
 #
 # The "PropertyPanel" is used to display a JS object to the user.
@@ -56,10 +57,56 @@ jsPropertyTitle=Breathnóir Réada
 # The %S is replaced by the evaluated code the user clicked on in the console.
 #
 # Example: The user executed `window.document` in the WebConsole. The `document`
 # object is written to the output. If the user clicks on the `document` output
 # in the console, a PropertyPanel will show up. The title of the PropertyPanel
 # is set to `Inspect: window.document` because the clicked `document` object was
 # evaluated based on the `window.document` string.
 jsPropertyInspectTitle=Scrúdaigh: %S
+saveBodies.label=Log Request and Response Bodies
+saveBodies.accesskey=L
 copyCmd.label=Cóipeáil
 copyCmd.accesskey=C
+selectAllCmd.label=Select All
+selectAllCmd.accesskey=W
+# LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
+# %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
+timestampFormat=%02S:%02S:%02S.%03S
+
+helperFuncUnsupportedTypeError=Can't call pprint on this type of object.
+# LOCALIZATION NOTE (networkUrlWithStatus):
+#
+# When the HTTP request is started only the URL of the request is printed to the
+# WebConsole. As the response status of the HTTP request arrives, the URL string
+# is replaced by this string (the response status can look like `HTTP/1.1 200 OK`).
+# The bracket is not closed to mark that this request is not done by now. As the
+# request is finished (the HTTP connection is closed) this string is replaced
+# by `networkUrlWithStatusAndDuration` which has a closing the braket.
+#
+# %1$S = URL of network request
+# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
+networkUrlWithStatus=%1$S [%2$S
+# LOCALIZATION NOTE (networkUrlWithStatusAndDuration):
+#
+# When the HTTP request is finished (the HTTP connection is closed) this string
+# replaces the former `networkUrlWithStatus` string in the WebConsole.
+#
+# %1$S = URL of network request
+# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
+# %3$S = duration for the complete network request in milliseconds
+networkUrlWithStatusAndDuration=%1$S [%2$S %3$Sms]
+NetworkPanel.label=Inspect Network Request
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
+#
+# This string is used to show the duration between two network events (e.g
+# request and respones header or response header and response body).
+NetworkPanel.durationMS=%Sms
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
+# This string is used to show the duration between the response header and the
+# response body event. It also shows the size of the received or cached image.
+#
+# The first %S is replace by the width of the inspected image.
+# The second %S is replaced by the height of the inspected image.
+# The third %S is replaced by the duration between the response header and the
+# response body event.
+NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
+ConsoleAPIDisabled=The Web Console logging API (console.log, console.info, console.warn, console.error) has been disabled by a script on this page.
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -2,126 +2,187 @@
 <!ENTITY search.placeholder "Cuardaigh na breiseáin go léir">
 <!ENTITY loading.label "Á Luchtú…">
 <!ENTITY listEmpty.installed.label "Níl aon bhreiseán den chineál seo suiteáilte agat">
 <!ENTITY listEmpty.availableUpdates.label "Ní bhfuarthas nuashonruithe">
 <!ENTITY listEmpty.recentUpdates.label "Ní raibh aon bhreiseáin nuashonraithe agat le déanaí">
 <!ENTITY listEmpty.findUpdates.label "Lorg Nuashonruithe">
 <!ENTITY listEmpty.search.label "Níor aimsíodh aon bhreiseáin chomhoiriúnacha">
 <!ENTITY listEmpty.button.label "Tuilleadh eolais faoi bhreiseáin">
-<!ENTITY installFromFile.label "Suiteáil ó chomhad…">
-<!ENTITY installFromFile.accesskey "i">
+<!ENTITY installAddonFromFile.label "Install Add-on From File…">
+<!ENTITY installAddonFromFile.accesskey "I">
+<!ENTITY toolsMenu.tooltip "Tools for all add-ons">
+
+<!ENTITY cmd.back.tooltip "Leathanach amháin siar">
+<!ENTITY cmd.forward.tooltip "Leathanach amháin ar aghaidh">
+<!-- global warnings -->
+
+<!ENTITY warning.safemode.label "All add-ons have been disabled by safe mode.">
+<!ENTITY warning.checkcompatibility.label "Add-on compatibility checking is disabled. You may have incompatible add-ons.">
+<!ENTITY warning.checkcompatibility.enable.label "Enable">
+<!ENTITY warning.checkcompatibility.enable.tooltip "Enable add-on compatibility checking">
+<!ENTITY warning.updatesecurity.label "Add-on update security checking is disabled. You may be compromised by updates.">
+<!ENTITY warning.updatesecurity.enable.label "Enable">
+<!ENTITY warning.updatesecurity.enable.tooltip "Enable add-on update security checking">
 <!-- categories / views -->
-<!-- LOCALIZATION NOTE: These should match the header-* entries in extensions.properties -->
 
 <!ENTITY view.search.label "Cuardach">
 <!ENTITY view.discover.label "Faigh Breiseáin">
 <!ENTITY view.locales.label "Teangacha">
 <!ENTITY view.searchengines.label "Innill Chuardaigh">
 <!ENTITY view.features.label "Eisínteachtaí">
-<!ENTITY view.appearance.label "Téamaí">
+<!ENTITY view.appearance2.label "Appearance">
 <!ENTITY view.plugins.label "Forlíontáin">
 <!ENTITY view.recentUpdates.label "Nuashonruithe Le Déanaí">
 <!ENTITY view.availableUpdates.label "Nuashonruithe Ar Fáil">
 <!-- addon updates -->
 
-<!ENTITY updates.updateAddonsNow.label "Nuashonraigh Breiseáin Anois">
-<!ENTITY updates.updateAddonsNow.accesskey "u">
+<!ENTITY updates.checkForUpdates.label "Check for Updates">
+<!ENTITY updates.checkForUpdates.accesskey "C">
 <!ENTITY updates.viewUpdates.label "Féach ar Nuashonruithe Le Déanaí">
 <!ENTITY updates.viewUpdates.accesskey "F">
-<!ENTITY updates.backgroudUpdateCheck.label "Cuardaigh Nuashonruithe go hUathoibríoch">
-<!ENTITY updates.backgroudUpdateCheck.accesskey "C">
+<!ENTITY updates.updateAddonsAutomatically.label "Update Add-ons Automatically">
+<!ENTITY updates.updateAddonsAutomatically.accesskey "A">
+<!ENTITY updates.resetUpdatesToAutomatic.label "Reset All Add-ons to Update Automatically">
+<!ENTITY updates.resetUpdatesToAutomatic.accesskey "R">
+<!ENTITY updates.resetUpdatesToManual.label "Reset All Add-ons to Update Manually">
+<!ENTITY updates.resetUpdatesToManual.accesskey "R">
 <!ENTITY updates.updating.label "Breiseáin á nuashonrú">
 <!ENTITY updates.installed.label "Nuashonraíodh do chuid breiseán.">
 <!ENTITY updates.downloaded.label "Íosluchtaíodh nuashonruithe na mbreiseán.">
 <!ENTITY updates.restart.label "Atosaigh anois chun an tsuiteáil a chur i gcrích">
 <!ENTITY updates.noneFound.label "Ní bhfuarthas nuashonruithe">
 <!ENTITY updates.manualUpdatesFound.label "Féach ar Nuashonruithe Ar Fáil">
+<!ENTITY updates.updateSelected.label "Install Updates">
+<!ENTITY updates.updateSelected.tooltip "Install available updates in this list">
 <!-- addon actions -->
 
-<!ENTITY cmd.showDetails.label "Taispeáin tuilleadh eolais">
-<!ENTITY cmd.showDetails.accesskey "s">
-<!ENTITY cmd.findUpdates.label "Cuardaigh nuashonruithe">
-<!ENTITY cmd.findUpdates.accesskey "C">
-<!ENTITY cmd.preferences.label "Sainroghanna">
-<!ENTITY cmd.preferences.accesskey "S">
+<!ENTITY cmd.showDetails.label "Show More Information">
+<!ENTITY cmd.showDetails.accesskey "S">
+<!ENTITY cmd.findUpdates.label "Find Updates">
+<!ENTITY cmd.findUpdates.accesskey "F">
+<!ENTITY cmd.preferencesWin.label "Options">
+<!ENTITY cmd.preferencesWin.accesskey "O">
+<!ENTITY cmd.preferencesUnix.label "Preferences">
+<!ENTITY cmd.preferencesUnix.accesskey "P">
 <!ENTITY cmd.about.label "Maidir Leis">
 <!ENTITY cmd.about.accesskey "M">
 
 <!ENTITY cmd.enableAddon.label "Cumasaigh">
 <!ENTITY cmd.enableAddon.accesskey "C">
 <!ENTITY cmd.disableAddon.label "Díchumasaigh">
 <!ENTITY cmd.disableAddon.accesskey "D">
+<!ENTITY cmd.enableTheme.label "Wear Theme">
+<!ENTITY cmd.enableTheme.accesskey "W">
+<!ENTITY cmd.disableTheme.label "Stop Wearing Theme">
+<!ENTITY cmd.disableTheme.accesskey "W">
+<!ENTITY cmd.installAddon.label "Suiteáil">
+<!ENTITY cmd.installAddon.accesskey "S">
 <!ENTITY cmd.uninstallAddon.label "Bain">
 <!ENTITY cmd.uninstallAddon.accesskey "B">
-<!ENTITY cmd.showPreferences.label "Sainroghanna">
-<!ENTITY cmd.showPreferences.tooltip "Athraigh sainroghanna an bhreiseáin seo">
+<!ENTITY cmd.showPreferencesWin.label "Roghanna">
+<!ENTITY cmd.showPreferencesWin.tooltip "Change this add-on's options">
+<!ENTITY cmd.showPreferencesUnix.label "Sainroghanna">
+<!ENTITY cmd.showPreferencesUnix.tooltip "Change this add-on's preferences">
 <!ENTITY cmd.contribute.label "Glac Páirt">
 <!ENTITY cmd.contribute.accesskey "c">
 <!ENTITY cmd.contribute.tooltip "Glac páirt i bhforbairt an bhreiseáin seo">
 
 <!ENTITY cmd.showReleaseNotes.label "Taispeáin na Nótaí Eisiúna">
 <!ENTITY cmd.showReleaseNotes.tooltip "Taispeáin na nótaí eisiúna don nuashonrú seo">
 <!ENTITY cmd.hideReleaseNotes.label "Folaigh na Nótaí Eisiúna">
 <!ENTITY cmd.hideReleaseNotes.tooltip "Folaigh na nótaí eisiúna don nuashonrú seo">
+<!-- discovery view -->
+<!-- LOCALIZATION NOTE (discover.title,discover.description,discover.footer):
+     Displayed in the center of the Get Add-ons view, see bug 601143 for mockups. -->
+
+<!ENTITY discover.title "What are Add-ons?">
+<!ENTITY discover.description2 "Add-ons are applications that let you personalize &brandShortName; with
+  extra functionality or style. Try a time-saving sidebar, a weather notifier, or a themed look to make &brandShortName;
+  your own.">
+<!ENTITY discover.footer "When you're connected to the internet, this pane will feature
+  some of the best and most popular add-ons for you to try out.">
 <!-- detail view -->
 
 <!ENTITY detail.version.label "Leagan">
-<!ENTITY detail.updated.label "Nuashonraithe">
+<!ENTITY detail.lastupdated.label "Last Updated">
 <!ENTITY detail.creator.label "Forbróir">
 <!ENTITY detail.homepage.label "Leathanach Baile">
 <!ENTITY detail.numberOfDownloads.label "Íosluchtú">
 
-<!ENTITY detail.updateAutomatically.label "Nuashonraigh go huathoibríoch">
-<!ENTITY detail.updateAutomatically.accesskey "u">
-<!ENTITY detail.updateAutomatically.tooltip "Nuashonraigh an breiseán seo go huathoibríoch nuair a bheidh nuashonrú ar fáil">
-<!ENTITY detail.checkForUpdates.label "Lorg nuashonruithe">
-<!ENTITY detail.checkForUpdates.accesskey "g">
+<!ENTITY detail.contributions.description "The developer of this add-on asks that you help support its continued development by making a small contribution.">
+
+<!ENTITY detail.updateType "Automatic Updates">
+<!ENTITY detail.updateDefault.label "Réamhshocrú">
+<!ENTITY detail.updateDefault.tooltip "Automatically install updates only if that's the default">
+<!ENTITY detail.updateAutomatic.label "Ann">
+<!ENTITY detail.updateAutomatic.tooltip "Automatically install updates">
+<!ENTITY detail.updateManual.label "As">
+<!ENTITY detail.updateManual.tooltip "Don't automatically install updates">
+<!ENTITY detail.home "Homepage">
+<!ENTITY detail.repository "Add-on Profile">
+<!ENTITY detail.size "Méid">
+
+<!ENTITY detail.checkForUpdates.label "Check for Updates">
+<!ENTITY detail.checkForUpdates.accesskey "F">
 <!ENTITY detail.checkForUpdates.tooltip "Lorg nuashonruithe le haghaidh an bhreiseáin seo">
-<!ENTITY detail.showPreferences.label "Sainroghanna">
-<!ENTITY detail.showPreferences.accesskey "S">
-<!ENTITY detail.showPreferences.tooltip "Athraigh sainroghanna an bhreiseáin seo">
+<!ENTITY detail.showPreferencesWin.label "Options">
+<!ENTITY detail.showPreferencesWin.accesskey "O">
+<!ENTITY detail.showPreferencesWin.tooltip "Change this add-on's options">
+<!ENTITY detail.showPreferencesUnix.label "Preferences">
+<!ENTITY detail.showPreferencesUnix.accesskey "P">
+<!ENTITY detail.showPreferencesUnix.tooltip "Change this add-on's preferences">
 <!-- ratings -->
 
 
-<!ENTITY rating.label "Rátáil:">
+<!ENTITY rating2.label "Rátáil">
 <!-- download/install progress -->
 
 <!ENTITY progress.pause.tooltip "Cuir ar Shos">
 <!ENTITY progress.cancel.tooltip "Cealaigh">
 <!-- list sorting -->
 
 
 <!ENTITY sort.name.label "Ainm">
 <!ENTITY sort.name.tooltip "Sórtáil de réir ainm">
-<!ENTITY sort.dateUpdated.label "Nuashonraithe">
+<!ENTITY sort.dateUpdated.label "Last Updated">
 <!ENTITY sort.dateUpdated.tooltip "Sórtáil de réir dáta nuashonraithe">
-<!ENTITY sort.rating.label "Rátáil">
-<!ENTITY sort.rating.tooltip "Sórtáil de réir meánrátála">
+<!ENTITY sort.relevance.label "Best match">
+<!ENTITY sort.relevance.tooltip "Sort by relevance">
+<!ENTITY sort.price.label "Price">
+<!ENTITY sort.price.tooltip "Sort by price">
 
 <!ENTITY search.filter2.label "Cuardaigh:">
 <!ENTITY search.filter2.installed.label "Mo Chuid Bhreiseán">
 <!ENTITY search.filter2.installed.tooltip "Taispeáin breiseáin shuiteáilte">
 <!ENTITY search.filter2.available.label "Breiseáin le fáil">
 <!ENTITY search.filter2.available.tooltip "Taispeáin na breiseáin is féidir suiteáil">
 
 <!ENTITY addon.homepage "Leathanach Baile">
 <!ENTITY addon.details.label "Tuilleadh">
 <!ENTITY addon.details.tooltip "Taispeáin tuilleadh eolais faoin bhreiseán seo">
 <!ENTITY addon.unknownDate "Anaithnid">
+<!-- LOCALIZATION NOTE (addon.disabled.postfix): This is used in a normal list
+     to signify that an add-on is disabled, in the form
+     "<Addon name> <1.0> (disabled)" -->
 <!ENTITY addon.disabled.postfix "(díchumasaithe)">
-<!-- LOCALIZATION NOTE (addon.update.postfix): This is used to signify that an item is an update, in the form "Addon v1.0 Update" -->
+<!-- LOCALIZATION NOTE (addon.update.postfix): This is used in the available
+     updates list to signify that an item is an update, in the form
+     "<Addon name> <1.1> Update". It is fine to use constructs like brackets if
+     necessary -->
 <!ENTITY addon.update.postfix "Nuashonrú">
-<!ENTITY addon.undo.label "Cealaigh?">
-<!ENTITY addon.undo.tooltip "Cealaigh an gníomh seo">
-<!ENTITY addon.undoUninstall.label "Cealaigh?">
-<!ENTITY addon.undoUninstall.tooltip "Coinnigh an breiseán seo suiteáilte">
+<!ENTITY addon.undoAction.label "Undo">
+<!ENTITY addon.undoAction.tooltip "Cealaigh an gníomh seo">
+<!ENTITY addon.undoRemove.label "Undo">
+<!ENTITY addon.undoRemove.tooltip "Coinnigh an breiseán seo suiteáilte">
 <!ENTITY addon.restartNow.label "Atosaigh anois">
 <!ENTITY addon.install.label "Suiteáil">
 <!ENTITY addon.install.tooltip "Suiteáil an breiseán seo">
 <!ENTITY addon.updateNow.label "Nuashonraigh Anois">
 <!ENTITY addon.updateNow.tooltip "Suiteáil an nuashonrú don bhreiseán seo">
+<!ENTITY addon.includeUpdate.label "Include in Update">
+<!ENTITY addon.updateAvailable.label "An update is available">
 <!ENTITY addon.checkingForUpdates.label "Nuashonruithe á lorg…">
 <!ENTITY addon.releaseNotes.label "Nótaí Eisiúna:">
 <!ENTITY addon.loadingReleaseNotes.label "Á Luchtú…">
 <!ENTITY addon.errorLoadingReleaseNotes.label "Tá brón orm, ach tharla earráid agus na nótaí eisiúna á luchtú.">
 
 <!ENTITY addon.createdBy.label "Le ">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -1,75 +1,103 @@
 #LOCALIZATION NOTE (aboutWindowTitle) %S is the addon name
 aboutWindowTitle=Maidir le %S
 aboutWindowCloseButton=Dún
 #LOCALIZATION NOTE (aboutWindowVersionString) %S is the addon version
 aboutWindowVersionString=leagan %S
 #LOCALIZATION NOTE (aboutAddon) %S is the addon name
 aboutAddon=Maidir le %S
 
-#LOCALIZATION NOTE These should match the view.*.label entities in extensions.dtd
-header-search=Torthaí Cuardaigh
-header-discover=Faigh Breiseáin
-header-locale=Teangacha
-header-searchengine=Innill Chuardaigh
-header-extension=Eisínteachtaí
-header-theme=Téamaí
-header-plugin=Forlíontáin
-header-recentUpdates=Nuashonruithe Le Déanaí
-header-availableUpdates=Nuashonruithe Ar Fáil
-
-#LOCALIZATION NOTE (header-goBack) %S is the name of the pane to go back to
-header-goBack=Ar ais go %S
-
 #LOCALIZATION NOTE (uninstallNotice) %S is the add-on name
 uninstallNotice=Baineadh %S.
 
 #LOCALIZATION NOTE (numReviews) #1 is the number of reviews
 numReviews=#1 léirmheas;#1 léirmheas;#1 léirmheas;#1 léirmheas;#1 léirmheas
 
 #LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated
 dateUpdated=%S Nuashonraithe
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
-notification.incompatible=Níl %1$S comhoiriúnach do %2$S %3$S.
+notification.incompatible=%1$S is incompatible with %2$S %3$S.
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
 notification.blocked=%1$S has been disabled due to security or stability issues.
 notification.blocked.link=Tuilleadh Eolais
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
-notification.softblocked=Is eol go bhfuil fadhbanna slándála nó cobhsaíochta le %1$S.
+notification.softblocked=%1$S is known to cause security or stability issues.
 notification.softblocked.link=Tuilleadh Eolais
+#LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
+notification.outdated=An important update is available for %1$S.
+notification.outdated.link=Update Now
 #LOCALIZATION NOTE (notification.enable) %1$S is the add-on name, %2$S is brand name
-notification.enable=Beidh %1$S cumasaithe tar éis duit %2$S a atosú.
+notification.enable=%1$S will be enabled after you restart %2$S.
 #LOCALIZATION NOTE (notification.disable) %1$S is the add-on name, %2$S is brand name
-notification.disable=Beidh %1$S díchumasaithe tar éis duit %2$S a atosú.
+notification.disable=%1$S will be disabled after you restart %2$S.
 #LOCALIZATION NOTE (notification.install) %1$S is the add-on name, %2$S is brand name
-notification.install=Beidh %1$S suiteáilte tar éis duit %2$S a atosú.
+notification.install=%1$S will be installed after you restart %2$S.
 #LOCALIZATION NOTE (notification.uninstall) %1$S is the add-on name, %2$S is brand name
-notification.uninstall=Beidh %1$S díshuiteáilte tar éis duit %2$S a atosú.
+notification.uninstall=%1$S will be uninstalled after you restart %2$S.
 #LOCALIZATION NOTE (notification.upgrade) %1$S is the add-on name, %2$S is brand name
-notification.upgrade=Beidh %1$S nuashonraithe tar éis duit %2$S a atosú.
+notification.upgrade=%1$S will be updated after you restart %2$S.
+#LOCALIZATION NOTE (notification.downloadError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
+notification.downloadError=There was an error downloading %1$S.
+notification.downloadError.retry=Try again
+notification.downloadError.retry.tooltip=Try downloading this add-on again
+#LOCALIZATION NOTE (notification.installError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
+notification.installError=There was an error installing %1$S.
+notification.installError.retry=Try again
+notification.installError.retry.tooltip=Try downloading and installing this add-on again
+
+#LOCALIZATION NOTE (contributionAmount) %S is the currency amount recommended for contributions
+contributionAmount=Suggested Donation: %S
 
 installDownloading=Íosluchtú
 installDownloaded=Íosluchtaithe
 installDownloadFailed=Earráid le linn íosluchtaithe
 installVerifying=Á Fhíorú
 installInstalling=Á Shuiteáil
 installEnablePending=Atosaigh chun cumasú
 installDisablePending=Atosaigh chun díchumasú
 installFailed=Earráid le linn suiteála
 installCancelled=Cealaíodh an tsuiteáil
 
-#LOCALIZATION NOTE: %1$S is the addon name, %2$S is brand name
-restartToEnable2=Beidh %1$S cumasaithe tar éis duit %2$S a atosú
-restartToDisable=Beidh %1$S díchumasaithe tar éis duit %2$S a atosú
-restartToUninstall=Beidh %1$S bainte tar éis duit %2$S a atosú
-restartToUpgrade=Beidh %1$S nuashonraithe tar éis duit %2$S a atosú
+#LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
+details.notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
+details.notification.blocked=%1$S has been disabled due to security or stability issues.
+details.notification.blocked.link=More Information
+#LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
+details.notification.softblocked=%1$S is known to cause security or stability issues.
+details.notification.softblocked.link=More Information
+#LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
+details.notification.outdated=An important update is available for %1$S.
+details.notification.outdated.link=Update Now
+#LOCALIZATION NOTE (details.notification.enable) %1$S is the add-on name, %2$S is brand name
+details.notification.enable=%1$S will be enabled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name
+details.notification.disable=%1$S will be disabled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name
+details.notification.install=%1$S will be installed after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name
+details.notification.uninstall=%1$S will be uninstalled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
+details.notification.upgrade=%1$S will be updated after you restart %2$S.
 
 installFromFile.dialogTitle=Roghnaigh breiseán le suiteáil
 installFromFile.filterName=Breiseáin
 
 uninstallAddonTooltip=Díshuiteáil an breiseán seo
 uninstallAddonRestartRequiredTooltip=Díshuiteáil an breiseán seo (atosú de dhíth)
 enableAddonTooltip=Cumasaigh an breiseán seo
 enableAddonRestartRequiredTooltip=Cumasaigh an breiseán seo (atosú de dhíth)
 disableAddonTooltip=Díchumasaigh an breiseán seo
 disableAddonRestartRequiredTooltip=Díchumasaigh an breiseán seo (atosú de dhíth)
+
+#LOCALIZATION NOTE (showAllSearchResults) #1 is the total number of search results
+showAllSearchResults=See one result;See all #1 results
+
+#LOCALIZATION NOTE (addon.purchase.label) displayed on a button in the list
+# view, %S is the price of the add-on including currency symbol
+addon.purchase.label=Purchase for %S…
+addon.purchase.tooltip=Visit the add-ons gallery to purchase this add-on
+#LOCALIZATION NOTE (cmd.purchaseAddon.label) displayed on a button in the detail
+# view, %S is the price of the add-on including currency symbol
+cmd.purchaseAddon.label=Purchase for %S…
+cmd.purchaseAddon.accesskey=u
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -38,23 +38,31 @@
 <!ENTITY downloading.intro "Nuashonrú á íosluchtú…">
 <!ENTITY connecting.label "Ag dul i dteagmháil le freastalaí na nuashonruithe…">
 <!ENTITY verificationFailedText.label "Níorbh fhéidir le &brandShortName; sláine an nuashonraithe incrimintigh a fhíorú tar éis é a íosluchtú. Dá bhrí sin, tá an pacáiste nuashonraithe á íosluchtú ina iomláine.">
 
 <!ENTITY viewDetails.tooltip "Mionsonraí faoin nuashonrú seo">
 
 <!ENTITY details.link "Mionsonraí">
 
+<!ENTITY error.title "Theip ar Nuashonrú">
+
 <!ENTITY error.label "Bhí fadhbanna ann agus an nuashonrú seo á lorg, á íosluchtú nó á shuiteáil. Níorbh fhéidir &brandShortName; a nuashonrú de bharr:">
                                            
 <!ENTITY errorManual.label "Tig leat &brandShortName; a nuashonrú de láimh tríd an nasc seo a leanúint agus an leagan is nuaí a íosluchtú:">
                                            
-<!ENTITY errorpatching.title "Theip ar Nuashonrú">
 <!ENTITY errorpatching.intro "Níorbh fhéidir an páirt-nuashonrú a chur i bhfeidhm. Déanfaidh &brandShortName; iarracht eile trí nuashonrú iomlán a íosluchtú.">
 
+<!ENTITY genericBackgroundError.label "&brandShortName; is unable to determine if there is an update available. Please
+                                           make sure that you have the latest version of &brandShortName; from:">
+<!ENTITY errorCertAttrNoUpdate2.label "Something is preventing &brandShortName; from updating securely.
+                                           Please make sure that you have the latest version of &brandShortName; from:">
+<!ENTITY errorCertAttrHasUpdate.label "Something is trying to trick &brandShortName; into accepting an
+                                           insecure update. Please contact your network provider and seek help.">
+
 <!ENTITY finishedPage.title "Nuashonrú Réidh le Suiteáil">
 <!ENTITY finishedPage.text "Suiteálfar an nuashonrú an chéad uair eile a atosóidh &brandShortName;. Is féidir leat &brandShortName; a atosú anois nó leanúint ag obair agus é a atosú níos déanaí.">
 
 <!ENTITY finishedBackgroundPage.text "Tá nuashonrú slándála agus cobhsaíochta le haghaidh &brandShortName; íosluchtaithe agus réidh le suiteáil.">
 <!ENTITY finishedBackground.name "Nuashonrú:">
 <!-- LOCALIZATION NOTE (finishedBackground.more): This string describes the button labels defined by restartNowButton and restartLaterButton in updates.properties. -->
 <!ENTITY finishedBackground.more "Suiteálfar an nuashonrú an chéad uair eile a atosóidh &brandShortName;. Is féidir leat &brandShortName; a atosú anois nó leanúint ag obair agus é a atosú níos déanaí.">
 
--- a/toolkit/chrome/mozapps/update/updates.properties
+++ b/toolkit/chrome/mozapps/update/updates.properties
@@ -27,17 +27,16 @@ intro_minor=Tá nuashonrú slándála agus cobhsaíochta le haghaidh %1$S ar fáil:
 # Example: 2.1.5
 addonLabel=%1$S %2$S
 
 updateType_major=Leagan Nua
 updateType_minor=Nuashonrú Slándála
 
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=Níorbh fhéidir le %S sláine an phacáiste nuashonraithe a dhearbhú.
-errorsPageHeader=Theip ar Nuashonrú
 licenseContentNotFound=Níorbh fhéidir an comhad ceadúnais a aimsiú don leagan seo. Féach ar leathanach baile %S le haghaidh tuilleadh eolais.
 updateMoreInfoContentNotFound=Ní raibh teacht ar mhionsonraí breise maidir leis an leagan seo. Chun breis eolais a fháil, tabhair cuairt ar leathanach baile %S.
 resumePausedAfterCloseTitle=Nuashonrú Bogearraí
 resumePausedAfterCloseMsg=Tá íosluchtú an nuashonraithe seo curtha ar shos agat. An bhfuil fonn ort an nuashonrú a íosluchtú sa chúlra agus tú ag brabhsáil le %S?
 updaterIOErrorTitle=Theip ar Nuashonrú Bogearraí
 updaterIOErrorMsg=Níorbh fhéidir an nuashonrú a shuiteáil. Bí cinnte de nach bhfuil cóipeanna eile de %S ag rith ar do ríomhaire, agus ansin atosaigh %S le hiarracht eile a dhéanamh.
 okButton=OK
 okButton.accesskey=O
--- a/toolkit/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/chrome/passwordmgr/passwordmgr.properties
@@ -34,35 +34,39 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 rememberValue = Bí i dtuilleamaí Bhainisteoir na bhFocal Faire leis an luach seo a choinneáil i gcuimhne.
 rememberPassword = Bí i dtuilleamaí Bhainisteoir na bhFocal Faire leis an bhfocal faire seo a choinneáil i gcuimhne.
 savePasswordTitle = Dearbhaigh
-# 1st string is product name, 2nd is the username for the login, 3rd is the
-#   login's hostname. Note that long usernames may be truncated.
-saveLoginText = An bhfuil tú sásta go meabhróidh %1$S focal faire "%2$S" ar %3$S?
-# 1st string is product name, 2nd is the login's hostname
-saveLoginTextNoUsername = An bhfuil tú sásta go meabhróidh %1$S an focal faire seo ar %2$S?
+# LOCALIZATION NOTE (rememberPasswordText):
+# 1st string is the username for the login, 2nd is the login's hostname. 
+# Note that long usernames may be truncated.
+rememberPasswordText = Remember password for "%1$S" on %2$S?
+# LOCALIZATION NOTE (rememberPasswordTextNoUsername):
+# String is the login's hostname.
+rememberPasswordTextNoUsername = Remember password on %S?
 notNowButtonText = &Ná Meabhraigh anois
 notifyBarNotNowButtonText =Ná Meabhraigh anois
 notifyBarNotNowButtonAccessKey = N
 neverForSiteButtonText = C&hoíche don Suíomh Seo
-notifyBarNeverForSiteButtonText = Choíche don Suíomh Seo
-notifyBarNeverForSiteButtonAccessKey = l
+notifyBarNeverRememberButtonText = Never Remember Password for This Site
+notifyBarNeverRememberButtonAccessKey = l
 rememberButtonText = Meabh&raigh
-notifyBarRememberButtonText = Meabhraigh
-notifyBarRememberButtonAccessKey = R
+notifyBarRememberPasswordButtonText = Remember Password
+notifyBarRememberPasswordButtonAccessKey = R
 passwordChangeTitle = Dearbhaigh an Focal Faire Nua
-passwordChangeText = An bhfuil fonn ort an focal faire atá stóráilte le haghaidh %S a athrú?
-passwordChangeTextNoUser = An bhfuil fonn ort focal faire stóráilte an aitheantais logála isteach seo a athrú?
-notifyBarChangeButtonText = Athraigh
-notifyBarChangeButtonAccessKey = C
+# LOCALIZATION NOTE (updatePasswordText):
+# String is the username for the login.
+updatePasswordText = Update saved password for "%S"?
+updatePasswordTextNoUser = Update saved password?
+notifyBarUpdateButtonText = Update Password
+notifyBarUpdateButtonAccessKey = U
 notifyBarDontChangeButtonText = Ná hAthraigh
 notifyBarDontChangeButtonAccessKey = D
 userSelectText = Dearbhaigh cén t-úsáideoir lena bhfuil tú ag athrú an focal faire
 hidePasswords=Folaigh Focail Fhaire
 hidePasswordsAccessKey=R
 showPasswords=Taispeáin Focail Fhaire
 showPasswordsAccessKey=R
 noMasterPasswordPrompt=An bhfuil tú cinnte gur mian leat d'fhocail fhaire a thaispeáint?
--- a/toolkit/crashreporter/crashreporter.ini
+++ b/toolkit/crashreporter/crashreporter.ini
@@ -18,17 +18,17 @@ CrashReporterDescriptionText2=Tharla fadhb gan súil i %s agus chlis sé. Chun cabhrú linn leis an bhfadhb seo a aithint agus a dheisiú, is féidir leat tuarascáil chliste a sheoladh chugainn.
 CrashReporterDefault=Ritear an feidhmchlár tar éis cliste chun tuarascáil faoin bhfadhb a sheoladh chuig déantóir an fheidhmchláir. Ní ceart é a rith go díreach.
 Details=Mionsonraí…
 ViewReportTitle=Inneachar na Tuarascála
 CommentGrayText=Cuir nóta leis (tá nótaí infheicthe go poiblí)
 ExtraReportInfo=Tá faisnéis theicniúil sa tuarascáil freisin maidir le staid an fheidhmchláir ag am a chliste.
 ; LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
 CheckSendReport=Inis do %s faoin gcliseadh seo ionas go mbeidh siad in ann é a réiteach
 CheckIncludeURL=Cuir seoladh an leathanaigh ar a raibh mé san áireamh
-CheckSendEmail=Seol ríomhphost chugam nuair a bheidh tuilleadh eolais ar fáil
+CheckAllowEmail=Allow %s to contact me about this report
 EmailGrayText=Cuir isteach do sheoladh ríomhphoist anseo
 ReportPreSubmit2=Seolfar do thuairisc chliste sula scoireann nó atosáionn tú.
 ReportDuringSubmit2=Tá do thuairisc á seoladh…
 ReportSubmitSuccess=Seoladh an tuairisc gan fadhb.
 ReportSubmitFailed=Bhí fadhb ann agus do thuarascáil á seoladh.
 ReportResubmit=Ag athsheoladh na tuarascálacha a theip ar a seoladh roimhe seo…
 ; LOCALIZATION NOTE (Quit2): The %s is replaced with the product name.
 Quit2=Scoir %s