diff -Nru thunderbird-38.0~b3+build2/build/client.py-args thunderbird-38.0~b6+build2/build/client.py-args
--- thunderbird-38.0~b3+build2/build/client.py-args 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/build/client.py-args 2015-06-03 09:26:22.000000000 +0000
@@ -1 +1 @@
---hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --hgtool1=../scripts/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print
+--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --hgtool1=../scripts/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print --mozilla-repo=http://hg.mozilla.org/releases/mozilla-esr38 --mozilla-rev=THUNDERBIRD_38_VERBRANCH
diff -Nru thunderbird-38.0~b3+build2/build/client.py-l10n-args thunderbird-38.0~b6+build2/build/client.py-l10n-args
--- thunderbird-38.0~b3+build2/build/client.py-l10n-args 2015-04-29 23:02:09.000000000 +0000
+++ thunderbird-38.0~b6+build2/build/client.py-l10n-args 2015-06-03 09:26:22.000000000 +0000
@@ -1 +1 @@
---hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --hgtool1=../scripts/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print
+--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --hgtool1=../scripts/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print --mozilla-repo=http://hg.mozilla.org/releases/mozilla-esr38 --mozilla-rev=THUNDERBIRD_38_VERBRANCH
diff -Nru thunderbird-38.0~b3+build2/calendar/base/content/calendar-extract.js thunderbird-38.0~b6+build2/calendar/base/content/calendar-extract.js
--- thunderbird-38.0~b3+build2/calendar/base/content/calendar-extract.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/base/content/calendar-extract.js 2015-06-03 09:26:18.000000000 +0000
@@ -92,7 +92,7 @@
let time = (new Date()).getTime();
let locale = Preferences.get("general.useragent.locale", "en-US");
- let baseUrl = "jar:resource://calendar/chrome/calendar-LOCALE.jar!/locale/LOCALE/calendar/calendar-extract.properties";
+ let baseUrl = "resource://calendar/chrome/calendar-LOCALE/locale/LOCALE/calendar/calendar-extract.properties";
let dayStart = Preferences.get("calendar.view.daystarthour", 6);
let extractor;
diff -Nru thunderbird-38.0~b3+build2/calendar/base/content/calendar-task-editing.js thunderbird-38.0~b6+build2/calendar/base/content/calendar-task-editing.js
--- thunderbird-38.0~b3+build2/calendar/base/content/calendar-task-editing.js 2015-04-29 23:02:09.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/base/content/calendar-task-editing.js 2015-06-03 09:26:18.000000000 +0000
@@ -89,7 +89,7 @@
* @param aEvent The DOM blur event
*/
onBlur: function tE_onBlur(aEvent) {
- var edit = aEvent.target;
+ let edit = aEvent.target;
if (edit.localName == "input") {
// For some reason, we only receive the blur event for the input
// element. There are no targets that point to the textbox. Go up
@@ -97,7 +97,11 @@
edit = edit.parentNode.parentNode;
}
- var calendar = getSelectedCalendar();
+ let calendar = getSelectedCalendar();
+ if (!calendar) {
+ // this must be a first run, we don't have a calendar yet
+ return;
+ }
if (calendar.getProperty("capabilities.tasks.supported") === false){
taskEdit.setupTaskField(edit,
diff -Nru thunderbird-38.0~b3+build2/calendar/base/content/preferences/categories.js thunderbird-38.0~b6+build2/calendar/base/content/preferences/categories.js
--- thunderbird-38.0~b3+build2/calendar/base/content/preferences/categories.js 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/base/content/preferences/categories.js 2015-06-03 09:26:18.000000000 +0000
@@ -45,7 +45,7 @@
}
gCategoryList = categoriesStringToArray(categories);
-
+
// When categories is empty, split returns an array containing one empty
// string, rather than an empty array. This results in an empty listbox
// child with no corresponding category.
@@ -92,7 +92,7 @@
} catch (ex) {
categoryColor.setAttribute("label", noneLabel);
}
-
+
newListItem.appendChild(categoryName);
newListItem.appendChild(categoryColor);
listbox.appendChild(newListItem);
@@ -108,7 +108,11 @@
listbox.clearSelection();
this.updateButtons();
window.openDialog("chrome://calendar/content/preferences/editCategory.xul",
- "addCategory", "modal,centerscreen,chrome,resizable=no",
+ "addCategory",
+ // Workaround for Bug 1151440 - the HTML color picker won't work
+ // in linux when opened from modal dialog
+ Application.platformIsLinux ? "centerscreen,chrome,resizable=no" :
+ "modal,centerscreen,chrome,resizable=no",
"", null, addTitle);
},
@@ -126,7 +130,11 @@
if (list.selectedItem) {
window.openDialog("chrome://calendar/content/preferences/editCategory.xul",
- "editCategory", "modal,centerscreen,chrome,resizable=no",
+ "editCategory",
+ // Workaround for Bug 1151440 - the HTML color picker won't work
+ // in linux when opened from modal dialog
+ Application.platformIsLinux ? "centerscreen,chrome,resizable=no" :
+ "modal,centerscreen,chrome,resizable=no",
gCategoryList[list.selectedIndex], currentColor, editTitle);
}
},
diff -Nru thunderbird-38.0~b3+build2/calendar/base/src/calUtils.js thunderbird-38.0~b6+build2/calendar/base/src/calUtils.js
--- thunderbird-38.0~b3+build2/calendar/base/src/calUtils.js 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/base/src/calUtils.js 2015-06-03 09:26:18.000000000 +0000
@@ -334,7 +334,11 @@
*/
function openCalendarWizard(aCallback) {
openDialog("chrome://calendar/content/calendarCreation.xul", "caEditServer",
- "chrome,titlebar,modal,resizable", aCallback);
+ // Workaround for Bug 1151440 - the HTML color picker won't work
+ // in linux when opened from modal dialog
+ Application.platformIsLinux ? "chrome,titlebar,resizable" :
+ "modal,chrome,titlebar,resizable",
+ aCallback);
}
/**
@@ -345,7 +349,10 @@
function openCalendarProperties(aCalendar) {
openDialog("chrome://calendar/content/calendar-properties-dialog.xul",
"CalendarPropertiesDialog",
- "chrome,titlebar,modal,resizable",
+ // Workaround for Bug 1151440 - the HTML color picker won't work
+ // in linux when opened from modal dialog
+ Application.platformIsLinux ? "chrome,titlebar,resizable" :
+ "modal,chrome,titlebar,resizable",
{calendar: aCalendar});
}
diff -Nru thunderbird-38.0~b3+build2/calendar/import-export/calMonthGridPrinter.js thunderbird-38.0~b6+build2/calendar/import-export/calMonthGridPrinter.js
--- thunderbird-38.0~b3+build2/calendar/import-export/calMonthGridPrinter.js 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/import-export/calMonthGridPrinter.js 2015-06-03 09:26:18.000000000 +0000
@@ -33,6 +33,7 @@
formatToHtml: function monthPrint_format(aStream, aStart, aEnd, aCount, aItems, aTitle) {
let document = cal.xml.parseFile("chrome://calendar-common/skin/printing/calMonthGridPrinter.html");
+ let defaultTimezone = cal.calendarDefaultTimezone();
// Set page title
document.getElementById("title").textContent = aTitle;
@@ -58,6 +59,8 @@
for each (let item in aItems) {
let itemStartDate = item[cal.calGetStartDateProp(item)] || item[cal.calGetEndDateProp(item)];
let itemEndDate = item[cal.calGetEndDateProp(item)] || item[cal.calGetStartDateProp(item)];
+ itemStartDate = itemStartDate.getInTimezone(defaultTimezone);
+ itemEndDate = itemEndDate.getInTimezone(defaultTimezone);
if (!itemStartDate && !itemEndDate) {
cal.print.addItemToDayboxNodate(document, item);
diff -Nru thunderbird-38.0~b3+build2/calendar/import-export/calWeekPrinter.js thunderbird-38.0~b6+build2/calendar/import-export/calWeekPrinter.js
--- thunderbird-38.0~b3+build2/calendar/import-export/calWeekPrinter.js 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/import-export/calWeekPrinter.js 2015-06-03 09:26:18.000000000 +0000
@@ -33,6 +33,7 @@
formatToHtml: function weekPrint_format(aStream, aStart, aEnd, aCount, aItems, aTitle) {
let document = cal.xml.parseFile("chrome://calendar-common/skin/printing/calWeekPrinter.html");
+ let defaultTimezone = cal.calendarDefaultTimezone();
// Set page title
document.getElementById("title").textContent = aTitle;
@@ -51,6 +52,8 @@
for each (let item in aItems) {
let itemStartDate = item[cal.calGetStartDateProp(item)] || item[cal.calGetEndDateProp(item)];
let itemEndDate = item[cal.calGetEndDateProp(item)] || item[cal.calGetStartDateProp(item)];
+ itemStartDate = itemStartDate.getInTimezone(defaultTimezone);
+ itemEndDate = itemEndDate.getInTimezone(defaultTimezone);
if (!itemStartDate && !itemEndDate) {
cal.print.addItemToDayboxNodate(document, item);
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/build/get-platform.py thunderbird-38.0~b6+build2/calendar/lightning/build/get-platform.py
--- thunderbird-38.0~b3+build2/calendar/lightning/build/get-platform.py 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/build/get-platform.py 2015-06-03 09:26:18.000000000 +0000
@@ -9,5 +9,5 @@
from xml.dom.minidom import parse
doc = parse(sys.argv[1] + "/install.rdf")
-elem = doc.getElementsByTagName("em:realTargetPlatform")[0]
+elem = doc.getElementsByTagName("em:targetPlatform")[0]
print elem.firstChild.nodeValue
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/build/universal.mk thunderbird-38.0~b6+build2/calendar/lightning/build/universal.mk
--- thunderbird-38.0~b3+build2/calendar/lightning/build/universal.mk 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/build/universal.mk 2015-06-03 09:26:18.000000000 +0000
@@ -24,23 +24,36 @@
STANDALONE_MAKEFILE := 1
include $(TOPSRCDIR)/config/config.mk
+define unify_lightning
+mkdir -p $(DIST_UNI)/$1
+rm -rf $(DIST_UNI)/$1/$2*
+cp -R $(DIST_ARCH_1)/$1/$2 $(DIST_UNI)/$1
+grep -v binary-component $(DIST_ARCH_1)/$1/$2/components/libical-manifest > \
+ $(DIST_UNI)/$1/$2/components/libical-manifest || true
+platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
+ $(DIST_ARCH_1)/$1/$2`; \
+mkdir -p $(DIST_UNI)/$1/$2/components/$$platform; \
+mv $(DIST_UNI)/$1/$2/components/*.dylib \
+ $(DIST_UNI)/$1/$2/components/$$platform; \
+$(foreach dylib,$(wildcard $(DIST_ARCH_1)/$1/$2/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) abi=$$platform >> $(DIST_UNI)/$1/$2/components/libical-manifest)
+platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
+ $(DIST_ARCH_2)/$1/$2`; \
+mkdir -p $(DIST_UNI)/$1/$2/components/$$platform; \
+cp $(DIST_ARCH_2)/$1/$2/components/*.dylib \
+ $(DIST_UNI)/$1/$2/components/$$platform; \
+$(foreach dylib,$(wildcard $(DIST_ARCH_2)/$1/$2/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) abi=$$platform >> $(DIST_UNI)/$1/$2/components/libical-manifest)
+grep -v em:targetPlatform $(DIST_ARCH_1)/$1/$2/install.rdf > $(DIST_UNI)/$1/$2/install.rdf
+endef
+
+define unify_lightning_repackage
+cd $(DIST_UNI)/$1/$2 && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *
+endef
+
postflight_all:
- mkdir -p $(DIST_UNI)/xpi-stage
- rm -rf $(DIST_UNI)/xpi-stage/lightning*
- cp -R $(DIST_ARCH_1)/xpi-stage/lightning $(DIST_UNI)/xpi-stage
- grep -v binary-component $(DIST_ARCH_1)/xpi-stage/lightning/components/libical-manifest > \
- $(DIST_UNI)/xpi-stage/lightning/components/libical-manifest || true
- platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
- $(DIST_ARCH_1)/xpi-stage/lightning`; \
- mkdir -p $(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
- mv $(DIST_UNI)/xpi-stage/lightning/components/*.dylib \
- $(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
- $(foreach dylib,$(wildcard $(DIST_ARCH_1)/xpi-stage/lightning/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) ABI=$$platform >> $(DIST_UNI)/xpi-stage/lightning/components/libical-manifest)
- platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
- $(DIST_ARCH_2)/xpi-stage/lightning`; \
- mkdir -p $(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
- cp $(DIST_ARCH_2)/xpi-stage/lightning/components/*.dylib \
- $(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
- $(foreach dylib,$(wildcard $(DIST_ARCH_2)/xpi-stage/lightning/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) ABI=$$platform >> $(DIST_UNI)/xpi-stage/lightning/components/libical-manifest)
- grep -v em:realTargetPlatform $(DIST_ARCH_1)/xpi-stage/lightning/install.rdf > $(DIST_UNI)/xpi-stage/lightning/install.rdf
- cd $(DIST_UNI)/xpi-stage/lightning && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *
+ $(call unify_lightning,xpi-stage,lightning)
+ $(call unify_lightning_repackage,xpi-stage,lightning)
+ifdef NIGHTLY_BUILD
+ $(call unify_lightning,$(MOZ_APP_DISPLAYNAME).app/Contents/Resources/extensions,{e2fda1a4-762b-4020-b5ad-a41df1933103})
+else
+ $(call unify_lightning,$(MOZ_APP_DISPLAYNAME).app/Contents/Resources/distribution/extensions,{e2fda1a4-762b-4020-b5ad-a41df1933103})
+endif
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/content/lightning.js thunderbird-38.0~b6+build2/calendar/lightning/content/lightning.js
--- thunderbird-38.0~b3+build2/calendar/lightning/content/lightning.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/content/lightning.js 2015-06-03 09:26:18.000000000 +0000
@@ -140,3 +140,6 @@
// Backend to use. false: libical, true: ical.js
pref("calendar.icaljs", false);
+
+// Calendar integration notification
+pref("calendar.integration.notify", true);
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/content/messenger-overlay-sidebar.js thunderbird-38.0~b6+build2/calendar/lightning/content/messenger-overlay-sidebar.js
--- thunderbird-38.0~b3+build2/calendar/lightning/content/messenger-overlay-sidebar.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/content/messenger-overlay-sidebar.js 2015-06-03 09:26:18.000000000 +0000
@@ -7,6 +7,7 @@
Components.utils.import("resource://gre/modules/Promise.jsm");
Components.utils.import("resource://gre/modules/Task.jsm");
Components.utils.import("resource://gre/modules/AddonManager.jsm");
+Components.utils.import("resource://calendar/modules/calAsyncUtils.jsm");
var gLastShownCalendarView = null;
@@ -189,8 +190,133 @@
MailToolboxCustomizeDone(aEvent, "CustomizeTaskToolbar");
};
+ ltnIntegrationCheck();
+
Services.obs.notifyObservers(window, "lightning-startup-done", false);
+}
+
+/**
+ * Displays the Lightning integration notification bar
+ */
+function ltnIntegrationNotification() {
+ const kOptOut = "mail.calendar-integration.opt-out"; // default: false
+ const kNotify = "calendar.integration.notify"; // default: true
+ const kSupportUri = "https://support.mozilla.org/kb/thunderbird-calendar-integration";
+ const kLightningGuuid = "{e2fda1a4-762b-4020-b5ad-a41df1933103}";
+
+ // we fall back to messagepanebox for Seamonkey
+ let notifyBox = document.getElementById("mail-notification-box") ||
+ document.getElementById("messagepanebox");
+
+ let appBrand = cal.calGetString("brand", "brandShortName", null, "branding");
+ let ltnBrand = ltnGetString("lightning", "brandShortName");
+ let label = ltnGetString("lightning", "integrationLabel", [appBrand, ltnBrand]);
+
+ // call backs for doing/undoing Lightning removal
+ let cbRemoveLightning = function (aAddon) {
+ aAddon.userDisabled = true;
+ };
+ let cbUndoRemoveLightning = function (aAddon) {
+ aAddon.userDisabled = false;
+ };
+
+ // call backs for the undo opt-out bar
+ let cbRestartNow = function(aNotificationBar, aButton) {
+ Services.startup.quit(Components.interfaces.nsIAppStartup.eRestart |
+ Components.interfaces.nsIAppStartup.eForceQuit);
+ };
+ let cbUndoOptOut = function(aNotificationBar, aButton) {
+ Preferences.set(kNotify, true);
+ Preferences.set(kOptOut, false);
+ AddonManager.getAddonByID(kLightningGuuid, cbUndoRemoveLightning);
+ // display notification bar again
+ ltnIntegrationNotification();
+ };
+ // call backs for the opt-out bar
+ let cbLearnMore = function(aNotificationBar, aButton) {
+ openUILink(kSupportUri, {});
+ return true;
+ };
+ let cbKeepIt = function(aNotificationBar, aButton) {
+ Preferences.set(kNotify, false);
+ };
+ let cbOptOut = function(aNotificationBar, aButton) {
+ Preferences.set(kNotify, false);
+ Preferences.set(kOptOut, true);
+ AddonManager.getAddonByID(kLightningGuuid, cbRemoveLightning);
+ // let the user know that removal will be applied after restart
+ let restartLabel = ltnGetString("lightning", "integrationRestartLabel",[ltnBrand, appBrand]);
+ let button = [{
+ label: ltnGetString("lightning", "integrationUndoButton"),
+ accessKey: ltnGetString("lightning", "integrationUndoAccessKey"),
+ popup: null,
+ callback: cbUndoOptOut
+ }, {
+ label: ltnGetString("lightning", "integrationRestartButton"),
+ accessKey: ltnGetString("lightning", "integrationRestartAccessKey"),
+ popup: null,
+ callback: cbRestartNow
+ }];
+ notifyBox.appendNotification(restartLabel,
+ "restart-required",
+ null,
+ notifyBox.PRIORITY_INFO_MEDIUM,
+ button);
+ };
+
+ let buttons = [{
+ label: ltnGetString("lightning", "integrationLearnMoreButton"),
+ accessKey: ltnGetString("lightning", "integrationLearnMoreAccessKey"),
+ popup: null,
+ callback: cbLearnMore
+ }, {
+ label: ltnGetString("lightning", "integrationOptOutButton"),
+ accessKey: ltnGetString("lightning", "integrationOptOutAccessKey"),
+ popup: null,
+ callback: cbOptOut
+ }, {
+ label: ltnGetString("lightning", "integrationKeepItButton"),
+ accessKey: ltnGetString("lightning", "integrationKeepItAccessKey"),
+ popup: null,
+ callback: cbKeepIt
+ }];
+
+ // we use PRIORITY_INFO_MEDIUM to overrule notifications from specialTabs.js if any
+ let notification = notifyBox.appendNotification(label,
+ "calendar-integration",
+ null,
+ notifyBox.PRIORITY_INFO_MEDIUM,
+ buttons);
+ notification.persistence = 3;
+}
+
+/**
+ * Checks whether to display the opt-out notification for Lightning integration
+ */
+function ltnIntegrationCheck() {
+ const kOptOut = "mail.calendar-integration.opt-out"; // default: false
+ const kNotify = "calendar.integration.notify"; // default: true
+ // don't do anything if the opt-out pref doesn't exist or is enabled by the user or the user has
+ // already decided to keep Lightning
+ if (!Preferences.get(kOptOut, true) && Preferences.get(kNotify, false)) {
+ // action is only needed, if hasn't used Lightning before, so lets check whether this looks
+ // like a default calendar setup
+ let cnt = new Object();
+ let calMgr = cal.getCalendarManager();
+ let cals = calMgr.getCalendars(cnt);
+ let homeCalName = cal.calGetString("calendar", "homeCalendarName", null, "calendar");
+ if (cnt.value == 1 &&
+ calMgr.getCalendarPref_(cals[0], "type") == "storage" &&
+ calMgr.getCalendarPref_(cals[0], "name") == homeCalName) {
+ // this looks like a default setup, so let's see whether the calendar contains any items
+ let pCal = cal.async.promisifyCalendar(cals[0]);
+ // we look at all items at any time, but we can stop if the first item was found
+ // if we've found no items, we call ltnIntegrationNotification to display the bar
+ pCal.getItems(Components.interfaces.calICalendar.ITEM_FILTER_ALL_ITEMS, 1, null, null)
+ .then(function(aItems) {if (!aItems.length) {ltnIntegrationNotification()}});
+ }
+ }
}
/* Called at midnight to tell us to redraw date-specific widgets. Do NOT call
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/install.rdf thunderbird-38.0~b6+build2/calendar/lightning/install.rdf
--- thunderbird-38.0~b3+build2/calendar/lightning/install.rdf 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/install.rdf 2015-06-03 09:26:18.000000000 +0000
@@ -40,7 +40,7 @@
https://www.mozilla.org/projects/calendar/chrome://calendar/skin/cal-icon32.pngchrome://messenger/content/preferences/preferences.xul
- @TARGET_PLATFORM@
+ @TARGET_PLATFORM@
#ifdef LIGHTNING_UPDATE_LOCATION
@LIGHTNING_UPDATE_LOCATION@?buildID=@GRE_BUILDID@&appABI=%APP_ABI%&appOS=%APP_OS%&locale=%APP_LOCALE%&appVersion=%APP_VERSION%&appID=%APP_ID%
#endif
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/lightning-packager.mk thunderbird-38.0~b6+build2/calendar/lightning/lightning-packager.mk
--- thunderbird-38.0~b3+build2/calendar/lightning/lightning-packager.mk 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/lightning-packager.mk 2015-06-03 09:26:22.000000000 +0000
@@ -39,7 +39,7 @@
# run where we can't influence the download location. Fake it from the env vars
# we have
BUILD_NR=$(shell echo $(POST_UPLOAD_CMD) | sed -n -e 's/.*-n \([0-9]*\).*/\1/p')
-CANDIDATE_NR=$(XPI_VERSION)
+CANDIDATE_NR=$(if $(LIGHTNING_VERSION),$(LIGHTNING_VERSION),$(XPI_VERSION))
EN_US_BINARY_URL=http://$(UPLOAD_HOST)/pub/mozilla.org/calendar/lightning/nightly/$(CANDIDATE_NR)-candidates/build$(BUILD_NR)/$(MOZ_PKG_PLATFORM)
else
EN_US_BINARY_URL = $(error You must set EN_US_BINARY_URL)
@@ -66,12 +66,6 @@
SHORTOS = linux
endif
-# function oslocales(filename)
-oslocales = $(shell $(AWK) '{ if ($$2 == "" || $$2 == "$(SHORTOS)") { print $$1 } }' $(1))
-
-# function apposlocales(app)
-apposlocales = $(call oslocales,$(topsrcdir)/$1/locales/$(if $(filter $(MOZ_UPDATE_CHANNEL),beta release),shipped-locales,all-locales))
-
# function print_ltnconfig(section,configname)
print_ltnconfig = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(XPI_STAGE_PATH)/$(XPI_NAME)/application.ini $1 $2)
@@ -96,14 +90,26 @@
langpack-en-US:
@echo "Skipping $@ as en-US is the default"
-# Skip those locales in Thunderbird but not in Lightning. Use either
-# all-locales or shipped-locales, depending on if we are doing a
-# regular repack or a release repack
-CAL_LOCALES := $(call apposlocales,calendar)
-TB_LOCALES := $(call apposlocales,mail)
-TB_SKIP_LOCALES := $(filter-out $(CAL_LOCALES) en-US,$(TB_LOCALES))
-$(addprefix langpack-,$(TB_SKIP_LOCALES)) $(addprefix upload-,$(TB_SKIP_LOCALES)):
- @echo "Skipping $@ as it is not in Lightning's locales: $(CAL_LOCALES)"
+# It wouldn't fit into mozharness to run compare-locales for calendar
+# separately, so we need to do it ourselves. Unfortunately compare-locales is
+# not installed globally on the slaves, so we need to hardcode the path.
+BUILD_COMPARE_LOCALES = $(wildcard $(topsrcdir)/../compare-locales)
+COMPARE_LOCALES = $(if $(BUILD_COMPARE_LOCALES),$(PYTHON) $(BUILD_COMPARE_LOCALES)/scripts/compare-locales,compare-locales)
+COMPARE_LOCALES_PYTHONPATH = $(if $(BUILD_COMPARE_LOCALES),$(BUILD_COMPARE_LOCALES)/lib,)
+
+merge-%:
+ifdef LOCALE_MERGEDIR
+ $(RM) -rf $(LOCALE_MERGEDIR)/calendar
+ MACOSX_DEPLOYMENT_TARGET= PYTHONPATH=$(COMPARE_LOCALES_PYTHONPATH) \
+ $(COMPARE_LOCALES) -m $(LOCALE_MERGEDIR) $(topsrcdir)/calendar/locales/l10n.ini $(L10NBASEDIR) $*
+
+ # This file requires a bugfix with string changes, see bug 1154448
+ [ -f $(L10NBASEDIR)/$*/calendar/chrome/calendar/calendar-extract.properties ] && \
+ $(RM) $(LOCALE_MERGEDIR)/calendar/chrome/calendar/calendar-extract.properties \
+ || true
+else
+ @echo "Not merging Lightning locales due to missing LOCALE_MERGEDIR"
+endif
# Calling these targets with prerequisites causes the libs and subsequent
# targets to be switched in order due to some make voodoo. Therefore we call
@@ -123,22 +129,14 @@
repackage-zip-%:
@echo "Already repackaged zip for $* in langpack step"
-repack-stage: repack-stage-all
- grep -v 'locale \w\+ en-US' $(L10N_TARGET)/chrome.manifest > $(L10N_TARGET)/chrome.manifest~ && \
- mv $(L10N_TARGET)/chrome.manifest~ $(L10N_TARGET)/chrome.manifest
- find $(abspath $(L10N_TARGET)) -name '*en-US*' -print0 | xargs -0 rm -rf
-
-repack-stage-all: $(XPI_STAGE_PATH)/$(XPI_NAME)
+repack-stage:
@echo "Repackaging $(XPI_PKGNAME) locale for Language $(AB_CD)"
$(RM) -rf $(L10N_TARGET)
cp -R $(XPI_STAGE_PATH)/$(XPI_NAME) $(L10N_TARGET)
+ grep -v 'locale \w\+ en-US' $(L10N_TARGET)/chrome.manifest > $(L10N_TARGET)/chrome.manifest~ && \
+ mv $(L10N_TARGET)/chrome.manifest~ $(L10N_TARGET)/chrome.manifest
+ find $(abspath $(L10N_TARGET)) -name '*en-US*' -print0 | xargs -0 rm -rf
-# Repack the existing lightning to contain all locales in lightning-all.xpi
-langpack-all: AB_CD=all
-langpack-all: L10N_XPI_NAME=$(XPI_NAME)-all
-langpack-all: L10N_XPI_PKGNAME=$(subst .$(AB_CD),,$(XPI_PKGNAME))
-langpack-all: recreate-platformini repack-stage-all $(addprefix libs-,$(call apposlocales,calendar))
- @echo "Done packaging"
# Actual locale packaging targets. If L10N_XPI_NAME is set, then use it.
# Otherwise keep the original XPI_NAME
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/lightning-tests.mk thunderbird-38.0~b6+build2/calendar/lightning/lightning-tests.mk
--- thunderbird-38.0~b3+build2/calendar/lightning/lightning-tests.mk 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/lightning-tests.mk 2015-06-03 09:26:18.000000000 +0000
@@ -2,11 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-ifndef UNIVERSAL_BINARY
PKG_STAGE = $(DIST)/test-stage
-else
-PKG_STAGE = $(DIST)/universal/test-stage
-endif
# This is the target that should be called externally
stage-package: stage-extension stage-mozmill
@@ -16,7 +12,7 @@
stage-extension:
$(NSINSTALL) -D $(PKG_STAGE)/extensions/$(XPI_EM_ID)
(cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/extensions/$(XPI_EM_ID) && tar -xf -)
- grep -v em:realTargetPlatform $(FINAL_TARGET)/install.rdf > $(PKG_STAGE)/extensions/$(XPI_EM_ID)/install.rdf
+ grep -v em:targetPlatform $(FINAL_TARGET)/install.rdf > $(PKG_STAGE)/extensions/$(XPI_EM_ID)/install.rdf
# stage mozmill tests and shared modules. Cross your fingers that there are no
# name conflicts between calendar/ and mail/
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/locales/Makefile.in thunderbird-38.0~b6+build2/calendar/lightning/locales/Makefile.in
--- thunderbird-38.0~b3+build2/calendar/lightning/locales/Makefile.in 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/locales/Makefile.in 2015-06-03 09:26:18.000000000 +0000
@@ -7,7 +7,6 @@
relativesrcdir = calendar/locales
USE_EXTENSION_MANIFEST = 1
-MOZ_CHROME_FILE_FORMAT=jar
DEFINES += -DAB_CD=$(AB_CD) \
-DTHEME=$(THEME) \
diff -Nru thunderbird-38.0~b3+build2/calendar/lightning/Makefile.in thunderbird-38.0~b6+build2/calendar/lightning/Makefile.in
--- thunderbird-38.0~b3+build2/calendar/lightning/Makefile.in 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/lightning/Makefile.in 2015-06-03 09:26:22.000000000 +0000
@@ -71,15 +71,14 @@
DEFINES += -DMOZ_SOURCE_REPO='$(MOZ_SOURCE_REPO)'
endif
-# include config.mk here so myconfig or app-config can set DISABLE_LIGHTNING_INSTALL
-include $(topsrcdir)/config/config.mk
-
-# installing lightning in a thunderbird build causes problems on tinderboxes
-# (see bug 406441 and bug 440017), so we need to provide a hook for the
-# tinderboxen to disable that.
-ifndef DISABLE_LIGHTNING_INSTALL
-# install Lightning as a global extension in dist/bin/extensions/
+ifdef NIGHTLY_BUILD
+# On nightly builds, install as a global extension in
+# dist/bin/extensions/
XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
+else
+# For beta and release builds, install as a distribution extension in
+# dist/bin/distribution/extensions/
+INSTALL_EXTENSION_ID = $(XPI_EM_ID)
endif
DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
@@ -102,11 +101,13 @@
include $(srcdir)/lightning-packager.mk
include $(srcdir)/lightning-tests.mk
-# For Lightning, we also need to preprocess the l10n prefs
+# For Lightning, we also need to preprocess the l10n prefs. Pull in the en-US
+# copy if the files doesn't exist.
repack-process-extrafiles: lightning-extrafiles
-lightning-extrafiles: LOCALE_BASEDIR=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)
+lightning-extrafiles: LTN_ABCD_L10NJS=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)/lightning-l10n.js
+lightning-extrafiles: LTN_ANY_L10NJS=$(if $(wildcard $(LTN_ABCD_L10NJS)),$(LTN_ABCD_L10NJS),$(topsrcdir)/calendar/locales/en-US/lightning-l10n.js)
lightning-extrafiles:
- $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LOCALE_BASEDIR)/lightning-l10n.js -o $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js)
+ $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LTN_ANY_L10NJS) -o $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js)
ident:
@printf 'comm_revision '
diff -Nru thunderbird-38.0~b3+build2/calendar/locales/Makefile.in thunderbird-38.0~b6+build2/calendar/locales/Makefile.in
--- thunderbird-38.0~b3+build2/calendar/locales/Makefile.in 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/locales/Makefile.in 2015-06-03 09:26:18.000000000 +0000
@@ -3,7 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-MOZ_CHROME_FILE_FORMAT=jar
USE_EXTENSION_MANIFEST = 1
DEFINES += -DAB_CD=$(AB_CD)
diff -Nru thunderbird-38.0~b3+build2/calendar/locales/shipped-locales thunderbird-38.0~b6+build2/calendar/locales/shipped-locales
--- thunderbird-38.0~b3+build2/calendar/locales/shipped-locales 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/locales/shipped-locales 2015-06-03 09:26:22.000000000 +0000
@@ -6,6 +6,7 @@
es-AR
es-ES
et
+eu
fr
fy-NL
ga-IE
diff -Nru thunderbird-38.0~b3+build2/calendar/providers/gdata/Makefile.in thunderbird-38.0~b6+build2/calendar/providers/gdata/Makefile.in
--- thunderbird-38.0~b3+build2/calendar/providers/gdata/Makefile.in 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/providers/gdata/Makefile.in 2015-06-03 09:26:18.000000000 +0000
@@ -8,9 +8,7 @@
XPI_VERSION = $(GDATA_VERSION)
XPI_NO_UNIVERSAL = 1
XPI_EM_ID = {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
-ifndef DISABLE_LIGHTNING_INSTALL
XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
-endif
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
diff -Nru thunderbird-38.0~b3+build2/calendar/resources/content/calendarCreation.js thunderbird-38.0~b6+build2/calendar/resources/content/calendarCreation.js
--- thunderbird-38.0~b3+build2/calendar/resources/content/calendarCreation.js 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/resources/content/calendarCreation.js 2015-06-03 09:26:18.000000000 +0000
@@ -82,8 +82,10 @@
cache.checked = true;
cache.disabled = true;
} else {
- cache.checked = cache.oldValue || false;
- cache.oldValue = null;
+ if (cache.oldValue !== undefined) {
+ cache.checked = cache.oldValue;
+ cache.oldValue = undefined;
+ }
cache.disabled = false;
}
}
diff -Nru thunderbird-38.0~b3+build2/calendar/resources/content/calendarCreation.xul thunderbird-38.0~b6+build2/calendar/resources/content/calendarCreation.xul
--- thunderbird-38.0~b3+build2/calendar/resources/content/calendarCreation.xul 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/resources/content/calendarCreation.xul 2015-06-03 09:26:18.000000000 +0000
@@ -71,6 +71,7 @@
diff -Nru thunderbird-38.0~b3+build2/calendar/test/unit/test_extract.js thunderbird-38.0~b6+build2/calendar/test/unit/test_extract.js
--- thunderbird-38.0~b3+build2/calendar/test/unit/test_extract.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/calendar/test/unit/test_extract.js 2015-06-03 09:26:19.000000000 +0000
@@ -5,10 +5,14 @@
Components.utils.import("resource://calendar/modules/calExtract.jsm");
Components.utils.import("resource://gre/modules/Preferences.jsm");
-var baseUrl = "jar:resource://calendar/chrome/calendar-LOCALE.jar!/locale/LOCALE/calendar/calendar-extract.properties";
-var extractor = new Extractor(baseUrl, "en-US", 8);
+let baseUrl = "resource://calendar/chrome/calendar-LOCALE/locale/LOCALE/calendar/calendar-extract.properties";
+let extractor = new Extractor(baseUrl, "en-US", 8);
function run_test() {
+ // Sanity check to make sure the base url is still right. If this fails,
+ // don't forget to also fix the url in base/content/calendar-extract.js.
+ ok(extractor.checkBundle("en-US"));
+
test_event_start_end();
test_event_start_duration();
test_event_start_end_whitespace();
diff -Nru thunderbird-38.0~b3+build2/chat/components/src/logger.js thunderbird-38.0~b6+build2/chat/components/src/logger.js
--- thunderbird-38.0~b3+build2/chat/components/src/logger.js 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/chat/components/src/logger.js 2015-06-03 09:26:19.000000000 +0000
@@ -655,7 +655,7 @@
if (!targetDate)
return null;
- let targetDay = Math.floor(targetDate / (86400 * 1000));
+ targetDate = targetDate.toDateString();
// We'll assume that the files relevant to our interests are
// in the same folder as the one provided.
@@ -667,8 +667,7 @@
let path = aEntry.path;
let [logTime] = getDateFromFilename(OS.Path.basename(path));
- let day = Math.floor(logTime / (86400 * 1000));
- if (targetDay == day) {
+ if (targetDate == logTime.toDateString()) {
relevantEntries.push({
path: path,
time: logTime
diff -Nru thunderbird-38.0~b3+build2/chat/protocols/twitter/twitter.js thunderbird-38.0~b6+build2/chat/protocols/twitter/twitter.js
--- thunderbird-38.0~b3+build2/chat/protocols/twitter/twitter.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/chat/protocols/twitter/twitter.js 2015-06-03 09:26:19.000000000 +0000
@@ -863,9 +863,16 @@
Services.obs.notifyObservers(this._browserRequest, "browser-request", null);
},
finishAuthorizationRequest: function() {
+ // Clean up the cookies, so that several twitter OAuth dialogs can work
+ // during the same session (bug 954308).
+ let cookies = Services.cookies.getCookiesFromHost("twitter.com");
+ while (cookies.hasMoreElements()) {
+ let cookie = cookies.getNext().QueryInterface(Ci.nsICookie2);
+ Services.cookies.remove(cookie.host, cookie.name, cookie.path, false);
+ }
+
if (!("_browserRequest" in this))
return;
-
this._browserRequest._active = false;
if ("_listener" in this._browserRequest)
this._browserRequest._listener._cleanUp();
diff -Nru thunderbird-38.0~b3+build2/chat/protocols/xmpp/xmpp-session.jsm thunderbird-38.0~b6+build2/chat/protocols/xmpp/xmpp-session.jsm
--- thunderbird-38.0~b3+build2/chat/protocols/xmpp/xmpp-session.jsm 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/chat/protocols/xmpp/xmpp-session.jsm 2015-06-03 09:26:19.000000000 +0000
@@ -68,6 +68,25 @@
Stanza.node("ping", Stanza.NS.ping)),
this.cancelDisconnectTimer, this);
},
+ _lastReceiveTime: 0,
+ _lastSendTime: 0,
+ checkPingTimer(aJustSentSomething = false) {
+ // Don't start a ping timer if we're not fully connected yet.
+ if (this.onXmppStanza != this.stanzaListeners.accountListening)
+ return;
+ let now = Date.now();
+ if (aJustSentSomething)
+ this._lastSendTime = now;
+ else
+ this._lastReceiveTime = now;
+ // We only cancel the ping timer if we've both received and sent
+ // something in the last two minutes. This is because Openfire
+ // servers will disconnect us if we don't send anything for a
+ // couple of minutes.
+ if (Math.min(this._lastSendTime, this._lastReceiveTime) >
+ now - this.kTimeBeforePing)
+ this.resetPingTimer();
+ },
get DEBUG() this._account.DEBUG,
get LOG() this._account.LOG,
@@ -112,6 +131,7 @@
if (aCallback)
this._handlers.set(aStanza.attributes.id, aCallback.bind(aThis));
this.send(aStanza.getXML());
+ this.checkPingTimer(true);
return aStanza.attributes.id;
},
@@ -174,8 +194,7 @@
/* When incoming data is available to be parsed */
onDataReceived: function(aData) {
- if (this.onXmppStanza == this.stanzaListeners.accountListening)
- this.resetPingTimer();
+ this.checkPingTimer();
let istream = Cc["@mozilla.org/io/string-input-stream;1"]
.createInstance(Ci.nsIStringInputStream);
istream.setData(aData, aData.length);
diff -Nru thunderbird-38.0~b3+build2/debian/changelog thunderbird-38.0~b6+build2/debian/changelog
--- thunderbird-38.0~b3+build2/debian/changelog 2015-04-30 23:15:03.000000000 +0000
+++ thunderbird-38.0~b6+build2/debian/changelog 2015-06-03 11:33:04.000000000 +0000
@@ -1,3 +1,9 @@
+thunderbird (1:38.0~b6+build2-0ubuntu0.12.04.1) precise; urgency=medium
+
+ * New upstream release from the beta channel (THUNDERBIRD_38_0b3_BUILD2)
+
+ -- Chris Coulson Wed, 03 Jun 2015 11:33:23 +0100
+
thunderbird (1:38.0~b3+build2-0ubuntu0.12.04.2) precise; urgency=medium
* New upstream release from the beta channel (THUNDERBIRD_38_0b3_BUILD2)
diff -Nru thunderbird-38.0~b3+build2/editor/ui/composer/content/editor.js thunderbird-38.0~b6+build2/editor/ui/composer/content/editor.js
--- thunderbird-38.0~b3+build2/editor/ui/composer/content/editor.js 2015-04-29 23:02:13.000000000 +0000
+++ thunderbird-38.0~b6+build2/editor/ui/composer/content/editor.js 2015-06-03 09:26:19.000000000 +0000
@@ -680,14 +680,24 @@
var commandNode = document.getElementById(commandID);
var state = commandNode.getAttribute("state");
- if (state == "mixed")
- {
+ switch (state) {
+ case "mixed":
//Selection is the "mixed" ( > 1 style) state
fontFaceMenuList.selectedItem = null;
fontFaceMenuList.setAttribute("label",GetString('Mixed'));
- }
- else
- {
+ break;
+ case "":
+ case "serif":
+ case "sans-serif":
+ // Generic variable width.
+ fontFaceMenuList.selectedIndex = 0;
+ break;
+ case "tt":
+ case "monospace":
+ // Generic fixed width.
+ fontFaceMenuList.selectedIndex = 1;
+ break;
+ default:
var menuPopup = document.getElementById("FontFacePopup");
var menuItems = menuPopup.childNodes;
@@ -856,7 +866,11 @@
}
for (var i = 0; i < gLocalFonts.length; ++i)
{
- if (gLocalFonts[i] != "")
+ // Remove Linux system generic fonts that collide with CSS generic fonts.
+ if (gLocalFonts[i] != "" &&
+ gLocalFonts[i] != "serif" &&
+ gLocalFonts[i] != "sans-serif" &&
+ gLocalFonts[i] != "monospace")
{
var itemNode = document.createElementNS(XUL_NS, "menuitem");
itemNode.setAttribute("label", gLocalFonts[i]);
diff -Nru thunderbird-38.0~b3+build2/im/app/profile/all-instantbird.js thunderbird-38.0~b6+build2/im/app/profile/all-instantbird.js
--- thunderbird-38.0~b3+build2/im/app/profile/all-instantbird.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/im/app/profile/all-instantbird.js 2015-06-03 09:26:19.000000000 +0000
@@ -259,9 +259,7 @@
pref("network.protocol-handler.expose.javascript", true);
// 0-Accept, 1-dontAcceptForeign, 2-dontUse
-// Reject all cookies, so that several twitter OAuth dialogs can work
-// during the same session. (See bug 875)
-pref("network.cookie.cookieBehavior", 2);
+pref("network.cookie.cookieBehavior", 0);
// The breakpad report server to link to in about:crashes
pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/");
diff -Nru thunderbird-38.0~b3+build2/l10n/changesets thunderbird-38.0~b6+build2/l10n/changesets
--- thunderbird-38.0~b3+build2/l10n/changesets 2015-04-29 23:58:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/changesets 2015-06-03 10:15:39.000000000 +0000
@@ -1,58 +1,58 @@
-ar 1131:21db29920df3
-ast 1055:ee069c2565cc
-be 1201:f990c857b4ee
-bg 731:6117485d1db0
-bn-BD 581:5c8bf363010c
-br 850:908d8eeaa936
-ca 1779:4ee0dea6ebfe
-cs 3114:6bbc4cdf1d58
-cy 738:0a097ec992a7
-da 1609:18e6a4ca131c
-de 4129:6afe69646ee2
-dsb 178:91b25298b760
-el 891:f564c381c150
-en-GB 1370:4469507a1bb6
-es-AR 1977:48078c76cca9
-es-ES 3432:6e26d2292003
-et 1341:a9d1a1e6bb75
-eu 1114:aab530106dc2
-fi 1615:ea87d2e6a462
-fr 6360:f6f6d1120d34
-fy-NL 2041:56754f04a92a
-ga-IE 1266:197858e29407
-gd 1200:87ebe5bdd94d
-gl 2457:0b0a95d5fa81
-he 1048:091bdcaf98cf
-hr 1427:c8c1b879f796
-hsb 259:d1de589348f4
-hu 1650:57ac36fe41bb
-hy-AM 815:1f4f3d403fd3
-id 1213:da70bc052b33
-is 921:94a3aec32f28
-it 4787:794e55a3c98b
-ja 1731:65459ff1b7c4
-ja-JP-mac 1457:e9867c9413aa
-ko 1450:15e6670b24ed
-lt 2331:ecfe771c7a68
-nb-NO 2070:c9f45ad58dd9
-nl 4915:f02129c01d0f
-nn-NO 1151:4392aeb7f0bb
-pa-IN 1400:9021a52bd268
-pl 6453:d2fa40b3f3d6
-pt-BR 1527:a7959e24e809
-pt-PT 2641:7409ae49dfa8
-rm 919:3edd77c319ea
-ro 1232:3db059527c0a
-ru 3347:00bd5a7cd520
-si 945:a248b95272b2
-sk 1482:495309b32070
-sl 1799:543452dfefee
-sq 1466:c1f47c41caa6
-sr 727:e68b59632946
-sv-SE 4097:3453b152618f
-ta-LK 473:24bbf4397fa9
-tr 1556:cfcd2084b169
-uk 2290:4a4e59cf2e2f
-vi 615:888132eb2a3f
-zh-CN 1763:f5ced89a2ec3
-zh-TW 2095:a4f14d53dfc0
+ar 1155:278585ade022
+ast 1081:6c1122ad0445
+be 1222:b19809c33209
+bg 761:1b00cd678c60
+bn-BD 596:7a8e864a31aa
+br 900:67c9f5f3dc4d
+ca 1809:d9340a2e19de
+cs 3157:383dc0694292
+cy 779:91b4146d3ec5
+da 1648:815033c0b4f4
+de 4180:1c6b6bace69e
+dsb 214:e04c9a87852d
+el 906:554f0f8eeb6c
+en-GB 1398:c1934aa3ece1
+es-AR 2001:d88005280e3a
+es-ES 3480:8e7e12de233f
+et 1372:ee3363251d62
+eu 1164:1a590461daa9
+fi 1640:72401b70f2be
+fr 6412:7bfeb8902aa5
+fy-NL 2079:5495b0ed8f0c
+ga-IE 1296:de9a92933541
+gd 1232:1221c4e3f08f
+gl 2478:7ce637394506
+he 1126:0f693108ea75
+hr 1460:4b7f48e3a87f
+hsb 298:431eb3fe0ec6
+hu 1693:6e7441772cd2
+hy-AM 845:f5753f7077b8
+id 1240:2f7257f89c9b
+is 954:04d9a7fc969f
+it 4907:7a2bdc5dd120
+ja 1777:1afbf295898b
+ja-JP-mac 1497:1fbd586a9aa9
+ko 1480:42484e38fd67
+lt 2362:8ed8c3f881ec
+nb-NO 2096:d68a45fcaf43
+nl 4960:8b8330b92662
+nn-NO 1172:07c0698066b3
+pa-IN 1429:6040d174b019
+pl 6586:102936f0b256
+pt-BR 1592:94f03f782854
+pt-PT 2779:fefefeea2a30
+rm 942:66fab3f29653
+ro 1280:8346bb0e06d9
+ru 3394:a78f29ed85bc
+si 960:417edb83317e
+sk 1505:3748c0f2a4bd
+sl 1858:fe159ce2f09c
+sq 1493:32003ae9fcb3
+sr 751:17b3f22e495d
+sv-SE 4146:4364e8bab54e
+ta-LK 481:37e33709bf4c
+tr 1596:0638b1e86c46
+uk 2340:8d9babb76ac4
+vi 637:985c71d4a4d3
+zh-CN 1791:88611de483d4
+zh-TW 2124:9ab93d52b236
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/chat/irc.properties thunderbird-38.0~b6+build2/l10n/dsb/chat/irc.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/chat/irc.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/chat/irc.properties 2015-06-03 10:02:19.000000000 +0000
@@ -148,7 +148,7 @@
# LOCALIZATION NOTE (error.*):
-# These are shown as error messages in the server tab.
+# These are shown as error messages in the conversation or server tab.
# %S is the channel name.
error.noChannel=Njejo žeden kanal: %S.
error.tooManyChannels=Pśistup k %S njemóžno; sćo do pśewjele kanalow stupił.
@@ -173,6 +173,9 @@
error.notChannelOwner=Njejsćo wobsejźaŕ kanala %S.
error.wrongKey=Do %S njedajo se stupiś, njepłaśiwe kanalowe gronidło.
error.sendMessageFailed=Pśi słanju wašeje slědneje powěsći jo zmólka nastała. Pšosym wopytajśo hyšći raz, gaž zwisk jo se wótnowił.
+# %1$S is the channel the user tried to join, %2$S is the channel
+# he was forwarded to.
+error.channelForward=Snaź njocośo se %1$S pśizamknuś, a buźośo se awtomatiski do %2$S dalej pósrědnjaś.
# LOCALIZATION NOTE (tooltip.*):
# These are the descriptions given in a tooltip with information received
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/dom/chrome/appstrings.properties thunderbird-38.0~b6+build2/l10n/dsb/dom/chrome/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/dom/chrome/appstrings.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/dom/chrome/appstrings.properties 2015-06-03 10:02:19.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Toś ten bok ma wěstotne pšawidła za wopśimjeśe, kótarež zajźujo jogo zasajźenjoju na toś ten nałog.
corruptedContentError=Bok, kótaryž cośo se woglědaś, njedajo se pokazaś, dokulaž jo se zmólka pśi pśenosowanju datow namakała.
remoteXUL=Toś ten bok wužywa njepódpěranu technologiju, kótaraž njestoj ako standard k dispoziciji.
+sslv3Used=Wěstota wašych datow na %S njedajo se garantěrowaś, dokulaž wužywa se SSLv3, złamany wěstotny protokol.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/dom/chrome/plugins.properties thunderbird-38.0~b6+build2/l10n/dsb/dom/chrome/plugins.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/dom/chrome/plugins.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/dom/chrome/plugins.properties 2015-06-03 10:02:19.000000000 +0000
@@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# LOCALIZATION NOTE (plugins.properties):
-# Those strings are inserted into an HTML page, so you all HTML characters
+# Those strings are inserted into an HTML page, so all HTML characters
# have to be escaped in a way that they show up correctly in HTML!
title_label=Wó tykacach
@@ -20,5 +20,11 @@
description_label=Wopisanje
suffixes_label=Sufikse
+# GMP Plugins
+gmp_license_info=Licencne informacije
+
openH264_name=OpenH264 Video Codec wót Cisco Systems, Inc.
openH264_description=Wótgrajśo webwideo a wužywajśo wideochaty.
+
+eme-adobe_name=Primetime Content Decryption Module provided by Adobe Systems, Incorporated
+eme-adobe_description=Šćitane webwideo wótgraś.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/dom/chrome/security/security.properties thunderbird-38.0~b6+build2/l10n/dsb/dom/chrome/security/security.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/dom/chrome/security/security.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/dom/chrome/security/security.properties 2015-06-03 10:02:19.000000000 +0000
@@ -4,7 +4,18 @@
BlockMixedActiveContent = Zacytowanje měšanego aktiwnego wopśimjeśa "%1$S" zablokěrowane
# CORS
-CrossSiteRequestBlocked=Napšašowanje kśickego póchada jo se zablokěrowało: Ta samska směrnica póchada směrnica zakazujo cytanje dalokeje resurse pśi %1$S. To dajo se pórěźiś, z tym až resursa pśesunjo se do teje samskeje domeny abo CORS se zmóžnja.
+# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
+CORSDisabled=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: CORS jo znjemóžnjony).
+CORSRequestFailed=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: CORS-napšašowanje njejo se raźiło).
+CORSRequestNotHttp=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: CORS-napšašowanje njejo http).
+CORSMissingAllowOrigin=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: CORS-głowa 'Access-Control-Allow-Origin' felujo).
+CORSAllowOriginNotMatchingOrigin=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: CORS-głowa 'Access-Control-Allow-Origin' njewótpowědujo '%2$S').
+CORSMethodNotFound=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: Metoda w CORS-hłowje 'Access-Control-Allow-Methods' se njenamakajo).
+CORSMissingAllowCredentials=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: 'true' wócakujo se w CORS-głowje 'Access-Control-Allow-Credentials' ).
+CORSPreflightDidNotSucceed=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: Preflight-kanal CORS njejo wuspěšny był).
+CORSInvalidAllowMethod=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: njepłaśiwy token '%2$S' w CORS-głowje 'Access-Control-Allow-Methods').
+CORSInvalidAllowHeader=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: njepłaśiwy token '%2$S' w CORS-głowje 'Access-Control-Allow-Headers').
+CORSMissingAllowHeaderFromPreflight=Napšašowanje Cross-Origin jo se zablokěrowało: Pšawidła Same Origin zakazujo cytanje dalokeje resurse na %1$S. (Pśicyna: felujucy token '%2$S' w CORS-głowje 'Access-Control-Allow-Headers' z preflight-kanala CORS).
# LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
InvalidSTSHeaders=Sedło jo njepłaśiwu głowowu smužku Strict-Transport-Security pódało.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/aboutDialog.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/aboutDialog.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/aboutDialog.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -12,19 +12,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
@@ -41,6 +59,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -3,8 +3,9 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
-
@@ -160,6 +161,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -2,6 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/addressbook/addressBook.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/addressbook/addressBook.properties 2015-06-03 10:02:19.000000000 +0000
@@ -9,6 +9,8 @@
lastFirstFormat=%S, %S
firstLastFormat=%S %S \u0020
+allAddressBooks=Wšykne adresniki
+
newContactTitle=Nowy kontakt
# %S will be the contact's display name
newContactTitleWithDisplayName=Nowy kontatt za %S
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/am-server-top.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/am-server-top.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/am-server-top.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -84,3 +84,7 @@
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/chat.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/chat.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/chat.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/chat.properties 2015-06-03 10:02:19.000000000 +0000
@@ -92,4 +92,17 @@
log.currentWeek=Toś ten tyźeń
log.previousWeek=Zachadny tyźeń
+# LOCALIZATION NOTE (messagePreview):
+# This is the default message preview to be shown
+# when the user has chosen not to show any info in the notification about the
+# incoming message being notified.
messagePreview=Nowa chatowa powěsć
+
+#LOCALIZATION NOTE (bundledMessagePreview): Semi-colon list of plural forms.
+# Used when multiple incoming messages from the same sender are bundled
+# into a single notification.
+# #1 is the number of incoming messages the user is being notified about. When #1
+# is greater than one, the plural form after the semicolon is used.
+# Do not translate %1$S, it is the message preview to be shown in the
+# notification, i.e. the first incoming message.
+bundledMessagePreview=%1$S… (a #1 dalšna powěsć);%1$S… (a #1 dalšnej powěsći);%1$S… (a #1 dalšne powěsći);%1$S… (a #1 dalšnych powěsćow)
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -2,5 +2,5 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/FilterEditor.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/FilterEditor.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/FilterEditor.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/FilterEditor.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -25,6 +25,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/filter.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/filter.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/filter.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/filter.properties 2015-06-03 10:02:19.000000000 +0000
@@ -24,6 +24,12 @@
continueButtonLabel=Pókšacowaś
cannotEnableFilter=Toś ten filter jo se nejskerjej pśez pśichodnu wersiju mozilla/netscape napórał. Njamóžośo toś ten filter zmóžniś, dokulaž njewěmy, kak dej se jen nałožowaś.
dontWarnAboutDeleteCheckbox=Wěcej se njepšašaś
+
+# LOCALIZATION NOTE(filterFAilureWarningPrefix)
+# %1$S=filter error action
+# %2$S=error code as hexadecimal string.
+filterFailureWarningPrefix=Filtrowańska akcija njejo se raźiło: "%1$S" ze zmólkowym kodom=%2$S za wopyt:
+
searchTermsInvalidTitle=Pytańske zapśimjeśa su njepłaśiwe
# LOCALIZATION NOTE(searchTermsInvalidRule)
# %1$S=search attribute name from the invalid rule
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/glodaComplete.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/glodaComplete.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/glodaComplete.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/glodaComplete.properties 2015-06-03 10:02:19.000000000 +0000
@@ -17,15 +17,3 @@
# a set of words, or a phrase containing multiple words (e.g. "red pepper")
# We use the same words in en-US, but maybe that's not always true.
glodaComplete.messagesMentioningMany.label=Powěsći, kótarež naspomnjeju: #1
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
-# autocomplete widget to refer to a search on the web for a short string
-# containing at most 15 characters. #1 is the search provider to use. #2 is
-# the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label=#1 za #2 pśepytaś
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
-# the autocomplete widget to refer to a search on the web for a short string
-# containing more than 15 characters. #1 is the search provider to use. #2 is
-# the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label.truncated=#1 za #2 pśepytaś…
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/imapMsgs.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/imapMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/imapMsgs.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/imapMsgs.properties 2015-06-03 10:02:19.000000000 +0000
@@ -75,17 +75,15 @@
imapEmptyMimePart=Toś ten tekstowy źěl buźo se na napšašowanje ześěgowaś.
-# LOCALIZATION NOTE (imapReceivingMessageHeaders): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the header currently being downloaded should appear.
-# Place the word %3$lu where the number of headers should appear.
-imapReceivingMessageHeaders=%S Powěsćowa głowowa smužka %lu z %lu se ześěgujo
-
-# LOCALIZATION NOTE (imapReceivingMessageFlags): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the flag currently being downloaded should appear.
-# Place the word %3$lu where the number of flags should appear.
-imapReceivingMessageFlags=%S Powěsćowa chórgojcka %lu z %lu se ześěgujo
+# LOCALIZATION NOTE (imapReceivingMessageHeaders2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of headers should appear.
+imapReceivingMessageHeaders2=Powěsćowa głowowa smužka %lu z %lu z %S se ześěgujo…
+
+# LOCALIZATION NOTE (imapReceivingMessageFlags2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of flags should appear.
+imapReceivingMessageFlags2=Powěsćowa chórgojcka %lu z %lu z %S se ześěgujo…
imapDeletingMessages=5038=Powěsći se lašuju…
@@ -107,10 +105,10 @@
# Place the word %S in your translation where the name of the folder should appear.
imapCopyingMessage=Powěsć kopěrujo se do %S…
-# LOCALIZATION NOTE (imapFolderReceivingMessageOf): Do not translate the word "%S" or "%lu" below.
+# LOCALIZATION NOTE (imapFolderReceivingMessageOf2): Do not translate the word "%S" or "%lu" below.
# Place the word %S in your translation where the name of the folder should appear.
# Place the word %lu where the number of headers should appear.
-imapFolderReceivingMessageOf=%S - Powěsć %lu z %lu se ześěgujo
+imapFolderReceivingMessageOf2=%S - Powěsć %lu z %lu se ześěgujo…
# LOCALIZATION NOTE (imapDiscoveringMailbox): Do not translate the word "%S" below.
# Place the word %S in your translation where the name of the folder should appear.
@@ -196,11 +194,11 @@
# Out of memory
imapOutOfMemory=Nałoženje njama składowański rum.
-# LOCALIZATION NOTE (imapCopyingMessageOf): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessageOf2): Do not translate the word "%S" below.
# Place the word %3$S in your translation where the name of the destination folder should appear.
# Place the word %1$S where the currently copying message should appear.
# Place the word %2$S where the total number of messages should appear.
-imapCopyingMessageOf=Powěsć %1$S z %2$S kopěrujo se do %3$S
+imapCopyingMessageOf2=Powěsć %1$S z %2$S kopěrujo se do %3$S…
# LOCALIZATION NOTE (imapMoveFolderToTrash): Do not translate the word %S below.
# "%S" is the the name of the folder.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/localMsgs.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/localMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/localMsgs.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/localMsgs.properties 2015-06-03 10:02:19.000000000 +0000
@@ -40,8 +40,6 @@
# %2$S will receive the total number of messages
receivedMsgs=%1$S z %2$S powěsćow jo se dostało
-pop3OutOfDiskSpace=Njejo dosć ruma na plaśe, aby se nowe powěsći ześěgnuli. Wopytajśo staru e-mail lašowaś, papjernik wuproznjowaś a swóje e-mailowe zarědniki zgusćaś a wopytajśo pótom hyšći raz.
-
# Status - parsing folder
#LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
# Place the word %S where the name of the mailbox should appear
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-06-03 10:02:19.000000000 +0000
@@ -9,161 +9,116 @@
## %S will be replaced with the name of file that could not be opened
unableToOpenFile=Njejo móžno, dataju %S wócyniś.
unableToOpenTmpFile=Njejo móžno, nachylnu dataju %S wócyniś. Pśeglědajśo swójo nastajenje 'Nachylny zapis'.
-
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Njemóžno wašu powěsć ako pśedłogu składowaś.
-
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Njemóžno wašu powěsć ako nacerjenje składowaś.
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Njemóžno zarědnik Pósłane wócyniś. Pśeglědajśo pšosym, lěc swóje e-mailowe nastajenja su korektne.
-
-## @name NS_MSG_NO_SENDER
-12510=Žeden wótpósłaŕ pódany. Pódajśo pšosym swóju e-mailowu adresu w Kontowych nastajenjach.
-
-## @name NS_MSG_NO_RECIPIENTS
-12511=Žedne dostawarje pódane. Zapódajśo pšosym dostawarja abo dislusijnu kupku do adresowego póla.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Zmólka pśi pisanju nachylneje dataje.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=Pśi słanju e-maile jo zmólka nastała. E-mailowy serwer jo wótegronił: %s. Pśeglědajśo, lěc waša e-mailowa adresa we wašych e-mailowych nastajenjach jo korektna a wopytajśo hyšći raz.
-
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=Pśi słanju e-maile jo zmólka (SMTP) nastała. Serwer jo wótegronił: %s.
-
-## @name NS_ERROR_SENDING_MESSAGE
-12517=Pśi słanju e-maile jo zmólka nastała. E-mailowy serwer jo wótegronił: %s. Pśekontrolěrujśo pšosym powěsć a wopytajśo hyšći raz.
-
-## @name NS_ERROR_POST_FAILED
-12518=Powěsć njejo se wótepósłaś dała, dokulaž zwězanje ze serwerom jo se njeraźiło. Serwer njestoj snaź k dispoziciji abo wótpokazujo zwiski. Pśeglědajśo, lěc wašo nastajenje za diskusijny serwer jo korektne a wopytajśo hyšći raz, w drugim paźe stajśo se ze swójim seśowym administratorom do zwiska.
-
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=Pśi wótesłanju njepósłanych powěsćow jo zmólka wustupiła.
-
-## @name NS_ERROR_SEND_FAILED
-12520=Pósłanje powěsći jo se njeraźiło.
-
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=Pśi słanju e-maile jo zmólka nastała: Zmólka serwera SMTP. Serwer jo wótegronił: %s Stajśo se ze swójim e-mailowym administratorom za pódpěru.
-
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Njemóžno wašu powěsć za poznjejše wótpósłanje składowaś.
-
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=Komunikaciska zmólka jo wustupiła: %d. Wopytajśo pšosym hyšći raz.
-
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=TO JO ZASTUPUJUCY TEKST. WY NJEBY NIGDY DEJAŁ TOŚ TEN TEKST WIŹEŚ.
-
-## @name NS_ERROR_TCP_READ_ERROR
-12528=Pśi dostawanju datow jo seśowa zmólka wustupiła. (Seśowa zmólka: %s) Wopytajśo hyšći raz zwězaś.
-
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=Pśi słanju posta jo zmólka wustupiła: wótegronowa postowa adresa jo njepłaśiwa była. Pśeglědajśo, lěc waša e-mailowa adresa w swójich postowych nastajenjach jo pšawa a wopytajśo hyšći raz.
-
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Pśiłožkowa zmólka.
-
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=Powěsć jo se wuspěšnje pósłała, ale njejo se do wašogo zarědnika Pósłany kopěrowaś dała.
-
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=Móžośo powěsć jano na jaden diskusijny serwer naraz pósłaś.
-
-## @name NS_MSG_CANCELLING
-12555=Pśetergnjo se…
-
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Waša powěsć jo se na diskusijnu kupku pósłała, ale nic drugemu dóstawarjeju.
-
-## @name NS_MSG_ERROR_READING_FILE
-12563=Zmólka pśi cytanju dataje.
-
+unableToSaveTemplate=Njejo móžno wašu powěsć ako pśedłogu składowaś.
+unableToSaveDraft=Njejo móžno wašu powěsć ako nacerjenje składowaś.
+couldntOpenFccFolder=Njejo móžno zarědnik Pósłane wócyniś. Pśeglědajśo pšosym, lěc waše kontowe nastajenja su korektne.
+noSender=Žeden wótpósłaŕ pódany. Pódajśo pšosym swóju e-mailowu adresu w kontowych nastajenjach.
+noRecipients=Žedne dostawarje pódane. Zapódajśo pšosym dostawarja abo dislusijnu kupku do adresowego póla.
+errorWritingFile=Zmólka pśi pisanju nachylneje dataje.
+
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingFromCommand=Pśi słanju e-maile jo zmólka nastała. E-mailowy serwer jo wótegronił: %s. Pśeglědajśo, lěc waša e-mailowa adresa we wašych kontowych nastajenjach jo korektna a wopytajśo hyšći raz.
+
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingDataCommand=Pśi słanju e-maile jo zmólka wuchadnego serwera (SMTP) nastała. Serwer jo wótegronił: %ss.
+
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=Pśi słanju e-maile jo zmólka nastała. E-mailowy serwer jo wótegronił: %s. Pśekontrolěrujśo pšosym powěsć a wopytajśo hyšći raz.
+postFailed=Powěsć njejo se wótepósłaś dała, dokulaž zwězowanje ze serwerom njejo se raźiło. Serwer njejo snaź k dispoziciji abo wótpokazujo zwiski. Pśeglědajśo, lěc waše nastajenja za diskusijny serwer su korektne a wopytajśo hyšći raz.
+errorQueuedDeliveryFailed=Pśi wótesłanju njepósłanych powěsćow jo zmólka nastała.
+sendFailed=Słanje powěsći jo njejo se raźiło.
+
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
+smtpServerError=Pśi słanju e-maile jo zmólka nastała: Zmólka wuchadnego serwera (SMTP). Serwer jo wótegronił: %s.
+unableToSendLater=Bóžko njejsmy mógli wašu powěsć za póznjejše słanje składowaś.
+
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=Komunikaciska zmólka jo wustupiła: %d. Wopytajśo pšosym hyšći raz.
+dontShowAlert=TO JO ZASTUPUJUCY TEKST. WY NJEBY NIGDY DEJAŁ TOŚ TEN TEKST WIŹEŚ.
+
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=Pśi dostawanju datow jo seśowa zmólka wustupiła. (Seśowa zmólka: %s) Wopytajśo hyšći raz zwězaś.
+couldNotGetUsersMailAddress=Pśi słanju e-maile jo zmólka nastała: wótegronowa e-mailowa adresa jo njepłaśiwa była. Pśeglědajśo, lěc waša e-mailowa adresa w swójich kontowych nastajenjach jo pšawa a wopytajśo hyšći raz.
+mimeMpartAttachmentError=Pśiłožkowa zmólka.
+failedCopyOperation=Powěsć jo se wuspěšnje pósłała, ale njejo se do wašogo zarědnika Pósłany kopěrowaś dała.
+nntpNoCrossPosting=Móžośo powěsć jano na jaden diskusijny serwer naraz pósłaś.
+msgCancelling=Pśetergnjo se…
+sendFailedButNntpOk=Waša powěsć jo se na diskusijnu kupku pósłała, ale nic na drugego dóstawarja.
+errorReadingFile=Zmólka pśi cytanju dataje.
followupToSenderMessage=Awtor toś teje powěsći jo pšosył, až wótegrona deje se jano na awtora pósłaś. Jolic cośo teke na diskusijnu kupku wótegroniś, pśidajśo adresěrowańskemu póloju nowu smužku, wubjeŕśo Diskusijna kupka z lisćiny dostawarjow a zapódajśo mě diskusijneje kupki.
-## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=Pśi pśidawanju %S jo zmólka nastała. Pšosym kontrolěrujśo, lěc maśo pśistup na dataju.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of the object to be attached
+errorAttachingFile=Pśi pśidawanju %S jo zmólka nastała. Pšosym kontrolěrujśo, lěc maśo pśistup na dataju.
-## @name NS_ERROR_SMTP_GREETING
-12572=Pśi słanju e-maile jo zmólka nastała: E-mailowy serwer jo wopacne witanje pósłał: %s.
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
+incorrectSmtpGreeting=Pśi słanju e-maile jo zmólka nastała: E-mailowy serwer jo wopacne witanje pósłał: %ss.
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=Pś słanju e-maile jo zmólka nastała. E-mailowy serwer jo wótegronił: %1$s. Pšosym kontrolěrujśo powěsćowego dostawarja %2$s a wopytajśo hyšći raz.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
+errorSendingRcptCommand=Pś słanju e-maile jo zmólka nastała. E-mailowy serwer jo wótegronił: \n%1$S.\n Pšosym kontrolěrujśo powěsćowego dostawarja "%2$S" a wopytajśo hyšći raz.
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=Pśi słanju e-maile jo zmólka nastała: Njejo móžno, wěsty wótkaz ze SMTP-serwerom %S z pomocu STARTTLS załožyś, dokulaž njepódpěra toś tu funkciju. Wótšaltujśo STARTTLS za ten serwer abo stajśo se ze swójim słužbowym póbitowarjom do zwiska.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
+startTlsFailed=Pśi słanju e-maile jo zmólka nastała: Njejo móžno, wěsty wótkaz z wuchadnym serwerom (SMTP) %S z pomocu STARTTLS napóraś dokulaž njepódpěra toś tu funkciju. Wótšaltujśo STARTTLS za ten serwer abo stajśo se ze swójim słužbowym póbitowarjom do zwiska.
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=Pśi słanju e-maile jo zmólka nastała: Gronidło za %S njedajo se namakaś. Powěsć njejo se pósłała.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
+smtpPasswordUndefined=Pśi słanju e-maile jo zmólka nastała: Gronidło za %S njedajo se namakaś. Powěsć njejo se pósłała.
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=Wjelikosć powěsći, kótaruž wopytujośo słaś, pśekšaca nachylne wjelikostny limit serwera. Powěsć njejo se pósłał; wopytajśo wjelikosć powěsći reducěrowaś abo cakajśo chylku a wopytajśo hyšći raz. Serwer jo wótegronił: %s.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=Wjelikosć powěsći, kótaruž wopytujośo słaś, pśekšaca nachylne wjelikostny limit serwera. Powěsć njejo se pósłał; wopytajśo wjelikosć powěsći reducěrowaś abo cakajśo chylku a wopytajśo hyšći raz. Serwer jo wótegronił: %s.
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=Wjelikosć powěsći, kótaruž wopytujośo słaś, pśekšaca globalny wjelikostny limit (%d bajtow) serwera. Powěsć njejo se pósłała; reducěrujśo wjelikosć powěsći a wopytajśo hyšći raz.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=Wjelikosć powěsći, kótaruž wopytujośo słaś, pśekšaca globalny wjelikostny limit (%d bajtow) serwera. Powěsć njejo se pósłała; reducěrujśo wjelikosć powěsći a wopytajśo hyšći raz.
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=Wjelikosć powěsći, kótaruž wopytujośo słaś, pśekšaca globalny wjelikostny limit serwera. Powěsć njejo se pósłała; reducěrujśo wjelikosć powěsć a wopytajśo hyšći raz. Serwer jo wótegronił: %s.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the Outgoing server (SMTP) response
+smtpPermSizeExceeded2=Wjelikosć powěsći, kótaruž wopytujośo słaś, pśekšaca globalny wjelikostny limit serwera. Powěsć njejo se pósłała; reducěrujśo wjelikosć powěsć a wopytajśo hyšći raz. Serwer jo wótegronił: %s.
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=Pśi słanju e-maile jo zmólka nastała: SMTP-serwer %S jo njeznaty. Serwer jo snaź wopaki konfigurěrowany. Pšosym kontrolěrujśo, lěc nastajenja wašogo SMTP-serwera su korektne a wopytajśo hyšći raz.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownServer=Pśi słanju e-maile jo zmólka nastała: Wuchadny serwer (SMTP) %S jo njeznaty. Serwer jo snaź wopaki konfigurěrowany. Pšosym kontrolěrujśo, lěc nastajenja wašogo wuchadnego serwera (SMTP) su korektne a wopytajśo hyšći raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=Powěsć njedajo se słaś, dokulaž zwisk ze SMTP-serwerom %S jo se njeraźił. Serwer njestoj snaź k dispoziciji abo wótpokazujo SMTP-zwiski. Pšosym kontrolěrujśo, lěc nastajenja wašogo SMTP-serwera su korektne a wopytajśo hyšći raz, abo stajśo ze serwerowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRefused=Powěsć njejo se wótepósłaś dała, dokulaž zwězowanje z wuchadnym serwerom (SMTP) %S njejo se raźiło. Serwer njejo snaź k dispoziciji abo wótpokazujo zwiski wuchadnego serwera (SMTP). Pśeglědajśo, lěc waše nastajenja za wuchadny serwer (SMTP) su korektne a wopytajśo hyšći raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=Powěsć njedajo se słaś, dokulaž zwisk ze SMTP-serwerom %S jo se w transakciji zgubił. Wopytajśo hyšći raz abo stajśo se ze swójim seśowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
+smtpSendInterrupted=Powěsć njedajo se słaś, dokulaž zwisk z wuchadnym serwerom (SMTP) %S jo se za cas transakcije zgubił. Wopytajśo hyšći raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=Powěsć njedajo se słaś, dokulaž zwisk ze SMTP-serwerom %S jo cas pśekšocył. Wopytajśo hyšći raz abo stajśo ze swójim seśowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
+smtpSendTimeout=Powěsć njedajo se słaś, dokulaž zwisk z wuchadnym serwerom (SMTP) %S jo cas pśekšocył. Wopytajśo hyšći raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=Powěsć njedajo se z někakeje pśicyny z pomocu SMTP_serwera %S słaś. Pšosym kontrolěrujśo, lěc nastajenja wašogo SMTP-serwera su korektne a wopytajśo hyšći raz, abo stajśo ze swójim seśowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownReason=Powěsć njedajo se z njeznateje pśicyny z pomocu wuchadnego serwera (SMTP) %S słaś. Pšosym kontrolěrujśo, lěc nastajenja wašogo wuchadnego serwera (SMTP) su korektne a wopytajśo hyšći raz.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=Zda se, až SMTP-serwer %S njepódpěra skoděrowane gronidła. Jolic sćo konto rowno konfigurěrował, změńśo do 'Gronidło, njewěsćej pśenjasone' ako 'Awtentificěrowańska metoda' w 'Kontowe nastajenja | Serwerowe nastajenja'. Jolic jo to funkcioněrowało a napśiski se njeraźi, jo to normalnje pśiznamje za to, až něchten co wašo gronidło kšadnuś.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainNoSsl=Zda se, až wuchadny serwer (SMTP) %S njepódpěra skoděrowane gronidła. Jolic rowno konto konfigurěrujośo, wopytajśo 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serwerowe nastajenja' do 'Gronidło, njewěsće pśenjasone' změniś. Jolic to zwětšego funkcioněrujo, ale něnto nic, jo móžno, až se wašo gronidło kšadnjo.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12595): $S is server hostname
-12595=Zda se, až SMTP-serwer %S njepódpěra skoděrowane gronidła. Jolic sćo konto rowno konfigurěrował, změńśo do 'Normalne gronidło' ako 'Awtentificěrowańska metoda' w 'Kontowe nastajenja | Serwerowe nastajenja'. Jolic jo to funkcioněrowało a napśiski se njeraźi, stajśo pšosym ze swójim e-mailowym administratorom abo póbitowarjom do zwiska.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainSsl=Zda se, až wuchadny serwer (SMTP) %S njepódpěra skoděrowane gronidła. Jolic rowno konto konfigurěrujośo, wopytajśo 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serwerowe nastajenja' do 'Normalne gronidło' změniś.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12596): $S is server hostname
-12596=SMTP-serwer %S njedowólujo gronidła z lutnego teksta. Pšosym změńśo 'Skoděrowane gronidło' ako 'Awtentificěrowańska metoda' w 'Kontowe nastajenja | Serwerowe nastajenja'.
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
+smtpAuthChangePlainToEncrypt=Wuchadny serwer (SMTP) %S njepódpěra gronidła z lutnego teksta. Pšosym wopytajśo 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serwerowe nastajenja' do 'Skoděrowane gronidło' změniś.
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Njejo móžno, SMTP-serwer %S awtentificěrowás. Pšosym pśekontrolěrujśo gronidło, a pśespytajśo 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
+smtpAuthFailure=Njejo móžno, wuchadny serwer (SMTP) %S awtentificěrowás. Pšosym kontrolěrujśo gronidło, a pśespytajśo 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=Tiket Kerberos/GSSAPI njejo se pśez SMTP-serwera %S akceptěrował. Pšosym pśekontrolěrujśo, lěc sćo pla wobcerka Kerberos/GSSAPI pśizjawjony.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
+smtpAuthGssapi=Tiket Kerberos/GSSAPI njejo se pśez wuchadny serwer (SMTP) %S akceptěrował. Pšosym kontrolěrujśo, lěc sćo pla wobcerka Kerberos/GSSAPI pśizjawjony.
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=SMTP-serwer %S njepódpěra wubranu awtentifikacisku metodu. Pšosym změńśo 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
+smtpAuthMechNotSupported=Wuchadny serwer (SMTP) %S njepódpěra wubranu awtentifikacisku metodu. Pšosym změńśo 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=Njejo móžno SMTP-serwer %S awtentificěrowaś. Njepódpěra awtentifikaciju (SMTP-AUTH), wy pak cośo awtentifikaciju wužywaś. Pšosym změńśo 'awtentifkacisku metodu' do 'Žedna' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)' abo stajśo se ze swójim e-mailowym póbitowarjom za instrukcije do zwiska.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
+smtpAuthNotSupported=Njejo móžno wuchadny serwer (SMTP) %S awtentificěrowaś. Njepódpěra awtentifikaciju (wuchadny serwer (SMTP)-AUTH), wy pak cośo awtentifikaciju wužywaś. Pšosym změńśo 'awtentifkacisku metodu' do 'Žedna' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)' abo stajśo se ze swójim e-mailowym póbitowarjom za instrukcije do zwiska.
-## @name NS_ERROR_ILLEGAL_LOCALPART
# LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
errorIllegalLocalPart=W lokalnem źělu adrese dostawarja %s su nje-ASCII-znamuška. To se hyšći njepódpěra. Pšosym změńśo toś tu adresu a wopytajśo hyšći raz.
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
saveDlogTitle=Powěsć składowaś
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
saveDlogMessages=Powěsć njejo se pósłała. Cośo powěsć w zarědniku Nacerjenja (%1$S) składowaś?
## generics string
defaultSubject=(žedna tema)
chooseFileToAttach=Dataje pśipowjesyś
-
genericFailureExplanation=Pśeglědajśo, lěc waše kontowe nastajenja su korektne a wopytajśo hyšći raz.
## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
@@ -182,21 +137,22 @@
sendWithEmptySubjectButton=Bźez temy pó&słaś
cancelSendingButton=Słanje pśeter&gnuś
-## Strings used by the dialog that informs about lack of newsgroup support.
+## Strings used by the dialog that informs about the lack of newsgroup support.
noNewsgroupSupportTitle=Diskusijne kupki se njepódpěraju
recipientDlogMessage=Toś to konto pódpěra jano e-mailowe dostawarje. Jolic pókšacujośo, budu se diskusijne kupki ignorěrowaś.
-## Strings used by the alert that tells the user an e-mail address is invalid.
+## Strings used by the alert that tells the user that an e-mail address is invalid.
addressInvalidTitle=Njepłaśiwa dostawarska adresa
addressInvalid=%1$S njejo płaśiwa e-mailowa adresa, dokulaž njama forma wužywaŕ@host. Musyśo ju korigěrowaś, nježli až pósćelośo e-mail.
-## String used by the dialog that ask the user to attach a web page
+## String used by the dialog that asks the user to attach a web page
attachPageDlogTitle=Pšosym pódajśo město, kótarež ma se pśipowjesyś
attachPageDlogMessage=Webbok (URL):
-## String used for attachment pretty name, when attachment is a message
+## String used for attachment pretty name, when the attachment is a message
messageAttachmentSafeName=Pśipowjesona powěsć
-## String used for attachment pretty name, when attachment is message part
+
+## String used for attachment pretty name, when the attachment is a message part
partAttachmentSafeName=Pśipowjesony powěsćowy źěl
# LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
@@ -211,73 +167,75 @@
## String used if a file to attach does not exist when passed as
## a command line argument
errorFileAttachTitle=Dataju pśipowjesyś
+
## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
errorFileAttachMessage=Dataja %1$S njeeksistěrujo a njedajo se togodla k powěsći pśipowjesyś.
-## Strings used by Save as Draft/Template dialog
+## Strings used by the Save as Draft/Template dialog
SaveDialogTitle=Powěsć składowaś
-## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
+
+## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
SaveDialogMsg=Waša powěsć jo se do zarědnika %1$S na %2$S składowała.
CheckMsg=Toś ten dialog wěcej njepokazaś.
-## Strings used by prompt when Quitting while in progress
+## Strings used by the prompt when Quitting while in progress
quitComposeWindowTitle=Powěsć pósłaś
+
## LOCALIZATION NOTE (quitComposeWindowMessage2): don't translate \n
quitComposeWindowMessage2=%1$S sćelo tuchylu powěsć.\nCośo cakaś, až powěsć njejo se pósłała, nježli až skóńcyjośo abo něnto skóńcyś?
quitComposeWindowQuitButtonLabel2=&Skóńcyś
quitComposeWindowWaitButtonLabel2=Ca&kaś
quitComposeWindowSaveTitle=Powěsć składowaś
+
## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
quitComposeWindowSaveMessage=%1$S składujo tuchylu powěsć.\nCośo cakaś, až powěsć njejo se pósłała, nježli až skóńcyjośo abo něnto skóńcyś?
-## Strings used by prompt for Ctrl-Enter check before sending message
+## Strings used by the prompt for Ctrl-Enter check before sending message
sendMessageCheckWindowTitle=Powěsć pósłaś
sendMessageCheckLabel=Sćo napšawdu gótowy, toś tu powěsć pósłaś?
sendMessageCheckSendButtonLabel=Pósłaś
-
assemblingMessageDone=Powěsć staja se gromadu…Gótowy
assemblingMessage=Powěsć staja se gromadu…
-
smtpDeliveringMail=E-mail se wótpósćela…
smtpMailSent=E-mail jo se wuspěšnje pósłala
-
assemblingMailInformation=E-mailowe informacije se zastajuju…
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
+
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is the file name/URI of attachment
gatheringAttachment=%S se pśipowjesa…
creatingMailMessage=Postowa powěsć se napórajo…
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
+## LOCALIZATION NOTE (copyMessageStart): argument %S is the folder name
copyMessageStart=Powěsć se do zarědnika %S kopěrujo…
copyMessageComplete=Kopěrowanje skóńcone.
copyMessageFailed=Kopěrowanje jo se njeraźiło.
-
filterMessageComplete=Filter jo dopołny.
filterMessageFailed=Filter njejo se raźił.
## LOCALIZATION NOTE (largeMessageSendWarning):
## Do not translate %S. It is the size of the message in user-friendly notation.
-largeMessageSendWarning=Warnowanje! Cośo rowno powěsć z wjelikosću %S słaś, kótaraž pśekšaca dowólony limit na e-mailowem serwerje. Cośo to napšawdu cyniś?
-
+largeMessageSendWarning=Warnowanje! Cośo rowno powěsć z wjelikosću %S bajtow wótpósłaś. Cośo to napšawdu cyniś?
sendingMessage=Powěsć se sćele…
sendMessageErrorTitle=Zmólka pśi słanju powěsći
postingMessage=Powěsć sePo sćele…
-
sendLaterErrorTitle=Zmólka pśi pózdźejšem słanju
saveDraftErrorTitle=Zmólka pśi składowanju ako nacerjenje
saveTemplateErrorTitle=Zmólka pśi składowanju ako pśedłogu
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is the file name/URI of object to be embedded
failureOnObjectEmbeddingWhileSaving=Jo problem pśi zapśěgnjenju dataje %.200S do powěsći nastał. Cośo pókšacowaś a toś tu powěsć bźez toś teje dataje składowaś?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is the file name/URI of object to be embedded
failureOnObjectEmbeddingWhileSending=Jo problem pśi zapśěgnjenju dataje %.200S do powěsći nastał. Cośo pókšacowaś a toś tu powěsć bźez toś teje dataje pósłaś?
returnToComposeWindowQuestion=Cośo se do wokna spisanja powěsćow wróśiś?
## reply header in composeMsg
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is the author (name of the person replying to)
mailnews.reply_header_authorwrotesingle=#1 jo napisał:
-## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is the author, #2 is the date, #3 is the time
mailnews.reply_header_ondateauthorwrote=#2 #3 jo #1 napisał:
-## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is the author, #2 is the date, #3 is the time
mailnews.reply_header_authorwroteondate=#1 jo #2 #3 napisał:
## reply header in composeMsg
@@ -294,7 +252,7 @@
## Attachment Reminder
## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
-## words that that should trigger an attachment reminder.
+## words that should trigger an attachment reminder.
mail.compose.attachment_reminder_keywords=.doc,.pdf,.xls,.ppt,.rtf,.pps,attachment,attach,attached,attaching,enclosed,CV,cover letter
addAttachmentButton=Pśidank pśidaś…
@@ -304,6 +262,7 @@
attachmentReminderTitle=Pśidankowe napominanje
attachmentReminderMsg=Sćo zabył pśidank pśidaś?
+
# LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
# #1 number of keywords
@@ -315,6 +274,7 @@
# Strings used by the Filelink offer notification bar.
learnMore.label=Dalšne informacije…
learnMore.accesskey=i
+
# LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
# #1 number of big attached files
@@ -323,10 +283,8 @@
bigFileShare.accesskey=W
bigFileAttach.label=Ignorěrowaś
bigFileAttach.accesskey=I
-
bigFileChooseAccount.title=Konto wubraś
bigFileChooseAccount.text=Wubjeŕśo mrokowe konto, aby pśidank nagrał
-
bigFileHideNotification.title=Dataje njenagraś
bigFileHideNotification.text=Njedostanjośo žednu powěźenku, jolic pśipowjesaśo dalšne wjelike dataje k toś tej powěsći.
bigFileHideNotification.check=Wó tom wěcej njeinforměrowaś.
@@ -335,6 +293,7 @@
# %S. %S is the display name for the cloud account the attachment is being
# uploaded to.
cloudFileUploadingTooltip=Nagrajo se do %S…
+
# LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
# %S. %S is the display name for the cloud account the attachment was uploaded
# to.
@@ -345,13 +304,14 @@
cloudFilePrivacyNotification=Wótkazowanje jo skóńcone. Pšosym źiwajśo na to, až wótkazane pśidanki mógu za luźi pśistupne byś, kótarež mógu wótkaze wugódaś abo wiźeś.
## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
-## word $S. Place the word $S where the host name should appear.
+## word %S. Place the word %S where the host name should appear.
smtpEnterPasswordPrompt=Zapódajśo swójo gronidło za %S:
+
## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
## words %1$S and %2$S. Place the word %1$S where the host name should appear,
## and %2$S where the user name should appear.
smtpEnterPasswordPromptWithUsername=Zapódajśo swójo gronidło za %2$S na %1$S:
-smtpEnterPasswordPromptTitle=Gronidło za SMTP-serwer trěbne
+smtpEnterPasswordPromptTitle=Gronidło wuchadnego serwera (SMTP) jo trěbne
# LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
@@ -360,43 +320,47 @@
## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
## will be replaced with the name of the folder the message is being saved to.
errorSavingMsg=Pśi składowanju powěsći do %S jo zmólka nastała. Hyšći raz wopytaś?
-
errorFilteringMsg=Waša powěsć jo se pósłała a składowała, ale pśi filtrowanju powěsći jo zmólka nastała.
-
errorCloudFileAuth.title=Awtentifikaciska zmólka
+
## LOCALIZATION NOTE(errorCloudFileAuth.message):
-## %1$S is the name of the online storage service that authentication failed against.
+## %1$S is the name of the online storage service against which the authentication failed.
errorCloudFileAuth.message=Awtentifikacija napśeśiwo %1$S jo njemóžno.
errorCloudFileUpload.title=Nagraśowa zmólka
+
## LOCALIZATION NOTE(errorCloudFileUpload.message):
-## %1$S is the name of the online storage service that uploading failed against.
+## %1$S is the name of the online storage service against which the uploading failed.
## %2$S is the name of the file that failed to upload.
errorCloudFileUpload.message=Njejo móžno, %2$S do %1$S nagraś.
errorCloudFileQuota.title=Kwotowa zmólka
+
## LOCALIZATION NOTE(errorCloudFileQuota.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
errorCloudFileQuota.message=Nagrawanje dataje %2$S do %1$S by waš webskładowy limit pśekšocyło.
errorCloudFileNameLimit.title=Zmólka datajowego mjenja
+
## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to the excess file name length
-errorCloudFileNameLimit.message=Dataja %2$S wopśimujo pśi nagrawanju do %1$S wěcej ako 120 znamuškow w swójom mjenju. Pšosym pśemjeńśo dataju, aby 120 znamuškow abo mjenjej w jeje mjenju było a nagrajśo hyšći raz.
+errorCloudFileNameLimit.message=%2$S ma wušej 120 znamuškow w swójom mjenju, což jo wěcej ako maksimalna dłujkośc datajowego mjenja za %1$S. Pšosym pśemjeńśo dataju, aby mě dataje na 120 znamuškow abo mjenjej reducěrował a nagrajśo hyšći raz.
errorCloudFileLimit.title=Zmólka datajoweje wjelikosći
+
## LOCALIZATION NOTE(errorCloudFileLimit.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to size restrictions.
errorCloudFileLimit.message=%2$S pśekšacujo maksimalnu wjelikosć za %1$S.
errorCloudFileOther.title=Njeznata zmólka
+
## LOCALIZATION NOTE(errorCloudFileOther.message):
## %1$S is the name of the online storage service that cannot be communicated with.
errorCloudFileOther.message=Pśi komunicěrowanju z %1$S jo njeznata zmólka nastała.
errorCloudFileDeletion.title=Lašowańska zmólka
+
## LOCALIZATION NOTE(errorCloudFileDeletion.message):
## %1$S is the name of the online storage service that the file is to be deleted from.
## %2$S is the name of the file that failed to be deleted.
errorCloudFileDeletion.message=Pśi lašowanju %2$S z %1$S jo problem nastał.
-
errorCloudFileUpgrade.label=Aktualizěrowaś
## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
@@ -411,7 +375,7 @@
cloudAttachmentListFooter=%1$S wólažcujo, wjelike dataje pśez e-mail źěliś.
## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
-## attachment, to be inserted into the message body. Do not translate the words
+## attachment to be inserted into the message body. Do not translate the words
## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
## %3$S is the name of the cloud storage service, and %4$S is the link to the
## attachment.
@@ -421,7 +385,6 @@
## upload notification bar to allow the user to dismiss the notification permanently.
stopShowingUploadingNotification.accesskey=n
stopShowingUploadingNotification.label=To nigda wěcej njepokazaś
-
replaceButton.label=Wuměniś…
replaceButton.accesskey=m
replaceButton.tooltip=Dialog Pytaś a wuměniś pokazaś
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/messengercompose/messengercompose.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/messengercompose/messengercompose.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/messengercompose/messengercompose.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/messengercompose/messengercompose.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -222,7 +222,7 @@
-
+
@@ -230,7 +230,7 @@
-
+
-
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/messenger.properties thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/messenger.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/messenger.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/messenger.properties 2015-06-03 10:02:19.000000000 +0000
@@ -83,6 +83,7 @@
alertFilterCheckbox=Wěcej njewarnowaś.
compactFolderDeniedLock=Zarědnik '%S' njedajo se zgusćaś, dokulaž druga operacija rowno wótběgujo. Wopytajśo pšosym pózdźej hyšći raz.
compactFolderWriteFailed=Zarědnik '%S' njejo dał se zgusćiś, dokulaž pisanje do zarědnika jo se njeraźiło. Pśekontrolěrujśo, lěc maśo dosć ruma na plaśe a maśo pisańske pšawa za datajowy system a wopytajśo pótom hyšći raz.
+compactFolderInsufficientSpace=Někotare zarědniki (na pś. '%S') njedaju se zguscyś, dokulaž njejo dosć lichego składowańskego ruma. Pšosym wulašujśo někotare dataje a wopytajśo hyšći raz.
filterFolderHdrAddFailed=Toś te powěsći njedaju se do zarědnika '%S' filtrowaś, dokulaž njejo se raźiło, jomu powěsć pśidaś. Pśeglědajśo, lěc zarědnik zwobraznjujo se pórědnje abo wopytajśo jen z kakosćow zarědnika pórěźiś.
filterFolderWriteFailed=Powěsći njejsu dali se do zarědnika '%S' filtrowaś, dokulaž pisanje do zarědnika jo se njeraźiło. Pśekontrolěrujśo, lěc maśo dosć ruma na plaśe a maśo pisańske pšawa za datajowy system a wopytajśo pótom hyšći raz.
copyMsgWriteFailed=Powěsći njejsu dali se do zarědnika '%S' pśesunuś abo kopěrowaś, dokulaž pisanje do zarědnika jo se njeraźiło. Aby rum na plaśe dobył, pśejźćo do menija Dataja, wubjeŕśo nejpjerwjej Papjernik wuprozniś a pótom Zarědniki zgusćiś a wopytajśo pótom hyšći raz.
@@ -95,6 +96,7 @@
filterFolderTruncateFailed=Pśi wótrězanju postowega kašćika pó filtrowanju powěsći do zarědnika '%1$S' jo zmólka nastała. Móžo trjeba byś %2$S skóńcyś a INBOX.msf wulašowaś.
mailboxTooLarge=Zarědnik %S jo połny a njamóžo dalšne powěsći pśiwześ. Aby rum za dalšne powěsći napórał, wulašujśo stary abo njewitany post a zgusććo zarědnik.
+outOfDiskSpace=Njejo dosć ruma na plaśe, aby se nowe powěsći ześěgnuli. Wopytajśo staru e-mail lašowaś, papjernik wuproznjowaś a swóje e-mailowe zarědniki zgusćaś a wopytajśo pótom hyšći raz.
errorGettingDB=Njemóžno indeksowu dataju za %S wócyniś. Jo snaź zmólka na plaśe była abo dopołna sćažka jo pśedłujka.
defaultServerTag=(Standard)
@@ -124,9 +126,16 @@
authKerberos=Kerberos / GSSAPI
authExternal=TLS-certifikat
authNTLM=NTLM
+authOAuth2=OAuth2
authAnySecure=Někaka wěsta metoda (zestarjona)
authAny=Někaka metoda (njewěsta)
+# OAuth2 window title
+# LOCALIZATION NOTE(oauth2WindowTitle):
+# %1$S is the username (or full email address) used for authentication.
+# %2$S is the hostname of the account being authenticated.
+oauth2WindowTitle=Zapódajśo pśizjawjeńske daty za %1$SS na %2$S
+
# LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
serverType-nntp=Serwer za diskusijne kupki (NNTP)
# LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
@@ -253,8 +262,9 @@
mailnews.send_default_charset=UTF-8
mailnews.view_default_charset=UTF-8
-# generate display names in last first order
-# valid mail.addr_book.displayName.lastnamefirst are: true or false
+# whether to generate display names in last first order
+# LOCALIZATION NOTE(mail.addr_book.displayName.lastnamefirst):
+# the only valid values are: true OR false (choose from the untranslated English words)
mail.addr_book.displayName.lastnamefirst=false
# the format for "mail.addr_book.quicksearchquery.format" is:
@@ -268,7 +278,9 @@
#
mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
-# valid mail.addr_book.show_phonetic_fields are: true or false
+# whether to also show phonetic fields in the addressbook
+# LOCALIZATION NOTE(mail.addr_book.show_phonetic_fields):
+# the only valid values are: true OR false (choose from the untranslated English words)
mail.addr_book.show_phonetic_fields=false
# valid format options are:
@@ -474,6 +486,22 @@
megaByteAbbreviation2=%.*f MB
gigaByteAbbreviation2=%.*f GB
+## LOCALIZATION NOTE(folderWithAccount):
+## This is used to show folder name together with an account name.
+## %1$S = folder name
+## %2$S = account name
+folderWithAccount=%1$S - %2$S
+## LOCALIZATION NOTE(folderWithUnreadMsgs):
+## This is a concatenation of two strings to compose a folder label with unread messages.
+## %1$S = folder name
+## %2$S = count of unread messages
+folderWithUnreadMsgs=%1$S (%2$S)
+## LOCALIZATION NOTE(summarizedValue):
+## This string shows an indication that the value shown is actually a summary
+## accumulated from all subfolders.
+## %S = summarized value from all subfolders
+folderSummarizedValue=*%S
+
# Error message if message for a message id wasn't found
errorOpenMessageForMessageIdTitle=Zmólka pśi wócynjenju ID powěsći
errorOpenMessageForMessageIdMessage=Powěsć za ID powěsći %S njejo se namakała
@@ -716,9 +744,6 @@
update.downloadAndInstallButton.label=Na %S aktualizěrowaś
update.downloadAndInstallButton.accesskey=a
-websearch.setDefault=Toś tu pytawu ako standard nastajiś
-websearch.isDefault=Toś ta pytawa jo tuchylu standard
-
outdatedpluginsMessage.title=Někotare tykace, kótarež wužywaju se na toś tom boku, su zestarjone.
outdatedpluginsMessage.updateButton.label=Tykace aktualizěrowaś…
outdatedpluginsMessage.updateButton.accesskey=T
@@ -770,3 +795,15 @@
ignoredSubthreadsFeedback=Wótegrona do pódnitki, kótaraž jo se wubrała, se njepokazuju.;Wótegrona do #1 pódnitkowu, kótarejž stej se wubrałej, se njepokazuju.;Wótegrona do #1 pódnitkow, kótarež su se wubrali, se njepokazuju.;Wótegrona do #1 pódnitkow, kótarež jo se wubrało, se njepokazuju.
# LOCALIZATION NOTE (saveAsType): replace %S with the extension of the file to be saved.
saveAsType=Dataja %S
+
+# LOCALIZATION NOTE (openSearch.label): The label used in the autocomplete
+# widget to refer to a search on the web for a short string containing at most
+# 15 characters. %1$S is the search provider to use. %2$S is the string to
+# search for.
+openSearch.label=Z %1$S za "%2$S" pytaś
+
+# LOCALIZATION NOTE (openSearch.label.truncated): The label used in the
+# autocomplete widget to refer to a search on the web for a short string
+# containing more than 15 characters. %1$S is the search provider to use. %2$S
+# is the string to search for, truncated to 15 characters.
+openSearch.label.truncated=Pyta se z %1$S za "%2$S…"
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/advanced.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/advanced.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/advanced.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -3,20 +3,21 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
-
-
-
-
+
+
+
+
@@ -37,6 +38,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/compose.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/compose.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/compose.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -6,6 +6,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/fonts.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/fonts.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/fonts.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/fonts.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -8,8 +8,8 @@
-
-
+
+
@@ -20,20 +20,18 @@
+
-
-
+
-
-
-
-
+
@@ -48,8 +46,12 @@
+
+
+
+
+
-
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/general.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/general.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/general.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/general.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -35,3 +35,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/offline.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/offline.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/offline.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -11,8 +11,8 @@
-
-
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/preferences.dtd thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/mail/chrome/messenger/preferences/preferences.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/mail/chrome/messenger/preferences/preferences.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -17,3 +17,7 @@
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pipnss/nsserrors.properties thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pipnss/nsserrors.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pipnss/nsserrors.properties 2015-06-03 10:02:19.000000000 +0000
@@ -315,3 +315,5 @@
MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Serwer wužywa certifikat z rozšyrjenim Basic Constraints, kótarež identificěrujo jen ako certifikatowu awtoritu. Za porědnje wudany certifikat to njepśitrjefi.
MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=Serwer jo certifikat z klucoweju wjelikosću prezentěrował, kótaraž jo pśemała, aby wěsty zwisk napórała.
MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Certifikat wersije 1 X.509, kótaryž njejo dowěry gódna kokulka, jo se wužył, aby certifikat serwera wudał. Certifikaty wersije 1 X.509 su zestarjone a njeby měli se wužywaś, aby druge certifikaty signěrowali.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Serwer jo certifikat pśedpołožył, kótaryž hyšći njejo płaśiwy.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Certifikat, kótaryž hyšći njejo płaśiwy, jo se wužył, aby certifikat serwera wudał.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pipnss/pipnss.properties thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pipnss/pipnss.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pipnss/pipnss.properties 2015-06-03 10:02:19.000000000 +0000
@@ -40,16 +40,12 @@
# End of size restriction.
VerifySSLClient=Klientowy certifikat SSL
VerifySSLServer=Serwerowy certifikat SSL
-VerifySSLStepUp=SSL-serwer ze Step-up
VerifySSLCA=Certifikatowa awtorita SSL
VerifyEmailSigner=Certifikat e-mailowego pódpisanego
VerifyEmailRecip=Certifikat e-mailowego dostawarja
-VerifyProtectObjSign=Pódpisany šćitanego objekta
VerifyObjSign=Pódpisaŕ objekta
-VerifyUserImport=Certifikat importěrowanja wužywarja
VerifyCAVerifier=Pśepytowaŕ certifikatoweje awtority
VerifyStatusResponder=Certifikat statusowego wótgranjarja
-VerifyAnyCA=Někaka certifikatowa awtorita
HighGrade=Wusoki stopjeń
MediumGrade=Srjeźny stopjeń
# LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
@@ -61,7 +57,6 @@
CertDumpVersion2=Wersija 2
CertDumpVersion3=Wersija 3
CertDumpSerialNo=Serijowy numer
-CertDumpOID=Objektowy identifikator
CertDumpMD2WithRSA=PKCS #1 MD2 ze skoděrowanim RSA
CertDumpMD5WithRSA=PKCS #1 MD5 ze skoděrowanim RSA
CertDumpSHA1WithRSA=PKCS #1 SHA-1 ze skoděrowanim RSA
@@ -69,11 +64,8 @@
CertDumpSHA384WithRSA=PKCS #1 SHA-384 ze skoděrowanim RSA
CertDumpSHA512WithRSA=PKCS #1 SHA-512 ze skoděrowanim RSA
CertDumpDefOID=Objektowy identifikator (%S)
-CertDumpNULL=NULL
CertDumpIssuer=Wudawaŕ
CertDumpSubject=Tema
-CertDumpRDN=Relatiwne jasne mě
-CertDumpATV=Typ a gódnota atributa
CertDumpAVACountry=C
CertDumpAVAState=ST
CertDumpAVALocality=L
@@ -245,44 +237,25 @@
CertDumpRawBytesHeader=Wjelikosć: %S bajtow / %S bitow
VerifySSLClient_p=Klient
VerifySSLServer_p=Serwer
-VerifySSLStepUp_p=Step-up
VerifySSLCA_p=SSL-CA
VerifyEmailSigner_p=Pódpisaś
VerifyEmailRecip_p=Šifrěrowaś
-VerifyProtectObjSign_p=Pódpisaŕ šćitanego objekta
VerifyObjSign_p=Pódpisaŕ objekta
-VerifyUserImport_p=Import wužywarja
VerifyCAVerifier_p=Pśepytowaŕ certifikatoweje awtority
VerifyStatusResponder_p=Statusowy wótegronjak
-VerifyAnyCA_p=CA
-VerifiedTrue=true
-VerifiedFalse=true
PK11BadPassword=Zapódane gronidło jo wopacne było.
SuccessfulP12Backup=Waše wěstotne certifikaty a priwatne kluce su se wuspěšnje zawěsćili.
SuccessfulP12Restore=Waše wěstotne certifikaty a priwatne kluce su se wuspěšnje wótnowili.
-PKCS12PasswordInvalid=Dataja PKCS #12 njedajo se dekoděrowaś. Snaź jo gronidło wopaki, kótarež sćo zapódał?
PKCS12DecodeErr=Dataja njedajo se dekoděrowaś. Pak njejo we formaśe PKCS #12, jo wobkškóźona pak gronidło, kótarež sćo zapódał, jo wopaki.
PKCS12UnknownErrRestore=Dataja PKCS #12 njedajo se z njeznatych pśicynow wotnowiś.
PKCS12UnknownErrBackup=Zawěsćeńska dataja PKCS #12 njedajo z njeznatych pśicynow napóraś.
PKCS12UnknownErr=Operacija PKCS #12 njejo so z njeznatych pśicynow raźiła.
PKCS12InfoNoSmartcardBackup=Njejo móžno certifikaty z hardwaroweho wěstotnego rěda zawěsćiś, kaž na pś. ze smartkórty.
PKCS12DupData=Certifikat a priwatny kluc južo eksistujotej na wěstotnem rěźe.
-AddModulePrompt=Cośo napšawdu toś ten wěstotny modul instalowěraś?
-AddModuleName=Mě modula: %S
-AddModulePath=Sćažka: %S
-AddModuleSuccess=Nowy wěstotny modul jo se zainstalowěrał
AddModuleFailure=Modul njedajo se pśidaś
AddModuleDup=Wěstotny modul južo eksistěrujo
-DelModuleBadName=Njepłaśiwe modulowe mě.
DelModuleWarning=Cośo napšawdu toś tón wěstotny modul lašowaś?
DelModuleError=Njejo móžno modul lašowaś
-DelModuleIntSuccess=Interny wěstotny modul jo se wuspěšnje wulašował
-DelModuleExtSuccess=Eksterny wěstotny modul jo se wuspěšnje wulašował
-ForcedBackup1=Wy by měł napóraś pśez gronidło šćitanu zawěsćeńsku kopiju swójogo nowego wěstotnego certifikata a jogo z nim zwězanego priwatnego kluca.
-ForcedBackup2=Gaby pśistup k swójomu priwatnemu klucoju zgubił, dokulaž sćo swójo wósobinske wěstotne gronidło zabył abo dataja jo wobškóźona, móžośo priwatny kluc a certifikat z toś teje zawěsćeńkeje kopije wótnowiś.
-ForcedBackup3=Aby kopiju napórał, klikniśo na W pórěźe. Jolic móžno, wy by měł swóju zawěsćeńsku kopiju na diskeśe składowaś, kótaraž chowaśo na wěstem městnje.
-UnknownCertIssuer=(Njeznaty wudawaŕ)
-UnknownCertOrg=(Njeznata organizacija)
AVATemplate=%S = %S
PSMERR_SSL_Disabled=Wěsty zwisk njejo móžno, dokulaž SSL-protokol jo znjemóžnjony.
@@ -295,7 +268,6 @@
certErrorTrust_SelfSigned=Certifikat njejo dowěry gódny, dokulaž jo se sam pódpisał.
certErrorTrust_UnknownIssuer=Certifikat njejo dowěry gódny, dokulaž wudawarski certifikat jo njeznaty.
-certErrorTrust_MissingChain=Certifikat njejo dowěry gódny, dokulaž žeden wudawarski rjeśaz njejo pódany.
certErrorTrust_CaInvalid=Certifikat njejo dowěry gódny, dokulaž jo se pśez njepłaśiwy certifikat certifikatoweje awtority wudał.
certErrorTrust_Issuer=Certifikat njejo dowěry gódny, dokulaž wudawarski certifikat njejo dowěry gódny.
certErrorTrust_SignatureAlgorithmDisabled=Toś ten certifikat njejo dowěry gódny, dokulaž jo se ze signěrowańskim algoritmusom signěrował, kótaryž jo se znjemóžnił, dokulaž algoritmus njejo wěsty.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pipnss/security.properties thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pipnss/security.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pipnss/security.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pipnss/security.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Title=Wěstotne warnowanje
-PostToInsecureFromSecureMessage=Lěcrownož toś ten bok jo skoděrowany, muse informacije, kótarež sćo zapódał, se pśez njeskoděrowany zwisk słaś a daju se lažko wót drugich cytaś.##Cośo napšawdu ze słanim toś tych informacijow pókšacowaś?##
-Continue=Dalej
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/certManager.dtd thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/certManager.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/certManager.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -10,9 +10,6 @@
-
-
-
@@ -37,7 +34,6 @@
-
@@ -49,11 +45,6 @@
-
-
-
-
-
@@ -72,8 +63,6 @@
-
-
@@ -90,8 +79,8 @@
-
-
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/deviceManager.dtd thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/deviceManager.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/deviceManager.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -11,11 +11,7 @@
-
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/pippki.dtd thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/pippki.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/pippki.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -9,7 +9,6 @@
-
@@ -20,19 +19,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -42,9 +28,7 @@
-
-
@@ -63,9 +47,6 @@
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/pippki.properties thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/pippki.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/security/manager/chrome/pippki/pippki.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/security/manager/chrome/pippki/pippki.properties 2015-06-03 10:02:19.000000000 +0000
@@ -11,7 +11,6 @@
unnamedCA=Certifikatowa awtorita (bźez mjenja)
#For editing cert trust
-editTrustWindowTitle=Dowěrygódnosć certifikata wobźěłaś
editTrustCA=Certifikat "%S" reprezentěrujo certifikatowu awtoritu.
editTrustEmail=Certifikat "%S" jo se wudał wót:
issuerNotTrusted=Dokulaž njedowěriśo certifikatowej awtoriśe, kótaraž jo toś ten certifikat wudała, njedowěriśo awtentiskosći toś togo certifikata, snaźkuli něco druge jo how pódane.
@@ -44,10 +43,7 @@
chooseP12RestoreFileDialog2=Certifikatowa dataja, kótaraž ma se importěrowaś
chooseP12BackupFileDialog=Datajowe mě za zawěsćenje
file_browse_PKCS12_spec=PKCS12-dataje
-
-
-#Preferences
-resetPreferences=Wužyjśo toś ten tłocašk, aby wy wěstotne nastajenja za %S na zawodowe nastajenja slědk stajił.
+getPKCS12FilePasswordMessage=Pšosym zapódajśo gronidło, kótarež jo se za skoděrowanje toś togo zawěsćenja certifikata wužyło:
#Cert verification
certVerified=Toś ten certifikat jo se za slědujuce wužyśa pśespytał:
@@ -65,18 +61,16 @@
clientAuthMessage2=Wudany pód: "%S"
#Page Info
-pageInfo_SiteNotVerified=Identita websedła njepśespytana
-pageInfo_WebSiteVerified=Identita websedła pśespytana
-pageInfo_Identity_Verified=Websedło %S pódpěra awtentifikaciju za bok, kótaryž se rowno woglědujośo. Identita toś togo websedła jo se wót %S pśespytała, certifikatowa awtorita, kótarejž dowěriśo za tos ten zaměr.
-pageInfo_ViewCertificate=Wěstotny certifikat pokazaś, kótaryž pśespytujo identitu togo websedła.
pageInfo_NoEncryption=Zwisk njeskoděrowany
pageInfo_Privacy_None1=Websedło %S njepódpěra skoděrowanje za bok, kótaryž se rowno woglědujośo.
pageInfo_Privacy_None2=Informacije, kótarež sćelu se bźez skoděrowanja pśez Internet, daju se wót drugich luźi wiźeś, mjaztym až jen pśeprěkuju.\u00A0
pageInfo_Privacy_None3=Bok, kótaryž se woglědujośo, njejo skoděrowany.
-# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
+# %1$S is the name of the encryption standard,
# %2$S is the key size of the cipher.
# %3$S is protocol version like "SSL 3" or "TLS 1.2"
pageInfo_EncryptionWithBitsAndProtocol=Zwisk skoděrowany (%1$S, bitowe kluce %2$S, %3$S)
+pageInfo_BrokenEncryption=Złamane šifrowanje(%1$S, bitowe kluce %2$S, %3$S)
pageInfo_Privacy_Encrypted1=Bok, kótaryž se woglědujośo, jo se skoděrował, pjerwjej až jo se pśez internet pósłał.
pageInfo_Privacy_Encrypted2=Skoděrowanje póśěźujo njeawtorizěrowanym wósobam informacije wiźeś, kótarež wuměnjaju se mjazy licadłami. Jo togodla wjelgin njewěrjobne, až jo něchten toś ten bok pśecytał, gaž jo wón seś pśeprěkował.
pageInfo_MixedContent=Zwisk pó źělach skoděrowany
@@ -85,7 +79,6 @@
#Cert Viewer
certDetails=Wobglědowak certifikatow:
notPresent=
-unknownIssuer=
escrowFinalMessage=Wy by měł jano na W pórěźe kliknuś, jolic dowěriśo "%S", aby wy swój priwatny koděrowański kluc šćitał.
@@ -158,7 +151,6 @@
addExceptionCheckingLong2=Wopytujo se, sedło identificěrowaś…
addExceptionNoCertShort=Žedne informacije k dispoziciji
addExceptionNoCertLong2=Njejo móžno, status identifikacije za toś to sedło zwěsćiś.
-addExceptionConnectionFailed=Zwisk njejo se raźił
#Certificate Exists in database
caCertExistsTitle=Certifikat eksistěrujo
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutReader.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutReader.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutReader.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutReader.properties 2015-06-03 10:02:19.000000000 +0000
@@ -5,15 +5,15 @@
aboutReader.loading=Zacytujo se...
aboutReader.loadError=Nastawk njedajo se z boka zacytaś
-aboutReader.colorSchemeLight=Swětły
-aboutReader.colorSchemeDark=Śamny
-aboutReader.colorSchemeSepia=Sepija
-aboutReader.colorSchemeAuto=Awtomatiski
-
-# LOCALIZATION NOTE (aboutReader.fontTypeSerif, aboutReader.fontTypeSansSerif):
-# These are the names of the fonts that are used.
-aboutReader.fontTypeSerif=Charis SIL Compact
-aboutReader.fontTypeSansSerif=Clear Sans
+aboutReader.colorScheme.light=Swětły
+aboutReader.colorScheme.dark=Śamny
+aboutReader.colorScheme.sepia=Sepija
+aboutReader.colorScheme.auto=Awtomatiski
+
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Serif
+aboutReader.fontType.sans-serif=Sans-serif
# LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
aboutReader.fontTypeSample=Aa
@@ -22,4 +22,16 @@
# for the font size setting. Tapping different samples will change the font size.
aboutReader.fontSizeSample=A
-aboutReader.toolbarTip=Pótusniśo wobrazowku, aby nastajenja cytaka pokazał
+aboutReader.toolbar.close=Cytański naglěd zacyniś
+aboutReader.toolbar.typeControls=Zapódawańske elementy
+aboutReader.toolbar.addToReadingList=Cytańskej lisćinje pśidaś
+aboutReader.toolbar.removeFromReadingList=Z cytańskeje lisćiny wótpóraś
+aboutReader.toolbar.openReadingList=Cytańsku lisćinu wócyniś
+aboutReader.toolbar.closeReadingList=Cytańsku lisćinu zacyniś
+aboutReader.toolbar.share=Źěliś
+
+aboutReader.footer.deleteThisArticle=Toś ten nastawk wulašowaś
+
+# Reader View toolbar button
+readerView.enter=Do cytańskego naglěda stupiś
+readerView.close=Cytański naglěd zacyniś
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.dtd thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -35,9 +35,11 @@
-
+
@@ -93,3 +95,6 @@
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutSupport.properties 2015-06-03 10:02:19.000000000 +0000
@@ -86,3 +86,8 @@
hasSeccompBPF = Seccomp-BPF (Filtrowanje systemowych zawołanjow)
canSandboxContent = Testowanje wopśimjeśowych procesow w pěskowem kašćiku
canSandboxMedia = Testowanje medijowych tykacow w pěskowem kašćiku
+
+# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
+# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
+# or 'false')
+multiProcessStatus = %1$S z %2$S (standard: %3$S)
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutTelemetry.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/aboutTelemetry.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/aboutTelemetry.properties 2015-06-03 10:02:19.000000000 +0000
@@ -7,6 +7,8 @@
# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
pageSubtitle = Toś ten bok pokazujo informacije wó wugbaśu, hardware, wužyśu a pśiměrjenjach zběrane pśez telemetriju. Toś te informacije budu se do %1$S słaś, ab pomagali, %2$S pólěpšyś.
+generalDataTitle = Powšykne daty
+
generalDataHeadingName = Mě
generalDataHeadingValue = Gódnota
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/browser.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/browser.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/browser.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/browser.properties 2015-06-03 10:02:19.000000000 +0000
@@ -8,3 +8,7 @@
browsewithcaret.checkButtonLabel=Jo
plainText.wordWrap=Dłujke smužki łamaś
+
+formPostSecureToInsecureWarning.title = Wěstotne warnowanje
+formPostSecureToInsecureWarning.message = Informacije, kótarež sćo na boku zapódał, pósćelu se pśez njewěsty zwisk a by mógli se wót tśeśich cytaś.\n\nCośo toś te informacije napšawdu słaś?
+formPostSecureToInsecureWarning.continue = Pókšacowaś
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/devtools/debugger.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/devtools/debugger.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/devtools/debugger.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/devtools/debugger.properties 2015-06-03 10:02:19.000000000 +0000
@@ -14,11 +14,46 @@
# dialog that prompts the user to allow the incoming connection.
remoteIncomingPromptTitle=Dochadajucy zwisk
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# LOCALIZATION NOTE (remoteIncomingPromptHeader): Header displayed on the
# dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=Dochadajuce napšašowanje, zwisk za daloke pytanja za zmólkami jo se namakało. Daloki klient móžo połnu kontrolu nad waš wobglědowak pśewześ! Zwisk dowóliś?
+remoteIncomingPromptHeader=Dochadajuce napšašowanje, zwisk za daloke pytanja za zmólkami jo se namakało. Daloki klient móžo połnu kontrolu nad waš wobglědowak pśewześ!
+# LOCALIZATION NOTE (remoteIncomingPromptClientEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the client such as "127.0.0.1:6000"
+remoteIncomingPromptClientEndpoint=Klientowy kóńcny dypk: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptServerEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the server such as "127.0.0.1:6000"
+remoteIncomingPromptServerEndpoint=Serwerowy kóńcny dypk: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptFooter): Footer displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptFooter=Zwisk dowóliś?
# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
# third button in the incoming connection dialog that lets the user disable the
# remote debugger server.
remoteIncomingPromptDisable=Znjemóžniś
+
+# LOCALIZATION NOTE (clientSendOOBTitle): The title displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBTitle=Identifikacija klienta
+# LOCALIZATION NOTE (clientSendOOBHeader): Header displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBHeader=Kóńcny dypk, z kótarymž zwězujośo, trjeba dalšne informacije, aby toś ten zwisk awtentificěrowaś. Pšosym zasajźćo slědujucy znamuškowy slěd do zapódawańskego póla, kótaraž pokazujo se na drugem kóńcu.
+# LOCALIZATION NOTE (clientSendOOBHash): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The client's cert fingerprint
+clientSendOOBHash=Mój certifikat: %1$S
+# LOCALIZATION NOTE (clientSendOOBToken): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The authentication token that the user will transfer.
+clientSendOOBToken=Znamuškowy slěd: %1$S
+
+# LOCALIZATION NOTE (serverReceiveOOBTitle): The title displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBTitle=Zapódajśo znamuškowy slěd klienta
+# LOCALIZATION NOTE (serverReceiveOOBBody): Main text displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBBody=Klient by měł gódnotu znamuškowego slěda zwobrazniś. Zapódajśo how ten znamuškowy slěd, aby šćo awtentifikaciju z toś tym klientom dokóńcył.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/fallbackMenubar.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/fallbackMenubar.properties 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/fallbackMenubar.properties 2015-06-03 10:02:19.000000000 +0000
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Skóńcyś
+quitMenuitem.key=q
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/textcontext.dtd thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/textcontext.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/global/textcontext.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/global/textcontext.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -24,3 +24,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties 2015-06-03 10:02:19.000000000 +0000
@@ -32,15 +32,14 @@
offlineCancelDownloadsAlertMsg=Jolic źośo něnto offline, se 1 ześěgnjenje pśetergnjo. Cośo napšawdu offline hyś?
offlineCancelDownloadsAlertMsgMultiple=Jolic źośo něnto offline, se %S ześěgnjenjow pśetergnjo. Cośo napšawdu offline hyś?
leavePrivateBrowsingCancelDownloadsAlertTitle=Wšykne ześěgnjenja pśetergnuś?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=Jolic zacynijośo něnto wšykne wokna priwatnego modusa, se 1 ześěgnjenje pśetergnjo. Cośo priwatny modus napšawdu spušćiś?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=Jolic zacynijośo něnto wšykne wokna priwatnego modusa, se %S ześěgnjenjow pśetergnjo. Cośo priwatny modus napšawdu spušćiś?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=Jolic zacynijośo něnto wšykne wokna priwatnego modusa, se 1 ześěgnjenje pśetergnjo. Cośo priwatny modus napšawdu spušćiś?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=Jolic zacynijośo něnto wšykne wokna priwatnego modusa, se %S ześěgnjenjow pśetergnjo. Cośo priwatny modus napšawdu spušćiś?
cancelDownloadsOKText=1 ześěgnjenje pśetergnuś
cancelDownloadsOKTextMultiple=%S ześěgnjenjow pśetergnuś
dontQuitButtonWin=Njeskóńcyś
dontQuitButtonMac=Njeskóńcyś
dontGoOfflineButton=Online wóstaś
-dontEnterPrivateBrowsingButton=Priwatny modus njestartowaś
-dontLeavePrivateBrowsingButton=W priwatnem modusu wóstaś
+dontLeavePrivateBrowsingButton2=W priwatnem modusu wóstaś
downloadsCompleteTitle=Ześěgnjenja dokóńcone
downloadsCompleteMsg=Wšykne dataje su ześěgnjone.\u0020
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -4,6 +4,7 @@
+
@@ -228,3 +229,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/extensions/extensions.properties 2015-06-03 10:02:19.000000000 +0000
@@ -56,8 +56,8 @@
notification.installError=Pśi instalěrowanju %1$S jo zmólka nastała.
notification.installError.retry=Hyšći raz wopytaś
notification.installError.retry.tooltip=Wopytajśo toś ten dodank hyšći raz ześěgnuś a instalěrowaś
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Buźo se skóro instalěrowaś.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S buźo se skóro instalěrowaś.
#LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
contributionAmount2=Naraźony pśinosk: %S
@@ -99,8 +99,8 @@
details.notification.uninstall=%1$S se wótinstalěrujo, za tym až sćo %2$S znowego startował.
#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
details.notification.upgrade=%1$S buźo se aktualizěrowaś, za tym až sćo %2$S znowego startował.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Buźo se skóro instalěrowaś.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S buźo se skóro instalěrowaś.
# LOCALIZATION NOTE (details.experiment.time.daysRemaining):
# Semicolon-separated list of plural forms.
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-38.0~b3+build2/l10n/dsb/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-06-03 10:02:19.000000000 +0000
@@ -39,3 +39,4 @@
+
diff -Nru thunderbird-38.0~b3+build2/l10n/dsb/webapprt/webapprt/overrides/appstrings.properties thunderbird-38.0~b6+build2/l10n/dsb/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/dsb/webapprt/webapprt/overrides/appstrings.properties 2015-04-29 23:40:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/dsb/webapprt/webapprt/overrides/appstrings.properties 2015-06-03 10:02:19.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Toś to nałoženje jo wopytało, pśistup na resursu měś, kótaraž ma pšawidła wopśimjeśoweje wěstoty, kótarež zajźujo jogo zasajźenjeju na toś ten nałog.
corruptedContentError=Nałoženje njamóžo ze zacytowanim pókšacowaś, dokulaž jo se zmólka w datowem pśenjasenju namakała.
remoteXUL=Toś to nałoženje jo wopytało, njepódpěranu technologiju wužywaś, kótaraž wěcej njestoj k dispoziciji.
+sslv3Used=Toś to nałoženje njamóžo wěstotu wašych datow na %S garantěrowaś, dokulaž SSLv3 wužywa, złamany wěstotny protokol.
diff -Nru thunderbird-38.0~b3+build2/l10n/es-ES/mail/chrome/messenger/preferences/fonts.dtd thunderbird-38.0~b6+build2/l10n/es-ES/mail/chrome/messenger/preferences/fonts.dtd
--- thunderbird-38.0~b3+build2/l10n/es-ES/mail/chrome/messenger/preferences/fonts.dtd 2015-04-29 23:41:23.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/es-ES/mail/chrome/messenger/preferences/fonts.dtd 2015-06-03 10:03:16.000000000 +0000
@@ -6,29 +6,25 @@
-
-
+
+
-
+
-
-
-
+
+
-
-
-
-
+
@@ -43,6 +39,11 @@
+
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/chat/accounts.properties thunderbird-38.0~b6+build2/l10n/eu/chat/accounts.properties
--- thunderbird-38.0~b3+build2/l10n/eu/chat/accounts.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/chat/accounts.properties 2015-06-03 10:03:38.000000000 +0000
@@ -5,5 +5,5 @@
# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
# %S is replaced with the name of the account
passwordPromptTitle=%S kontuaren pasahitza
-passwordPromptText=Konektatu ahal izateko, idatzi %S kontuaren pasahitza.
+passwordPromptText=Sartu %S kontuaren pasahitza konektatu ahal izateko.
passwordPromptSaveCheckbox=Erabili pasahitz-kudeatzailea pasahitz hau gogoratzeko.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/chat/irc.properties thunderbird-38.0~b6+build2/l10n/eu/chat/irc.properties
--- thunderbird-38.0~b3+build2/l10n/eu/chat/irc.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/chat/irc.properties 2015-06-03 10:03:39.000000000 +0000
@@ -37,11 +37,11 @@
# LOCALIZATION NOTE (ctcp.version):
# %1$S is the nickname of the user whose version was requested.
# %2$S is the version response from the client.
-ctcp.version="%2$S" ari da erabiltzen %1$S
+ctcp.version="%2$S" %1$S erabiltzen ari da.
# LOCALIZATION NOTE (ctcp.time):
# %1$S is the nickname of the user whose time was requested.
# %2$S is the time response.
-ctcp.time=%1$S goitizenaren ordua %2$S da.
+ctcp.time=%1$S erabiltzailearen ordua %2$S da.
# LOCALZIATION NOTE (command.*):
# These are the help messages for each command, the %S is the command name
@@ -52,8 +52,8 @@
command.chanserv=%S <komandoa>: Bidali komandoa ChanServ-i.
command.deop=%S <1.goitizena>[,<2.goitizena>]*: Kendu norbaiti kanalaren operatzaile egoera. Kanalaren operatzailea izan behar zara hau egiteko.
command.devoice=%S <1.goitizena>[,<2.goitizena>]*: Kendu norbaiti kanalaren ahots egoera, hitz egitea galaraziz kanala moderatuta badago (+m). Kanalaren operatzailea izan behar zara hau egiteko.
-command.invite2=%S <nick>[ <nick>]* [<channel>]: Invite one or more nicks to join you in the current channel, or to join the specified channel.
-command.join=%S <1.gela>[,<2.gela>]* [<1.gakoa>[,<2.gakoa>]*]: Idatzi kanal bat edo gehiago, aukeran bakoitzarentzat kanalaren gakoa emanaz beharrezkoa bada.
+command.invite2=%S <nick>[ <nick>]* [<channel>]: Gonbidatu erabiltzaile bat edo gehiago kanal honetara, edo zehaztutako kanalera.
+command.join=%S <1.gela>[,<2.gela>]* [<1.gakoa>[,<2.gakoa>]*]: sartu kanal bat edo gehiago, aukeran bakoitzarentzat kanalaren gakoa emanaz beharrezkoa bada.
command.kick=%S <goitizena> [<mezua>]: Kendu norbait kanaletik. Kanalaren operatzailea izan behar zara hau egiteko.
command.list=%S: Bistaratu sareko txat-gelen zerrenda. Kontuz, hau eginez gero zenbait zerbitzarik deskonektatu egin zaitzakete.
command.memoserv=%S <komandoa>: Bidali komandoa MemoServ-i.
@@ -148,7 +148,7 @@
# LOCALIZATION NOTE (error.*):
-# These are shown as error messages in the server tab.
+# These are shown as error messages in the conversation or server tab.
# %S is the channel name.
error.noChannel=Ez dago kanala: %S.
error.tooManyChannels=Ezin da %S kanalera batu; kanal gehiegitan zaude.
@@ -168,11 +168,14 @@
error.cannotSendToChannel=Ezin duzu mezurik bidali %S kanalera.
error.channelFull=%S kanala beteta dago.
error.inviteOnly=%S kanalera sartzeko gonbidapena behar duzu.
-error.nonUniqueTarget=%S ez da erabiltzailea@ostalaria bakarra edo 'shortname'a edo kanal gehiegitan saiatu zara sartzen aldi berean.
+error.nonUniqueTarget=%S ez da erabiltzailea@ostalaria bakarra edo shortname-a edo kanal gehiegitan saiatu zara sartzen aldi berean.
error.notChannelOp=Ez zara %S kanaleko operatzailea.
error.notChannelOwner=Ez zara %S kanaleko jabea.
error.wrongKey=Ezin da %S(e)ra sartu, kanalaren pasahitz baliogabea.
-error.sendMessageFailed=Errorea gertatu da zure azken mezua bidaltzean. Saiatu berriro konexioa berrezarri denean.
+error.sendMessageFailed=Errore bat gertatu da zure azken mezua bidaltzean. Saiatu berriro konexioa berrezarri denean.
+# %1$S is the channel the user tried to join, %2$S is the channel
+# he was forwarded to.
+error.channelForward=Ezin zara %1$S gelan sartu eta automatikoki %2$S gelara birbideratua izan zara.
# LOCALIZATION NOTE (tooltip.*):
# These are the descriptions given in a tooltip with information received
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/chat/twitter.properties thunderbird-38.0~b6+build2/l10n/eu/chat/twitter.properties
--- thunderbird-38.0~b3+build2/l10n/eu/chat/twitter.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/chat/twitter.properties 2015-06-03 10:03:38.000000000 +0000
@@ -14,9 +14,9 @@
# in English, inside parenthesis, or the empty string if we have no specific
# message for the error.
# %2$S is the message that caused the error.
-error.general=Errorea gertatu da %1$S bidaltzean: %2$S
-error.retweet=Errorea gertatu da %1$S birtuita bidaltzean: %2$S
-error.delete=Errorea gertatu da %1$S ezabatzean: %2$S
+error.general=Errore bat gertatu da %1$S bidaltzean: %2$S
+error.retweet=Errore bat gertatu da %1$S bertxiotzean: %2$S
+error.delete=Errore bat gertatu da %1$S ezabatzean: %2$S
# LOCALIZATION NOTE (error.descriptionTooLong)
# %S is the truncated string that was sent to the server.
error.descriptionTooLong=Deskribapenak luzera maximoa gainditu du (160 karaktere), automatikoki moztu da ondorengora: %S.
@@ -28,8 +28,8 @@
# LOCALIZATION NOTE (action.*):
# This will be an action in the context menu of displayed tweets.
-action.copyLink=Kopiatu tuiterako lotura
-action.retweet=Bidali birtuita
+action.copyLink=Kopiatu txiotzeko lotura
+action.retweet=Bertxiotu
action.reply=Erantzun
action.delete=Ezabatu
# LOCALIZATION NOTE (action.follow, action.stopFollowing):
@@ -45,7 +45,7 @@
event.followed=%S zu jarraitzen ari da.
# LOCALIZATION NOTE (event.deleted):
# %S will be replaced by the text of the deleted tweet.
-event.deleted=Tuit hau ezabatu duzu: "%S".
+event.deleted=Txio hau ezabatu duzu: "%S".
# LOCALIZATION NOTE (replyingToStatusText):
# This will be visible in the status bar of the conversation window
@@ -94,7 +94,7 @@
tooltip.url=Webgunea
# LOCALIZATION NOTE (tooltip.protected):
# whether the user's tweets are publicly visible.
-tooltip.protected=Tuitak babesten ditu
+tooltip.protected=Txioak babesten ditu
# LOCALIZATION NOTE (tooltip.following):
# whether you are subscribed to the user's tweets.
tooltip.following=Une honetan jarraitzen
@@ -103,7 +103,7 @@
# LOCALIZATION NOTE (tooltip.*_count):
# Please see the right side of the official Twitter website UI.
tooltip.friends_count=Jarraitzen
-tooltip.statuses_count=Tuitak
+tooltip.statuses_count=Txioak
tooltip.followers_count=Jarraitzaileak
tooltip.listed_count=Zerrendan
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/chat/xmpp.properties thunderbird-38.0~b6+build2/l10n/eu/chat/xmpp.properties
--- thunderbird-38.0~b3+build2/l10n/eu/chat/xmpp.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/chat/xmpp.properties 2015-06-03 10:03:39.000000000 +0000
@@ -22,14 +22,14 @@
connection.error.serverClosedConnection=Zerbitzariak konexioa itxi du
connection.error.resetByPeer=Konexioa bikoteak berrezarrita
connection.error.timedOut=Konexioa denboraz kanpo gelditu da
-connection.error.receivedUnexpectedData=Espero gabeko datuak jaso dira
+connection.error.receivedUnexpectedData=Ustekabeko datuak jaso dira
connection.error.incorrectResponse=Erantzun okerra jaso da
connection.error.startTLSRequired=Zerbitzariak zifraketa eskatzen du baina desgaitu egin duzu
connection.error.startTLSNotSupported=Zerbitzariak ez du zifraketa onartzen baina zure konfigurazioak behartu egiten du
connection.error.failedToStartTLS=Huts zifraketa hastean
connection.error.noAuthMec=Zerbitzariak ez du autentifikazio-mekanismorik eskaini
connection.error.noCompatibleAuthMec=Zerbitzariak eskainitako autentifikazio-mekanismoak ez dira onartzen
-connection.error.notSendingPasswordInClear=Zerbitzariak onartzen duen autentifikazio bakarra pasahitza testu-lauean bidaliz da
+connection.error.notSendingPasswordInClear=Zerbitzariak onartzen duen autentifikazio bakarra pasahitza testu arrunt bezala bidaliz da
connection.error.authenticationFailure=Autentifikazioaren hutsegitea
connection.error.notAuthorized=Baimenik gabe (pasahitz okerra sartu duzu?)
connection.error.failedToGetAResource=Huts baliabidea eskuratzean
@@ -44,6 +44,9 @@
# fails.
# %S is the name of the MUC.
conversation.error.joinFailed=Ezin da sartu: %S
+# These are displayed in a conversation as a system error message.
+conversation.error.remoteServerNotFound=Ezin izan da jasotzailearen zerbitzaria atzitu
+conversation.error.unknownError=Errore ezezaguna
# LOCALIZATION NOTE (tooltip.*):
# These are the titles of lines of information that will appear in
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/appstrings.properties thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/appstrings.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/appstrings.properties 2015-06-03 10:03:38.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Modu honetan kargatzea eragozten duen edukien segurtasun-politika du orri honek.
corruptedContentError=Ikusten saiatzen ari zaren orria ezin da erakutsi datu-transmisioan errore bat detektatu delako.
remoteXUL=Orri honek dagoeneko lehenespenez eskuragarri ez dagoen euskarririk ez duen teknologia bat erabiltzen du.
+sslv3Used=Ezin da %S gunean zure datuen segurtasuna bermatu SSLv3 erabiltzen duelako, segurtasun-protokolo hautsi bat.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/dom/dom.properties thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/dom/dom.properties
--- thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/dom/dom.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/dom/dom.properties 2015-06-03 10:03:39.000000000 +0000
@@ -131,11 +131,11 @@
# LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
LenientThisWarning=[LenientThis] duen propietatearen 'get' edo 'set' ezikusten, "this" objektua baliogabea delako.
# LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
-GetWindowWithOuterIdWarning=Zaharkituta dago nsIDOMWindowUtils.getOuterWindowWithId() erabiltzea. Honen ordez erabili izen bereko nsIWindowMediator metodoa.
+GetWindowWithOuterIdWarning=Zaharkituta dago nsIDOMWindowUtils.getOuterWindowWithId() erabiltzea. Erabili nsIWindowMediator-en izen bereko metodoa horren ordez.
# LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
-GetPreventDefaultWarning=Zaharkituta dago getPreventDefault() erabiltzea. Honen ordez erabili defaultPrevented.
+GetPreventDefaultWarning=Zaharkituta dago getPreventDefault() erabiltzea. Erabili defaultPrevented horren ordez.
# LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
-GetSetUserDataWarning=Zaharkituta dago getUserData() edo setUserData() erabiltzea. Honen ordez erabili WeakMap edo element.dataset.
+GetSetUserDataWarning=Zaharkituta dago getUserData() edo setUserData() erabiltzea. Erabili WeakMap edo element.dataset horren ordez.
# LOCALIZATION NOTE: Do not translate "mozGetAsFile" or "toBlob"
MozGetAsFileWarning=Zaharkituta dago mozGetAsFile metodo ez-estandarra eta laster kendu egingo da. Erabili toBlob metodo estandarra horren ordez.
# LOCALIZATION NOTE: Do not translate "captureEvents()" or "addEventListener()"
@@ -157,57 +157,9 @@
SendAsBinaryWarning=Zaharkituta dago sendAsBinary metodo ez-estandarra eta laster kendu egingo da. Erabili send(Blob data) metodo estandarra horren ordez.
# LOCALIZATION NOTE: Do not translate "window.controllers"
Window_ControllersWarning=Zaharkituta dago window.controlleers. Ez ezazu erabili erabiltzaile-agentearen detekziorako.
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Down" and "ArrowDown".
-KeyNameDownWarning=Zaharkituta dago KeyboardEvent.key-ren "Down" balioa eta "ArrowDown" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Left" and "ArrowLeft".
-KeyNameLeftWarning=Zaharkituta dago KeyboardEvent.key-ren "Left" balioa eta "ArrowLeft" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Right" and "ArrowRight".
-KeyNameRightWarning=Zaharkituta dago KeyboardEvent.key-ren "Right" balioa eta "ArrowRight" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Up" and "ArrowUp".
-KeyNameUpWarning=Zaharkituta dago KeyboardEvent.key-ren "Up" balioa eta "ArrowUp" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Crsel" and "CrSel".
-KeyNameCrselWarning=Zaharkituta dago KeyboardEvent.key-ren "Crsel" balioa eta "CrSel" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Del" and "Delete".
-KeyNameDelWarning=Zaharkituta dago KeyboardEvent.key-ren "Del" balioa eta "Delete" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Exsel" and "ExSel".
-KeyNameExselWarning=Zaharkituta dago KeyboardEvent.key-ren "Exsel" balioa eta "ExSel" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Menu" and "ContextMenu".
-KeyNameMenuWarning=Zaharkituta dago KeyboardEvent.key-ren "Menu" balioa eta "ContextMenu" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Esc" and "Escape".
-KeyNameEscWarning=Zaharkituta dago KeyboardEvent.key-ren "Esc" balioa eta "Escape" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Nonconvert" and "NonConvert".
-KeyNameNonconvertWarning=Zaharkituta dago KeyboardEvent.key-ren "Nonconvert" balioa eta "NonConvert" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "HalfWidth" and "Hankaku".
-KeyNameHalfWidthWarning=Zaharkituta dago KeyboardEvent.key-ren "HalfWidth" balioa eta "Hankaku" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "RomanCharacters", "Romaji" and "Eisu".
-KeyNameRomanCharactersWarning=Zaharkituta dago KeyboardEvent.key-ren "RomanCharacters" balioa eta "Romaji" baliora berrizendatuko da edo "Eisu" baliora birmapeatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "FullWith" and "Zenkaku".
-KeyNameFullWidthWarning=Zaharkituta dago KeyboardEvent.key-ren "FullWidth" balioa eta "Zankaku" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "SelectMedia" and "MediaSelect".
-KeyNameSelectMediaWarning=Zaharkituta dago KeyboardEvent.key-ren "SelectMedia" balioa eta "MediaSelect" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "MediaNextTrack" and "MediaTrackNext".
-KeyNameMediaNextTrackWarning=Zaharkituta dago KeyboardEvent.key-ren "MediaNextTrack" balioa eta "MediaTrackNext" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "MediaPreviousTrack" and "MediaTrackPrevious".
-KeyNameMediaPreviousTrackWarning=Zaharkituta dago KeyboardEvent.key-ren "MediaPreviousTrack" balioa eta "MediaTrackPrevious" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Red" and "ColorF0Red".
-KeyNameRedWarning=Zaharkituta dago KeyboardEvent.key-ren "Red" balioa eta "ColorF0Red" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Green" and "ColorF1Green".
-KeyNameGreenWarning=Zaharkituta dago KeyboardEvent.key-ren "Green" balioa eta "ColorF1Green" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Yellow" and "ColorF2Yellow".
-KeyNameYellowWarning=Zaharkituta dago KeyboardEvent.key-ren "Yellow" balioa eta "ColorF2Yellow" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Blue" and "ColorF3Blue".
-KeyNameBlueWarning=Zaharkituta dago KeyboardEvent.key-ren "Blue" balioa eta "ColorF3Blue" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Live".
-KeyNameLiveWarning=Zaharkituta dago KeyboardEvent.key-ren "Live" balioa eta ezabatu egingo da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Apps".
-KeyNameAppsWarning=Zaharkituta dago KeyboardEvent.key-ren "Apps" balioa eta ezabatu egingo da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "FastFwd" and "MediaFastForward".
-KeyNameFastFwdWarning=Zaharkituta dago KeyboardEvent.key-ren "FastFwd" balioa eta "MediaFastForward" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key", "Zoom" and "ZoomToggle".
-KeyNameZoomWarning=Zaharkituta dago KeyboardEvent.key-ren "Zoom" balioa eta "ZoomToggle" baliora berrizendatuko da. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
-# LOCALIZATION NOTE: Do not translate "KeyboardEvent.key" and "Dead".
-KeyNameDeadKeysWarning=Zaharkituta daude "Dead" balioarekin hasten diren KeyboardEvent.key-ren balioak eta "Dead" balioan elkartuko dira. Laguntza gehiagorako: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
ImportXULIntoContentWarning=Zaharkituta dago XUL nodoak eduki-dokumentu batean inportatzea. Litekeena da eginbide hau laster kentzea.
XMLDocumentLoadPrincipalMismatch=Debekatuta dago document.load erabiltzea beste leihoetatik datozen dokumentuetan. Dokumentua sortutako leihoak soilik dei dezake .load dokumentu horretan. Hobe XMLHttpRequest erabiltzea horren ordez.
# LOCALIZATION NOTE: Do not translate "IndexedDB".
IndexedDBTransactionAbortNavigation=Osatu gabeko IndexedDB transakzio bat bertan behera utzi da orriaren nabigazioa dela eta.
+# LOCALIZATION NOTE (WillChangeBudgetWarning): Do not translate Will-change, %1$S,%2$S,%3$S are numbers.
+WillChangeBudgetWarning='Will-change' eginbidearen memoria-erabilpena oso handia da. Gainazalak %1$S pixel hartzen ditu eta muga gainazalaren area bider %2$S da (%3$S pixel). Muga gaindituta, dokumentuko 'will-change'en agerpen guztiak ezikusi egiten dira.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/plugins.properties thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/plugins.properties
--- thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/plugins.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/plugins.properties 2015-06-03 10:03:39.000000000 +0000
@@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# LOCALIZATION NOTE (plugins.properties):
-# Those strings are inserted into an HTML page, so you all HTML characters
+# Those strings are inserted into an HTML page, so all HTML characters
# have to be escaped in a way that they show up correctly in HTML!
title_label=Pluginei buruz
@@ -20,5 +20,11 @@
description_label=Azalpena
suffixes_label=Atzizkiak
+# GMP Plugins
+gmp_license_info=Lizentziaren informazioa
+
openH264_name=OpenH264 bideo kodeka, Cisco Systems, Inc.-ek hornitua
openH264_description=Erreproduzitu webeko bideoak eta erabili bideo-txatak.
+
+eme-adobe_name=Primetime edukiaren deszifratze-modulua (PCDM) Adobe Systems, Incorporated-ek eskainia
+eme-adobe_description=Erreproduzitu babesdun web bideoa.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/security/security.properties thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/security/security.properties
--- thunderbird-38.0~b3+build2/l10n/eu/dom/chrome/security/security.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/dom/chrome/security/security.properties 2015-06-03 10:03:38.000000000 +0000
@@ -4,7 +4,18 @@
BlockMixedActiveContent = Eduki aktibo mistoa kargatzea blokeatuta "%1$S"
# CORS
-CrossSiteRequestBlocked=Jatorri gurutzatuko eskaera blokeatuta: jatorri bereko politikak (Same Origin Policy) %1$S helbideko urruneko baliabidea irakurtzea debekatzen du. Baliabidea domeinu berera mugituz edo CORS gaituz konpon daiteke hau.
+# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
+CORSDisabled=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: CORS desgaituta).
+CORSRequestFailed=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: CORS eskaerak huts egin du).
+CORSRequestNotHttp=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: CORS eskaera ez da http).
+CORSMissingAllowOrigin=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: 'Access-Control-Allow-Origin' CORS goiburua falta da).
+CORSAllowOriginNotMatchingOrigin=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: 'Access-Control-Allow-Origin' CORS goiburua ez dator '%2$S'(r)ekin bat).
+CORSMethodNotFound=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: ez da metodorik aurkitu 'Access-Control-Allow-Methods' CORS goiburuan).
+CORSMissingAllowCredentials=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: 'true' espero zen 'Access-Control-Allow-Credentials' goiburuan).
+CORSPreflightDidNotSucceed=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: CORS preflight kanalak huts egin du).
+CORSInvalidAllowMethod=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: '%2$S' tokena baliogabea da 'Access-Control-Allow-Methods' CORS goiburuan).
+CORSInvalidAllowHeader=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: '%2$S' tokena baliogabea da 'Access-Control-Allow-Headers' CORS goiburuan).
+CORSMissingAllowHeaderFromPreflight=Jatorri gurutzatuaren eskaera (CORS) blokeatuta: jatorri bereko politikak ez du baimentzen %1$S helbideko baliabidea irakurtzea. (Arrazoia: '%2$S' tokena falta da CORS preflight kanaleko 'Access-Control-Allow-Headers' CORS goiburuan).
# LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
InvalidSTSHeaders=Guneak baliogabeko 'Strict-Transport-Security' goiburukoa zehaztu du.
@@ -15,7 +26,13 @@
InsecurePasswordsPresentOnPage=Pasahitz-eremuak daude orri ez-seguru batean (http://). Erabiltzaileen kredentzialak lapurtzea baimentzen duen segurtasun-arrisku bat da hau.
InsecureFormActionPasswordsPresent=Pasahitz-eremuak daude ekintza ez-segurua duen inprimaki batean (http://). Erabiltzaileen kredentzialak lapurtzea baimentzen duen segurtasun-arrisku bat da hau.
InsecurePasswordsPresentOnIframe=Pasahitz-eremuak daude iframe ez-seguru batean (http://). Erabiltzaileen kredentzialak lapurtzea baimentzen duen segurtasun-arrisku bat da hau.
-LoadingMixedActiveContent=Eduki aktibo mistoa (ez-segurua) kargatzen orri seguru batean "%1$S"
-LoadingMixedDisplayContent=Bistaratzeko eduki mistoa (ez-segurua) kargatzen orri seguru batean "%1$S"
+# LOCALIZATION NOTE: "%1$S" is the URI of the insecure mixed content resource
+LoadingMixedActiveContent2=Eduki aktibo misto ez-segurua kargatzen ("%1$S") orri seguru batean
+LoadingMixedDisplayContent2=Bistaratzeko eduki misto ez-segurua kargatzen ("%1$S") orri seguru batean
# LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
BothAllowScriptsAndSameOriginPresent=Bere sandbox atributuan bai allow-scripts bai eta allow-same-origin dituen iframe batek bere sanboxing-a ken dezake.
+
+# LOCALIZATION NOTE: Do not translate "SSL 3.0".
+WeakProtocolVersionWarning=Gune honek SSL 3.0 protokoloa darabil zifraketarako, baina zaharkituta dago eta ez da segurua.
+# LOCALIZATION NOTE: Do not translate "RC4".
+WeakCipherSuiteWarning=Gune honek RC4 zifratzea darabil zifraketarako, baina zaharkituta dago eta ez da segurua.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editingOverlay.dtd thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editingOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editingOverlay.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editingOverlay.dtd 2015-06-03 10:03:39.000000000 +0000
@@ -31,7 +31,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editor.dtd thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editor.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editor.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editor.dtd 2015-06-03 10:03:39.000000000 +0000
@@ -12,14 +12,14 @@
-
+
-
+
-
+
@@ -35,7 +35,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editorOverlay.dtd thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editorOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editorOverlay.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editorOverlay.dtd 2015-06-03 10:03:39.000000000 +0000
@@ -220,7 +220,7 @@
-
+
@@ -293,11 +293,11 @@
-
+
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editorPrefsOverlay.dtd thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editorPrefsOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editorPrefsOverlay.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editorPrefsOverlay.dtd 2015-06-03 10:03:38.000000000 +0000
@@ -8,6 +8,6 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editor.properties thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editor.properties
--- thunderbird-38.0~b3+build2/l10n/eu/editor/ui/chrome/composer/editor.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/editor/ui/chrome/composer/editor.properties 2015-06-03 10:03:39.000000000 +0000
@@ -19,13 +19,13 @@
OpenHTMLFile=Ireki HTML fitxategia
OpenTextFile=Ireki testu-fitxategia
SelectImageFile=Hautatu irudi-fitxategia
-SaveDocument=Gorde orria
-SaveDocumentAs=Gorde orria honela
+SaveDocument=Gorde orrialdea
+SaveDocumentAs=Gorde orrialdea honela:
SaveTextAs=Gorde testua honela
EditMode=Edizio modua
Preview=Aurrebista
Publish=Argitaratu
-PublishPage=Argitaratu orria
+PublishPage=Argitaratu orrialdea
DontPublish=Ez argitaratu
SavePassword=Erabili pasahitz-kudeatzailea pasahitz hau gordetzeko
CorrectSpelling=(zuzendu ortografia)
@@ -35,15 +35,15 @@
CheckSpelling=Egiaztatu ortografia
InputError=Errorea
Alert=Alerta
-CantEditFramesetMsg=Mezu-prestatzaileak ezin du editatu HTML marko-multzorik edo barneko markoak dituen orririk. Marko-multzoen kasuan, saiatu marko bakoitzari dagokion orria banaka editatzen. Barneko markoak dituzten orrien kasuan, berriz, gorde orriaren kopia bat eta kendu
">
+&brandShortName;(e)k ezin du orrialdea kargatu.">
-
Web helbideak normalean http://www.adibidez.net/ formatukoak dira
-
Ziurtatu aurrerako barrak erabiltzen dituzula (adib./).
+
+
Web helbideak normalean
+http://www.adibidea.com/ formatukoak dira
+
Ziurtatu aurrerako barrak erabiltzen dituzula (adib.
+/).
">
@@ -45,16 +52,17 @@
-
Sakatu "Saiatu berriro" linean jarri eta orria berritzeko.
">
+
Sakatu "Saiatu berriro" linean jarri eta orrialdea berritzeko.
+ ">
-
Mesedez jarri harremanetan webgunearen jabeekin arazoaren berri emateko.
+
Arazoaren berri emateko, jarri harremanetan webgunearen jabeekin.
">
-
Mesedez harremanetan ipini webgune jabeekin arazo honen berri emateko.
+
Jarri harremanetan webgunearen jabeekin arazo honen berri emateko.
">
@@ -71,53 +79,64 @@
Egiaztatu proxyaren konexioaren ezarpenak.
-
Sare kudeatzailearekin harremanetan jarri ziurtatzeko proxy-zerbitzaria martxan dagoela.
+
Sare kudeatzailearekin harremanetan jarri ziurtatzeko proxy-zerbitzaria
+ martxan dagoela.
Ordenagailua edo sarea firewall edo proxy baten bidez babestuta badaude, egiaztatu &brandShortName;(e)k webera irteteko baimena daukala.
+
Ordenagailua edo sarea firewall edo proxy baten bidez babestuta badaude,
+egiaztatu &brandShortName;(e)k webera irteteko baimena daukala.
">
-
+
-
Arazo hau baliteke cookieak desgaituta eduki edo ez onartzeagatik izatea.
+
Arazo hau baliteke cookieak desgaituta eduki edo ez onartzeagatik
+izatea.
">
-
+
-
Egiaztatu zure sistemak instalatuta duela Segurtasun-kudeatzaile Pertsonala (PSM).
+
Egiaztatu zure sistemak instalatuta duela Segurtasun-kudeatzaile
+Pertsonala (PSM).
Zerbitzariaren konfigurazio ezohikoak eragina izan lezake.
">
-
Ikusten saiatzen ari zaren orria ezin da bistaratu jasotako datuen autentikotasuna ezin delako egiaztatu.
+
Ikusten saiatzen ari zaren orrialdea ezin da bistaratu jasotako datuen benetakotasuna ezin delako egiaztatu.
Jarri harremanetan webgunearen jabeekin arazoaren berri emateko.
">
-
Hau zerbitzariaren konfigurazioan errore bat dela eta izan daiteke, edo norbait zerbitzariaren nortasuna hartzen ari dela.
-
Aurretik zerbitzari honetara behar bezala konektatu bazara, errorea aldirokoa izan daiteke eta geroago saia zaitezke.
+
Hau zerbitzariaren konfigurazioan errore bat dela eta izan daiteke,
+edo norbait zerbitzariaren nortasuna hartzen ari dela.
+
Aurretik zerbitzari honetara behar bezala konektatu bazara, errorea
+aldirokoa izan daiteke eta geroago saia zaitezke.
">
-
Gunea une batez desgaituta edo oso lanpetuta egon daiteke. Saiatu berriro minutu batzuen buruan.
-
Beste inolako orririk ezin baduzu kargatu, egiaztatu ordenagailuaren sareko konexioa.
-
Ordenagailua edo sarea firewall edo proxy baten bidez babestuta badaude, egiaztatu &brandShortName;(e)k webera irteteko baimena daukala.
+
Gunea une batez desgaituta edo oso lanpetuta egon daiteke.
+Saiatu berriro minutu batzuen buruan.
+
Beste inolako orrialderik ezin baduzu kargatu,
+egiaztatu ordenagailuaren sareko konexioa.
+
Ordenagailua edo sarea firewall edo proxy baten bidez babestuta badaude,
+egiaztatu &brandShortName;(e)k webera irteteko baimena daukala.
">
-Gune erasotzaileek zure informazio pertsonala ostu, zure ordenagailua bestei erasotzeko erabili edo zure sistema kaltetzeko programak instalatzen saiatzen da.
Beren gunea eraso gune bat bezala oker erreportaturik dagoela uste duten webguneen jabeek berrikuspen bat eskatu dezakete.
">
+Gune erasotzaileek zure informazio pertsonala ostu, zure ordenagailua bestei erasotzeko erabili edo zure sistema kaltetzeko programak instalatzen saiatzen da.
+
Beren gunea eraso gune bat bezala oker erreportaturik dagoela uste duten webguneen jabeek berrikuspen bat eskatu dezakete.
">
-Orri honetan informazio pertsonala idaztean nortasun iruzur bat egiteko aukera dago.s
Mota honetako web iruzurrak phishing erasoak bezala ezagutzen dira, konfiantza duzun webgune eta e-posta helbideak imitatzen dira.
">
+Orrialde honetan informazio pertsonala sartzean nortasun iruzur bat egiteko aukera dago.
+
Mota honetako web iruzurrak phishing erasoak bezala ezagutzen dira, konfiantza duzun webgune eta e-posta helbideak imitatzen dira.
">
-&brandShortName;(e)k orri hau modu honetan kargatzea eragotzi du onartzen ez den edukien-segurtasun politika duelako.">
+&brandShortName;(e)k orrialde hau modu honetan kargatzea eragotzi du onartzen ez den edukien-segurtasun politika duelako.">
Ikusten saiatzen ari zaren edukia ezin da erakutsi errore bat detektatu delako datu-transmisioan.
Jarri harremanetan arduradunekin arazo honen berri emateko.
">
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/mail/defines.inc thunderbird-38.0~b6+build2/l10n/eu/mail/defines.inc
--- thunderbird-38.0~b3+build2/l10n/eu/mail/defines.inc 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/mail/defines.inc 2015-06-03 10:03:38.000000000 +0000
@@ -6,6 +6,6 @@
# variable definition and use the format specified.
-#define MOZ_LANGPACK_CONTRIBUTORS Librezale.org
+#define MOZ_LANGPACK_CONTRIBUTORS Librezale.eus
#unfilter emptyLines
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/mail/installer/custom.properties thunderbird-38.0~b6+build2/l10n/eu/mail/installer/custom.properties
--- thunderbird-38.0~b3+build2/l10n/eu/mail/installer/custom.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/mail/installer/custom.properties 2015-06-03 10:03:39.000000000 +0000
@@ -18,7 +18,7 @@
# You can use \n to create a newline in the string but only when the string
# from en-US contains a \n.
-REG_APP_DESC=$BrandShortName era guztietako ezaugarriak dituen posta-bezeroa da. $BrandShortName(e)k IMAP eta POP posta-protokoloak onartzen ditu eta HTML formatudun posta ere bai. Integratutako zabor-posta kontrolak, RSS maneiatzeko gaitasuna, bilaketa bizkor eta boteretsua, ortografia egiaztatzea idatzi ahala, postakutxa orokorra eta mezuen iragazte aurreratua aipa daitezke ezaugarri modernoen artean.
+REG_APP_DESC=$BrandShortName era guztietako ezaugarriak dituen posta-bezeroa da. $BrandShortName(e)k IMAP eta POP posta-protokoloak onartzen ditu eta HTML formatudun posta ere bai. Integratutako zabor-posta kontrolak, RSS maneiatzeko gaitasuna, bilaketa bizkor eta boteretsua, ortografia egiaztatzea idatzi ahala, postontzi orokorra eta mezuen iragazte aurreratua aipa daitezke ezaugarri modernoen artean.
CONTEXT_OPTIONS=$BrandShortName(r)en &aukerak
CONTEXT_SAFE_MODE=$BrandShortName(r)en modu &segurua
OPTIONS_PAGE_TITLE=Instalazio mota
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/mail/installer/override.properties thunderbird-38.0~b6+build2/l10n/eu/mail/installer/override.properties
--- thunderbird-38.0~b3+build2/l10n/eu/mail/installer/override.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/mail/installer/override.properties 2015-06-03 10:03:39.000000000 +0000
@@ -39,7 +39,7 @@
ClickInstall=Instalazioa hasteko, egin klik Instalatu botoian.
ClickUninstall=Desinstalazioa hasteko, egin klik Desinstalatu botoian.
Completed=Burututa
-LicenseTextRB=Mesedez gainbegiratu lizentzia-kontratuaren baldintzak $BrandFullNameDA instalatu aurretik. Lizentziaren baldintza guztiak onartzen badituzu, aukeratu azpiko lehen aukera. $_CLICK
+LicenseTextRB=Gainbegiratu lizentzia-kontratuaren baldintzak $BrandFullNameDA instalatu aurretik. Lizentziaren baldintza guztiak onartzen badituzu, aukeratu azpiko lehen aukera. $_CLICK
ComponentsText=Markatu instalatu nahi dituzun osagaiak eta desmarkatu nahi ez dituzunak. $_CLICK
ComponentsSubText2_NoInstTypes=Hautatu instalatu beharreko osagaiak:
DirText=Instalatzaileak $BrandFullNameDA ondorengo karpetan instalatuko du. Karpeta ezberdin batean instalatzeko, egin klik Arakatu botoian eta aukeratu beste karpeta bat. $_CLICK
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pipnss/nsserrors.properties thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pipnss/nsserrors.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pipnss/nsserrors.properties 2015-06-03 10:03:39.000000000 +0000
@@ -24,8 +24,8 @@
SSL_ERROR_EXPIRED_CERT_ALERT=SSL parekoak zure ziurtagiria iraungita bezala ukatu du.
SSL_ERROR_SSL_DISABLED=Ezin da konektatu: SSL ezgaiturik dago.
SSL_ERROR_FORTEZZA_PQG=Ezin da konektatu: SSL parekoa beste FORTEZZA domeinu batetan dago.
-SSL_ERROR_UNKNOWN_CIPHER_SUITE=SSL zifratu suite ezezaguna bat eskatu da.
-SSL_ERROR_NO_CIPHERS_SUPPORTED=Ez dago zifratze suite gaiturik programa honetan.
+SSL_ERROR_UNKNOWN_CIPHER_SUITE=SSL zifratze-suite ezezaguna eskatu da.
+SSL_ERROR_NO_CIPHERS_SUPPORTED=Ez dago zifratze-suiterik gaituta programa honetan.
SSL_ERROR_BAD_BLOCK_PADDING=SSL okerreko bloke betetzea duen erregistro bat jaso du.
SSL_ERROR_RX_RECORD_TOO_LONG=SSL gehienezko luzera muga jaso duen erregistro bat jaso du.
SSL_ERROR_TX_RECORD_TOO_LONG=SSL gehienezko luzera muga gainditzen duen erregistro bat bidali saiatzen ari da.
@@ -72,17 +72,17 @@
SSL_ERROR_EXTRACT_PUBLIC_KEY_FAILURE=SSL ez da parekoaren ziurtagiritik gako publikoa ateratzeko gai.
SSL_ERROR_SERVER_KEY_EXCHANGE_FAILURE=Espero ez zen akatsa SSL zerbitzari gako aldaketaren diosala prozesatzerakoan.
SSL_ERROR_CLIENT_KEY_EXCHANGE_FAILURE=Espero ez zen akatsa SSL bezero gako aldaketaren diosala prozesatzerakoan.
-SSL_ERROR_ENCRYPTION_FAILURE=Gako bloke zifraketa algoritmoak huts egin du hautatutako zifraketa suitean.
-SSL_ERROR_DECRYPTION_FAILURE=Gako bloke deszifraketa algoritmoak huts egin du hautatutako zifraketa suitean.
+SSL_ERROR_ENCRYPTION_FAILURE=Multzokako datu-zifraketa algoritmoak huts egin du hautatutako zifratze-suitean.
+SSL_ERROR_DECRYPTION_FAILURE=Multzokako datuen deszifratze-algoritmoak huts egin du hautatutako zifratze-suitean.
SSL_ERROR_SOCKET_WRITE_FAILURE=Zifraturiko datuak azpiko socket-ean idazteko saiakerak huts egin du.
SSL_ERROR_MD5_DIGEST_FAILURE=MD5 laburpen-funtzioak huts egin du.
SSL_ERROR_SHA_DIGEST_FAILURE=SHA-1 laburpen-funtzioak huts egin du.
SSL_ERROR_MAC_COMPUTATION_FAILURE=MAC konputazioak huts egin du.
SSL_ERROR_SYM_KEY_CONTEXT_FAILURE=Huts gako simetriko testuingurua sortzerakoan.
SSL_ERROR_SYM_KEY_UNWRAP_FAILURE=Huts gako simetrikoa bezero gako aldaketa mezuan zabaltzean.
-SSL_ERROR_PUB_KEY_SIZE_LIMIT_EXCEEDED=SSL zerbitzaria etxe-moduko gako publikoa esportatze zifratze suitearekin erabiltzen saiatu da.
+SSL_ERROR_PUB_KEY_SIZE_LIMIT_EXCEEDED=SSL zerbitzaria etxe-moduko gako publikoa esportatzeko zifratze-suitearekin erabiltzen saiatu da.
SSL_ERROR_IV_PARAM_FAILURE=PKCS11 kodeak huts egin du IV parametro bat bihurtzean.
-SSL_ERROR_INIT_CIPHER_SUITE_FAILURE=Huts hautatutako zifratze suitea abiaraztean.
+SSL_ERROR_INIT_CIPHER_SUITE_FAILURE=Huts egin du hautatutako zifratze-suitea abiaraztean.
SSL_ERROR_SESSION_KEY_GEN_FAILURE=Bezeroak huts egin du SSL saiorako gakoak sortzean.
SSL_ERROR_NO_SERVER_KEY_FOR_ALG=Zerbitzariak ez du gakorik saiatu den gako aldaketa algoritmoarentzat.
SSL_ERROR_TOKEN_INSERTION_REMOVAL=PKCS#11 token bat txertatu edo kendu da ekintza betetzen ari zenean.
@@ -315,3 +315,5 @@
MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Zerbitzariak oinarrizko murriztapenen hedapenak dituen eta ziurtagiri-autoritate gisa identifikatzen den ziurtagiria erabiltzen du. Hau ezin liteke gertatu ondo jaulkitako ziurtagiri batentzat.
MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=Zerbitzariak aurkeztu duen ziurtagiriaren gako-tamaina oso txikia da konexio segurua ezartzeko.
MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Fidagarria ez den X.509 1 bertsioko ziurtagiria erabili da zerbitzariaren ziurtagiria jaulkitzeko. X.509 1 bertsioko ziurtagiriak zaharkituta daude eta ez dira erabili behar beste ziurtagiriak sinatzeko.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Zerbitzariak aurkeztu duen ziurtagiria ez da baliozkoa oraindik.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Oraindik baliozkoa ez den ziurtagiri bat erabili da zerbitzariaren ziurtagiria jaulkitzeko.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pipnss/pipnss.properties thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pipnss/pipnss.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pipnss/pipnss.properties 2015-06-03 10:03:39.000000000 +0000
@@ -40,16 +40,12 @@
# End of size restriction.
VerifySSLClient=SSL bezeroaren ziurtagiria
VerifySSLServer=SSL zerbitzariaren ziurtagiria
-VerifySSLStepUp=SSL zerbitzaria Step-up-ekin
VerifySSLCA=SSL ziurtagiri-autoritatea
VerifyEmailSigner=Posta elektroniko sinatzailearen ziurtagiria
VerifyEmailRecip=Posta elektroniko hartzailearen ziurtagiria
-VerifyProtectObjSign=Babestutako objektuaren sinatzailea
VerifyObjSign=Objektuaren sinatzailea
-VerifyUserImport=Erabiltzailearen inportazio-ziurtagiria
VerifyCAVerifier=AZ egiaztatzailea
VerifyStatusResponder=Egoera erantzulearen ziurtagiria
-VerifyAnyCA=Edozein ziurtagiri-autoritate
HighGrade=Gradu altua
MediumGrade=Gradu ertaina
# LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
@@ -61,7 +57,6 @@
CertDumpVersion2=2 Bertsioa
CertDumpVersion3=3 Bertsioa
CertDumpSerialNo=Serie-zenbakia:
-CertDumpOID=Objektu identifikatzailea
CertDumpMD2WithRSA=PKCS #1 MD2 RSA zifraketarekin
CertDumpMD5WithRSA=PKCS #1 MD5 RSA zifraketarekin
CertDumpSHA1WithRSA=PKCS #1 SHA-1 RSA zifraketarekin
@@ -69,11 +64,8 @@
CertDumpSHA384WithRSA=PKCS #1 SHA-384, RSA zifraketarekin
CertDumpSHA512WithRSA=PKCS #1 SHA-512, RSA zifraketarekin
CertDumpDefOID=Objektu-identifikatzailea (%S)
-CertDumpNULL=NULUA
CertDumpIssuer=Jaulkitzailea
CertDumpSubject=Gaia
-CertDumpRDN=Izen berezitu erlatiboa
-CertDumpATV=Atributu mota eta balioa
CertDumpAVACountry=C
CertDumpAVAState=ST
CertDumpAVALocality=L
@@ -245,44 +237,25 @@
CertDumpRawBytesHeader=Tamaina: %S Byte / %S Bit
VerifySSLClient_p=Bezeroa
VerifySSLServer_p=Zerbitzaria
-VerifySSLStepUp_p=Aurreratu
VerifySSLCA_p=SSL AZ
VerifyEmailSigner_p=Sinatu
VerifyEmailRecip_p=Zifratu
-VerifyProtectObjSign_p=Babestutako objektuaren sinatzailea
VerifyObjSign_p=Objektuaren sinatzailea
-VerifyUserImport_p=Erabiltzailearen inportazioa
VerifyCAVerifier_p=AZ egiaztatzailea
VerifyStatusResponder_p=Egoera-erantzulea
-VerifyAnyCA_p=AZ
-VerifiedTrue=egiazkoa
-VerifiedFalse=faltsua
PK11BadPassword=Idatzitako token-pasahitza ez da zuzena.
SuccessfulP12Backup=Segurtasun-ziurtagiri(ar)en eta gako pribatu(ar)en babeskopiak behar bezala egin dira.
SuccessfulP12Restore=Segurtasun-ziurtagiria(k) eta gako pribatua(k) behar bezala berreskuratu dira.
-PKCS12PasswordInvalid=Ezin izan da PKCS #12 fitxategia deskodetu. Idatzi duzun pasahitza okerra izango ote da?
PKCS12DecodeErr=Huts egin du fitxategi hau deskodetzeak. Ez dago PKCS #12 formatuan, hondatuta dago, edo idatzi duzun pasahitza ez da zuzena.
PKCS12UnknownErrRestore=Huts egin du PKCS #12 fitxategia leheneratzean, arrazoi ezezagunengatik.
PKCS12UnknownErrBackup=Huts egin du PKCS #12 fitxategiaren babeskopia sortzean, arrazoi ezezagunengatik.
PKCS12UnknownErr=PKCS #12 eragiketak huts egin du, arrazoi ezezagunengatik.
PKCS12InfoNoSmartcardBackup=Ezin da hardwarearen segurtasun-gailu bateko ziurtagirien babeskopia egin, txip txartel batekoena adibidez.
PKCS12DupData=Ziurtagiria eta gako pribatua badaude jadanik segurtasun-gailuan.
-AddModulePrompt=Ziur zaude segurtasun-modulu hau instalatu nahi duzula?
-AddModuleName=Moduluaren izena: %S
-AddModulePath=Bide-izena: %S
-AddModuleSuccess=Segurtasun-modulu berria instalatu da
AddModuleFailure=Ezin da modulua gehitu
AddModuleDup=Segurtasun-modulua badago lehendik
-DelModuleBadName=Modulu-izen baliogabea.
DelModuleWarning=Ziur zaude segurtasun-modulu hau ezabatu nahi duzula?
DelModuleError=Ezin da modulua ezabatu
-DelModuleIntSuccess=Barneko segurtasun-modulua behar bezala ezabatu da
-DelModuleExtSuccess=Kanpoko segurtasun-modulua behar bezala ezabatu da
-ForcedBackup1=Segurtasun-ziurtagiri berriari eta berari asozitutako gako pribatuari pasahitzez babestutako kopia egin behar diezu.
-ForcedBackup2=Zure segurtasun-pasahitz pertsonala galdu duzulako, edo fitxategiak hondatu zaizkizulako gako pribatua atzitu ezin baduzu, gako pribatu hori eta ziurtagiria babeskopia horretatik berreskuratu ahal izango dituzu.
-ForcedBackup3=Kopia bat egiteko, egin klik 'Ados'en. Ahal baduzu, babeskopia leku seguruan edukitzen duzun diskete batean gorde behar duzu.
-UnknownCertIssuer=(Jaulkitzaile ezezaguna)
-UnknownCertOrg=(Erakunde ezezaguna)
AVATemplate=%S = %S
PSMERR_SSL_Disabled=Ezin da modu seguruan konektatu SSL protokoloa ezgaiturik dago eta.
@@ -295,7 +268,6 @@
certErrorTrust_SelfSigned=Ziurtagiria ez da fidagarria bere buruak sinatzen duelako.
certErrorTrust_UnknownIssuer=Ziurtagiria ez da fidagarria ziurtagiri jaulkitzailea ezezaguna delako.
-certErrorTrust_MissingChain=Ziurtagiria ez da fidagarria jaulkitzaile-katerik ez delako hornitu.
certErrorTrust_CaInvalid=Ziurtagiria ez da fidagarria ZA ziurtagiri baliogabe batek jaulki duelako.
certErrorTrust_Issuer=Ziurtagiria ez da fidagarria ziurtagiri jaulkitzailea ez delako fidagarria.
certErrorTrust_SignatureAlgorithmDisabled=Ziurtagiria ez da fidagarria segurua ez izateagatik desgaituta dagoen algoritmo batekin sinatuta dagoelako.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pipnss/security.properties thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pipnss/security.properties
--- thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pipnss/security.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pipnss/security.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Title=Segurtasun abisua
-PostToInsecureFromSecureMessage=Nahiz eta orri hau zifratuta egon, idatzi duzun informazioa zifratu gabeko konexio baten bitartez bidaliko da eta erraz irakur dezake beste norbaitek.##Ziur zaude informazioa bidaltzen jarraitu nahi duzula?##
-Continue=Jarraitu
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/certManager.dtd thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/certManager.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/certManager.dtd 2015-06-03 10:03:39.000000000 +0000
@@ -10,9 +10,6 @@
-
-
-
@@ -37,7 +34,6 @@
-
@@ -49,11 +45,6 @@
-
-
-
-
-
@@ -72,8 +63,6 @@
-
-
@@ -91,7 +80,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/deviceManager.dtd thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/deviceManager.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/deviceManager.dtd 2015-06-03 10:03:38.000000000 +0000
@@ -11,11 +11,7 @@
-
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/pippki.dtd thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/pippki.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/pippki.dtd 2015-06-03 10:03:39.000000000 +0000
@@ -9,7 +9,6 @@
-
@@ -20,19 +19,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -42,9 +28,7 @@
-
-
@@ -63,9 +47,6 @@
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/pippki.properties thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/pippki.properties
--- thunderbird-38.0~b3+build2/l10n/eu/security/manager/chrome/pippki/pippki.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/security/manager/chrome/pippki/pippki.properties 2015-06-03 10:03:39.000000000 +0000
@@ -11,7 +11,6 @@
unnamedCA=Autoritate ziurtagiri emailea (izenik gabe)
#For editing cert trust
-editTrustWindowTitle=Editatu ziurtagiriaren fidagarritasuna
editTrustCA="%S" ziurtagiriak autoritate ziurtagiri emaile bat adierazten du.
editTrustEmail="%S" ziurtagiriaren jaulkitzailea:
issuerNotTrusted=Ziurtagiri hau jaulki duen autoritate ziurtagiri emaileaz fidatzen ez zarelako, ez zara ziurtagiri horren autentikotasunaz fidatzen baldin eta hemen ez bada bestelakorik adierazten.
@@ -44,10 +43,7 @@
chooseP12RestoreFileDialog2=Inportatzeko ziurtagiri-fitxategia
chooseP12BackupFileDialog=Babeskopia egiteko fitxategi izena
file_browse_PKCS12_spec=PKCS12 fitxategiak
-
-
-#Preferences
-resetPreferences=Erabili botoi hau %S(r)en segurtasun hobespenei fabrika ezarpenak berrezartzeko.
+getPKCS12FilePasswordMessage=Idatzi ziurtagiriaren babeskopia hau zifratzeko erabili zen pasahitza:
#Cert verification
certVerified=Ziurtagiri hau ondorengo erabileretarako egiaztatu da:
@@ -65,18 +61,16 @@
clientAuthMessage2=Honela jaulkia: "%S"
#Page Info
-pageInfo_SiteNotVerified=Webgunearen nortasuna egiaztatu gabe
-pageInfo_WebSiteVerified=Webgunearen nortasuna egiaztatua
-pageInfo_Identity_Verified=%S webguneak ikusten ari zaren orriaren autentifikazioa onartzen du. Webgune honen nortasuna %S(e)k egiaztatu du, zeregin horretarako zuretzat fidagarria den autoritate ziurtagiri emaile batek, alegia.
-pageInfo_ViewCertificate=Ikusi webgune honen nortasuna egiaztatzen duen segurtasun-ziurtagiria.
pageInfo_NoEncryption=Konexioa zifratu gabe
pageInfo_Privacy_None1=%S webguneak ez du onartzen ikusten ari zaren orriaren zifratzea.
pageInfo_Privacy_None2=Interneten zifratu gabe bidalitako informazioa, batetik bestera dabilenean, beste norbaitek ikus dezake.
pageInfo_Privacy_None3=Ikusten ari zaren orria ez dago zifratuta.
-# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
+# %1$S is the name of the encryption standard,
# %2$S is the key size of the cipher.
# %3$S is protocol version like "SSL 3" or "TLS 1.2"
pageInfo_EncryptionWithBitsAndProtocol=Konexioa zifratuta (%1$S, %2$S biteko gakoak, %3$S)
+pageInfo_BrokenEncryption=Zifraketa hautsia (%1$S, %2$S biteko gakoak, %3$S)
pageInfo_Privacy_Encrypted1=Ikusten ari zaren orria zifratu egin da Internetetik transmititu aurretik.
pageInfo_Privacy_Encrypted2=Ordenagailuen artean transmititzen den informazioa baimenik gabeko pertsonek ikustea zailtzen du zifratzeak. Horrela ia ezinezkoa da sarean zehar dabilela inork orri hau hau irakurtzea.
pageInfo_MixedContent=Konexioa erdizka zifratuta
@@ -85,7 +79,6 @@
#Cert Viewer
certDetails=Ziurtagiri ikustatzailea:
notPresent=
-unknownIssuer=
escrowFinalMessage="%S" zure zifratzearen gako pribatua babesteko fidagarritzat jotzen baduzu soilik egin behar duzu klik 'Ados'en.
@@ -158,7 +151,6 @@
addExceptionCheckingLong2=Gunea identifikatzen saiatzen…
addExceptionNoCertShort=Ez dago informaziorik eskuragarri
addExceptionNoCertLong2=Ezin da eskuratu gune honetarako identifikazio-egoera.
-addExceptionConnectionFailed=Konexioak huts egin du
#Certificate Exists in database
caCertExistsTitle=Ziurtagiria badago
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutReader.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutReader.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutReader.properties 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutReader.properties 2015-06-03 10:03:39.000000000 +0000
@@ -0,0 +1,37 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+aboutReader.loading=Kargatzen…
+aboutReader.loadError=Huts egin du artikulua orritik kargatzean
+
+aboutReader.colorScheme.light=Argia
+aboutReader.colorScheme.dark=Iluna
+aboutReader.colorScheme.sepia=Sepia
+aboutReader.colorScheme.auto=Automatikoa
+
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Serif
+aboutReader.fontType.sans-serif=Sans-serif
+
+# LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
+aboutReader.fontTypeSample=Aa
+
+# LOCALIZATION NOTE (aboutReader.fontSizeSample): String used to sample a relative font size
+# for the font size setting. Tapping different samples will change the font size.
+aboutReader.fontSizeSample=A
+
+aboutReader.toolbar.close=Itxi irakurtzeko ikuspegia
+aboutReader.toolbar.typeControls=Tipografia-kontrolak
+aboutReader.toolbar.addToReadingList=Gehitu irakurketa-zerrendara
+aboutReader.toolbar.removeFromReadingList=Kendu irakurketa-zerrendatik
+aboutReader.toolbar.openReadingList=Ireki irakurketa-zerrenda
+aboutReader.toolbar.closeReadingList=Itxi irakurketa-zerrenda
+aboutReader.toolbar.share=Partekatu
+
+aboutReader.footer.deleteThisArticle=Ezabatu artikulu hau
+
+# Reader View toolbar button
+readerView.enter=Sartu irakurtzeko ikuspegian
+readerView.close=Irten irakurtzeko ikuspegitik
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutSupport.dtd thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutSupport.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutSupport.dtd 2015-06-03 10:03:38.000000000 +0000
@@ -35,9 +35,11 @@
-
+
@@ -93,3 +95,6 @@
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutSupport.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutSupport.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutSupport.properties 2015-06-03 10:03:39.000000000 +0000
@@ -86,3 +86,8 @@
hasSeccompBPF = Seccomp-BPF (Sistema-deien iragaztea)
canSandboxContent = Eduki-prozesuen isolamendua
canSandboxMedia = Multimedia-pluginen isolamendua
+
+# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
+# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
+# or 'false')
+multiProcessStatus = %2$S/%1$S (lehenetsia: %3$S)
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutTelemetry.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/aboutTelemetry.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/aboutTelemetry.properties 2015-06-03 10:03:39.000000000 +0000
@@ -7,6 +7,8 @@
# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
pageSubtitle = Telemetry-k bildutako errendimenduaren, hardwarearen, erabilpenaren eta pertsonalizazioen inguruko datuak erakusten ditu orri honek. Informazio hau %1$S(r)a bidaltzen da %2$S hobetzen laguntzeko.
+generalDataTitle = Datu orokorrak
+
generalDataHeadingName = Izena
generalDataHeadingValue = Balioa
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/browser.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/browser.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/browser.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/browser.properties 2015-06-03 10:03:38.000000000 +0000
@@ -8,3 +8,7 @@
browsewithcaret.checkButtonLabel=Bai
plainText.wordWrap=Itzulbiratu lerro luzeak
+
+formPostSecureToInsecureWarning.title = Segurtasun abisua
+formPostSecureToInsecureWarning.message = Orri honetan sartu duzun informazioa konexio ez-seguru baten bitartez bidaliko da eta hirugarren batek irakur lezake.\n\nZiur zaude informazio hau bidali nahi duzula?
+formPostSecureToInsecureWarning.continue = Jarraitu
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/devtools/debugger.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/devtools/debugger.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/devtools/debugger.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/devtools/debugger.properties 2015-06-03 10:03:38.000000000 +0000
@@ -14,11 +14,46 @@
# dialog that prompts the user to allow the incoming connection.
remoteIncomingPromptTitle=Sarrerako konexioa
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# LOCALIZATION NOTE (remoteIncomingPromptHeader): Header displayed on the
# dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=Sarrerako eskaera bat detektatu da urruneko arazketaren konexioa baimentzeko. Urruneko bezeroak zure nabigatzailearen kontrol osoa har dezake! Baimendu konexioa?
+remoteIncomingPromptHeader=Sarrerako eskaera bat detektatu da urruneko arazketaren konexioa baimentzeko. Urruneko bezeroak zure nabigatzailearen kontrol osoa har lezake!
+# LOCALIZATION NOTE (remoteIncomingPromptClientEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the client such as "127.0.0.1:6000"
+remoteIncomingPromptClientEndpoint=Bezeroaren amaiera-puntua: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptServerEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the server such as "127.0.0.1:6000"
+remoteIncomingPromptServerEndpoint=Zerbitzariaren amaiera-puntua: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptFooter): Footer displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptFooter=Baimendu konexioa?
# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
# third button in the incoming connection dialog that lets the user disable the
# remote debugger server.
remoteIncomingPromptDisable=Desgaitu
+
+# LOCALIZATION NOTE (clientSendOOBTitle): The title displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBTitle=Bezeroaren identifikazioa
+# LOCALIZATION NOTE (clientSendOOBHeader): Header displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBHeader=Konektatzen saiatzen ari zaren amaiera-puntuak informazio gehiago behar du konexio hau autentifikatzeko. Mesedez, hornitu beste amaierako gonbitean agertzen den tokena:
+# LOCALIZATION NOTE (clientSendOOBHash): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The client's cert fingerprint
+clientSendOOBHash=Nire ziurtagiria: %1$S
+# LOCALIZATION NOTE (clientSendOOBToken): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The authentication token that the user will transfer.
+clientSendOOBToken=Tokena: %1$S
+
+# LOCALIZATION NOTE (serverReceiveOOBTitle): The title displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBTitle=Hornitu bezeroaren tokena
+# LOCALIZATION NOTE (serverReceiveOOBBody): Main text displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBBody=Bezeroak token-balio bat bistaratu behar luke. Idatzi token-balio hori hemen bezeroarekiko autentifikazioa burutzeko.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/fallbackMenubar.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/fallbackMenubar.properties 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/fallbackMenubar.properties 2015-06-03 10:03:38.000000000 +0000
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Irten
+quitMenuitem.key=q
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/textcontext.dtd thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/textcontext.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/global/textcontext.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/global/textcontext.dtd 2015-06-03 10:03:38.000000000 +0000
@@ -24,3 +24,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/downloads/downloads.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/downloads/downloads.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/downloads/downloads.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/downloads/downloads.properties 2015-06-03 10:03:38.000000000 +0000
@@ -32,15 +32,14 @@
offlineCancelDownloadsAlertMsg=Orain lineaz kanpo jartzen bazara, deskarga bat bertan behera geldituko da. Ziur zaude lineaz kanpo jarri nahi duzula?
offlineCancelDownloadsAlertMsgMultiple=Orain lineaz kanpo jartzen bazara, %S deskarga bertan behera geldituko dira. Ziur zaude lineaz kanpo jarri nahi duzula?
leavePrivateBrowsingCancelDownloadsAlertTitle=Utzi deskarga guztiak?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=Nabigatze pribatuko leiho guztiak ixten badituzu orain, deskarga bat bertan behera utziko da. Ziur zaude nabigatze pribatua utzi nahi duzula?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=Nabigatze pribatuko leiho guztiak ixten badituzu orain, %S deskarga bertan behera utziko dira. Ziur zaude nabigatze pribatua utzi nahi duzula?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=Nabigatze pribatuko leiho guztiak ixten badituzu, deskarga bat bertan behera utziko da. Ziur zaude nabigatze pribatua utzi nahi duzula?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=Nabigatze pribatuko leiho guztiak ixten badituzu, %S deskarga bertan behera utziko dira. Ziur zaude nabigatze pribatua utzi nahi duzula?
cancelDownloadsOKText=Ezeztatu deskarga bat
cancelDownloadsOKTextMultiple=Ezeztatu %S deskarga
dontQuitButtonWin=Ez irten
dontQuitButtonMac=Ez itxi
dontGoOfflineButton=Egon linean
-dontEnterPrivateBrowsingButton=Ez sartu nabigatze pribatuan
-dontLeavePrivateBrowsingButton=Mantendu nabigatze pribatuan
+dontLeavePrivateBrowsingButton2=Mantendu nabigatze pribatuan
downloadsCompleteTitle=Deskargak burutu dira
downloadsCompleteMsg=Fitxategi guztien deskarga burutu da.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-06-03 10:03:38.000000000 +0000
@@ -4,6 +4,7 @@
+
@@ -228,3 +229,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/extensions/extensions.properties 2015-06-03 10:03:38.000000000 +0000
@@ -56,8 +56,8 @@
notification.installError=Errorea gertatu da %1$S instalatzean.
notification.installError.retry=Saiatu berriro
notification.installError.retry.tooltip=Saiatu gehigarri hau berriro deskargatu eta instalatzen
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Laster instalatuko da.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S laster instalatuko da.
#LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
contributionAmount2=Gomendatutako dohaintza: %S
@@ -99,8 +99,8 @@
details.notification.uninstall=%2$S berrabiarazi ondoren desinstalatuko da %1$S.
#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
details.notification.upgrade=%2$S berrabiarazi ondoren eguneratuko da %1$S.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Laster instalatuko da.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S laster instalatuko da.
# LOCALIZATION NOTE (details.experiment.time.daysRemaining):
# Semicolon-separated list of plural forms.
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-38.0~b3+build2/l10n/eu/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-06-03 10:03:38.000000000 +0000
@@ -39,3 +39,4 @@
+
diff -Nru thunderbird-38.0~b3+build2/l10n/eu/webapprt/webapprt/overrides/appstrings.properties thunderbird-38.0~b6+build2/l10n/eu/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/eu/webapprt/webapprt/overrides/appstrings.properties 2015-04-29 23:41:54.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/eu/webapprt/webapprt/overrides/appstrings.properties 2015-06-03 10:03:38.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Modu honetan kargatzea eragozten duen edukien segurtasun-politika du aplikazio hau atzitzen saiatu den baliabideak.
corruptedContentError=Aplikazioak ezin du kargatzen jarraitu datu-transmisioen errorea atzeman delako.
remoteXUL=Dagoeneko erabilgarri ez dagoen eta onartzen ez den teknologia bat erabiltzen saiatu da aplikazio hau.
+sslv3Used=Aplikazio honek ezin du %S gunean zure datuen segurtasuna bermatu SSLv3 erabiltzen duelako, segurtasun-protokolo hautsi bat.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/chat/irc.properties thunderbird-38.0~b6+build2/l10n/fi/chat/irc.properties
--- thunderbird-38.0~b3+build2/l10n/fi/chat/irc.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/chat/irc.properties 2015-06-03 10:03:59.000000000 +0000
@@ -148,7 +148,7 @@
# LOCALIZATION NOTE (error.*):
-# These are shown as error messages in the conversation.
+# These are shown as error messages in the conversation or server tab.
# %S is the channel name.
error.noChannel=Ei ole kanavaa: %S.
error.tooManyChannels=Ei voida liittyä kanavalle %S; olet liittynyt liian monelle kanavalle.
@@ -173,6 +173,9 @@
error.notChannelOwner=Et ole kanavan %S omistaja.
error.wrongKey=Ei voitu liittyä kanavalle %S. Virheellinen kanavan salasana.
error.sendMessageFailed=Tapahtui virhe lähetettäessä viimeistä viestiäsi. Yritä uudestaan kun yhteys on palautettu.
+# %1$S is the channel the user tried to join, %2$S is the channel
+# he was forwarded to.
+error.channelForward=Et voi liittyä kanavalle %1$S. Sinut ohjattiin automaattisesti kanavalle %2$S.
# LOCALIZATION NOTE (tooltip.*):
# These are the descriptions given in a tooltip with information received
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/dom/chrome/appstrings.properties thunderbird-38.0~b6+build2/l10n/fi/dom/chrome/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/fi/dom/chrome/appstrings.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/dom/chrome/appstrings.properties 2015-06-03 10:03:59.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Tällä sivulla on sisällön tietosuojakäytäntö, joka estää sen sisällyttämisen toiseen sivuun tällä tavalla.
corruptedContentError=Avattavaa sivua ei voida näyttää, koska tiedonsiirrossa tapahtui virhe.
remoteXUL=Tämä sivu käyttää teknologiaa, jota ei enää oletuksena tueta.
+sslv3Used=Tietojesi turvallisuutta palvelimella %S ei voida taata, koska se käyttää rikkoutunutta turvallisuuskäytäntöä SSLv3.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/dom/chrome/plugins.properties thunderbird-38.0~b6+build2/l10n/fi/dom/chrome/plugins.properties
--- thunderbird-38.0~b3+build2/l10n/fi/dom/chrome/plugins.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/dom/chrome/plugins.properties 2015-06-03 10:03:59.000000000 +0000
@@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# LOCALIZATION NOTE (plugins.properties):
-# Those strings are inserted into an HTML page, so you all HTML characters
+# Those strings are inserted into an HTML page, so all HTML characters
# have to be escaped in a way that they show up correctly in HTML!
title_label=Tietoja liitännäisistä
@@ -20,5 +20,11 @@
description_label=Kuvaus
suffixes_label=Päätteet
-openH264_name=OpenH264-videokoodekin on toimittanut Cisco Systems, Inc.
-openH264_description=Toista videoita ja osallistu videopohjaisiin keskusteluihin.
+# GMP Plugins
+gmp_license_info=License information
+
+openH264_name=OpenH264 Video Codecin on toimittanut Cisco Systems, Inc.
+openH264_description=Toista videoita ja osallistu videokeskusteluihin.
+
+eme-adobe_name=Primetime Content Decryption Modulen on toimittanut Adobe Systems, Incorporated
+eme-adobe_description=Toista suojattuja videoita.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/dom/chrome/security/security.properties thunderbird-38.0~b6+build2/l10n/fi/dom/chrome/security/security.properties
--- thunderbird-38.0~b3+build2/l10n/fi/dom/chrome/security/security.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/dom/chrome/security/security.properties 2015-06-03 10:03:59.000000000 +0000
@@ -4,7 +4,18 @@
BlockMixedActiveContent = Estettiin osittain suojaamattoman, interaktiivisen sisällön lataus "%1$S"
# CORS
-CrossSiteRequestBlocked=Eri lähteistä tulevat pyynnöt estetty (Cross-Origin Request): Saman lähteen käytäntö (Same Origin Policy) estää lukemasta tietoa etäpalvelimelta %1$S. Tämä voidaan korjata siirtämällä resurssi saman palvelinnimen alle tai ottamalla CORS käyttöön.
+# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
+CORSDisabled=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS disabled).
+CORSRequestFailed=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request failed).
+CORSRequestNotHttp=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request not http).
+CORSMissingAllowOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header 'Access-Control-Allow-Origin' missing).
+CORSAllowOriginNotMatchingOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header 'Access-Control-Allow-Origin' does not match '%2$S').
+CORSMethodNotFound=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: Did not find method in CORS header 'Access-Control-Allow-Methods').
+CORSMissingAllowCredentials=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: expected 'true' in CORS header 'Access-Control-Allow-Credentials').
+CORSPreflightDidNotSucceed=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS preflight channel did not succeed).
+CORSInvalidAllowMethod=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: invalid token '%2$S' in CORS header 'Access-Control-Allow-Methods').
+CORSInvalidAllowHeader=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: invalid token '%2$S' in CORS header 'Access-Control-Allow-Headers').
+CORSMissingAllowHeaderFromPreflight=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: missing token '%2$S' in CORS header 'Access-Control-Allow-Headers' from CORS preflight channel).
# LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
InvalidSTSHeaders=Verkkosivusto määritteli virheellisen Strict-Transport-Security -otsakkeen.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/aboutDialog.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/aboutDialog.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/aboutDialog.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -13,18 +13,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
@@ -41,6 +59,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -3,7 +3,8 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
+
@@ -160,6 +161,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -2,6 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/addressbook/addressBook.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/addressbook/addressBook.properties 2015-06-03 10:03:59.000000000 +0000
@@ -9,6 +9,8 @@
lastFirstFormat=%S, %S
firstLastFormat=%S %S
+allAddressBooks=Kaikki osoitekirjat
+
newContactTitle=Uusi yhteystieto
# %S will be the contact's display name
newContactTitleWithDisplayName=Uudet yhteystiedot nimelle "%S"
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/am-server-top.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/am-server-top.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/am-server-top.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -68,19 +68,23 @@
-
+
+
-
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/chat.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/chat.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/chat.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/chat.properties 2015-06-03 10:03:59.000000000 +0000
@@ -92,4 +92,17 @@
log.currentWeek=Tällä viikolla
log.previousWeek=Viime viikolla
+# LOCALIZATION NOTE (messagePreview):
+# This is the default message preview to be shown
+# when the user has chosen not to show any info in the notification about the
+# incoming message being notified.
messagePreview=Uusi keskusteluryhmäviesti
+
+#LOCALIZATION NOTE (bundledMessagePreview): Semi-colon list of plural forms.
+# Used when multiple incoming messages from the same sender are bundled
+# into a single notification.
+# #1 is the number of incoming messages the user is being notified about. When #1
+# is greater than one, the plural form after the semicolon is used.
+# Do not translate %1$S, it is the message preview to be shown in the
+# notification, i.e. the first incoming message.
+bundledMessagePreview=%1$S… (ja #1 viesti lisää);%1$S… (ja #1 viestiä lisää)
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/FilterEditor.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/FilterEditor.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/FilterEditor.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/FilterEditor.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -25,6 +25,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/filter.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/filter.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/filter.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/filter.properties 2015-06-03 10:03:59.000000000 +0000
@@ -24,6 +24,12 @@
continueButtonLabel=Jatka
cannotEnableFilter=Tämä suodatin on todennäköisesti luotu uudemmalla Mozillan tai Netscapen versiolla. Et voi ottaa sitä käyttöön, koska emme tiedä, miten sitä käytetään.
dontWarnAboutDeleteCheckbox=Älä kysy uudestaan
+
+# LOCALIZATION NOTE(filterFAilureWarningPrefix)
+# %1$S=filter error action
+# %2$S=error code as hexadecimal string.
+filterFailureWarningPrefix=Suodatintoiminto epäonnistui: "%1$S" virhekoodilla=%2$S yritettäessä:
+
searchTermsInvalidTitle=Virheelliset hakutermit
# LOCALIZATION NOTE(searchTermsInvalidRule)
# %1$S=search attribute name from the invalid rule
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/glodaComplete.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/glodaComplete.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/glodaComplete.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/glodaComplete.properties 2015-06-03 10:03:59.000000000 +0000
@@ -17,15 +17,3 @@
# a set of words, or a phrase containing multiple words (e.g. "red pepper")
# We use the same words in en-US, but maybe that's not always true.
glodaComplete.messagesMentioningMany.label=Viestit joissa mainitaan: #1
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
-# autocomplete widget to refer to a search on the web for a short string
-# containing at most 15 characters. #1 is the search provider to use. #2 is
-# the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label=Etsi palvelusta #1: #2
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
-# the autocomplete widget to refer to a search on the web for a short string
-# containing more than 15 characters. #1 is the search provider to use. #2 is
-# the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label.truncated=Etsi palvelusta #1: #2…
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/imapMsgs.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/imapMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/imapMsgs.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/imapMsgs.properties 2015-06-03 10:03:59.000000000 +0000
@@ -75,17 +75,15 @@
imapEmptyMimePart=Tämä osa viestin runkoa ladataan pyydettäessä.
-# LOCALIZATION NOTE (imapReceivingMessageHeaders): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the header currently being downloaded should appear.
-# Place the word %3$lu where the number of headers should appear.
-imapReceivingMessageHeaders=%S - ladataan viestien otsakkeita %lu / %lu
-
-# LOCALIZATION NOTE (imapReceivingMessageFlags): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the flag currently being downloaded should appear.
-# Place the word %3$lu where the number of flags should appear.
-imapReceivingMessageFlags=%S - ladataan viestien lippuja %lu / %lu
+# LOCALIZATION NOTE (imapReceivingMessageHeaders2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of headers should appear.
+imapReceivingMessageHeaders2=%S ladataan viestien otsakkeita %lu / %lu…
+
+# LOCALIZATION NOTE (imapReceivingMessageFlags2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of flags should appear.
+imapReceivingMessageFlags2=%S ladataan viestien lippuja %lu / %lu…
imapDeletingMessages=Poistetaan viestejä…
@@ -107,10 +105,10 @@
# Place the word %S in your translation where the name of the folder should appear.
imapCopyingMessage=Kopioidaan viestiä kansioon %S…
-# LOCALIZATION NOTE (imapFolderReceivingMessageOf): Do not translate the word "%S" or "%lu" below.
+# LOCALIZATION NOTE (imapFolderReceivingMessageOf2): Do not translate the word "%S" or "%lu" below.
# Place the word %S in your translation where the name of the folder should appear.
# Place the word %lu where the number of headers should appear.
-imapFolderReceivingMessageOf=%S - Ladataan viestiä %lu / %lu
+imapFolderReceivingMessageOf2=%S - Ladataan viestiä %lu / %lu…
# LOCALIZATION NOTE (imapDiscoveringMailbox): Do not translate the word "%S" below.
# Place the word %S in your translation where the name of the folder should appear.
@@ -119,7 +117,7 @@
# LOCALIZATION NOTE (imapEnterPasswordPrompt): Do not translate the word %S below.
# Place the word "%S" in your translation where the email address
# or the username should appear
-imapEnterPasswordPrompt=Kirjoista salasana osoitteelle %S:
+imapEnterPasswordPrompt=Kirjoita salasana osoitteelle %S:
# LOCALIZATION NOTE (imapServerNotImap4): Do not translate the word "IMAP4" below.
imapServerNotImap4=Sähköpostipalvelin %S ei ole IMAP4-postipalvelin.
@@ -198,11 +196,11 @@
# Out of memory
imapOutOfMemory=Sovellukselle ei ole tarpeeksi muistia.
-# LOCALIZATION NOTE (imapCopyingMessageOf): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessageOf2): Do not translate the word "%S" below.
# Place the word %3$S in your translation where the name of the destination folder should appear.
# Place the word %1$S where the currently copying message should appear.
# Place the word %2$S where the total number of messages should appear.
-imapCopyingMessageOf=Kopioidaan viestiä %1$S / %2$S kansioon %3$S
+imapCopyingMessageOf2=Kopioidaan viestiä %1$S / %2$S kansioon %3$S…
# LOCALIZATION NOTE (imapMoveFolderToTrash): Do not translate the word %S below.
# "%S" is the the name of the folder.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/localMsgs.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/localMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/localMsgs.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/localMsgs.properties 2015-06-03 10:03:59.000000000 +0000
@@ -40,8 +40,6 @@
# %2$S will receive the total number of messages
receivedMsgs=Vastaanotettu %1$S / %2$S viestiä
-pop3OutOfDiskSpace=Kiintolevytila ei riitä uusille viesteille. Vapauta levytilaa poistamalla vanhoja viestejä, tyhjentämällä roskakori tai tiivistämällä kansioita ja yritä sitten uudelleen.
-
# Status - parsing folder
#LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
# Place the word %S where the name of the mailbox should appear
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-06-03 10:03:59.000000000 +0000
@@ -9,161 +9,116 @@
## %S will be replaced with the name of file that could not be opened
unableToOpenFile=Tiedoston %S avaaminen ei onnistunut.
unableToOpenTmpFile=Väliaikaistiedoston %S avaaminen ei onnistunut. Tarkista "Väliaikainen hakemisto"-asetuksesi.
-
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Viestisi tallennus mallipohjana ei onnistunut.
-
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Viestisi tallennus luonnoksena ei onnistunut.
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Lähetetyt viestit -kansion avaaminen epäonnistui. Tarkista, että sähköpostiasetuksesi ovat oikeat.
-
-## @name NS_MSG_NO_SENDER
-12510=Lähettäjää ei ole annettu. Täytä sähköpostiosoitteesi Sähköposti ja keskusteluryhmät -tilin asetuksiin.
-
-## @name NS_MSG_NO_RECIPIENTS
-12511=Yhtään vastaanottajaa ei ole annettu. Kirjoita vastaanottaja tai keskusteluryhmä osoiteriville.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Virhe väliaikaistiedostoa kirjoitettaessa.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=Postia lähetettäessä tapahtui virhe. Postipalvelin vastasi: %s. Tarkista että sähköpostiosoitteesi on asetuksissa oikein ja yritä uudelleen.
-
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=Postia lähetettäessä tapahtui virhe (SMTP). Palvelin vastasi: %s.
-
-## @name NS_ERROR_SENDING_MESSAGE
-12517=Postia lähetettäessä tapahtui virhe. Postipalvelin vastasi: %s. Tarkista viesti ja yritä uudelleen.
-
-## @name NS_ERROR_POST_FAILED
-12518=Viestiä ei voitu lähettää, koska yhteys NNTP-palvelimeen epäonnistui. Palvelin voi olla varattu tai estää yhteyspyynnöt. Varmista, että NNTP-palvelinasetuksesi ovat oikeat ja yritä uudelleen tai vaihtoehtoisesti ota yhteyttä verkon ylläpitoon.
-
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=Lähtevien viestien lähettämisessä tapahtui virhe.
-
-## @name NS_ERROR_SEND_FAILED
-12520=Viestien lähettäminen epäonnistui.
-
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=Postia lähetettäessä tapahtui SMTP-palvelinvirhe. Palvelin vastasi: %s. Avun saamiseksi ota yhteyttä sähköpostipalvelun käyttäjätukeen.
-
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Ei pystynyt tallentamaan viestiä myöhempää lähettämistä varten.
-
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=Tapahtui kommunikaatiovirhe: %d. Ole hyvä ja yritä uudelleen.
-
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=THIS IS JUST A PLACEHOLDER. YOU SHOULD NEVER SEE THIS STRING.
-
-## @name NS_ERROR_TCP_READ_ERROR
-12528=Dataa vastaanotettaessa tapahtui verkkovirhe. (Verkkovirhe nro: %s) Yritä yhteyttä uudelleen.
-
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=Postia lähetettäessä tapahtui virhe: vastausosoite ei kelpaa. Tarkista, että sähköpostiosoitteesi on oikein postiasetuksissasi, ja yritä uudelleen.
-
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Virhe liitetiedostossa.
-
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=Viestin lähettäminen onnistui, mutta sitä ei voitu kopioida Lähetetyt kansioon.
-
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=Voit lähettää viestin vain yhteen NNTP-palvelimeen kerrallaan.
-
-## @name NS_MSG_CANCELLING
-12555=Peruutetaan…
-
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Viestisi on lähetetty keskusteluryhmään, mutta sitä ei ole lähetetty toiselle vastaanottajalle.
-
-## @name NS_MSG_ERROR_READING_FILE
-12563=Virhe luettaessa tiedostoa.
-
+unableToSaveTemplate=Viestisi tallennus mallipohjana ei onnistunut.
+unableToSaveDraft=Viestisi tallennus luonnoksena ei onnistunut.
+couldntOpenFccFolder=Lähetetyt viestit -kansion avaaminen epäonnistui. Tarkista, että sähköpostiasetuksesi ovat oikeat.
+noSender=Lähettäjää ei ole annettu. Täytä sähköpostiosoitteesi tiliasetuksiin.
+noRecipients=Yhtään vastaanottajaa ei ole annettu. Kirjoita vastaanottaja tai keskusteluryhmä osoiteriville.
+errorWritingFile=Virhe väliaikaistiedostoa kirjoitettaessa.
+
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingFromCommand=Postia lähetettäessä tapahtui virhe. Postipalvelin vastasi: %s. Tarkista että sähköpostiosoitteesi on asetuksissa oikein ja yritä uudelleen.
+
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingDataCommand=Postia lähetettäessä tapahtui virhe (SMTP). Palvelin vastasi: %s.
+
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=Postia lähetettäessä tapahtui virhe. Postipalvelin vastasi: %s. Tarkista viesti ja yritä uudelleen
+postFailed=Viestiä ei voitu lähettää, koska yhteys keskusteluryhmäpalvelimeen epäonnistui. Palvelin voi olla varattu tai estää yhteyspyynnöt. Varmista, että keskusteluryhmä-palvelinasetuksesi ovat oikeat ja yritä uudelleen tai vaihtoehtoisesti ota yhteyttä verkon ylläpitoon.
+errorQueuedDeliveryFailed=Lähtevien viestien lähettämisessä tapahtui virhe.
+sendFailed=Viestien lähettäminen epäonnistui.
+
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
+smtpServerError=Postia lähetettäessä tapahtui SMTP-palvelinvirhe. Palvelin vastasi: %s.
+unableToSendLater=Ei pystynyt tallentamaan viestiä myöhempää lähettämistä varten.
+
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=Tapahtui kommunikaatiovirhe: %d. Ole hyvä ja yritä uudelleen.
+dontShowAlert=THIS IS JUST A PLACEHOLDER. YOU SHOULD NEVER SEE THIS STRING.
+
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=Dataa vastaanotettaessa tapahtui verkkovirhe. (Verkkovirhe nro: %s) Yritä yhteyttä uudelleen.
+couldNotGetUsersMailAddress=Postia lähetettäessä tapahtui virhe: vastausosoite ei kelpaa. Tarkista, että sähköpostiosoitteesi on oikein postiasetuksissasi, ja yritä uudelleen.
+mimeMpartAttachmentError=Liitetiedostovirhe.
+failedCopyOperation=Viestin lähettäminen onnistui, mutta sitä ei voitu kopioida Lähetetyt-kansioon.
+nntpNoCrossPosting=Voit lähettää viestin vain yhteen keskusteluryhmäpalvelimeen kerrallaan.
+msgCancelling=Peruutetaan…
+sendFailedButNntpOk=Viestisi on lähetetty keskusteluryhmään, mutta sitä ei ole lähetetty toiselle vastaanottajalle.
+errorReadingFile=Virhe luettaessa tiedostoa.
followupToSenderMessage=Viestin kirjoittaja on pyytänyt, että vastaukset lähetettäisiin vain kirjoittajalle. Jos haluat vastata myös tähän keskusteluryhmään, lisää uusi rivi osoitealueelle, valitse keskusteluryhmä listasta ja kirjoita ryhmän nimi.
-## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=Tiedoston %S liittämisessä tapahtui virhe. Tarkista, että sinulla on oikeudet lukea tiedostoa.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of the object to be attached
+errorAttachingFile=Tiedoston %S liittämisessä tapahtui virhe. Tarkista, että sinulla on oikeudet lukea tiedostoa.
-## @name NS_ERROR_SMTP_GREETING
-12572=Postia lähetettäessä tapahtui virhe: postipalvelimen kättelyviesti oli virheellinen: %s
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
+incorrectSmtpGreeting=Postia lähetettäessä tapahtui virhe: postipalvelimen kättelyviesti oli virheellinen: %s
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=Postia lähetettäessä tapahtui virhe. Postipalvelin vastasi: %1$s. Tarkista osoite %2$s ja yritä uudelleen.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
+errorSendingRcptCommand=Postia lähetettäessä tapahtui virhe. Postipalvelin vastasi: \n%1$S.\n. Tarkista osoite %2$S ja yritä uudelleen.
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=Postia lähetettäessä tapahtui virhe: SMTP-palvelimeen %S ei kyetty muodostamaan suojattua yhteyttä STARTTLS-käytännöllä, koska palvelin ei kerro tukevansa tätä SMARTTLS:ää. Poista STARTTLS käytöstä tälle palvelimelle tai ota yhteyttä palveluntarjoajaasi.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
+startTlsFailed=Postia lähetettäessä tapahtui virhe: SMTP-palvelimeen %S ei kyetty muodostamaan suojattua yhteyttä STARTTLS-käytännöllä, koska palvelin ei kerro tukevansa ominaisuutta. Poista STARTTLS käytöstä tälle palvelimelle tai ota yhteyttä palveluntarjoajaasi.
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=Postia lähetettäessä tapahtui virhe: Salasanaa palvelimelle %S ei ole annettu. Viestiä ei lähetetty.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
+smtpPasswordUndefined=Postia lähetettäessä tapahtui virhe: Salasanaa palvelimelle %S ei ole annettu. Viestiä ei lähetetty.
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=Viestin, jota yritit lähettää, koko ylittää palvelimella olevan väliaikaisen viestien kokorajoituksen. Viestiä ei lähetetty. Odota hetki ja yritä uudelleen tai tee viestistäsi pienempi. Palvelin vastasi: %s.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=Viestin, jota yritit lähettää, koko ylittää palvelimella olevan väliaikaisen viestien kokorajoituksen. Viestiä ei lähetetty. Odota hetki ja yritä uudelleen tai tee viestistäsi pienempi. Palvelin vastasi: %s.
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=Viestin, jota yritit lähettää, koko ylittää palvelimen kokorajoituksen viesteille (%d tavua). Viestiä ei lähetetty. Tee viestistäsi pienempi ja yritä uudelleen.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=Viestin, jota yritit lähettää, koko ylittää palvelimen kokorajoituksen viesteille (%d tavua). Viestiä ei lähetetty. Tee viestistäsi pienempi ja yritä uudelleen.
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=Viestin, jota yritit lähettää, koko ylittää palvelimen kokorajoituksen viesteille. Viestiä ei lähetetty. Tee viestistäsi pienempi ja yritä uudelleen. Palvelin vastasi: %s.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the Outgoing server (SMTP) response
+smtpPermSizeExceeded2=Viestin, jota yritit lähettää, koko ylittää palvelimen kokorajoituksen viesteille. Viestiä ei lähetetty. Tee viestistäsi pienempi ja yritä uudelleen. Palvelin vastasi: %s.
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=Postia lähetettäessä tapahtui virhe: SMTP-palvelinta %S ei tunneta. Palvelinasetukset voivat olla virheelliset. Varmista, että SMTP-palvelinasetuksesi ovat oikein ja yritä uudelleen.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownServer=Postia lähetettäessä tapahtui virhe: SMTP-palvelinta %S ei tunneta. Palvelinasetukset voivat olla virheelliset. Varmista, että SMTP-palvelinasetuksesi ovat oikein ja yritä uudelleen.
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=Viestiä ei voitu lähettää, koska yhteyttä SMTP-palvelimeen %S ei onnistuttu luomaan. Palvelin voi olla varattu tai estää SMTP-yhteyspyynnöt. Varmista, että SMTP-palvelinasetuksesi ovat oikein ja yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRefused=Viestiä ei voitu lähettää, koska yhteyttä SMTP-palvelimeen %S ei onnistuttu luomaan. Palvelin voi olla varattu tai estää SMTP-yhteyspyynnöt. Varmista, että SMTP-palvelinasetuksesi ovat oikein ja yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=Viestiä ei voitu lähettää, koska yhteys SMTP-palvelimeen %S katkesi kesken tiedonsiirron. Yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
+smtpSendInterrupted=Viestiä ei voitu lähettää, koska yhteys SMTP-palvelimeen %S katkesi kesken tiedonsiirron. Yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=Viestiä ei voitu lähettää, koska yhteys SMTP-palvelimeen %S aikakatkaistiin. Yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
+smtpSendTimeout=Viestiä ei voitu lähettää, koska yhteys SMTP-palvelimeen %S aikakatkaistiin. Yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=Viestiä ei voitu lähettää SMTP-palvelimen %S kautta tuntemattomasta syystä. Varmista, että SMTP-palvelinasetuksesi ovat oikein ja yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownReason=Viestiä ei voitu lähettää SMTP-palvelimen %S kautta tuntemattomasta syystä. Varmista, että SMTP-palvelinasetuksesi ovat oikein ja yritä uudelleen tai ota yhteyttä verkon ylläpitoon.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=SMTP-palvelin %S ei näytä tukevan salattuja salasanoja. Jos juuri loit tilin, yritä vaihtaa todennustavaksi "Salasana, turvaton lähetys" palvelinasetuksista: Tilien asetukset - Palvelinasetukset. Jos yhteys toimi ennen, mutta lakkasi yhtäkkiä toimimasta, salasanaasi voidaan yrittää varastaa.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainNoSsl=SMTP-palvelin %S ei näytä tukevan salattuja salasanoja. Jos juuri loit tilin, yritä vaihtaa todennustavaksi "Salasana, turvaton lähetys" palvelinasetuksista: Tilien asetukset - Palvelinasetukset. Jos yhteys toimi ennen, mutta lakkasi yhtäkkiä toimimasta, salasanaasi voidaan yrittää varastaa.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12595=SMTP-palvelin %S ei näytä tukevan salattuja salasanoja. Jos juuri loit tilin, yritä vaihtaa todennustavaksi "Normaali salasana" palvelinasetuksista: Tilien asetukset - Palvelinasetukset. Jos yhteys toimi ennen, mutta lakkasi yhtäkkiä toimimasta, ota yhteys sähköpostitilisi hallinnoijaan tai palveluntarjoajaan.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainSsl=SMTP-palvelin %S ei näytä tukevan salattuja salasanoja. Jos juuri loit tilin, yritä vaihtaa todennustavaksi "Normaali salasana" palvelinasetuksista: Tilien asetukset - Palvelinasetukset. Jos yhteys toimi ennen, mutta lakkasi yhtäkkiä toimimasta, ota yhteys sähköpostitilisi hallinnoijaan tai palveluntarjoajaan.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12594): $S is server hostname
-12596=SMTP-palvelin %S -palvelin ei hyväksy salaamattomia salasanoja. Yritä vaihtaa todennustavaksi "Salattu salasana" palvelinasetuksista: Tilien asetukset - Palvelinasetukset.
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
+smtpAuthChangePlainToEncrypt=SMTP-palvelin %S -palvelin ei hyväksy salaamattomia salasanoja. Yritä vaihtaa todennustavaksi "Salattu salasana" palvelinasetuksista: Tilien asetukset - Palvelinasetukset.
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Todennus SMTP-palvelimelle %S epäonnistui. Tarkista salasanasi ja todennustapa palvelinasetuksissa: Tilien asetukset - Lähtevän postin palvelin (SMTP).
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
+smtpAuthFailure=Todennus SMTP-palvelimelle %S epäonnistui. Tarkista salasanasi ja todennustapa palvelinasetuksissa: Tilien asetukset - Lähtevän postin palvelin (SMTP).
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=SMTP-palvelin %S ei hyväksynyt Kerberos/GSSAPI-lippuasi. Tarkista, että olet kirjautunut Kerberos/GSSAPI-verkkoon.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
+smtpAuthGssapi=SMTP-palvelin %S ei hyväksynyt Kerberos/GSSAPI-lippuasi. Tarkista, että olet kirjautunut Kerberos/GSSAPI-verkkoon.
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=SMTP-palvelin %S ei tue valittua todennustapaa. Muuta todennustapaa palvelinasetuksista: Tilien asetukset - Lähtevän postin palvelin (STMP).
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
+smtpAuthMechNotSupported=SMTP-palvelin %S ei tue valittua todennustapaa. Muuta todennustapaa palvelinasetuksista: Tilien asetukset - Lähtevän postin palvelin (STMP).
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=Todennus SMTP-palvelimelle %S ei onnistunut. Palvelin ei tue todennusta (SMTP-AUTH), mutta todennus vaaditaan. Muuta palvelinasetuksista todennustavaksi "Ei mitään" (Tilien asetukset - Lähtevän postin palvelin (SMTP)) tai pyydä ohjeita sähköpostipalveluntarjoajaltasi.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
+smtpAuthNotSupported=Todennus SMTP-palvelimelle %S ei onnistunut. Palvelin ei tue todennusta (SMTP-AUTH), mutta todennus vaaditaan. Muuta palvelinasetuksista todennustavaksi "Ei mitään" (Tilien asetukset - Lähtevän postin palvelin (SMTP)) tai pyydä ohjeita sähköpostipalveluntarjoajaltasi.
-## @name NS_ERROR_ILLEGAL_LOCALPART
# LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
errorIllegalLocalPart=Vastaanottajan osoitteessa %s on merkkejä, jotka eivät kuulu ASCII-merkistöön. Tätä ei vielä tueta. Muokkaa osoitetta ja yritä uudestaan.
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
saveDlogTitle=Tallenna viesti
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
saveDlogMessages=Viestiä ei ole lähetetty. Tallennetaanko viesti Luonnoskansioon (%1$S)?
## generics string
defaultSubject=(ei aihetta)
chooseFileToAttach=Liitä tiedosto(t)
-
genericFailureExplanation=Varmista, että sähköposti- ja keskusteluryhmätilien asetukset ovat oikein ja yritä uudelleen.
## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
@@ -196,6 +151,7 @@
## String used for attachment pretty name, when attachment is a message
messageAttachmentSafeName=Liitetty viesti
+
## String used for attachment pretty name, when attachment is message part
partAttachmentSafeName=Liitetty viestin osa
@@ -211,22 +167,26 @@
## String used if a file to attach does not exist when passed as
## a command line argument
errorFileAttachTitle=Liitä tiedosto
+
## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
errorFileAttachMessage=Tiedostoa %1$S ei löydy, eikä sitä siksi voitu liittää viestiin.
## Strings used by Save as Draft/Template dialog
SaveDialogTitle=Tallenna viesti
+
## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
SaveDialogMsg=Viestisi on tallennettu tilin %2$S kansioon %1$S.
CheckMsg=Älä näytä tätä valintaikkunaa enää uudestaan.
## Strings used by prompt when Quitting while in progress
quitComposeWindowTitle=Lähetetään viestiä
+
## LOCALIZATION NOTE (quitComposeWindowMessage2): don't translate \n
quitComposeWindowMessage2=%1$S lähettää parhaillaan viestiä.\nLopetetaanko vasta kun viesti on lähetetty vai lopetetaanko heti?
quitComposeWindowQuitButtonLabel2=&Lopeta
quitComposeWindowWaitButtonLabel2=&Odota
quitComposeWindowSaveTitle=Tallentaan viestiä
+
## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
quitComposeWindowSaveMessage=%1$S parhaillaan tallentaa viestiä.\nLopetetaanko vasta kun viesti on tallennettu vai lopetetaan heti?
@@ -234,14 +194,12 @@
sendMessageCheckWindowTitle=Lähetä viesti
sendMessageCheckLabel=Lähetetäänkö viesti?
sendMessageCheckSendButtonLabel=Lähetä
-
assemblingMessageDone=Kootaan viestiä…Valmis
assemblingMessage=Kootaan viestiä…
-
smtpDeliveringMail=Lähetetään postia…
smtpMailSent=Postin lähettäminen onnistui
-
assemblingMailInformation=Kootaan postin tietoja…
+
## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
gatheringAttachment=Liitetään tiedostoa %S…
creatingMailMessage=Luodaan sähköpostiviestiä…
@@ -250,24 +208,22 @@
copyMessageStart=Kopioidaan viestiä kansioon %S…
copyMessageComplete=Kopiointi valmis.
copyMessageFailed=Kopiointi epäonnistui.
-
filterMessageComplete=Suodatin suoritettiin.
filterMessageFailed=Suodattimen suoritus epäonnistui.
## LOCALIZATION NOTE (largeMessageSendWarning):
## Do not translate %S. It is the size of the message in user-friendly notation.
largeMessageSendWarning=Varoitus! Olet lähettämässä %S kokoista viestiä, joka voi olla suurempi kuin postipalvelin hyväksyy. Lähetetäänkö viesti?
-
sendingMessage=Lähetetään viestiä…
sendMessageErrorTitle=Viestin lähetyksen virhe
postingMessage=Lähetään viestiä…
-
sendLaterErrorTitle=Virhe myöhemmin lähettämisessä
saveDraftErrorTitle=Virhe luonnoksen tallentamisessa
saveTemplateErrorTitle=Virhe mallipohjan tallentamisessa
## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
failureOnObjectEmbeddingWhileSaving=Tiedoston %.200S liittämisessä viestiin tapahtui virhe. Tallennetaanko viesti ilman tätä tiedostoa?
+
## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
failureOnObjectEmbeddingWhileSending=Tiedoston %.200S liittämisessä viestiin tapahtui virhe. Lähetetäänkö viesti ilman tätä tiedostoa?
returnToComposeWindowQuestion=Palataanko viestin kirjoitus -ikkunaan?
@@ -275,8 +231,10 @@
## reply header in composeMsg
## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
mailnews.reply_header_authorwrotesingle=#1 kirjoitti:
+
## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
mailnews.reply_header_ondateauthorwrote=#2, #3, #1 kirjoitti:
+
## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
mailnews.reply_header_authorwroteondate=#1 kirjoitti #2 #3:
@@ -304,6 +262,7 @@
attachmentReminderTitle=Liitetiedostoista muistuttaja
attachmentReminderMsg=Unohditko liittää tiedoston?
+
# LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
# #1 number of keywords
@@ -315,6 +274,7 @@
# Strings used by the Filelink offer notification bar.
learnMore.label=Lue lisää…
learnMore.accesskey=L
+
# LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
# #1 number of big attached files
@@ -323,10 +283,8 @@
bigFileShare.accesskey=L
bigFileAttach.label=Ohita
bigFileAttach.accesskey=O
-
bigFileChooseAccount.title=Valitse tili
bigFileChooseAccount.text=Valitse pilvipalvelutili, johon liite siirretään
-
bigFileHideNotification.title=Älä siirrä tiedostoja
bigFileHideNotification.text=Sinua ei huomauteta vaikka liittäisit tähän viestiin lisää suuria tiedostoja.
bigFileHideNotification.check=Älä ikinä uudestaan huomauta tästä.
@@ -335,6 +293,7 @@
# %S. %S is the display name for the cloud account the attachment is being
# uploaded to.
cloudFileUploadingTooltip=Siirretään palveluun %S…
+
# LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
# %S. %S is the display name for the cloud account the attachment was uploaded
# to.
@@ -347,6 +306,7 @@
## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
## word $S. Place the word $S where the host name should appear.
smtpEnterPasswordPrompt=Kirjoita salasanasi palvelimelle %S:
+
## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
## words %1$S and %2$S. Place the word %1$S where the host name should appear,
## and %2$S where the user name should appear.
@@ -360,43 +320,47 @@
## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
## will be replaced with the name of the folder the message is being saved to.
errorSavingMsg=Viestin tallentamisessa kansioon %S tapahtui virhe. Yritetäänkö uudestaan?
-
errorFilteringMsg=Viesti lähetettiin ja tallennettiin, mutta suodattimen suorittaminen viestille epäonnistui.
-
errorCloudFileAuth.title=Todennusvirhe
+
## LOCALIZATION NOTE(errorCloudFileAuth.message):
## %1$S is the name of the online storage service that authentication failed against.
errorCloudFileAuth.message=Ei voitu todentaa palvelussa %1$S.
errorCloudFileUpload.title=Siirtovirhe
+
## LOCALIZATION NOTE(errorCloudFileUpload.message):
## %1$S is the name of the online storage service that uploading failed against.
## %2$S is the name of the file that failed to upload.
errorCloudFileUpload.message=Ei voitu siirtää tiedostoa %2$S palveluun %1$S.
errorCloudFileQuota.title=Tilavirhe
+
## LOCALIZATION NOTE(errorCloudFileQuota.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
errorCloudFileQuota.message=Tiedoston %2$S siirtäminen palveluun %1$S ylittäisi palvelussa olevan vapaan tilan.
errorCloudFileNameLimit.title=Tiedostonimivirhe
+
## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to the excess file name length
errorCloudFileNameLimit.message=Tiedoston %2$S siirtäminen palveluun %1$S epäonnistui, koska tiedostonimessä on yli 120 merkkiä. Anna tiedostolle uusi lyhyempi nimi ja yritä uudestaan.
errorCloudFileLimit.title=Tiedostokokovirhe
+
## LOCALIZATION NOTE(errorCloudFileLimit.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to size restrictions.
errorCloudFileLimit.message=Tiedosto %2$S ylittää palvelun %1$S maksimitiedostokoon.
errorCloudFileOther.title=Tuntematon virhe
+
## LOCALIZATION NOTE(errorCloudFileOther.message):
## %1$S is the name of the online storage service that cannot be communicated with.
errorCloudFileOther.message=Tapahtui tuntematon virhe kommunikoitaessa palvelun %1$S kanssa.
errorCloudFileDeletion.title=Poistamisvirhe
+
## LOCALIZATION NOTE(errorCloudFileDeletion.message):
## %1$S is the name of the online storage service that the file is to be deleted from.
## %2$S is the name of the file that failed to be deleted.
errorCloudFileDeletion.message=Tapahtui virhe poistettaessa tiedostoa %2$S palvelusta %1$S.
-
errorCloudFileUpgrade.label=Päivitä
## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
@@ -421,7 +385,6 @@
## upload notification bar to allow the user to dismiss the notification permanently.
stopShowingUploadingNotification.accesskey=Ä
stopShowingUploadingNotification.label=Älä näytä enää uudestaan
-
replaceButton.label=Korvaa…
replaceButton.accesskey=K
replaceButton.tooltip=Näytä Etsi ja korvaa -ikkuna
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/messenger.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/messenger.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/messenger.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/messenger.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -145,6 +145,8 @@
+
+
@@ -593,8 +595,10 @@
-
-
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/messenger.properties thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/messenger.properties
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/messenger.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/messenger.properties 2015-06-03 10:03:59.000000000 +0000
@@ -83,6 +83,7 @@
alertFilterCheckbox=\u00C4lä varoita minua jatkossa.
compactFolderDeniedLock=Kansiota %S ei voida tiivistää, koska toinen toiminto on varannut kansion. Yritä uudelleen, kun toiminto on valmis.
compactFolderWriteFailed=Kansiota %S ei voida tiivistää, koska kansioon kirjoittaminen epäonnistui. Varmista, että sinulla on tarpeeksi levytilaa ja kirjoitusoikeudet. Yritä sen jälkeen uudestaan.
+compactFolderInsufficientSpace=Joitain kansiota (esim. "%S") ei voida tiivistää, koska kiintolevyllä ei ole riittävästi vapaata tilaa. Vapauta levytilaa poistamalla tiedostoja ja yritä uudestaan.
filterFolderHdrAddFailed=Viestejä ei voitu suodattaa kansioon %S, koska viestin lisääminen kansioon epäonnistui. Tarkista, että kansio näkyy normaalisti tai yritä korjata sitä kansion ominaisuuksista.
filterFolderWriteFailed=Viestejä ei voitu suodattaa kansioon %S, koska kansioon kirjoittaminen epäonnistui. Varmista, että sinulla on tarpeeksi levytilaa ja kirjoitusoikeudet. Yritä sen jälkeen uudelleen.
copyMsgWriteFailed=Viestejä ei voitu siirtää tai kopioida kansioon %S, koska kansioon kirjoittaminen epäonnistui. Vapauttaaksesi levytilaa valitse Tiedosto-valikosta ensin Tyhjennä roskakori ja sitten Tiivistä kansiot, ja yritä uudelleen.
@@ -95,6 +96,7 @@
filterFolderTruncateFailed=Suodatin siirsi viestin kansioon %1$S, mutta saapuneet-kansion järjestelyssä tapahtui virhe. Voit joutua sulkemaan %2$Sin ja poistamaan tiedoston INBOX.msf.
mailboxTooLarge=Kansio %S on täynnä, eikä sinne voi tallentaa enempää viestejä. Vapauta tilaa poistamalla vanhoja tai tarpeettomia viestejä ja tiivistämällä kansio sen jälkeen.
+outOfDiskSpace=Kiintolevytila ei riitä uusille viesteille. Vapauta levytilaa poistamalla vanhoja viestejä, tyhjentämällä roskakori tai tiivistämällä kansioita ja yritä sitten uudelleen.
errorGettingDB=Yhteenvetotiedoston avaus kohteelle %S epäonnistui. Levyllä oli virhe tai polku on liian pitkä.
defaultServerTag=(Oletus)
@@ -124,9 +126,16 @@
authKerberos=Kerberos / GSSAPI
authExternal=TLS-varmenne
authNTLM=NTLM
+authOAuth2=OAuth2
authAnySecure=Mikä tahansa turvallinen tapa (vanhentunut)
authAny=Mikä tahansa (turvaton)
+# OAuth2 window title
+# LOCALIZATION NOTE(oauth2WindowTitle):
+# %1$S is the username (or full email address) used for authentication.
+# %2$S is the hostname of the account being authenticated.
+oauth2WindowTitle=Kirjoita salasana tunnukselle %1$S palvelimella %2$S
+
# LOCALIZATION NOTES(serverType-nntp): Do not translate "NNTP" in the line below
serverType-nntp=Keskusteluryhmäpalvelin (NNTP)
# LOCALIZATION NOTES(serverType-pop3): Do not translate "POP" in the line below
@@ -253,8 +262,9 @@
mailnews.send_default_charset=UTF-8
mailnews.view_default_charset=ISO-8859-1
-# generate display names in last first order
-# valid mail.addr_book.displayName.lastnamefirst are: true or false
+# whether to generate display names in last first order
+# LOCALIZATION NOTE(mail.addr_book.displayName.lastnamefirst):
+# the only valid values are: true OR false (choose from the untranslated English words)
mail.addr_book.displayName.lastnamefirst=false
# the format for "mail.addr_book.quicksearchquery.format" is:
@@ -268,7 +278,9 @@
#
mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
-# valid mail.addr_book.show_phonetic_fields are: true or false
+# whether to also show phonetic fields in the addressbook
+# LOCALIZATION NOTE(mail.addr_book.show_phonetic_fields):
+# the only valid values are: true OR false (choose from the untranslated English words)
mail.addr_book.show_phonetic_fields=false
# valid format options are:
@@ -480,6 +492,22 @@
megaByteAbbreviation2=%.*f Mt
gigaByteAbbreviation2=%.*f Gt
+## LOCALIZATION NOTE(folderWithAccount):
+## This is used to show folder name together with an account name.
+## %1$S = folder name
+## %2$S = account name
+folderWithAccount=%1$S - %2$S
+## LOCALIZATION NOTE(folderWithUnreadMsgs):
+## This is a concatenation of two strings to compose a folder label with unread messages.
+## %1$S = folder name
+## %2$S = count of unread messages
+folderWithUnreadMsgs=%1$S (%2$S)
+## LOCALIZATION NOTE(summarizedValue):
+## This string shows an indication that the value shown is actually a summary
+## accumulated from all subfolders.
+## %S = summarized value from all subfolders
+folderSummarizedValue=*%S
+
# Error message if message for a message id wasn't found
errorOpenMessageForMessageIdTitle=Virhe avattaessa viestitunnusta
errorOpenMessageForMessageIdMessage=Viestitunnukseen %S liittyvää viestiä ei löytynyt
@@ -722,9 +750,6 @@
update.downloadAndInstallButton.label=Päivitä versioon %S
update.downloadAndInstallButton.accesskey=P
-websearch.setDefault=Aseta valittu hakukone oletukseksi
-websearch.isDefault=Valittu hakukone on oletushakukone
-
outdatedpluginsMessage.title=Joistakin sivun käyttämistä liitännäisistä on uusia versioita.
outdatedpluginsMessage.updateButton.label=Päivitä liitännäiset…
outdatedpluginsMessage.updateButton.accesskey=P
@@ -776,3 +801,15 @@
ignoredSubthreadsFeedback=Vastauksia valittuun alaviestiketjuun ei näytetä.;Vastauksia #1 valittuun alaviestiketjuun ei näytetä.
# LOCALIZATION NOTE (saveAsType): replace %S with the extension of the file to be saved.
saveAsType=%S-tiedosto
+
+# LOCALIZATION NOTE (openSearch.label): The label used in the autocomplete
+# widget to refer to a search on the web for a short string containing at most
+# 15 characters. %1$S is the search provider to use. %2$S is the string to
+# search for.
+openSearch.label=Hae %1$S palvelusta "%2$S"
+
+# LOCALIZATION NOTE (openSearch.label.truncated): The label used in the
+# autocomplete widget to refer to a search on the web for a short string
+# containing more than 15 characters. %1$S is the search provider to use. %2$S
+# is the string to search for, truncated to 15 characters.
+openSearch.label.truncated=Hae palvelusta %1$S "%2$S…"
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/advanced.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/advanced.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/advanced.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -3,20 +3,21 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
-
-
-
-
+
+
+
+
@@ -38,6 +39,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/compose.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/compose.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/compose.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -6,6 +6,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/fonts.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/fonts.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/fonts.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/fonts.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -8,8 +8,8 @@
-
-
+
+
@@ -21,19 +21,17 @@
-
-
+
+
-
-
-
-
+
@@ -48,7 +46,11 @@
-
+
+
+
+
+
@@ -61,7 +63,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/general.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/general.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/general.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/general.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -35,3 +35,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/offline.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/offline.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/offline.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -11,8 +11,8 @@
-
-
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/preferences.dtd thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/mail/chrome/messenger/preferences/preferences.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/mail/chrome/messenger/preferences/preferences.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -17,3 +17,7 @@
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pipnss/nsserrors.properties thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pipnss/nsserrors.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pipnss/nsserrors.properties 2015-06-03 10:03:59.000000000 +0000
@@ -315,3 +315,5 @@
MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Palvelin käyttää tavallista rajoitelaajennusvarmennetta, joka tunnistaa sen varmentajaksi. Asianmukaisella varmenteella näin ei pitäisi olla.
MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=Palvelimen tarjoaman varmenteen avaimen koko on liian pieni suojatun yhteyden luomiseksi.
MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=X.509 versio 1 -varmenne, joka ei ole luotettu ankkuri, käytettiin palvelimen varmenteen allekirjoittamiseen. X.509 versio 1 -varmenteet ovat vanhentuneita, eikä niitä pitäisi käyttää muiden varmenteiden allekirjoittamiseen.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Palvelimen lähettämä varmenne ei ole vielä voimassa.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Palvelimen varmenne on myönnetty varmenteella, joka ei ole vielä voimassa.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pipnss/pipnss.properties thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pipnss/pipnss.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pipnss/pipnss.properties 2015-06-03 10:03:59.000000000 +0000
@@ -40,16 +40,12 @@
# End of size restriction.
VerifySSLClient=SSL-asiakasohjelman varmenne
VerifySSLServer=SSL-palvelimen varmenne
-VerifySSLStepUp=SSL-palvelin step-up -tuella
VerifySSLCA=SSL-varmentaja
VerifyEmailSigner=Sähköpostin allekirjoittajan varmenne
VerifyEmailRecip=Sähköpostin vastaanottajan varmenne
-VerifyProtectObjSign=Suojatun objektin allekirjoittaja
VerifyObjSign=Objektin allekirjoittaja
-VerifyUserImport=Käyttäjän tuoma varmenne
VerifyCAVerifier=Varmentajan todentaja
VerifyStatusResponder=Tilakyselyn vastaajan varmenne
-VerifyAnyCA=Mikä tahansa varmentaja
HighGrade=Korkeatasoinen
MediumGrade=Keskitasoinen
# LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
@@ -61,7 +57,6 @@
CertDumpVersion2=Versio 2
CertDumpVersion3=Versio 3
CertDumpSerialNo=Sarjanumero
-CertDumpOID=Objektin tunniste
CertDumpMD2WithRSA=PKCS #1 MD2 RSA-salauksella
CertDumpMD5WithRSA=PKCS #1 MD5 RSA-salauksella
CertDumpSHA1WithRSA=PKCS #1 SHA-1 RSA-salauksella
@@ -69,11 +64,8 @@
CertDumpSHA384WithRSA=PKCS #1 SHA-384 RSA-salauksella
CertDumpSHA512WithRSA=PKCS #1 SHA-512 RSA-salauksella
CertDumpDefOID=Objektin tunniste (%S)
-CertDumpNULL=NULL
CertDumpIssuer=Myöntäjä
CertDumpSubject=Kohde
-CertDumpRDN=Suhteellinen yksikäsitteinen nimi
-CertDumpATV=Ominaisuuden tyyppi ja arvo
CertDumpAVACountry=C
CertDumpAVAState=ST
CertDumpAVALocality=L
@@ -245,44 +237,25 @@
CertDumpRawBytesHeader=Koko: %S tavua / %S bittiä
VerifySSLClient_p=Asiakasohjelma
VerifySSLServer_p=Palvelin
-VerifySSLStepUp_p=Step-up
VerifySSLCA_p=SSL-CA
VerifyEmailSigner_p=Allekirjoita
VerifyEmailRecip_p=Salaa
-VerifyProtectObjSign_p=Suojatun objektin allekirjoittaja
VerifyObjSign_p=Objektin allekirjoittaja
-VerifyUserImport_p=Käyttäjän tuoma
VerifyCAVerifier_p=CA-todentaja
VerifyStatusResponder_p=Tilakyselyn vastaaja
-VerifyAnyCA_p=CA
-VerifiedTrue=tosi
-VerifiedFalse=epätosi
PK11BadPassword=Kirjoitettu salasana oli väärä.
SuccessfulP12Backup=Varmenteiden ja salaisten avainten varmuuskopiointi onnistui.
SuccessfulP12Restore=Varmenteiden ja salaisten avainten palauttaminen onnistui.
-PKCS12PasswordInvalid=PKCS #12 -tiedoston purku ei onnistunut. Ehkä kirjoitettu salasana oli väärä?
PKCS12DecodeErr=Tiedoston purku epäonnistui. Joko se ei ole PKCS #12 -muodossa, se on viallinen, tai kirjoittamasi salasana oli väärä.
PKCS12UnknownErrRestore=PKCS #12 -tiedoston palauttaminen epäonnistui tuntemattomasta syystä.
PKCS12UnknownErrBackup=PKCS #12 -tiedoston varmuuskopiointi epäonnistui tuntemattomista syistä.
PKCS12UnknownErr=PKCS #12 -toiminto epäonnistui tuntemattomista syistä.
PKCS12InfoNoSmartcardBackup=Varmenteiden varmuuskopioiminen turvalaitteelta, kuten älykortilta, ei ole mahdollista.
PKCS12DupData=Varmenne ja salainen avain ovat jo olemassa tällä turvalaitteella.
-AddModulePrompt=Asennetaanko tämä turvallisuusmoduuli?
-AddModuleName=Moduulin nimi: %S
-AddModulePath=Polku: %S
-AddModuleSuccess=Uusi turvallisuusmoduuli on asennettu
AddModuleFailure=Moduulin lisääminen ei onnistunut
AddModuleDup=Turvallisuusmoduuli on jo olemassa
-DelModuleBadName=Moduulin nimi ei kelpaa.
DelModuleWarning=Poistetaanko tämä turvallisuusmoduuli?
DelModuleError=Moduulin poistaminen ei onnistu
-DelModuleIntSuccess=Sisäisen turvallisuusmoduulin poisto onnistui
-DelModuleExtSuccess=Ulkoisen turvallisuusmoduulin poisto onnistui
-ForcedBackup1=Uudesta turvallisuusvarmenteesta ja siihen liittyvästä salaisesta avaimesta on suositeltua tehdä salasanalla suojattu varmuuskopio.
-ForcedBackup2=Jos henkilökohtaisen turvallisuussalasanan unohtumisen tai tiedoston korruptoitumisen vuoksi menetät kyvyn käyttää salaista avaintasi, voit palauttaa salaisen avaimen ja varmenteen tältä varmuuskopiolta.
-ForcedBackup3=Napsauta OK tehdäksesi kopion. Varmuuskopio tulisi tallentaa erillisille levylle, jota pidetään turvallisessa paikassa.
-UnknownCertIssuer=(Tuntematon julkaisija)
-UnknownCertOrg=(Tuntematon myöntäjä)
AVATemplate=%S = %S
PSMERR_SSL_Disabled=Suojatun yhteyden muodostaminen ei onnistu, koska SSL-yhteiskäytäntö on otettu pois käytöstä.
@@ -295,7 +268,6 @@
certErrorTrust_SelfSigned=Varmenteeseen ei luoteta, koska se on allekirjoitettu itsellään.
certErrorTrust_UnknownIssuer=Varmenteeseen ei luoteta, koska sen myöntäjän varmenne on tuntematon.
-certErrorTrust_MissingChain=Varmenteeseen ei luoteta, koska varmentajaketjua ei ole.
certErrorTrust_CaInvalid=Varmenteeseen ei luoteta, koska sen varmentajan varmenne ei ole kelvollinen.
certErrorTrust_Issuer=Varmenteeseen ei luoteta, koska sen myöntäjän varmenteeseen ei luoteta.
certErrorTrust_SignatureAlgorithmDisabled=Varmenteeseen ei luoteta, koska se on allekirjoitettu allekirjoitusalgoritmilla, joka ei ole suojattu.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pipnss/security.properties thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pipnss/security.properties
--- thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pipnss/security.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pipnss/security.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Title=Turvallisuusvaroitus
-PostToInsecureFromSecureMessage=Tämä sivu on salattu, mutta sivulliset voivat helposti lukea sille kirjoitetut tiedot koska ne lähetetään salaamatta.##Lähetetäänkö nämä tiedot?##
-Continue=Jatka
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/certManager.dtd thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/certManager.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/certManager.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -10,9 +10,6 @@
-
-
-
@@ -37,7 +34,6 @@
-
@@ -49,11 +45,6 @@
-
-
-
-
-
@@ -72,8 +63,6 @@
-
-
@@ -91,7 +80,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/deviceManager.dtd thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/deviceManager.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/deviceManager.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -11,11 +11,7 @@
-
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/pippki.dtd thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/pippki.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/pippki.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -9,7 +9,6 @@
-
@@ -21,19 +20,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -42,9 +28,7 @@
-
-
@@ -63,9 +47,6 @@
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/pippki.properties thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/pippki.properties
--- thunderbird-38.0~b3+build2/l10n/fi/security/manager/chrome/pippki/pippki.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/security/manager/chrome/pippki/pippki.properties 2015-06-03 10:03:59.000000000 +0000
@@ -11,7 +11,6 @@
unnamedCA=Varmentaja (nimeämättä)
#For editing cert trust
-editTrustWindowTitle=Muokkaa varmenteen luottamusta
editTrustCA=Varmenne %S todentaa varmentajan.
editTrustEmail=Varmenteen %S on myöntänyt:
issuerNotTrusted=Koska tämän varmenteen varmentajaan ei luoteta, myöskään varmenteeseen ei luoteta, ellei tässä toisin määritetä.
@@ -44,10 +43,7 @@
chooseP12RestoreFileDialog2=Tuotavan varmennetiedoston nimi
chooseP12BackupFileDialog=Varmuuskopioitavan tiedoston nimi
file_browse_PKCS12_spec=PKCS12-tiedostot
-
-
-#Preferences
-resetPreferences=Nollaa tästä painikkeesta %Sin turvallisuusasetukset oletuksiinsa.
+getPKCS12FilePasswordMessage=Kirjoita salasana, jota käytettiin varmenteiden varmuuskopion salaukseen:
#Cert verification
certVerified=Tämä varmenne on seuraaviin tarkoituksiin:
@@ -65,18 +61,16 @@
clientAuthMessage2=Myönnetty alle: %S
#Page Info
-pageInfo_SiteNotVerified=Sivuston identiteettiä ei ole varmennettu
-pageInfo_WebSiteVerified=Sivuston identiteetti varmennettu
-pageInfo_Identity_Verified=Palvelin %S tukee todennusta tarkastellulla sivulla. Sivun identiteetin todentaa luotettu varmentaja %S.
-pageInfo_ViewCertificate=Tarkastele tämän sivuston identiteetin todentavaa varmennetta.
pageInfo_NoEncryption=Yhteys ei ole salattu
pageInfo_Privacy_None1=Palvelin %S ei käytä salausta tällä sivulla.
pageInfo_Privacy_None2=Sivulliset voivat lukea verkossa salaamatta siirrettyjä tietoja.
pageInfo_Privacy_None3=Tätä sivua ei ole salattu.
-# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
+# %1$S is the name of the encryption standard,
# %2$S is the key size of the cipher.
# %3$S is protocol version like "SSL 3" or "TLS 1.2"
pageInfo_EncryptionWithBitsAndProtocol=Yhteys salattu (%1$S, %2$S-bittinen avain, %3$S)
+pageInfo_BrokenEncryption=Rikkinäinen salaus (%1$S, %2$S-bittinen avain, %3$S)
pageInfo_Privacy_Encrypted1=Tämä sivu salattiin ennen sen siirtoa.
pageInfo_Privacy_Encrypted2=Salauksen vuoksi asiattomien on hyvin vaikea tarkastella tietokoneiden välillä siirtyvää tietoa. Siksi on epätodennäköistä, että kukaan luki tätä sivua sen siirtyessä verkon yli.
pageInfo_MixedContent=Yhteys osittain salattu
@@ -85,7 +79,6 @@
#Cert Viewer
certDetails=Tarkastele varmennetta:
notPresent=
-unknownIssuer=
escrowFinalMessage=Valitse OK, vain jos luotat tahon %S suojaamaan salaista salausavaintasi.
@@ -158,7 +151,6 @@
addExceptionCheckingLong2=Yritetään tunnistaa sivustoa…
addExceptionNoCertShort=Tietoja ei ole saatavilla
addExceptionNoCertLong2=Tunnistustietoja ei ollut saatavilla sivustolle.
-addExceptionConnectionFailed=Yhteys epäonnistui
#Certificate Exists in database
caCertExistsTitle=Varmenne löytyi
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutReader.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutReader.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutReader.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutReader.properties 2015-06-03 10:03:59.000000000 +0000
@@ -5,15 +5,15 @@
aboutReader.loading=Ladataan...
aboutReader.loadError=Artikkelin lataaminen sivulta epäonnistui
-aboutReader.colorSchemeLight=Vaalea
-aboutReader.colorSchemeDark=Tumma
-aboutReader.colorSchemeSepia=Sepia
-aboutReader.colorSchemeAuto=Automaattinen
-
-# LOCALIZATION NOTE (aboutReader.fontTypeSerif, aboutReader.fontTypeSansSerif):
-# These are the names of the fonts that are used.
-aboutReader.fontTypeSerif=Charis SIL Compact
-aboutReader.fontTypeSansSerif=Clear Sans
+aboutReader.colorScheme.light=Vaalea
+aboutReader.colorScheme.dark=Tumma
+aboutReader.colorScheme.sepia=Sepia
+aboutReader.colorScheme.auto=Automaattinen
+
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Serif
+aboutReader.fontType.sans-serif=Sans-serif
# LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
aboutReader.fontTypeSample=Aa
@@ -22,4 +22,16 @@
# for the font size setting. Tapping different samples will change the font size.
aboutReader.fontSizeSample=A
-aboutReader.toolbarTip=Kosketa ruutua nähdäksesi lukutilan valinnat
+aboutReader.toolbar.close=Sulje lukutila
+aboutReader.toolbar.typeControls=Kirjasinasetukset
+aboutReader.toolbar.addToReadingList=Lisää lukulistaan
+aboutReader.toolbar.removeFromReadingList=Poista lukulistasta
+aboutReader.toolbar.openReadingList=Avaa lukulista
+aboutReader.toolbar.closeReadingList=Sulje lukulista
+aboutReader.toolbar.share=Jaa
+
+aboutReader.footer.deleteThisArticle=Poista artikkeli
+
+# Reader View toolbar button
+readerView.enter=Avaa lukutila
+readerView.close=Sulje lukutila
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutSupport.dtd thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutSupport.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutSupport.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -37,9 +37,11 @@
+
-
+
@@ -95,3 +97,6 @@
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutSupport.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutSupport.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutSupport.properties 2015-06-03 10:03:59.000000000 +0000
@@ -86,3 +86,8 @@
hasSeccompBPF = Seccomp-BPF (Järjestelmäkutsujen suodatus)
canSandboxContent = Sisältöprosessin suorittaminen hiekkalaatikossa
canSandboxMedia = Medialiitännäisen suorittaminen hiekkalaatikossa
+
+# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
+# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
+# or 'false')
+multiProcessStatus = %1$S/%2$S (oletus: %3$S)
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutTelemetry.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/aboutTelemetry.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/aboutTelemetry.properties 2015-06-03 10:03:59.000000000 +0000
@@ -7,6 +7,8 @@
# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
pageSubtitle = Tällä sivulla näet Kaukomittaus-toiminnallisuuden keräämät tiedot suorituskyvystä ja ominaisuuksien käyttöuseudesta. Sivulla näkyvät tiedot lähetetään %1$Slle auttamaan %2$Sin kehityksessä.
+generalDataTitle = Yleistiedot
+
generalDataHeadingName = Nimi
generalDataHeadingValue = Arvo
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/browser.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/browser.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/browser.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/browser.properties 2015-06-03 10:03:59.000000000 +0000
@@ -8,3 +8,7 @@
browsewithcaret.checkButtonLabel=Kyllä
plainText.wordWrap=Rivitä pitkät rivit
+
+formPostSecureToInsecureWarning.title = Turvallisuusvaroitus
+formPostSecureToInsecureWarning.message = Antamasi tiedot tullaan lähettämään salaamattoman yhteyden kautta, ja muut henkilöt voivat helposti lukea niitä.\n\nHaluatko varmasti jatkaa tietojen lähettämistä?
+formPostSecureToInsecureWarning.continue = Jatka
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/devtools/debugger.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/devtools/debugger.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/devtools/debugger.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/devtools/debugger.properties 2015-06-03 10:03:59.000000000 +0000
@@ -14,11 +14,46 @@
# dialog that prompts the user to allow the incoming connection.
remoteIncomingPromptTitle=Incoming Connection
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# LOCALIZATION NOTE (remoteIncomingPromptHeader): Header displayed on the
# dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=An incoming request to permit remote debugging connection was detected. A remote client can take complete control over your browser! Allow connection?
+remoteIncomingPromptHeader=An incoming request to permit remote debugging connection was detected. A remote client can take complete control over your browser!
+# LOCALIZATION NOTE (remoteIncomingPromptClientEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the client such as "127.0.0.1:6000"
+remoteIncomingPromptClientEndpoint=Client Endpoint: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptServerEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the server such as "127.0.0.1:6000"
+remoteIncomingPromptServerEndpoint=Server Endpoint: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptFooter): Footer displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptFooter=Allow connection?
# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
# third button in the incoming connection dialog that lets the user disable the
# remote debugger server.
remoteIncomingPromptDisable=Disable
+
+# LOCALIZATION NOTE (clientSendOOBTitle): The title displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBTitle=Client Identification
+# LOCALIZATION NOTE (clientSendOOBHeader): Header displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBHeader=The endpoint you are connecting to needs more information to authenticate this connection. Please provide the token below in the prompt that appears on the other end.
+# LOCALIZATION NOTE (clientSendOOBHash): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The client's cert fingerprint
+clientSendOOBHash=My Cert: %1$S
+# LOCALIZATION NOTE (clientSendOOBToken): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The authentication token that the user will transfer.
+clientSendOOBToken=Token: %1$S
+
+# LOCALIZATION NOTE (serverReceiveOOBTitle): The title displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBTitle=Provide Client Token
+# LOCALIZATION NOTE (serverReceiveOOBBody): Main text displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBBody=The client should be displaying a token value. Enter that token value here to complete authentication with this client.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/fallbackMenubar.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/fallbackMenubar.properties 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/fallbackMenubar.properties 2015-06-03 10:03:59.000000000 +0000
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Lopeta
+quitMenuitem.key=L
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/textcontext.dtd thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/textcontext.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/global/textcontext.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/global/textcontext.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -24,3 +24,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties 2015-06-03 10:03:59.000000000 +0000
@@ -32,17 +32,16 @@
offlineCancelDownloadsAlertMsg=Jos nyt siirryt yhteydettömään tilaan, yhden tiedoston lataus peruutetaan. Siirrytäänkö yhteydettömään tilaan?
offlineCancelDownloadsAlertMsgMultiple=Jos nyt siirryt yhteydettömään tilaan, %S tiedoston lataus peruutetaan. Siirrytäänkö yhteydettömään tilaan?
leavePrivateBrowsingCancelDownloadsAlertTitle=Peruutetaanko kaikki lataukset?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=Jos suljet kaikki yksityisen selaustilan ikkunat, 1 lataus peruutetaan. Suljetaanko yksityisen selaustilan ikkunat?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=Jos suljet kaikki yksityisen selaustilan ikkunat, %S latausta peruutetaan. Suljetaanko yksityisen selaustilan ikkunat?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=Jos suljet kaikki yksityisen selaustilan ikkunat, 1 lataus peruutetaan. Suljetaanko yksityisen selaustilan ikkunat?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=Jos suljet kaikki yksityisen selaustilan ikkunat, %S latausta peruutetaan. Suljetaanko yksityisen selaustilan ikkunat?
cancelDownloadsOKText=Peruuta lataus
cancelDownloadsOKTextMultiple=Peruuta %S latausta
dontQuitButtonWin=Älä lopeta
dontQuitButtonMac=Älä lopeta
dontGoOfflineButton=Pysy yhteystilassa
-dontEnterPrivateBrowsingButton=Älä siirry yksityiseen selaustilaan
-dontLeavePrivateBrowsingButton=Pysy yksityisessä selaustilassa
+dontLeavePrivateBrowsingButton2=Pysy yksityisessä selaustilassa
downloadsCompleteTitle=Lataukset valmiita
-downloadsCompleteMsg=Kaikki tiedostot on ladattu.
+downloadsCompleteMsg=Kaikki tiedostot on ladattu.
# LOCALIZATION NOTE (infiniteRate):
# If download speed is a JavaScript Infinity value, this phrase is used
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -4,6 +4,7 @@
+
@@ -228,3 +229,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/extensions/extensions.properties 2015-06-03 10:03:59.000000000 +0000
@@ -56,8 +56,8 @@
notification.installError=Tapahtui virhe asennettaessa lisäosaa %1$S.
notification.installError.retry=Yritä uudestaan
notification.installError.retry.tooltip=Yritä ladata ja asentaa lisäosaa uudestaan
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Asennetaan kohta.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S asennetaan kohta.
#LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
contributionAmount2=Suositeltu lahjoitus: %S
@@ -99,8 +99,8 @@
details.notification.uninstall=Lisäosa %1$S poistetaan %2$Sin seuraavan käynnistyksen yhteydessä.
#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
details.notification.upgrade=Lisäosa %1$S päivitetään %2$Sin seuraavan käynnistyksen yhteydessä.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Asennetaan kohta.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S asennetaan kohta.
# LOCALIZATION NOTE (details.experiment.time.daysRemaining):
# Semicolon-separated list of plural forms.
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-38.0~b3+build2/l10n/fi/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-06-03 10:03:59.000000000 +0000
@@ -39,3 +39,4 @@
+
diff -Nru thunderbird-38.0~b3+build2/l10n/fi/webapprt/webapprt/overrides/appstrings.properties thunderbird-38.0~b6+build2/l10n/fi/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/fi/webapprt/webapprt/overrides/appstrings.properties 2015-04-29 23:42:08.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fi/webapprt/webapprt/overrides/appstrings.properties 2015-06-03 10:03:59.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Tämä sovellus yritti avata sisältöä, jolla on tietosuojakäytäntö joka estää sen sisällyttämiseen tällä tavalla.
corruptedContentError=Sovellusta ei voida ladata, koska tiedonsiirrossa tapahtui virhe.
remoteXUL=Tämä sovellus käyttää teknologiaa, jota ei enää oletuksena tueta.
+sslv3Used=Tämä sovellus ei voi taata tietojesi turvallisuutta palvelimella %S, koska se käyttää rikkoutunutta turvallisuuskäytäntöä SSLv3.
diff -Nru thunderbird-38.0~b3+build2/l10n/fy-NL/toolkit/chrome/global/resetProfile.dtd thunderbird-38.0~b6+build2/l10n/fy-NL/toolkit/chrome/global/resetProfile.dtd
--- thunderbird-38.0~b3+build2/l10n/fy-NL/toolkit/chrome/global/resetProfile.dtd 2015-04-29 23:43:06.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/fy-NL/toolkit/chrome/global/resetProfile.dtd 2015-06-03 10:04:49.000000000 +0000
@@ -5,11 +5,11 @@
-
-
+
+
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/chat/irc.properties thunderbird-38.0~b6+build2/l10n/hsb/chat/irc.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/chat/irc.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/chat/irc.properties 2015-06-03 10:06:35.000000000 +0000
@@ -148,7 +148,7 @@
# LOCALIZATION NOTE (error.*):
-# These are shown as error messages in the server tab.
+# These are shown as error messages in the conversation or server tab.
# %S is the channel name.
error.noChannel=Njeje žadyn kanal: %S.
error.tooManyChannels=Přistup k %S njemóžno; sy do přewjele kanalow zastupił.
@@ -173,6 +173,9 @@
error.notChannelOwner=Njejsće wobsedźer kanala %S.
error.wrongKey=Do %S njeda so zastupić, njepłaćiwe kanalowe hesło.
error.sendMessageFailed=Při słanju wašeje poslednjeje powěsće je zmylk wustupił. Prošu spytajće hišće raz, hdyž zwisk je so wobnowił.
+# %1$S is the channel the user tried to join, %2$S is the channel
+# he was forwarded to.
+error.channelForward=Snano nochceće so %1$S přidružić, a budźeće so awtomatisce do %2$S dale sposrědkować.
# LOCALIZATION NOTE (tooltip.*):
# These are the descriptions given in a tooltip with information received
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/dom/chrome/appstrings.properties thunderbird-38.0~b6+build2/l10n/hsb/dom/chrome/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/dom/chrome/appstrings.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/dom/chrome/appstrings.properties 2015-06-03 10:06:35.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Tuta strona ma wěstotne prawidła za wobsah, kotrež zasadźenju na tute wašnje zadźěwaja.
corruptedContentError=Strona, kotruž chceće sej wobhladać, njeda so pokazać, dokelž je so zmylk při přenošowanju datow namakał.
remoteXUL=Tuta strona wužiwa njepodpěrowanu technologiju, kotraž jako standard we Firefoxu k dispoziciji njesteji.
+sslv3Used=Wěstota wašich datow na %S njeda so garantować, dokelž so SSLv3 wužiwa, złamany wěstotny protokol.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/dom/chrome/plugins.properties thunderbird-38.0~b6+build2/l10n/hsb/dom/chrome/plugins.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/dom/chrome/plugins.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/dom/chrome/plugins.properties 2015-06-03 10:06:36.000000000 +0000
@@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# LOCALIZATION NOTE (plugins.properties):
-# Those strings are inserted into an HTML page, so you all HTML characters
+# Those strings are inserted into an HTML page, so all HTML characters
# have to be escaped in a way that they show up correctly in HTML!
title_label=Wo tykačach
@@ -20,5 +20,11 @@
description_label=Wopisanje
suffixes_label=Sufiksy
+# GMP Plugins
+gmp_license_info=Licencne informacije
+
openH264_name=OpenH264 Video Codec wot Cisco Systems, Inc.
openH264_description=Wothrajće webwideja a wužiwajće widejochaty.
+
+eme-adobe_name=Primetime Content Decryption Module provided by Adobe Systems, Incorporated
+eme-adobe_description=Škitane webwidejo wothrać.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/dom/chrome/security/security.properties thunderbird-38.0~b6+build2/l10n/hsb/dom/chrome/security/security.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/dom/chrome/security/security.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/dom/chrome/security/security.properties 2015-06-03 10:06:35.000000000 +0000
@@ -4,7 +4,18 @@
BlockMixedActiveContent = Začitowanje měčaneho aktiwneho wobsaha "%1$S" zablokowane
# CORS
-CrossSiteRequestBlocked=Naprašowanje křižneho pochada je so zablokowało: Samsna pochadna směrnica zakazuje čitanje dalokeje resursy při %1$S. To da so porjedźić, z tym, zo so resursa do samsneje domeny přesunje abo CORS so zmóžnja.
+# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
+CORSDisabled=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: CORS je znjemóžnjeny).
+CORSRequestFailed=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: CORS-naprašowanje je so nimokuliło).
+CORSRequestNotHttp=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: CORS-naprašowanje http njeje).
+CORSMissingAllowOrigin=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: CORS-hłowa 'Access-Control-Allow-Origin' faluje).
+CORSAllowOriginNotMatchingOrigin=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: CORS-hłowa 'Access-Control-Allow-Origin' '%2$S' njewotpowěduje).
+CORSMethodNotFound=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: Metoda w CORS-hłowje 'Access-Control-Allow-Methods' so njenamaka).
+CORSMissingAllowCredentials=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: 'true' so w CORS-hłowje 'Access-Control-Allow-Credentials' wočakuje).
+CORSPreflightDidNotSucceed=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: Preflight-kanal CORS njeje wuspěšny był).
+CORSInvalidAllowMethod=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: njepłaćiwy token '%2$S' w CORS-hłowje 'Access-Control-Allow-Methods').
+CORSInvalidAllowHeader=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: njepłaćiwy token '%2$S' w CORS-hłowje 'Access-Control-Allow-Headers').
+CORSMissingAllowHeaderFromPreflight=Naprašowanje Cross-Origin je so zablokowało: Prawidła Same Origin zakazuje čitanje zdaleneje resursy na %1$S. (Přičina: falowacy token '%2$S' w CORS-hłowje 'Access-Control-Allow-Headers' z preflight-kanala CORS).
# LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
InvalidSTSHeaders=Sydło je njepłaćiwu hłowowu linku Strict-Transport-Security podało.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/aboutDialog.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/aboutDialog.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/aboutDialog.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -12,19 +12,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
@@ -41,6 +59,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -3,8 +3,9 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
-
@@ -160,6 +161,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -2,6 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/addressbook/addressBook.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/addressbook/addressBook.properties 2015-06-03 10:06:35.000000000 +0000
@@ -9,6 +9,8 @@
lastFirstFormat=%S, %S
firstLastFormat=%S %S \u0020
+allAddressBooks=Wšě adresniki
+
newContactTitle=Nowy kontakt
# %S will be the contact's display name
newContactTitleWithDisplayName=Nowy kontakt za %S
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/am-server-top.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/am-server-top.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/am-server-top.dtd 2015-06-03 10:06:36.000000000 +0000
@@ -84,3 +84,7 @@
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/chat.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/chat.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/chat.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/chat.properties 2015-06-03 10:06:35.000000000 +0000
@@ -92,4 +92,17 @@
log.currentWeek=Tutón tydźeń
log.previousWeek=Zańdźeny tydźeń
+# LOCALIZATION NOTE (messagePreview):
+# This is the default message preview to be shown
+# when the user has chosen not to show any info in the notification about the
+# incoming message being notified.
messagePreview=Nowa chatowa powěsć
+
+#LOCALIZATION NOTE (bundledMessagePreview): Semi-colon list of plural forms.
+# Used when multiple incoming messages from the same sender are bundled
+# into a single notification.
+# #1 is the number of incoming messages the user is being notified about. When #1
+# is greater than one, the plural form after the semicolon is used.
+# Do not translate %1$S, it is the message preview to be shown in the
+# notification, i.e. the first incoming message.
+bundledMessagePreview=%1$S… (a #1 dalša powěsć);%1$S… (a #1 dalšej powěsći);%1$S… (a #1 dalše powěsće);%1$S… (a #1 dalšich powěsćow)
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -2,5 +2,5 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/FilterEditor.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/FilterEditor.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/FilterEditor.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/FilterEditor.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -25,6 +25,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/filter.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/filter.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/filter.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/filter.properties 2015-06-03 10:06:35.000000000 +0000
@@ -24,6 +24,12 @@
continueButtonLabel=Pokročować
cannotEnableFilter=Tutón filter bu najskerje přez přichodnu wersiju wot Mozilla/Netscape załoženy. Njemóžeće tutón filter zmóžnić, dokelž njewěmy, kak dyrbi so nałožić.
dontWarnAboutDeleteCheckbox=Hižo so njeprašeć
+
+# LOCALIZATION NOTE(filterFAilureWarningPrefix)
+# %1$S=filter error action
+# %2$S=error code as hexadecimal string.
+filterFailureWarningPrefix=Filtrowanska akcija je so nimokuliło: "%1$S" ze zmylkowym kodom=%2$S za pospyt:
+
searchTermsInvalidTitle=Pytanske wurazy njepłaćiwe
# LOCALIZATION NOTE(searchTermsInvalidRule)
# %1$S=search attribute name from the invalid rule
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/glodaComplete.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/glodaComplete.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/glodaComplete.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/glodaComplete.properties 2015-06-03 10:06:35.000000000 +0000
@@ -17,15 +17,3 @@
# a set of words, or a phrase containing multiple words (e.g. "red pepper")
# We use the same words in en-US, but maybe that's not always true.
glodaComplete.messagesMentioningMany.label=Powěsće, kotrež naspominaja: #1
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
-# autocomplete widget to refer to a search on the web for a short string
-# containing at most 15 characters. #1 is the search provider to use. #2 is
-# the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label=#1 za #2 přepytać
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
-# the autocomplete widget to refer to a search on the web for a short string
-# containing more than 15 characters. #1 is the search provider to use. #2 is
-# the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label.truncated=#1 za #2 přepytać…
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/imapMsgs.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/imapMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/imapMsgs.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/imapMsgs.properties 2015-06-03 10:06:35.000000000 +0000
@@ -75,17 +75,15 @@
imapEmptyMimePart=Tutón dźěl powěsćoweho tekst sćehnje so na žadanje.
-# LOCALIZATION NOTE (imapReceivingMessageHeaders): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the header currently being downloaded should appear.
-# Place the word %3$lu where the number of headers should appear.
-imapReceivingMessageHeaders=Hłowa powěsće %lu z %lu z %S so sćahuje
-
-# LOCALIZATION NOTE (imapReceivingMessageFlags): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the flag currently being downloaded should appear.
-# Place the word %3$lu where the number of flags should appear.
-imapReceivingMessageFlags=Powěsćowa chorhojčka %lu z %lu z %S so sćahuje
+# LOCALIZATION NOTE (imapReceivingMessageHeaders2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of headers should appear.
+imapReceivingMessageHeaders2=Hłowa powěsće %lu z %lu z %S so sćahuje…
+
+# LOCALIZATION NOTE (imapReceivingMessageFlags2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of flags should appear.
+imapReceivingMessageFlags2=Powěsćowa chorhojčka %lu z %lu z %S so sćahuje…
imapDeletingMessages=Powěsće so hašeja…
@@ -107,10 +105,10 @@
# Place the word %S in your translation where the name of the folder should appear.
imapCopyingMessage=Powěsć so do %S kopěruje…
-# LOCALIZATION NOTE (imapFolderReceivingMessageOf): Do not translate the word "%S" or "%lu" below.
+# LOCALIZATION NOTE (imapFolderReceivingMessageOf2): Do not translate the word "%S" or "%lu" below.
# Place the word %S in your translation where the name of the folder should appear.
# Place the word %lu where the number of headers should appear.
-imapFolderReceivingMessageOf=%S - Powěsć %lu z %lu so sćahuje
+imapFolderReceivingMessageOf2=%S - Powěsć %lu z %lu so sćahuje…
# LOCALIZATION NOTE (imapDiscoveringMailbox): Do not translate the word "%S" below.
# Place the word %S in your translation where the name of the folder should appear.
@@ -196,11 +194,11 @@
# Out of memory
imapOutOfMemory=Nałoženje nima žadyn składowanski rum.
-# LOCALIZATION NOTE (imapCopyingMessageOf): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessageOf2): Do not translate the word "%S" below.
# Place the word %3$S in your translation where the name of the destination folder should appear.
# Place the word %1$S where the currently copying message should appear.
# Place the word %2$S where the total number of messages should appear.
-imapCopyingMessageOf=Powěsć %1$S z %2$S so do %3$S kopěruje
+imapCopyingMessageOf2=Powěsć %1$S z %2$S so do %3$S kopěruje…
# LOCALIZATION NOTE (imapMoveFolderToTrash): Do not translate the word %S below.
# "%S" is the the name of the folder.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/localMsgs.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/localMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/localMsgs.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/localMsgs.properties 2015-06-03 10:06:35.000000000 +0000
@@ -40,8 +40,6 @@
# %2$S will receive the total number of messages
receivedMsgs=%1$S z %2$S powěsćow je so přijało
-pop3OutOfDiskSpace=Njeje dosć tačeloweho ruma , zo bychu nowe powěsće sćahnyli. Spytajće stary póst zhašeć, papjernik wuprózdnić a swoje e-mejlowe rjadowaki zhusćić, a spytajće potom hišće raz.
-
# Status - parsing folder
#LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
# Place the word %S where the name of the mailbox should appear
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-06-03 10:06:36.000000000 +0000
@@ -9,162 +9,117 @@
## %S will be replaced with the name of file that could not be opened
unableToOpenFile=Dataja %S njeda so wočinić.
unableToOpenTmpFile=Temporarna dataja %S njeda so wočinić. Skontrolujće nastajenja 'temporarny zapis'.
-
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Njeje móžno, wašu powěsć jako předłohu składować.
-
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Njeje móžno, wašu powěsć jako naćisk składować.
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Rjadowak 'Pósłane' njeda so wočinić. Prošu skontrolujće, hač waše e-mejlowe nastajenja su korektne.
-
-## @name NS_MSG_NO_SENDER
-12510=Njebu žadyn wotpósłar podaty. Prošu zapisajće swoju e-mejlowu adresu w kontowych nastajenjach.
-
-## @name NS_MSG_NO_RECIPIENTS
-12511=Njebuchu žani přijimarjo podaći. Prošu zapodajće přijimarja abo diskusijnu skupinu w adresowem polu.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Zmylk při pisanju temporarneje dataje.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=Při słanju e-mejle je zmylk wustupił. E-mejlowy serwer wotmołwi: %s. Prošu skontrolujće, hač waša e-mejlowa adresa w e-mejlowych nastajenjach je korektna a spytajće hišće raz.
-
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=Při słanju e-mejle je zmylk (SMTP) wustupił. Serwer wotmołwi: %s.
-
-## @name NS_ERROR_SENDING_MESSAGE
-12517=Při słanju je zmylk wustupił. E-mejlowy serwer wotmołwi: %s. Prošu přepruwujće powěśc a spytajće hišće raz.
-
-## @name NS_ERROR_POST_FAILED
-12518=Powěsć njeda so wotpósłać, dokelž zwjazanje z diskusijnym serwerom je so njeporadźiło. Móžno, zo serwer k dispoziciji njesteji abo zwiski wotpokazuje. Prošu skontrolujće, hač nastajenja wašeho diskusijneho serwera su korektne a spytajće hišće raz abo stajće so ze swojim syćowym administratorom do zwiska.
-
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=Při dodawanju njepósłanych powěsćow je zmylk wustupił.
-
-## @name NS_ERROR_SEND_FAILED
-12520=Słanje powěsće je so njeporadźiło.
-
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=Při słanju e-mejle je zmylk wustupił: zmylk SMTP-serwera. Serwer wotmołwi: %s Stajće so ze swojim administratorom do zwiska a prošće jeho wo pomoc.
-
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Njeje móžno, wašu powěsć składować, zo byšće ju pozdźišo pósłał.
-
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=Je komunikaciski zmylk wustupił: %d. Prošu spytajće hišće raz.
-
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=TO JE JENOŽ ZASTUPOWACY ZNAMJEŠKOWY RJEĆAZK. WY NJEMĚŁ TUTÓN RJEĆAZK ŽENJE WIDŹEĆ.
-
-## @name NS_ERROR_TCP_READ_ERROR
-12528=Při přijimowanju datow je syćowy zmylk wustupił. (Syćowy zmylk: %s) Spytajće hišće raz zwjazać.
-
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=Při słanju e-mejle je zmylk wustupił: nawrótna póstowa adresa bě njepłaćiwa. Prošu skontrolujće, hač waša e-mejlowa adresa w kontowych nastajenjach je korektna a spytajće hišće raz.
-
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Přiwěškowy zmylk.
-
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=Powěsć je so wuspěšnje wotpósłała, ale njeda so do wašeho rjadowaka Pósłane kopěrować.
-
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=Móžeće powěsć jenož na jedyn diskusijny serwer naraz pósłać.
-
-## @name NS_MSG_CANCELLING
-12555=Přetorhuje so…
-
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Waša powěsć bu do diskusijneje skupiny pósłana, ale nic na druheho přijimarja.
-
-## @name NS_MSG_ERROR_READING_FILE
-12563=Zmylk při čitanju dataje.
-
+unableToSaveTemplate=Njeje móžno, wašu powěsć jako předłohu składować.
+unableToSaveDraft=Njeje móžno, wašu powěsć jako naćisk składować.
+couldntOpenFccFolder=Rjadowak 'Pósłane' njeda so wočinić. Prošu skontrolujće, hač waše kontowe nastajenja su korektne.
+noSender=Njeje so žadyn wotpósłar podał. Prošu přidaće swoju e-mejlowu adresu w kontowych nastajenjach.
+noRecipients=Njebuchu žani přijimarjo podaći. Prošu zapodajće přijimarja abo diskusijnu skupinu w adresowem polu.
+errorWritingFile=Zmylk při pisanju temporarneje dataje.
+
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingFromCommand=Při słanju e-mejle je zmylk wustupił. E-mejlowy serwer wotmołwi: %s. Prošu skontrolujće, hač waša e-mejlowa adresa w kontowych nastajenjach je korektna a spytajće hišće raz.
+
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingDataCommand=Při słanju e-mejle je zmylk wuchadneho serwera (SMTP) wustupił. Serwer wotmołwi: %s.
+
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=Při słanju je zmylk wustupił. E-mejlowy serwer wotmołwi: %s. Prošu přepruwujće powěśc a spytajće hišće raz.
+postFailed=Powěsć njeda so wotpósłać, dokelž zwjazowanje z diskusijnym serwerom je so nimokuliło. Je móžno, zo serwer k dispoziciji njeje abo zwiski wotpokazuje. Prošu skontrolujće, hač nastajenja wašeho diskusijneho serwera su korektne a spytajće hišće raz.
+errorQueuedDeliveryFailed=Při dodawanju njepósłanych powěsćow je zmylk wustupił.
+sendFailed=Słanje powěsće je so nimokuliło.
+
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
+smtpServerError=Při słanju e-mejle je zmylk wustupił: Zmylk wuchadneho serwera (SMTP). Serwer wotmołwi: %s.
+unableToSendLater=Bohužel njemóžachmy wašu powěsć za pozdźiše słanje składować.
+
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=Je komunikaciski zmylk wustupił: %d. Prošu spytajće hišće raz.
+dontShowAlert=TO JE JENOŽ ZASTUPOWACY ZNAMJEŠKOWY RJEĆAZK. WY NJEMĚŁ TUTÓN RJEĆAZK ŽENJE WIDŹEĆ.
+
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=Při přijimowanju datow je syćowy zmylk wustupił. (Syćowy zmylk: %s) Spytajće hišće raz zwjazać.
+couldNotGetUsersMailAddress=Při słanju e-mejle je zmylk wustupił: nawrótna e-mejlowa adresa běše njepłaćiwa. Prošu skontrolujće, hač waša e-mejlowa adresa we wašich kontowych nastajenjach je korektna a spytajće hišće raz.
+mimeMpartAttachmentError=Přiwěškowy zmylk.
+failedCopyOperation=Powěsć je so wuspěšnje wotpósłała, ale njeda so do wašeho rjadowaka Pósłane kopěrować.
+nntpNoCrossPosting=Móžeće powěsć jenož na jedyn diskusijny serwer naraz pósłać.
+msgCancelling=Přetorhuje so…
+sendFailedButNntpOk=Waša powěsć je so do diskusijneje skupiny pósłała, ale nic na druheho přijimarja.
+errorReadingFile=Zmylk při čitanju dataje.
followupToSenderMessage=Awtor tuteje powěsće je požadał, zo wotmołwy maja so jenož na awtora słać. Jeli chceće tež diskusijnej skupinje wotmołwić, přidajće adresowemu dialogej nowu linku, wubjerće Diskusijna skupina z lisćiny přijimarjow, a zapodajće mjeno diskusijneje skupiny.
-## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=Při připowěšenju %S je zmylk wustupił. Prošu skontrolujće, hač maće přistup na dataju.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of the object to be attached
+errorAttachingFile=Při připowěšenju %S je zmylk wustupił. Prošu skontrolujće, hač maće přistup na dataju.
-## @name NS_ERROR_SMTP_GREETING
-12572=Při słanju e-mejle je zmylk wustupił: E-mejlowy serwer je wopačne powitanje pósłał: %s.
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
+incorrectSmtpGreeting=Při słanju e-mejle je zmylk wustupił: E-mejlowy serwer je wopačne powitanje pósłał: %s.
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=Při słanju e-mejle je zmylk wustupił. E-mejlowy serwer wotmołwi: %1$s. Prošu skontrolujće přijimarja powěsće %2$s a spytaj hišće raz.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
+errorSendingRcptCommand=Při słanju e-mejle je zmylk wustupił. E-mejlowy serwer wotmołwi: \n%1$S.\n Prošu skontrolujće powěsćoweho přijimarja "%2$S" a spytaj hišće raz.
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=Při słanju e-mejle je zmylk wustupił: Njeje móžno, wěsty zwisk ze SMTP-serwerom %S z pomocu STARTTLS wutworić, dokelž nima tu funkciju. Wupińće STARTTLS za tón serwer abo stajće so ze swojim poskićowarjom słužby do zwiska.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
+startTlsFailed=Při słanju e-mejle je zmylk wustupił: Njeje móžno, wěsty zwisk z wuchadnym serwerom (SMTP) %S z pomocu STARTTLS wutworić, dokelž nima tu funkciju. Wupińće STARTTLS za tón serwer abo stajće so ze swojim poskićowarjom słužby do zwiska.
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=Při słanju e-mejle je zmylk wustupił: Njeda so hesło za %S dóstać. Powěsć njeje so pósłała.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
+smtpPasswordUndefined=Při słanju e-mejle je zmylk wustupił: Njeda so hesło za %S dóstać. Powěsć njeje so pósłała.
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=Wulkosć powěsće, kotruž pospytujeće słać, překročuje temporarnu wulkosćowy limit serwera. Powěsć njeje so pósłała; spytajće wulkosć powěsće redukować abo čakajće chwilku a spytajće hišće raz. Serwer wotmołwi: %s.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=Wulkosć powěsće, kotruž pospytujeće słać, překročuje temporarnu wulkosćowy limit serwera. Powěsć njeje so pósłała; spytajće wulkosć powěsće redukować abo čakajće chwilku a spytajće hišće raz. Serwer wotmołwi: %s.
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=Wulkosć powěsće, kotruž pospytujeće słać, překročuje globalny wulkosćowy limit (%d bajtow) serwera. Powěsc njeje so pósłała; zredukujće wulkosć powěsće spytajće hišće raz.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=Wulkosć powěsće, kotruž pospytujeće słać, překročuje globalny wulkosćowy limit (%d bajtow) serwera. Powěsc njeje so pósłała; zredukujće wulkosć powěsće spytajće hišće raz.
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=Wulkosć powěsće, kotruž pospytujeće słać, překročuje globalny wulkosćowy limit serwera. Powěsc njeje so pósłała; zredukujće wulkosć powěsće spytajće hišće raz. Serwer wotmołwi: %s.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the Outgoing server (SMTP) response
+smtpPermSizeExceeded2=Wulkosć powěsće, kotruž pospytujeće słać, překročuje globalny wulkosćowy limit serwera. Powěsc njeje so pósłała; zredukujće wulkosć powěsće spytajće hišće raz. Serwer wotmołwi: %s.
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=Při słanju e-mejle je zmylk wustupił: SMTP-serwer %S je njeznaty. Móže być, zo serwer je wopak skonfigurowany. Prošu skontrolujće, hač nastajenja wašeho SMTP-serwera su korektne a spytajće hišće raz.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownServer=Při słanju e-mejle je zmylk wustupił: Wuchadny serwer (SMTP) %S je njeznaty. Móže być, zo serwer je wopak skonfigurowany. Prošu skontrolujće, hač nastajenja wašeho wuchadneho serwera (SMTP) su korektne a spytajće hišće raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=Powěsć njeda so słać, dokelž zwjazowanje ze SMTP-serwerom %S je so njeporadźiło. Móže być, zo serwer k dispoziciji njesteji abo SMTP-zwiski wotpokazuje. Prošu skontrolujće, hač nastajenja wašeho SMTP-serwera su korektne a spytajće hišće raz, abo stajće so ze serwerowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRefused=Powěsć njeda so wotpósłać, dokelž zwjazowanje z wuchadnym serwerom (SMTP) %S je so nimokuliło. Je móžno, zo serwer k dispoziciji njeje abo zwiski wuchadneho serwera (SMTP) wotpokazuje. Prošu skontrolujće, hač nastajenja wašeho wuchadneho serwera (SMTP) su korektne a spytajće hišće raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=Powěsć njeda so słać, dokelž zwisk ze SMTP-serwerom %S je so za transakciju zhubił. Spytajće hišće raz abo stajće so ze swojim syćowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
+smtpSendInterrupted=Powěsć njeda so słać, dokelž zwisk z wuchadnym serwerom (SMTP) %S je so za transakciju zhubił. Spytajće hišće raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=Powěsć njeda so słać, dokelž zwisk ze SMTP-serwerom %S je čas překročił. Spytajće hišće raz abo stajće so ze swojim syćowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
+smtpSendTimeout=Powěsć njeda so słać, dokelž zwisk z wuchadnym serwerom (SMTP) %S je čas překročił. Spytajće hišće raz.
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=Powěsć njeda so ze SMTP-serwerom %S z njeznateje přičiny słać. Prošu skontrolujće, hač nastajenja wašeho SMTP-serwara su korektne a spytajće hišće raz, abo stajće so ze swojim syćowym administratorom do zwiska.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownReason=Powěsć njeda so z njeznateje přičiny z pomocu wuchadneho serwera (SMTP) %S słać. Prošu skontrolujće, hač nastajenja wašeho wuchadneho serwera (SMTP) su korektne a spytajće hišće raz.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=Zda so, z SMTP-serwer %S zaklučowane hesła njepodpěruje. Jeli sće swoje konto runje připrawił, wubjerće prošu 'Hesło, njewěsće přenjesene' jako 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serwerowe nastajenja'. Jeli zwjetša funguje a so nětko nadobo njeporadźi, je to zwučene znamjo, kak něchtó móhł waše hesło kradnyć.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainNoSsl=Zda so, zo wuchadny serwer (SMTP) %S zaklučowane hesła njepodpěruje. Jeli runje konto konfigurujeće, spytajće 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serwerowe nastajenja' do 'Hesło, njewěsće přenjesene' změnić. Jeli to zwjetša funguje, ale nětko nic, je móžno, zo so waše hesło kradnje.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12595): $S is server hostname
-12595=Zda so, z SMTP-serwer %S zaklučowane hesła njepodpěruje. Jeli sće swoje konto runje připrawił, wubjerće prošu 'Normalne hesło' jako 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serverowe nastajenja'. Jeli zwjetša funguje a so nětko nadobo njeporadźi, stajće so prošu ze swojim e-mejlowym administratorom abo poskićowarjom do zwiska.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainSsl=Zda so, zo wuchadny serwer (SMTP) %S zaklučowane hesła njepodpěruje. Jeli runje konto konfigurujeće, spytajće 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serwerowe nastajenja' do 'Normalne hesło' změnić.
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12596): $S is server hostname
-12596=SMTP-serwer %S njedowola hesła luteho teksta. Prošu wubjerće 'Zaklučowane hesło' jako 'awtentifikacisku metodu' w 'Kontowe Nastajenja | Serwerowe nastajenja'.
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
+smtpAuthChangePlainToEncrypt=Wuchadny serwer (SMTP) %S hesła z luteho teksta njepodpěruje. Prošu spytajće 'awtentifikacisku metodu' w 'Kontowe nastajenja | Serwerowe nastajenja' do 'Zaklučowane hesło' změnić.
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Njeje móžno SMTP-serwer %S awtentifikować. Prošu skontrolujće hesło, a přepruwujće 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
+smtpAuthFailure=Njeje móžno wuchadny serwer (SMTP) %S awtentifikować. Prošu skontrolujće hesło, a přepruwujće 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=Tiket Kerberos/GSSAPI njebu wot SMTP-serwera %S akceptowany. Prošu skontrolujće, hač sće pola wobwoda Kerberos/GSSAPI přizjewjeny.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
+smtpAuthGssapi=Tiket Kerberos/GSSAPI njebu wot wuchadneho serwera (SMTP) %S akceptowany. Prošu skontrolujće, hač sće pola wobwoda Kerberos/GSSAPI přizjewjeny.
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=SMTP-serwer %S njepodpěruje wubranu awtentifikacisku metodu. Prošu změńće 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
+smtpAuthMechNotSupported=Wuchadny serwer (SMTP) %S njepodpěruje wubranu awtentifikacisku metodu. Prošu změńće 'awtentifikacisku metodu' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)'.
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=Njeje móžno SMTP-serwer %S awtentifikować. Njepodpěruje awtentifikaciju (SMTP-AUTH), wy wšak chceće awtentifikaciju wužiwać. Prošu změńće 'awtentifkacisku metodu' do Žana' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)' abo stajće so ze swojim e-mejlowym poskićowarjom za instrukcije do zwiska.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
+smtpAuthNotSupported=Njeje móžno wuchadny serwer (SMTP) %S awtentifikować. Njepodpěruje awtentifikaciju (wuchadny serwer (SMTP)-AUTH), wy wšak chceće awtentifikaciju wužiwać. Prošu změńće 'awtentifkacisku metodu' do Žana' w 'Kontowe nastajenja | Wuchadny serwer (SMTP)' abo stajće so ze swojim e-mejlowym poskićowarjom za instrukcije do zwiska.
-## @name NS_ERROR_ILLEGAL_LOCALPART
# LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
errorIllegalLocalPart=W lokalnym dźělu adresy přijimarja %s su nje-ASCII-znamješka. To so hišće njepodpěruje. Prošu změńće tutu adresu a spytajće hišće raz.
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
saveDlogTitle=Powěsć składować
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
saveDlogMessages=Powěsć njeje so pósłała. Chceće powěsć w swojim rjadowaku Naćiski składować (%1$S)?
## generics string
defaultSubject=(žana tema)
chooseFileToAttach=Dataje připowěsnyć
-
-genericFailureExplanation=Prošu skontrolujće, hač waše kontowe nastajenje su korektne a spytajće hišće raz.
+genericFailureExplanation=Prošu skontrolujće, hač waše kontowe nastajenja su korektne a spytajće hišće raz.
## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
undisclosedRecipients=skryći přijimarjo
@@ -182,21 +137,22 @@
sendWithEmptySubjectButton=Bjez temy pó&słać
cancelSendingButton=Pósłanje přetor&hnyć
-## Strings used by the dialog that informs about lack of newsgroup support.
+## Strings used by the dialog that informs about the lack of newsgroup support.
noNewsgroupSupportTitle=Diskusijne skupiny so njepodpěruja
recipientDlogMessage=Tute konto jenož e-mejlowych přijimarjow podpěruje. Jeli pokročujeće, budu so diskusijne skupiny ignorować.
-## Strings used by the alert that tells the user an e-mail address is invalid.
+## Strings used by the alert that tells the user that an e-mail address is invalid.
addressInvalidTitle=Njepłaćiwa přijimarska adresa
addressInvalid=%1$S njeje płaćiwa e-mejlowa adresa, dokelž nima forma wužiwar@serwer. Dyrbiće ju korigować, prjedy hač e-mejl pósćeleće.
-## String used by the dialog that ask the user to attach a web page
+## String used by the dialog that asks the user to attach a web page
attachPageDlogTitle=Prošu podajće město, kotrež ma so připowěsnyć
attachPageDlogMessage=Webstrona (URL):
-## String used for attachment pretty name, when attachment is a message
+## String used for attachment pretty name, when the attachment is a message
messageAttachmentSafeName=Připowěsnjena powěsć
-## String used for attachment pretty name, when attachment is message part
+
+## String used for attachment pretty name, when the attachment is a message part
partAttachmentSafeName=Připowěsnjeny powěsćowy dźěl
# LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
@@ -211,73 +167,75 @@
## String used if a file to attach does not exist when passed as
## a command line argument
errorFileAttachTitle=Dataju připowěsnyć
+
## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
errorFileAttachMessage=Dataja %1$S njeeksistuje a njeda so tohodla k powěsći připowěsnyć.
-## Strings used by Save as Draft/Template dialog
+## Strings used by the Save as Draft/Template dialog
SaveDialogTitle=Powěsć składować
-## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
+
+## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
SaveDialogMsg=Waša powěsć je so do rjadowaka %1$S na %2$S składowała.
CheckMsg=Tutón dialog hižo njepokazać.
-## Strings used by prompt when Quitting while in progress
+## Strings used by the prompt when Quitting while in progress
quitComposeWindowTitle=Powěsć pósłać
+
## LOCALIZATION NOTE (quitComposeWindowMessage2): don't translate \n
quitComposeWindowMessage2=%1$S tuchwilu powěsć sćele.\nChceće čakać, doniž powěsć njeje so pósłała, prjedy hač skónčiće abo nětko skónčić?
quitComposeWindowQuitButtonLabel2=&Skónčić
quitComposeWindowWaitButtonLabel2=Ča&kać
quitComposeWindowSaveTitle=Powěsć składować
+
## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
quitComposeWindowSaveMessage=%1$S tuchwilu powěsć składuje.\nChceće čakać, doniž powěsć njeje so składowała, prjedy hač skónčiće abo nětko skónčić?
-## Strings used by prompt for Ctrl-Enter check before sending message
+## Strings used by the prompt for Ctrl-Enter check before sending message
sendMessageCheckWindowTitle=Powěsć pósłać
sendMessageCheckLabel=Sće woprawdźe hotowy, tutu powěsć pósłać?
sendMessageCheckSendButtonLabel=Pósłać
-
assemblingMessageDone=Powěsć so zestaja…Hotowo
assemblingMessage=Powěsć so zestaja…
-
smtpDeliveringMail=Póst so dodawa…
smtpMailSent=Póst wuspěšnje pósłany
-
assemblingMailInformation=Póstowe informacije so zestajeja…
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
+
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is the file name/URI of attachment
gatheringAttachment=%S so připowěša…
creatingMailMessage=Póstowa powěsć so wutworja…
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
+## LOCALIZATION NOTE (copyMessageStart): argument %S is the folder name
copyMessageStart=Powěsć so do rjadowaka %S kopěruje…
copyMessageComplete=Kopěrowanje zakónčene.
copyMessageFailed=Kopěrowanje je so njeporadźiło.
-
filterMessageComplete=Filter je dospołny.
filterMessageFailed=Filter njeje so poradźił.
## LOCALIZATION NOTE (largeMessageSendWarning):
## Do not translate %S. It is the size of the message in user-friendly notation.
-largeMessageSendWarning=Warnowanje! Chceće runje powěsć z wulkosću %S słać, kotraž dowoleny limit na e-mejlowym serwerje překročuje. Chceće to woprawdźe činić?
-
+largeMessageSendWarning=Warnowanje! Chceće powěsć z %S bajtami pósłać. Chceće to woprawdźe činić?
sendingMessage=Powěsć so sćele…
sendMessageErrorTitle=Zmylk při słanju powěsće
postingMessage=Powěsć so wotesyła…
-
sendLaterErrorTitle=Zmylk při pozdźišim słanju
saveDraftErrorTitle=Zmylk při składowanju naćiska
saveTemplateErrorTitle=Zmylk při składowanju předłohi
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is the file name/URI of object to be embedded
failureOnObjectEmbeddingWhileSaving=Při zasadźenju dataje %.200S do powěsće je problem wustupił. Chceće powěsć bjez tuteje dataje składować?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is the file name/URI of object to be embedded
failureOnObjectEmbeddingWhileSending=Při zasadźenju dataje %.200S do powěsće je problem wustupił. Chceće powěsć bjez tuteje dataje pósłać?
returnToComposeWindowQuestion=Chceće so do spisowanskeho wokna wróćić?
## reply header in composeMsg
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is the author (name of the person replying to)
mailnews.reply_header_authorwrotesingle=#1 napisa:
-## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is the author, #2 is the date, #3 is the time
mailnews.reply_header_ondateauthorwrote=#2 #3 #1 napisa:
-## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is the author, #2 is the date, #3 is the time
mailnews.reply_header_authorwroteondate=#1 #2 #3 napisa:
## reply header in composeMsg
@@ -294,7 +252,7 @@
## Attachment Reminder
## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
-## words that that should trigger an attachment reminder.
+## words that should trigger an attachment reminder.
mail.compose.attachment_reminder_keywords=.doc,.pdf,.xls,.ppt,.rtf,.pps,attachment,attach,attached,attaching,enclosed,CV,cover letter
addAttachmentButton=Přiwěšk přidać…
@@ -304,6 +262,7 @@
attachmentReminderTitle=Přiwěškowe napominanje
attachmentReminderMsg=Sće zabył přiwěšk přidać?
+
# LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
# #1 number of keywords
@@ -315,6 +274,7 @@
# Strings used by the Filelink offer notification bar.
learnMore.label=Dalše informacije…
learnMore.accesskey=i
+
# LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
# #1 number of big attached files
@@ -323,10 +283,8 @@
bigFileShare.accesskey=k
bigFileAttach.label=Ignorować
bigFileAttach.accesskey=I
-
bigFileChooseAccount.title=Konto wubrać
bigFileChooseAccount.text=Wubjerće mróčelowe konto, zo by přiwěšk nahrał
-
bigFileHideNotification.title=Dataje njenahrać
bigFileHideNotification.text=Njedóstanjeće žanu zdźělenku, jeli dalše wulke dataje k tutej powěsći připowěsnjeće.
bigFileHideNotification.check=Wo tym hižo njeinformować.
@@ -335,6 +293,7 @@
# %S. %S is the display name for the cloud account the attachment is being
# uploaded to.
cloudFileUploadingTooltip=Nahraje so do %S…
+
# LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
# %S. %S is the display name for the cloud account the attachment was uploaded
# to.
@@ -345,13 +304,14 @@
cloudFilePrivacyNotification=Wotkazowanje je zakónčene. Prošu wobkedźbujće, zo wotkazane přiwěški móža za ludźi přistupne być, kotřiž móža wotkazy zhódać abo widźeć.
## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
-## word $S. Place the word $S where the host name should appear.
+## word %S. Place the word %S where the host name should appear.
smtpEnterPasswordPrompt=Zapodajće swoje hesło za %S:
+
## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
## words %1$S and %2$S. Place the word %1$S where the host name should appear,
## and %2$S where the user name should appear.
smtpEnterPasswordPromptWithUsername=Zapodajće swoje hesło za %2$S na %1$S:
-smtpEnterPasswordPromptTitle=Hesło za SMTP-serwer trěbne
+smtpEnterPasswordPromptTitle=Hesło wuchadneho serwera (SMTP) je trěbne
# LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
@@ -360,43 +320,47 @@
## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
## will be replaced with the name of the folder the message is being saved to.
errorSavingMsg=Při składowanju powěsće do %S je zmylk wustupił. Hišće raz spytać?
-
errorFilteringMsg=Waša powěsć je so pósłała a składowała, ale při filtrowanju powěsće je zmylk wustupił.
-
errorCloudFileAuth.title=Awtentifikaciski zmylk
+
## LOCALIZATION NOTE(errorCloudFileAuth.message):
-## %1$S is the name of the online storage service that authentication failed against.
+## %1$S is the name of the online storage service against which the authentication failed.
errorCloudFileAuth.message=Awtentifikacija napřećo %1$S je njemóžno.
errorCloudFileUpload.title=Nahraćowy zmylk
+
## LOCALIZATION NOTE(errorCloudFileUpload.message):
-## %1$S is the name of the online storage service that uploading failed against.
+## %1$S is the name of the online storage service against which the uploading failed.
## %2$S is the name of the file that failed to upload.
errorCloudFileUpload.message=Njeje móžno %2$S do %1$S nahrać.
errorCloudFileQuota.title=Kwotowy zmylk
+
## LOCALIZATION NOTE(errorCloudFileQuota.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
errorCloudFileQuota.message=Nahrawanje dataje %2$S do %1$S by waš webskładowy limit překročiło.
errorCloudFileNameLimit.title=Zmylk datajoweho mjena
+
## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to the excess file name length
-errorCloudFileNameLimit.message=Dataja %2$S při nahrawanju do %1$S wjace hač 120 znamješkow w swojim mjenje wobsahuje. Prošu přemjenujće dataju, zo by 120 znamješkow abo mjenje w jeje mjenje było a nahrajće hišće raz.
+errorCloudFileNameLimit.message=%2$S ma přez 120 znamješkow w swojim mjenje, štož je wjace hač maksimalna dołhośc datajoweho mjena za %1$S. Prošu přemjenujće dataju, zo byšće mjeno dataje na 120 znamješkow abo mjenje redukował a nahrajće hišće raz.
errorCloudFileLimit.title=Zmylk datajoweje wulkosće
+
## LOCALIZATION NOTE(errorCloudFileLimit.message):
## %1$S is the name of the online storage service being uploaded to.
## %2$S is the name of the file that could not be uploaded due to size restrictions.
errorCloudFileLimit.message=%2$S překročuje maksimalnu wulkosć za %1$S.
errorCloudFileOther.title=Njeznaty zmylk
+
## LOCALIZATION NOTE(errorCloudFileOther.message):
## %1$S is the name of the online storage service that cannot be communicated with.
errorCloudFileOther.message=Při komunikowanju z %1$S je njeznaty zmylk wustupił.
errorCloudFileDeletion.title=Hašenski zmylk
+
## LOCALIZATION NOTE(errorCloudFileDeletion.message):
## %1$S is the name of the online storage service that the file is to be deleted from.
## %2$S is the name of the file that failed to be deleted.
errorCloudFileDeletion.message=Při hašenju %2$S z %1$S je problem wustupił.
-
errorCloudFileUpgrade.label=Aktualizować
## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
@@ -411,7 +375,7 @@
cloudAttachmentListFooter=%1$S wosnadnja, wulke dataje přez e-mejl dźělić.
## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
-## attachment, to be inserted into the message body. Do not translate the words
+## attachment to be inserted into the message body. Do not translate the words
## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
## %3$S is the name of the cloud storage service, and %4$S is the link to the
## attachment.
@@ -421,7 +385,6 @@
## upload notification bar to allow the user to dismiss the notification permanently.
stopShowingUploadingNotification.accesskey=n
stopShowingUploadingNotification.label=To ženje hižo njepokazać
-
replaceButton.label=Wuměnić…
replaceButton.accesskey=m
replaceButton.tooltip=Dialog Pytać a wuměnić pokazać
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/messenger.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/messenger.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/messenger.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/messenger.dtd 2015-06-03 10:06:36.000000000 +0000
@@ -145,6 +145,8 @@
+
+
@@ -593,7 +595,9 @@
-
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/messenger.properties thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/messenger.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/messenger.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/messenger.properties 2015-06-03 10:06:35.000000000 +0000
@@ -83,6 +83,7 @@
alertFilterCheckbox=Hišće raz njewarnować.
compactFolderDeniedLock=Rjadowak '%S' njeda so zhusćić, dokelž so druha operacija wotměwa. Prošu spytajće pozdźišo hišće raz.
compactFolderWriteFailed=Rjadowak '%S' njeda so zhusćić, dokelž pisanje do rjadowaka je so njeporadźiło. Prošu přepruwujće, hač maće dosć tačeloweho ruma a hač maće pisanske prawa za datajowy system, spytajće potom hišće raz.
+compactFolderInsufficientSpace=Někotre rjadowaki (na př. '%S') njehodźa so zhušćić, dokelž dosć swobodneho składowanskeho ruma njeje. Prošu zhašejće někotre dataje a spytajće hišće raz.
filterFolderHdrAddFailed=Tute powěsće njehodźa so do rjadowaka '%S' filtrować, dokelž njeje so poradźiło, jemu powěsć přidać. Přepruwujće, hač so rjadowak porjadnje zwobraznja abo spytajće jón z kajkosćow rjadowaka porjedźić.
filterFolderWriteFailed=Powěsće njedachu so do rjadowaka '%S' filtrować, dokelž pisanje do rjadowaka je so njeporadźiło. Přepruwujće, hač maće dosć tačeloweho ruma a hač maće pisanske prawa za datajowy system, spytajće potom hišće raz.
copyMsgWriteFailed=Powěsće njedachu so do rjadowaka '%S' přesunyć abo kopěrować, dokelž pisanje do rjadowaka je so njeporadźiło. Zo byšće tačelowy rum dobył, dźiće do menija Dataja, wubjerće potom Papjernik wuprózdnić, potom Rjadowaki zhusćić a spytajće potom hišće raz.
@@ -95,6 +96,7 @@
filterFolderTruncateFailed=Při wobrězanju póstoweho kašćika po filtrowanju powěsće do rjadowaka '%1$S' je zmylk wustupił. Móžno, zo dyrbiće %2$S začinić a dataju INBOX.msf zhašeć.
mailboxTooLarge=Rjadowak %S je połny a njemóže dalše powěsće přiwzać. Zo byšće rum za dalše powěsće dobył, zhašejće stary abo njewitanu e-mejl a zhušćće rjadowak.
+outOfDiskSpace=Njeje dosć tačeloweho ruma , zo bychu nowe powěsće sćahnyli. Spytajće stary póst zhašeć, papjernik wuprózdnić a swoje e-mejlowe rjadowaki zhusćić, a spytajće potom hišće raz.
errorGettingDB=Njeje móžno, zjimansku dataju za %S wočinić. Snadź bě zmylk na tačeli abo połna šćežka je předołha.
defaultServerTag=(Standard)
@@ -124,9 +126,16 @@
authKerberos=Kerberos / GSSAPI
authExternal=TLS-certifikat
authNTLM=NTLM
+authOAuth2=OAuth2
authAnySecure=Wěsta metoda (njeschwalene)
authAny=Wěsta metoda (njewěste)
+# OAuth2 window title
+# LOCALIZATION NOTE(oauth2WindowTitle):
+# %1$S is the username (or full email address) used for authentication.
+# %2$S is the hostname of the account being authenticated.
+oauth2WindowTitle=Zapodajće přizjewjenske daty za %1$S na %2$S
+
# LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
serverType-nntp=Diskusijny serwer (NNTP)
# LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
@@ -253,8 +262,9 @@
mailnews.send_default_charset=UTF-8
mailnews.view_default_charset=UTF-8
-# generate display names in last first order
-# valid mail.addr_book.displayName.lastnamefirst are: true or false
+# whether to generate display names in last first order
+# LOCALIZATION NOTE(mail.addr_book.displayName.lastnamefirst):
+# the only valid values are: true OR false (choose from the untranslated English words)
mail.addr_book.displayName.lastnamefirst=false
# the format for "mail.addr_book.quicksearchquery.format" is:
@@ -268,7 +278,9 @@
#
mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
-# valid mail.addr_book.show_phonetic_fields are: true or false
+# whether to also show phonetic fields in the addressbook
+# LOCALIZATION NOTE(mail.addr_book.show_phonetic_fields):
+# the only valid values are: true OR false (choose from the untranslated English words)
mail.addr_book.show_phonetic_fields=false
# valid format options are:
@@ -474,6 +486,22 @@
megaByteAbbreviation2=%.*f MB
gigaByteAbbreviation2=%.*f GB
+## LOCALIZATION NOTE(folderWithAccount):
+## This is used to show folder name together with an account name.
+## %1$S = folder name
+## %2$S = account name
+folderWithAccount=%1$S - %2$S
+## LOCALIZATION NOTE(folderWithUnreadMsgs):
+## This is a concatenation of two strings to compose a folder label with unread messages.
+## %1$S = folder name
+## %2$S = count of unread messages
+folderWithUnreadMsgs=%1$S (%2$S)
+## LOCALIZATION NOTE(summarizedValue):
+## This string shows an indication that the value shown is actually a summary
+## accumulated from all subfolders.
+## %S = summarized value from all subfolders
+folderSummarizedValue=*%S
+
# Error message if message for a message id wasn't found
errorOpenMessageForMessageIdTitle=Zmylk při wočinjenju ID powěsće
errorOpenMessageForMessageIdMessage=Powěsć za ID powěsće %S njenamakana
@@ -716,9 +744,6 @@
update.downloadAndInstallButton.label=Na %S aktualizować
update.downloadAndInstallButton.accesskey=a
-websearch.setDefault=Tutu pytawu jako standard nastajić
-websearch.isDefault=Tuta pytawa je tuchwilu standard
-
outdatedpluginsMessage.title=Někotre tykače, kotrež tuta strona wužiwa, su njeaktuelne.
outdatedpluginsMessage.updateButton.label=Tykače aktualizować…
outdatedpluginsMessage.updateButton.accesskey=a
@@ -770,3 +795,15 @@
ignoredSubthreadsFeedback=Wotmołwy do podnitki, kotraž je so wubrała, so njepokazaja.;Wotmołwy do #1 podnitkow, kotrejž stej so wubrałoj, so njepokazaja.;Wotmołwy do #1 podnitkow, kotrež su so wubrali, so njepokazaja.;Wotmołwy do #1 podnitkow, kotrež je so wubrało, so njepokazaja.
# LOCALIZATION NOTE (saveAsType): replace %S with the extension of the file to be saved.
saveAsType=Dataja %S
+
+# LOCALIZATION NOTE (openSearch.label): The label used in the autocomplete
+# widget to refer to a search on the web for a short string containing at most
+# 15 characters. %1$S is the search provider to use. %2$S is the string to
+# search for.
+openSearch.label=Z %1$S za "%2$S" pytać
+
+# LOCALIZATION NOTE (openSearch.label.truncated): The label used in the
+# autocomplete widget to refer to a search on the web for a short string
+# containing more than 15 characters. %1$S is the search provider to use. %2$S
+# is the string to search for, truncated to 15 characters.
+openSearch.label.truncated=Pyta so z %1$S za "%2$S…"
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/advanced.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/advanced.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/advanced.dtd 2015-06-03 10:06:36.000000000 +0000
@@ -3,20 +3,21 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
-
-
-
-
+
+
+
+
@@ -37,6 +38,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/compose.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/compose.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/compose.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -6,6 +6,8 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/fonts.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/fonts.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/fonts.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/fonts.dtd 2015-06-03 10:06:36.000000000 +0000
@@ -8,8 +8,8 @@
-
-
+
+
@@ -20,20 +20,18 @@
+
-
-
+
-
-
-
-
+
@@ -48,8 +46,12 @@
+
+
+
+
+
-
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/general.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/general.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/general.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/general.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -35,3 +35,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/offline.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/offline.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/offline.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -11,8 +11,8 @@
-
-
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/preferences.dtd thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/mail/chrome/messenger/preferences/preferences.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/mail/chrome/messenger/preferences/preferences.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -17,3 +17,7 @@
+
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pipnss/nsserrors.properties thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pipnss/nsserrors.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pipnss/nsserrors.properties 2015-06-03 10:06:36.000000000 +0000
@@ -315,3 +315,5 @@
MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Serwer wužiwa certifikat z rozšěrjenjom Basic Constraints, kotrež jón jako certifikatowu awtoritu identifikuje. Za porjadnje wudaty certifikat to njepřitrjechi.
MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=Serwer je certifikat z klučowej wulkosću předstajił, kotraž je přemała, zo by wěsty zwisk wutworiła.
MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Certifikat wersije 1 X.509, kotryž dowěry hódna kótwička njeje, je so wužił, zo by certifikat serwera wudał. Certifikaty wersije 1 X.509 su zestarjene a njeměli so wužiwać, zo bychu druhe certifikaty signowali.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Serwer je certifikat předpołožił, kotryž hišće płaćiwy njeje.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Certifikat, kotryž hišće płaćiwy njeje, je so wužił, zo by certifikat serwera wudał.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pipnss/pipnss.properties thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pipnss/pipnss.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pipnss/pipnss.properties 2015-06-03 10:06:36.000000000 +0000
@@ -40,16 +40,12 @@
# End of size restriction.
VerifySSLClient=Klientowy certifikat SSL
VerifySSLServer=Serwerowy certifikat SSL
-VerifySSLStepUp=SSL-serwer ze Step-up
VerifySSLCA=SSL certifikatowa awtorita
VerifyEmailSigner=Certifikat e-mejloweho podpisarja
VerifyEmailRecip=Certifikat e-mejloweho přijimowarja
-VerifyProtectObjSign=Podpisar škitaneho objekta
VerifyObjSign=Podpisar objekta
-VerifyUserImport=Certifikat importowanja wužiwara
VerifyCAVerifier=Pruwowar certifikatoweje awtority
VerifyStatusResponder=Certifikat statusoweho wotmołwjaka
-VerifyAnyCA=Někajka certifikatowa awtorita
HighGrade=Wysoki stopjeń
MediumGrade=Srjedźny stopjeń
# LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
@@ -61,7 +57,6 @@
CertDumpVersion2=Wersija 2
CertDumpVersion3=Wersija 3
CertDumpSerialNo=Serijowe čisło
-CertDumpOID=Objektowy identifikator
CertDumpMD2WithRSA=PKCS #1 MD2 ze zaklučowanjom RSA
CertDumpMD5WithRSA=PKCS #1 MD5 ze zaklučowanjom RSA
CertDumpSHA1WithRSA=PKCS #1 SHA-1 ze zaklučowanjom RSA
@@ -69,11 +64,8 @@
CertDumpSHA384WithRSA=PKCS #1 SHA-384 ze zaklučowanjom RSA
CertDumpSHA512WithRSA=PKCS #1 SHA-512 ze zaklučowanjom RSA
CertDumpDefOID=Objektowy identifikator (%S)
-CertDumpNULL=NULL
CertDumpIssuer=Wudawar
CertDumpSubject=Předmjet
-CertDumpRDN=Relatiwne jednozmyslne mjeno
-CertDumpATV=Typ a hódnota atributa
CertDumpAVACountry=C
CertDumpAVAState=ST
CertDumpAVALocality=L
@@ -245,44 +237,25 @@
CertDumpRawBytesHeader=Wulkosć: %S bajtow / %S bitow
VerifySSLClient_p=Klient
VerifySSLServer_p=Serwer
-VerifySSLStepUp_p=Step-up
VerifySSLCA_p=SSL-CA
VerifyEmailSigner_p=Podpisać
VerifyEmailRecip_p=Zaklučować
-VerifyProtectObjSign_p=Podpisar škitaneho objekta
VerifyObjSign_p=Podpisar objekta
-VerifyUserImport_p=Import wužiwarja
VerifyCAVerifier_p=Přepruwowar certifikatoweje awtority
VerifyStatusResponder_p=Status Responder
-VerifyAnyCA_p=CA
-VerifiedTrue=true
-VerifiedFalse=false
PK11BadPassword=Zapodate hesło bě wopak.
SuccessfulP12Backup=Waše wěstotne certifikaty a priwatne kluče buchu wuspěšnje zawěsćene.
SuccessfulP12Restore=Waše wěstotne certifikaty a priwatne kluče buchu wuspěšnje wobnowjene.
-PKCS12PasswordInvalid=Dataja PKCS #12 njeda so dekodować. Snano bě hesło, kotrež sće zapodał, wopak?
PKCS12DecodeErr=Dataja njeda so dekodowaće. Pak njeje we formaće PKCS #12, je wobkškodźena pak hesło, kotrež sće zapodał, je wopak.
PKCS12UnknownErrRestore=Dataja PKCS #12 njeda so z njeznatych přičinow wobnowić.
PKCS12UnknownErrBackup=Zawěsćenska dataja PKCS #12 njeda z njeznatych přičinow wutworić.
PKCS12UnknownErr=Operacija PKCS #12 je so z njeznatych přičinow njeporadźiła.
PKCS12InfoNoSmartcardBackup=Njejo móžno certifikaty z hardwaroweho wěstotneho grata zawěsćić, kaž na př. ze smartkarty.
PKCS12DupData=Certifikat a priwatny kluč hižo eksistujetej na wěstotnym graće.
-AddModulePrompt=Chceće woprawdźe tutón wěstotny modul instalować?
-AddModuleName=Mjeno modula: %S
-AddModulePath=Šćežka: %S
-AddModuleSuccess=Nowy wěstotny modul je so instalował
AddModuleFailure=Modul njeda so přidać
AddModuleDup=Wěstotny modul hižo eksistuje
-DelModuleBadName=Njepłaćiwe modulowe mjeno.
DelModuleWarning=Chceće woprawdźe tutón wěstotny modul zhašeć?
DelModuleError=Njeje móžno modul zhašeć
-DelModuleIntSuccess=Interny wěstotny modul je so wuspěšnje zhašał
-DelModuleExtSuccess=Eksterny wěstotny modul je so wuspěšnje zhašał
-ForcedBackup1=Wy měł přez hesło škitanu zawěsćensku kopiju swojeho noweho wěstotneho certifikata a jeho z nim zwjazaneho priwatneho kluča wutworić.
-ForcedBackup2=Hdy byšće přistup k swojemu priwatnemu klučej zhubił, dokelž sće swoje wosobinske wěstotne hesło zabył abo dataja je wobškodźena, móžeće priwatny kluč a certifikat z tuteje zawěsćenskeje kopije wobnowić.
-ForcedBackup3=Zo byšće kopiju wutworił, klikńće na W porjadku. Jeli móžno, wy měł swoju zawěsćensku kopiju na diskeće składować, kotraž na wěstnym městnje chowaće.
-UnknownCertIssuer=(Njeznaty wudawar)
-UnknownCertOrg=(Njeznata organizacija)
AVATemplate=%S = %S
PSMERR_SSL_Disabled=Wěsty zwisk njeje móžno, dokelž SSL-protokol je znjemóžnjeny.
@@ -295,7 +268,6 @@
certErrorTrust_SelfSigned=Certifikat njeje dowěry hódny, dokelž je so sam podpisał.
certErrorTrust_UnknownIssuer=Certifikat njeje dowěry hódny, dokelž wudawarski certifikat je njeznaty.
-certErrorTrust_MissingChain=Certifikat njeje dowěry hódny, dokelž žadyn wudawarski rjećaz podaty njeje.
certErrorTrust_CaInvalid=Certifikat njeje dowěry hódny, dokelž bu přez njepłaćiwy certifikat certifikatoweje awtority wudaty.
certErrorTrust_Issuer=Certifikat njeje dowěry hódny, dokelž wudawarski certifikat dowěry hódny njeje.
certErrorTrust_SignatureAlgorithmDisabled=Tutón certifikat dowěry hódny njeje, dokelž je so ze signowanskim algoritmom signował, kotryž je so znjemóžnił, dokelž algoritm wěsty njeje.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pipnss/security.properties thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pipnss/security.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pipnss/security.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pipnss/security.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Title=Wěstotne warnowanje
-PostToInsecureFromSecureMessage=Hačrunjež je tuta strona zaklučowana, dyrbja informacije, kotrež sće zapisał, so přez njezaklučowany zwisk słać a hodźa so lochko wot druhich čitać.##Chceće woprawdźe ze słanjom tutych informacijow pokročować?##
-Continue=Dale
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/certManager.dtd thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/certManager.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/certManager.dtd 2015-06-03 10:06:36.000000000 +0000
@@ -10,9 +10,6 @@
-
-
-
@@ -37,7 +34,6 @@
-
@@ -49,11 +45,6 @@
-
-
-
-
-
@@ -72,8 +63,6 @@
-
-
@@ -90,8 +79,8 @@
-
-
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/deviceManager.dtd thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/deviceManager.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/deviceManager.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -11,11 +11,7 @@
-
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/pippki.dtd thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/pippki.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/pippki.dtd 2015-06-03 10:06:36.000000000 +0000
@@ -9,7 +9,6 @@
-
@@ -20,19 +19,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -42,9 +28,7 @@
-
-
@@ -63,9 +47,6 @@
-
-
-
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/pippki.properties thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/pippki.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/security/manager/chrome/pippki/pippki.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/security/manager/chrome/pippki/pippki.properties 2015-06-03 10:06:36.000000000 +0000
@@ -11,7 +11,6 @@
unnamedCA=Certifikatowa awtorita (bjez mjena)
#For editing cert trust
-editTrustWindowTitle=Dowěryhódnosć certifikata wobdźěłać
editTrustCA=Certifikat "%S" reprezentuje certifikatowu awtoritu.
editTrustEmail=Certifikat "%S" bu wudaty wot:
issuerNotTrusted=Dokelž njedowěrjeće certifikatowej awtoriće, kotraž je tutón certifikat wudała, njedowěrjeće awtentiskosći tutoho certifikata, chibazo něšto druhe je tu podate.
@@ -44,10 +43,7 @@
chooseP12RestoreFileDialog2=Certifikatowa dataja, kotraž ma so importować
chooseP12BackupFileDialog=Datajowe mjeno za zawěsćenje
file_browse_PKCS12_spec=PKCS12-dataje
-
-
-#Preferences
-resetPreferences=Wužijće tute tłóčatko, zo byšće wěstotne nastajenja za %S na zawodne nastajenja wróćo stajił.
+getPKCS12FilePasswordMessage=Prošu zapodajće hesło, kotrež je so za zaklučowanje tutoho zawěsćenja certifikata wužiło:
#Cert verification
certVerified=Tutón certifikat bu za slědowace wužića přepruwowany:
@@ -65,18 +61,16 @@
clientAuthMessage2=Wudaty pod: "%S"
#Page Info
-pageInfo_SiteNotVerified=Identita websydła njepřepruwowana
-pageInfo_WebSiteVerified=Identita websydła přepruwowana
-pageInfo_Identity_Verified=Websydło %S podpěruje awtentifikaciju za stronu, kotruž sej runje wobhladujeće. Identita tutoho websydła bu wot %S přepruwowana, certifikatowa awtorita, kotrejž za tutón zaměr dowěrjeće.
-pageInfo_ViewCertificate=Wěstotny certifikat pokazać, kotryž identitu toho websydła přepruwuje.
pageInfo_NoEncryption=Zwisk njezaklučowany
pageInfo_Privacy_None1=Websydło %S njepodpěruje zaklučowanje za stronu, kotruž sej runje wobhladujeće.
pageInfo_Privacy_None2=Informacije, kotrež sćelu so bjez zaklučowanja přez Internet, hodźa so wot druhich ludźi widźeć, mjeztym zo jón přeprěkuja.\u0020
pageInfo_Privacy_None3=Strona, kotruž sej wobhladujeće, njeje zaklučowana.
-# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
+# %1$S is the name of the encryption standard,
# %2$S is the key size of the cipher.
# %3$S is protocol version like "SSL 3" or "TLS 1.2"
pageInfo_EncryptionWithBitsAndProtocol=Zwisk zaklučowany (%1$S, bitowe kluče %2$S, %3$S)
+pageInfo_BrokenEncryption=Złamane zaklučowanje (%1$S, bitowe kluče %2$S, %3$S)
pageInfo_Privacy_Encrypted1=Strona, kotruž sej wobhladujeće, bu zaklučowana, prjedy hač buchu přez internet pósłane.
pageInfo_Privacy_Encrypted2=Zaklučowanje poćežuje njeawtorizowanym wosobam informacije widźeć, kotrež so mjez ličakami wuměnjeja. Je tohodla prawdźe jara njepodobne, zo je něchtó tutu stronu přečitał, hdyž je wona syć přeprěčiła.
pageInfo_MixedContent=Zwisk zdźěla zaklučowany
@@ -85,7 +79,6 @@
#Cert Viewer
certDetails=Wobhladowak certifiaktow:
notPresent=
-unknownIssuer=
escrowFinalMessage=Wy měł jenož na W porjadku klikny, jeli "%S" dowěrjeće, zo byšće swój priwatny šifrowanski kluč škitał.
@@ -158,7 +151,6 @@
addExceptionCheckingLong2=Pospytuje so, tute sydło identifikować…
addExceptionNoCertShort=Žane informacije k dispoziciji
addExceptionNoCertLong2=Njeje móžno status identifikacije za tute sydło nabyć.
-addExceptionConnectionFailed=Zwisk je so njeporadźił
#Certificate Exists in database
caCertExistsTitle=Certifikat eksistuje
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutReader.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutReader.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutReader.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutReader.properties 2015-06-03 10:06:36.000000000 +0000
@@ -5,15 +5,15 @@
aboutReader.loading=Začituje so...
aboutReader.loadError=Nastawk njeda so ze strony začitać
-aboutReader.colorSchemeLight=Swětły
-aboutReader.colorSchemeDark=Ćmowy
-aboutReader.colorSchemeSepia=Sepija
-aboutReader.colorSchemeAuto=Awtomatisce
-
-# LOCALIZATION NOTE (aboutReader.fontTypeSerif, aboutReader.fontTypeSansSerif):
-# These are the names of the fonts that are used.
-aboutReader.fontTypeSerif=Charis SIL Compact
-aboutReader.fontTypeSansSerif=Clear Sans
+aboutReader.colorScheme.light=Swětły
+aboutReader.colorScheme.dark=Ćmowy
+aboutReader.colorScheme.sepia=Sepija
+aboutReader.colorScheme.auto=Awtomatisce
+
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Serif
+aboutReader.fontType.sans-serif=Sans-serif
# LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
aboutReader.fontTypeSample=Aa
@@ -22,4 +22,16 @@
# for the font size setting. Tapping different samples will change the font size.
aboutReader.fontSizeSample=A
-aboutReader.toolbarTip=Podótkńće so wobrazowki, zo byšće nastajenja čitaka pokazał
+aboutReader.toolbar.close=Čitanski napohlad začinić
+aboutReader.toolbar.typeControls=Zapodawanske elementy
+aboutReader.toolbar.addToReadingList=Čitanskej lisćinje přidać
+aboutReader.toolbar.removeFromReadingList=Z čitanskeje lisćiny wotstronić
+aboutReader.toolbar.openReadingList=Čitansku lisćinu wočinić
+aboutReader.toolbar.closeReadingList=Čitansku lisćinu začinić
+aboutReader.toolbar.share=Dźělić
+
+aboutReader.footer.deleteThisArticle=Tutón nastawk zhašeć
+
+# Reader View toolbar button
+readerView.enter=Do čitanskeho napohlada zastupić
+readerView.close=Čitanski napohlad začinić
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.dtd thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -35,9 +35,11 @@
-
+
@@ -93,3 +95,6 @@
+
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutSupport.properties 2015-06-03 10:06:36.000000000 +0000
@@ -86,3 +86,8 @@
hasSeccompBPF = Seccomp-BPF (Filtrowanje systemowych zawołanjow)
canSandboxContent = Testowanje wobsahowych procesow w pěskowym kašćiku
canSandboxMedia = Testowanje medijowych tykačow w pěskowym kašćiku
+
+# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
+# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
+# or 'false')
+multiProcessStatus = %1$S z %2$S (standard: %3$S)
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutTelemetry.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/aboutTelemetry.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/aboutTelemetry.properties 2015-06-03 10:06:36.000000000 +0000
@@ -7,6 +7,8 @@
# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
pageSubtitle = Tuta strona pokazuje informacije wo wukonje, hardware, wužiću a přiměrjenjach zběrane přez telemetriju. Tute informacije budu so do %1$S słać, zo bychu pomhali, %2$S polěpšić.
+generalDataTitle = Powšitkowne daty
+
generalDataHeadingName = Mjeno
generalDataHeadingValue = Hódnota
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/browser.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/browser.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/browser.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/browser.properties 2015-06-03 10:06:35.000000000 +0000
@@ -8,3 +8,7 @@
browsewithcaret.checkButtonLabel=Haj
plainText.wordWrap=Dołhe linki łamać
+
+formPostSecureToInsecureWarning.title = Wěstotne warnowanje
+formPostSecureToInsecureWarning.message = Informacije, kotrež sće na stronje zapodał, so přez njewěsty zwisk pósćelu a móhli so wot třećich čitać.\n\nChceće tute informacije woprawdźe słać?
+formPostSecureToInsecureWarning.continue = Pokročować
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/charsetMenu.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/charsetMenu.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/charsetMenu.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/charsetMenu.properties 2015-06-03 10:06:35.000000000 +0000
@@ -41,7 +41,7 @@
# Globally-relevant
UTF-8.key = U
UTF-8 = Unicode
-windows-1252.key = W
+windows-1252.key = Z
windows-1252 = Zapadne
# Arabic
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/devtools/debugger.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/devtools/debugger.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/devtools/debugger.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/devtools/debugger.properties 2015-06-03 10:06:35.000000000 +0000
@@ -14,11 +14,46 @@
# dialog that prompts the user to allow the incoming connection.
remoteIncomingPromptTitle=Dochadźacy zwisk
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# LOCALIZATION NOTE (remoteIncomingPromptHeader): Header displayed on the
# dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=Dochadźace naprašowanje, zwisk za zdalene pytanja za zmylkami je so namakało. Zdaleny klient móže połnu kontrolu nad waš wobhladowak přewzać! Zwisk dowolić?
+remoteIncomingPromptHeader=Dochadźace naprašowanje, zwisk za zdalene pytanja za zmylkami je so namakało. Zdaleny klient móže połnu kontrolu nad waš wobhladowak přewzać!
+# LOCALIZATION NOTE (remoteIncomingPromptClientEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the client such as "127.0.0.1:6000"
+remoteIncomingPromptClientEndpoint=Klientowy kónčny dypk: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptServerEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the server such as "127.0.0.1:6000"
+remoteIncomingPromptServerEndpoint=Serwerowy kónčny dypk: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptFooter): Footer displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptFooter=Zwisk dowolić?
# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
# third button in the incoming connection dialog that lets the user disable the
# remote debugger server.
remoteIncomingPromptDisable=Znjemóžnić
+
+# LOCALIZATION NOTE (clientSendOOBTitle): The title displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBTitle=Identifikacija klienta
+# LOCALIZATION NOTE (clientSendOOBHeader): Header displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBHeader=Kónčny dypk, z kotrymž zwjazujeće, trjeba dalše informacije, zo by tutón zwisk awtentifikował. Prošu zasadźće slědowacy znamješkowy slěd do zapodawanskeje linki, kotraž so na druhim kóncu jewi.
+# LOCALIZATION NOTE (clientSendOOBHash): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The client's cert fingerprint
+clientSendOOBHash=Mój certifikat: %1$S
+# LOCALIZATION NOTE (clientSendOOBToken): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The authentication token that the user will transfer.
+clientSendOOBToken=Znamješkowy slěd: %1$S
+
+# LOCALIZATION NOTE (serverReceiveOOBTitle): The title displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBTitle=Zapodajće znamješkowy slěd klienta
+# LOCALIZATION NOTE (serverReceiveOOBBody): Main text displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBBody=Klient měł hódnotu znamješkoweho slěda zwobraznić. Zapodajće tu tón znamješkowy slěd, zo byšće awtentifikaciju z tutym klientom dokónčił.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/fallbackMenubar.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/fallbackMenubar.properties 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/fallbackMenubar.properties 2015-06-03 10:06:35.000000000 +0000
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Skónčić
+quitMenuitem.key=q
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/textcontext.dtd thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/textcontext.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/global/textcontext.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/global/textcontext.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -24,3 +24,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties 2015-06-03 10:06:35.000000000 +0000
@@ -32,15 +32,14 @@
offlineCancelDownloadsAlertMsg=Jeli nětko offline dźeće, so 1 sćehnjenje přetorhnje. Chceće woprawdźe offline hić?
offlineCancelDownloadsAlertMsgMultiple=Jeli nětko offline dźeće, so %S sćehnjenjow přetorhnje. Chceće woprawdźe offline hić?
leavePrivateBrowsingCancelDownloadsAlertTitle=Wšě sćehnjenja přetorhnyć?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=Jeli nětko wšě wokna priwatneho modusa začiniće, so 1 sćehnjenje přetorhnje. Chceće priwatny modus woprawdźe wopušćić?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=Jeli nětko wšě wokna priwatneho modusa začiniće, so %S sćehnjenjow přetorhnje. Chceće priwatny modus woprawdźe wopušćić?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=Jeli nětko wšě wokna priwatneho modusa začiniće, so 1 sćehnjenje přetorhnje. Chceće priwatny modus woprawdźe wopušćić?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=Jeli nětko wšě wokna priwatneho modusa začiniće, so %S sćehnjenjow přetorhnje. Chceće priwatny modus woprawdźe wopušćić?
cancelDownloadsOKText=1 sćehnjenje přetorhnyć
cancelDownloadsOKTextMultiple=%S sćehnjenjow přetorhnyć
dontQuitButtonWin=Njeskónčić
dontQuitButtonMac=Njeskónčić
dontGoOfflineButton=Online wostać
-dontEnterPrivateBrowsingButton=Priwatny modus njestartować
-dontLeavePrivateBrowsingButton=W priwatnym modusu wostać
+dontLeavePrivateBrowsingButton2=W priwatnym modusu wostać
downloadsCompleteTitle=Sćehnjenja zakónčene
downloadsCompleteMsg=Wšě dataje su sćehnjene.\u0020
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -4,6 +4,7 @@
+
@@ -228,3 +229,5 @@
+
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/extensions/extensions.properties 2015-06-03 10:06:35.000000000 +0000
@@ -56,8 +56,8 @@
notification.installError=Při instalowanju %1$S je zmylk wustupił.
notification.installError.retry=Hišće raz spytać
notification.installError.retry.tooltip=Spytajće tutón přidatk hišće raz sćahnyć a instalować
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Budźe so bórze instalować.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S budźe so bórze instalować.
#LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
contributionAmount2=Namjetowany přinošk: %S
@@ -99,8 +99,8 @@
details.notification.uninstall=%1$S so wotinstaluje, po tym zo sće %2$S znowa startował.
#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
details.notification.upgrade=%1$S budźe so aktualizować, po tym zo sće %2$S znowa startował.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Budźe so bórze instalować.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S budźe so bórze instalować.
# LOCALIZATION NOTE (details.experiment.time.daysRemaining):
# Semicolon-separated list of plural forms.
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-38.0~b3+build2/l10n/hsb/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/toolkit/chrome/mozapps/plugins/plugins.dtd 2015-06-03 10:06:35.000000000 +0000
@@ -39,3 +39,4 @@
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hsb/webapprt/webapprt/overrides/appstrings.properties thunderbird-38.0~b6+build2/l10n/hsb/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-38.0~b3+build2/l10n/hsb/webapprt/webapprt/overrides/appstrings.properties 2015-04-29 23:45:34.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hsb/webapprt/webapprt/overrides/appstrings.properties 2015-06-03 10:06:35.000000000 +0000
@@ -33,3 +33,4 @@
cspBlocked=Tute nałoženje je spytało, přistup na resursu měć, kotraž ma prawidła wobsahoweje wěstoty, kotrež jeho zasadźenju na tute wašnje zadźěwaja.
corruptedContentError=Nałoženje njemóže ze začitowanjom pokročować, dokelž je so zmylk w datowym přenjesenju wotkrył.
remoteXUL=Tute nałoženje je spytało, njepodpěranu technologiju wužiwać, kotraž k dispoziciji hižo njesteji.
+sslv3Used=Tute nałoženje njemóže wěstotu wašich datow na %S garantować, dokelž SSLv3 wužiwa, złamany wěstotny protokol.
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/communicator/utilityOverlay.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/communicator/utilityOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/communicator/utilityOverlay.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/communicator/utilityOverlay.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -41,7 +41,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/AccountWizard.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/AccountWizard.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/AccountWizard.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/AccountWizard.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -84,7 +84,7 @@
these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix3 as a single sentence, inserting
text after the """ entity in haveSmtp1.suffix3, if required grammatically.
-->
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/addressbook/abCardOverlay.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/addressbook/abCardOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/addressbook/abCardOverlay.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/addressbook/abCardOverlay.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -15,13 +15,13 @@
-
+
-
+
-
+
-
+
@@ -30,36 +30,36 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -77,12 +77,12 @@
-
+
-
+
@@ -101,7 +101,7 @@
-
+
@@ -116,12 +116,12 @@
-
+
-
+
-
+
@@ -131,7 +131,7 @@
-
+
@@ -146,11 +146,11 @@
-
+
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/addressbook/abMainWindow.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -74,7 +74,7 @@
-
+
@@ -102,7 +102,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/messengercompose/composeMsgs.properties 2015-06-03 10:07:04.000000000 +0000
@@ -20,7 +20,7 @@
errorSendingFromCommand=Hiba történt a levél küldése közben. A levelezőkiszolgáló válasza: %s. Ellenőrizze, hogy az Ön e-mail címe helyesen van-e megadva a fiók beállításaiban, majd próbálja újra.
## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
-errorSendingDataCommand=Kimenő kiszolgáló (SMTP) hiba történt a levél küldése közben. A kiszolgáló válasza: %s.
+errorSendingDataCommand=Levélküldő kiszolgáló (SMTP) hiba történt a levél küldése közben. A kiszolgáló válasza: %s.
## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
errorSendingMessage=Hiba történt a levél küldése közben. A levelezőkiszolgáló válasza: %s. Ellenőrizze az üzenetet, majd próbálja újra.
@@ -29,7 +29,7 @@
sendFailed=Az üzenet küldése sikertelen.
## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
-smtpServerError=Hiba történt a levél küldése közben: Kimenő kiszolgáló (SMTP) hiba. A kiszolgáló válasza: %s.
+smtpServerError=Hiba történt a levél küldése közben: Levélküldő kiszolgáló (SMTP) hiba. A kiszolgáló válasza: %s.
unableToSendLater=Elnézést, nem sikerült menteni az üzenetet a későbbi elküldéshez.
## LOCALIZATION NOTE (communicationsError): argument %d is the error code
@@ -57,7 +57,7 @@
errorSendingRcptCommand=Hiba történt a levél küldése közben. A levelezőkiszolgáló válasza:\n%1$S.\nEllenőrizze az üzenet címzettjeit („%2$S”), majd próbálja újra.
## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
-startTlsFailed=Hiba történt a levél küldésekor: Nem sikerült kapcsolódni a(z) %S kimenő (SMTP)kiszolgálóhoz a STARTTLS használatával, ugyanis az nem hirdeti ezt a funkciót. Kapcsolja ki a STARTTLS-t ehhez a kiszolgálóhoz, vagy forduljon a szolgáltatóhoz.
+startTlsFailed=Hiba történt a levél küldésekor: Nem sikerült kapcsolódni a(z) %S levélküldő (SMTP) kiszolgálóhoz a STARTTLS használatával, ugyanis az nem hirdeti ezt a funkciót. Kapcsolja ki a STARTTLS-t ehhez a kiszolgálóhoz, vagy forduljon a szolgáltatóhoz.
## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
smtpPasswordUndefined=Hiba történt a levél küldésekor: Nem sikerült megszerezni a jelszót ehhez: %S. Az üzenet nem lett elküldve.
@@ -72,19 +72,19 @@
smtpPermSizeExceeded2=Az elküldeni kívánt üzenet mérete meghaladja a kiszolgáló által meghatározott globális méretkorlátot. Az üzenet nem lett elküldve. Próbálja csökkenteni a méretét, és küldje el újra. A kiszolgáló válasza: %s.
## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
-smtpSendFailedUnknownServer=Hiba történt a levél küldésekor: a(z) %S kimenő (SMTP) kiszolgáló ismeretlen. Lehet, hogy a kiszolgálót hibásan állították be. Ellenőrizze, hogy a kimenő (SMTP) kiszolgáló beállításai helyesek-e, és próbálja újra.
+smtpSendFailedUnknownServer=Hiba történt a levél küldésekor: a(z) %S levélküldő kiszolgáló (SMTP) ismeretlen. Lehet, hogy a kiszolgálót hibásan állították be. Ellenőrizze, hogy a levélküldő (SMTP) kiszolgáló beállításai helyesek-e, és próbálja újra.
## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
-smtpSendRefused=Az üzenet küldése sikertelen, mert nem lehetett kapcsolatot teremteni a kimenő (SMTP) kiszolgálóval (%S). A kiszolgáló elérhetetlen, vagy visszautasítja a kimenő (SMTP) kapcsolatokat. Ellenőrizze, hogy a kimenő (SMTP) kiszolgáló beállításai helyesek-e, és próbálja meg újra.
+smtpSendRefused=Az üzenet küldése sikertelen, mert nem lehetett kapcsolatot teremteni a levélküldő (SMTP) kiszolgálóval (%S). A kiszolgáló elérhetetlen, vagy visszautasítja a levélküldő kiszolgáló (SMTP) kapcsolatokat. Ellenőrizze, hogy a levélküldő (SMTP) kiszolgáló beállításai helyesek-e, és próbálja meg újra.
## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
-smtpSendInterrupted=Az üzenet küldése sikertelen, mert a kimenő (SMTP) kiszolgálóval (%S) való kapcsolat megszakadt a tranzakció közben. Próbálja újra.
+smtpSendInterrupted=Az üzenet küldése sikertelen, mert a levélküldő (SMTP) kiszolgálóval (%S) való kapcsolat megszakadt a tranzakció közben. Próbálja újra.
## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
-smtpSendTimeout=Az üzenet küldése sikertelen, mert a kimenő (SMTP) kiszolgálóval (%S) való kapcsolat időtúllépés miatt megszakadt. Próbálja újra.
+smtpSendTimeout=Az üzenet küldése sikertelen, mert a levélküldő (SMTP) kiszolgálóval (%S) való kapcsolat időtúllépés miatt megszakadt. Próbálja újra.
## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
-smtpSendFailedUnknownReason=Az üzenet küldése a kimenő (SMTP) kiszolgálóval (%S) ismeretlen okból megszakadt. Ellenőrizze, hogy a kimenő (SMTP) kiszolgáló beállításai helyesek-e, és próbálja meg újra.
+smtpSendFailedUnknownReason=Az üzenet küldése a levélküldő (SMTP) kiszolgálóval (%S) ismeretlen okból megszakadt. Ellenőrizze, hogy a levélküldő (SMTP) kiszolgáló beállításai helyesek-e, és próbálja meg újra.
# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
smtpAuthChangeEncryptToPlainNoSsl=Úgy tűnik, a kimenő (SMTP) kiszolgáló (%S) nem támogatja a titkosított jelszavakat. Ha most állította be a fiókot, akkor próbálja meg módosítani a „Hitelesítési módszert” a „Postafiók beállításai | Kiszolgáló beállításai” alatt a „Jelszó, nem biztonságos átvitellel” lehetőségre. Ha ez korábban működött, de már nem, akkor lehet, hogy ellopták a jelszavát.
@@ -96,16 +96,16 @@
smtpAuthChangePlainToEncrypt=A kimenő (SMTP) kiszolgáló (%S) nem engedi meg a sima szöveges jelszavak használatát. Próbálja megadni a „Titkosított jelszó” lehetőséget a „Hitelesítési módszer” beállításnál a „Postafiók beállításai | Kiszolgáló beállításai” alatt.\u0020
# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
-smtpAuthFailure=Nem sikerült a hitelesítés a(z) %S kimenő (SMTP) kiszolgálóhoz. Ellenőrizze a jelszót és a „Hitelesítési módszer” beállítást a „Postafiók beállításai | Kimenő kiszolgáló (SMTP)” alatt.
+smtpAuthFailure=Nem sikerült a hitelesítés a(z) %S levélküldő (SMTP) kiszolgálóhoz. Ellenőrizze a jelszót és a „Hitelesítési módszer” beállítást a „Postafiók beállításai | Levélküldő kiszolgáló (SMTP)” alatt.
# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
-smtpAuthGssapi=A Kerberos/GSSAPI jegyet nem fogadta el a(z) %S kimenő (SMTP) kiszolgáló. Ellenőrizze, hogy be van-e jelentkezve a Kerberos/GSSAPI-tartományba.
+smtpAuthGssapi=A Kerberos/GSSAPI jegyet nem fogadta el a(z) %S levélküldő (SMTP) kiszolgáló. Ellenőrizze, hogy be van-e jelentkezve a Kerberos/GSSAPI-tartományba.
# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
-smtpAuthMechNotSupported=A kimenő (SMTP) kiszolgáló (%S) nem támogatja a kiválasztott hitelesítési módszert. Módosítsa a „Hitelesítési módszer” beállítást a „Postafiók beállításai | Kimenő kiszolgáló (SMTP)” alatt.
+smtpAuthMechNotSupported=A levélküldő (SMTP) kiszolgáló (%S) nem támogatja a kiválasztott hitelesítési módszert. Módosítsa a „Hitelesítési módszer” beállítást a „Postafiók beállításai | Levélküldő kiszolgáló (SMTP)” alatt.
# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
-smtpAuthNotSupported=Nem sikerült a hitelesítés a(z) %S kimenő (SMTP) kiszolgálóhoz. Nem támogatja a hitelesítést (kimenő kiszolgáló (SMTP)-AUTH), de Ön hitelesítés használatát választotta. Módosítsa a „Hitelesítési módszer” beállítást „Nincs”-re a „Postafiók beállításai | Kimenő kiszolgáló (SMTP)” alatt, vagy forduljon a szolgáltatójához további tanácsokért.
+smtpAuthNotSupported=Nem sikerült a hitelesítés a(z) %S levélküldő (SMTP) kiszolgálóhoz. Nem támogatja a hitelesítést (levélküldő kiszolgáló (SMTP)-AUTH), de Ön hitelesítés használatát választotta. Módosítsa a „Hitelesítési módszer” beállítást „Nincs”-re a „Postafiók beállításai | Levélküldő kiszolgáló (SMTP)” alatt, vagy forduljon a szolgáltatójához további tanácsokért.
# LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
errorIllegalLocalPart=Nem ASCII karakterek is vannak a címzett %s címének helyi részében. Ez még nem támogatott. Módosítsa a címet, és próbálja újra.
@@ -311,7 +311,7 @@
## words %1$S and %2$S. Place the word %1$S where the host name should appear,
## and %2$S where the user name should appear.
smtpEnterPasswordPromptWithUsername=Adja meg %2$S felhasználó jelszavát a(z) %1$S kiszolgálón:
-smtpEnterPasswordPromptTitle=Kimenő kiszolgáló (SMTP) jelszó szükséges
+smtpEnterPasswordPromptTitle=Levélküldő kiszolgáló (SMTP) jelszó szükséges
# LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/Localization_and_Plurals
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/messenger.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/messenger.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/messenger.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/messenger.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -29,7 +29,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
@@ -63,17 +63,17 @@
-
+
-
+
-
+
@@ -84,11 +84,11 @@
-
+
-
+
@@ -136,7 +136,7 @@
-
+
@@ -148,7 +148,7 @@
-
+
@@ -163,7 +163,7 @@
-
+
@@ -257,14 +257,14 @@
-
+
-
+
@@ -305,10 +305,10 @@
-
+
-
-
+
+
@@ -318,9 +318,9 @@
-
+
-
+
@@ -342,7 +342,7 @@
-
+
@@ -357,10 +357,10 @@
-
+
-
+
@@ -421,15 +421,15 @@
-
+
-
+
-
+
@@ -451,9 +451,9 @@
-
+
-
+
@@ -470,9 +470,9 @@
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/SearchDialog.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/SearchDialog.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger/SearchDialog.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger/SearchDialog.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -27,9 +27,9 @@
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger-newsblog/feed-subscriptions.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger-newsblog/feed-subscriptions.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger-newsblog/feed-subscriptions.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -9,22 +9,22 @@
-
+
-
+
-
+
-
-
+
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd
--- thunderbird-38.0~b3+build2/l10n/hu/mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd 2015-04-29 23:46:07.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/hu/mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd 2015-06-03 10:07:04.000000000 +0000
@@ -5,4 +5,4 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/chat/irc.properties thunderbird-38.0~b6+build2/l10n/nl/chat/irc.properties
--- thunderbird-38.0~b3+build2/l10n/nl/chat/irc.properties 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/chat/irc.properties 2015-06-03 10:09:54.000000000 +0000
@@ -47,34 +47,34 @@
# These are the help messages for each command, the %S is the command name
# Each command first gives the parameter it accepts and then a description of
# the command.
-command.action=%S <uit te voeren actie>: Een bepaalde actie uitvoeren.
-command.ctcp=%S <bijnaam> <bericht>: Stuurt een ctcp-bericht naar het contact.
-command.chanserv=%S <opdracht>: Een opdracht naar chanserv sturen.
-command.deop=%S <bijnaam1>[,<bijnaam2>]*: Operator-status van iemand uitschakelen. U moet hiervoor wel kanaaloperator zijn.
-command.devoice=%S <bijnaam1>[,<bijnaam2>]*: Spreekstatus van iemand verwijderen, zodat men niet meer kan praten in een gemodereerd kanaal (+m). U moet hiervoor wel kanaaloperator zijn.
-command.invite2=%S <bijnaam>[ <bijnaam>]* [<kanaal>]: Eén of meerdere bijnamen uitnodigen om aan het huidige kanaal deel te nemen, of om aan het opgegeven kanaal deel te nemen.
-command.join=%S <ruimte1>[ <toets1>][,<ruimte2>[ <toets2>]]*: Een of meerdere ruimtes openen, met een optioneel wachtwoord indien noodzakelijk.
-command.kick=%S <bijnaam> [<bericht>]: Iemand uit een ruimte verwijderen. U moet hiervoor wel kanaaloperator zijn.
-command.list=%S: Een lijst van chatruimtes op het netwerk weergeven. Waarschuwing: sommige servers verbreken de verbinding als u dit doet.
-command.memoserv=%S <opdracht>: Een opdracht naar MemoServ sturen.
-command.modeUser=%S (+|-)<nieuwe modus> [<bijnaam>]: De modus van een gebruiker instellen of opheffen.
-command.modeChannel=%S <kanaal>[ (+|-)<nieuwe modus> [<parameter>][,<parameter>]*]: Een kanaalmodus opvragen, instellen of opheffen.
-command.msg=%S <bijnaam> <bericht>: Een privébericht naar een gebruiker sturen (in plaats van naar een ruimte).
-command.nick=%S <nieuwe bijnaam>: Uw bijnaam wijzigen.
-command.nickserv=%S <opdracht>: Een opdracht naar NickServ sturen.
-command.notice=%S <doel> <bericht>: Verzendt een notitie naar een gebruiker of kanaal.
-command.op=%S <bijnaam1>[,<bijnaam2>]*: Iemand benoemen tot operator voor het huidige kanaal. U moet hiervoor wel kanaaloperator zijn.
-command.operserv=%S <opdracht>: Een opdracht naar OperServ sturen.
-command.part=%S [bericht]: Huidige kanaal verlaten met een optioneel afscheidsbericht.
-command.ping=%S [<bijnaam>]: Vraagt de vertragingstijd op van een gebruiker (of de server als geen naam is gegeven).
-command.quit=%S <bericht>: Verbinding met de server verbreken met een optioneel afscheidsbericht.
-command.quote=%S <opdracht>: Een opdracht direct naar de server sturen.
-command.time=%S: Geeft de huidige lokale tijd van de IRC-server.
-command.topic=%S [<nieuw onderwerp>]: Onderwerp van dit kanaal instellen.
-command.umode=%S (+|-)<nieuwe modus>: De modus van een gebruiker instellen of opheffen.
-command.version=%S <bijnaam>: De versie van een gebruikersclient opvragen.
-command.voice=%S <bijnaam1>[,<bijnaam2>]*: Iemand spreekstatus geven. U moet hiervoor wel kanaaloperator zijn.
-command.whois2=%S [<bijnaam>]: Informatie over een gebruiker opvragen.
+command.action=%S <uit te voeren actie>: een bepaalde actie uitvoeren.
+command.ctcp=%S <bijnaam> <bericht>: stuurt een ctcp-bericht naar het contact.
+command.chanserv=%S <opdracht>: een opdracht naar chanserv sturen.
+command.deop=%S <bijnaam1>[,<bijnaam2>]*: operator-status van iemand uitschakelen. U moet hiervoor wel kanaaloperator zijn.
+command.devoice=%S <bijnaam1>[,<bijnaam2>]*: spreekstatus van iemand verwijderen, zodat men niet meer kan praten in een gemodereerd kanaal (+m). U moet hiervoor wel kanaaloperator zijn.
+command.invite2=%S <bijnaam>[ <bijnaam>]* [<kanaal>]: een of meerdere bijnamen uitnodigen om aan het huidige kanaal deel te nemen, of om aan het opgegeven kanaal deel te nemen.
+command.join=%S <ruimte1>[ <toets1>][,<ruimte2>[ <toets2>]]*: een of meerdere ruimtes openen, met een optioneel wachtwoord indien noodzakelijk.
+command.kick=%S <bijnaam> [<bericht>]: iemand uit een ruimte verwijderen. U moet hiervoor wel kanaaloperator zijn.
+command.list=%S: een lijst van chatruimtes op het netwerk weergeven. Waarschuwing: sommige servers verbreken de verbinding als u dit doet.
+command.memoserv=%S <opdracht>: een opdracht naar MemoServ sturen.
+command.modeUser=%S (+|-)<nieuwe modus> [<bijnaam>]: de modus van een gebruiker instellen of opheffen.
+command.modeChannel=%S <kanaal>[ (+|-)<nieuwe modus> [<parameter>][,<parameter>]*]: een kanaalmodus opvragen, instellen of opheffen.
+command.msg=%S <bijnaam> <bericht>: een privébericht naar een gebruiker sturen (in plaats van naar een ruimte).
+command.nick=%S <nieuwe bijnaam>: uw bijnaam wijzigen.
+command.nickserv=%S <opdracht>: een opdracht naar NickServ sturen.
+command.notice=%S <doel> <bericht>: verzendt een notitie naar een gebruiker of kanaal.
+command.op=%S <bijnaam1>[,<bijnaam2>]*: iemand benoemen tot operator voor het huidige kanaal. U moet hiervoor wel kanaaloperator zijn.
+command.operserv=%S <opdracht>: een opdracht naar OperServ sturen.
+command.part=%S [bericht]: huidige kanaal verlaten met een optioneel afscheidsbericht.
+command.ping=%S [<bijnaam>]: vraagt de vertragingstijd op van een gebruiker (of de server als geen naam is gegeven).
+command.quit=%S <bericht>: verbinding met de server verbreken met een optioneel afscheidsbericht.
+command.quote=%S <opdracht>: een opdracht direct naar de server sturen.
+command.time=%S: geeft de huidige lokale tijd van de IRC-server.
+command.topic=%S [<nieuw onderwerp>]: onderwerp van dit kanaal instellen.
+command.umode=%S (+|-)<nieuwe modus>: de modus van een gebruiker instellen of opheffen.
+command.version=%S <bijnaam>: de versie van een gebruikersclient opvragen.
+command.voice=%S <bijnaam1>[,<bijnaam2>]*: iemand spreekstatus geven. U moet hiervoor wel kanaaloperator zijn.
+command.whois2=%S [<bijnaam>]: informatie over een gebruiker opvragen.
# LOCALIZATION NOTE (message.*):
# These are shown as system messages in the conversation.
@@ -148,7 +148,7 @@
# LOCALIZATION NOTE (error.*):
-# These are shown as error messages in the server tab.
+# These are shown as error messages in the conversation or server tab.
# %S is the channel name.
error.noChannel=Er is geen kanaal %S.
error.tooManyChannels=Kan niet aan %S deelnemen; u neemt aan te veel kanalen deel.
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/aboutRights.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/aboutRights.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/aboutRights.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/aboutRights.dtd 2015-06-03 10:09:53.000000000 +0000
@@ -2,7 +2,7 @@
-
+
-
+
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/accountCreationUtil.properties thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/accountCreationUtil.properties
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/accountCreationUtil.properties 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/accountCreationUtil.properties 2015-06-03 10:09:53.000000000 +0000
@@ -7,7 +7,7 @@
# sanitizeDatatypes.js
-hostname_syntax.error=Hostnaam is leeg of bevat verboden tekens. Alleen letters, cijfers, - en . zijn toegestaan.
+hostname_syntax.error=Hostnaam is leeg of bevat niet-toegestane tekens. Alleen letters, cijfers, - en . zijn toegestaan.
alphanumdash.error=String bevat niet-ondersteunde tekens. Alleen letters, cijfers, - en _ zijn toegestaan.
allowed_value.error=Opgegeven waarde niet in lijst van toegestane waarden
url_scheme.error=URL-schema niet toegestaan
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/cloudfile/addAccountDialog.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/cloudfile/addAccountDialog.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/cloudfile/addAccountDialog.dtd 2015-06-03 10:09:53.000000000 +0000
@@ -6,7 +6,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/filter.properties thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/filter.properties
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/filter.properties 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/filter.properties 2015-06-03 10:09:53.000000000 +0000
@@ -14,7 +14,7 @@
untitledFilterName=Filter zonder titel
matchAllFilterName=Alle berichten vergelijken
filterListBackUpMsg=Uw filters werken niet omdat het bestand msgFilterRules.dat, dat uw filters bevat, niet kon worden gelezen. Er zal een nieuw msgFilterRules.dat-bestand worden gemaakt en een reservekopie van het oude bestand, genaamd rulesbackup.dat, zal worden gemaakt in dezelfde map.
-customHeaderOverflow=U hebt de grens van 50 aangepaste kopregels overschreden. Verwijder één of meer aangepaste kopregels en probeer het opnieuw.
+customHeaderOverflow=U hebt de grens van 50 aangepaste kopregels overschreden. Verwijder een of meer aangepaste kopregels en probeer het opnieuw.
filterCustomHeaderOverflow=Uw filters hebben de grens van 50 aangepaste kopregels overschreden. Bewerk het bestand msgFilterRules.dat, dat uw filters bevat, zodat het minder aangepaste kopregels gebruikt.
invalidCustomHeader=Eén van uw filters gebruikt een aangepaste kopregel die een ongeldig teken bevat, zoals ‘:’, een niet-afdrukbaar teken, een niet-ascii-teken, of een 8-bits ascii-teken. Bewerk het bestand msgFilterRules.dat, dat uw filters bevat, om ongeldige tekens uit uw aangepaste kopregels te verwijderen.
continueFilterExecution=Het toepassen van filter %S is mislukt. Wilt u doorgaan met het toepassen van filters?
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/folderProps.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/folderProps.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/folderProps.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/folderProps.dtd 2015-06-03 10:09:54.000000000 +0000
@@ -15,7 +15,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/joinChat.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/joinChat.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/joinChat.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/joinChat.dtd 2015-06-03 10:09:53.000000000 +0000
@@ -3,8 +3,8 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/messenger.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/messenger.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/messenger.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/messenger.dtd 2015-06-03 10:09:54.000000000 +0000
@@ -171,7 +171,7 @@
-
+
@@ -185,7 +185,7 @@
-
+
@@ -199,12 +199,12 @@
-
+
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/messenger.properties thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/messenger.properties
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/messenger.properties 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/messenger.properties 2015-06-03 10:09:53.000000000 +0000
@@ -590,7 +590,7 @@
# construct strings that look like (for example) "1 more" or "20 more".
# has details
# on this mechanism.
-headerMoreAddrs=#1 meer;#1 meer
+headerMoreAddrs=nog #1;nog #1
# LOCALIZATION NOTE (headerMoreAddrsTooltip): semicolon separated list of
# plural forms of the phrase ", and #1 more" as used in the tooltip text
@@ -599,7 +599,7 @@
# look like (for example) ", and 1 more" or ", and 20 more".
# has details
# on this mechanism.
-headerMoreAddrsTooltip=, en #1 meer;, en #1 meer
+headerMoreAddrsTooltip=, en nog #1;, en nog #1
# LOCALIZATION NOTE (headertoFieldMe): first person prepositional object
# pronoun used in the "to" header of the message header pane. This is also
@@ -671,8 +671,8 @@
addonLocalError-2=Deze add-on kon niet worden geïnstalleerd, omdat deze niet overeenkomt met de add-on die #3 verwacht.
addonLocalError-3=Deze add-on kon niet worden geïnstalleerd, omdat deze beschadigd lijkt.
addonLocalError-4=#1 kon niet worden geïnstalleerd, omdat #3 het benodigde bestand niet kan aanpassen.
-addonErrorIncompatible=#1 kon niet worden geïnstalleerd, omdat deze niet compatibel is met #3 #4.
-addonErrorBlocklisted=#1 kon niet worden geïnstalleerd, omdat deze een hoog risico op stabiliteits- of veiligheidsproblemen geeft.
+addonErrorIncompatible=#1 kon niet worden geïnstalleerd, omdat het niet compatibel is met #3 #4.
+addonErrorBlocklisted=#1 kon niet worden geïnstalleerd, omdat het een hoog risico op stabiliteits- of veiligheidsproblemen geeft.
confirmMsgDelete.title=Verwijderen bevestigen
confirmMsgDelete.collapsed.desc=Dit zal berichten in samengevouwen conversaties verwijderen. Weet u zeker dat u wilt doorgaan?
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/newmailaccount/accountProvisioner.properties thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/newmailaccount/accountProvisioner.properties
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/newmailaccount/accountProvisioner.properties 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/newmailaccount/accountProvisioner.properties 2015-06-03 10:09:53.000000000 +0000
@@ -13,7 +13,7 @@
# #1 is the number of additional email addresses available for registration.
# This line is shown when there are more than two suggested email
# addresses available.
-moreOptions=+#1 meer…;+#1 meer…
+moreOptions=+ nog #1…;+ nog #1…
# LOCALIZATION NOTE (sepAnd):
# \u0020 is a space, and should be included before and after.
sepAnd=\u0020en\u0020
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/preferences/fonts.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/preferences/fonts.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/preferences/fonts.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/preferences/fonts.dtd 2015-06-03 10:09:54.000000000 +0000
@@ -9,7 +9,7 @@
-
+
@@ -74,6 +74,6 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/preferences/preferences.properties thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/preferences/preferences.properties
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/preferences/preferences.properties 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/preferences/preferences.properties 2015-06-03 10:09:53.000000000 +0000
@@ -75,8 +75,8 @@
cookiepermissionstitle=Uitzonderingen - Cookies
cookiepermissionstext=U kunt opgeven welke websites altijd of nooit toestemming hebben om cookies te gebruiken. Typ het exacte adres van de website die u wilt beheren en klik vervolgens op Blokkeren, Toestaan voor sessie of Toestaan.
-invalidURI=Vul een geldige hostnaam in
-invalidURITitle=Ongeldige hostnaam ingevuld
+invalidURI=Voer een geldige hostnaam in
+invalidURITitle=Ongeldige hostnaam ingevoerd
#### Cookie Viewer
hostColon=Host:
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/preferences/sendoptions.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/preferences/sendoptions.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/preferences/sendoptions.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/preferences/sendoptions.dtd 2015-06-03 10:09:53.000000000 +0000
@@ -4,7 +4,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/quickFilterBar.dtd thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/quickFilterBar.dtd
--- thunderbird-38.0~b3+build2/l10n/nl/mail/chrome/messenger/quickFilterBar.dtd 2015-04-29 23:50:18.000000000 +0000
+++ thunderbird-38.0~b6+build2/l10n/nl/mail/chrome/messenger/quickFilterBar.dtd 2015-06-03 10:09:53.000000000 +0000
@@ -194,7 +194,7 @@
-
+
diff -Nru thunderbird-38.0~b3+build2/mail/base/content/msgHdrViewOverlay.js thunderbird-38.0~b6+build2/mail/base/content/msgHdrViewOverlay.js
--- thunderbird-38.0~b3+build2/mail/base/content/msgHdrViewOverlay.js 2015-04-29 23:02:09.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/base/content/msgHdrViewOverlay.js 2015-06-03 09:26:18.000000000 +0000
@@ -1587,7 +1587,9 @@
.createInstance(Components.interfaces.nsIMsgComposeParams);
fields.newsgroups = addressNode.getAttribute("newsgroup");
- fields.to = addressNode.getAttribute("fullAddress");
+ let addresses = MailServices.headerParser.makeFromDisplayAddress(
+ addressNode.getAttribute("fullAddress"), {});
+ fields.to = MailServices.headerParser.makeMimeHeader(addresses, 1);
params.type = Components.interfaces.nsIMsgCompType.New;
diff -Nru thunderbird-38.0~b3+build2/mail/base/modules/oauth.jsm thunderbird-38.0~b6+build2/mail/base/modules/oauth.jsm
--- thunderbird-38.0~b3+build2/mail/base/modules/oauth.jsm 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/base/modules/oauth.jsm 2015-06-03 09:26:18.000000000 +0000
@@ -18,8 +18,10 @@
Cu.import("resource:///modules/gloda/log4moz.js");
function OAuth(aDisplayName, aBaseUri, aAuthUri, aAuthToken, aAuthTokenSecret,
- aAppKey, aAppSecret, aSignatureMethod, aTempCredentialsMethod,
- aAuthorizeMethod, aRequestCredentialsMethod)
+ aAppKey, aAppSecret, aSignatureMethod,
+ aTempCredentialsMethod = "oauth/request_token",
+ aAuthorizeMethod = "oauth/authorize",
+ aRequestCredentialsMethod = "oauth/access_token")
{
this._userInfo = {};
this.displayName = aDisplayName;
@@ -32,9 +34,9 @@
this.log = Log4Moz.getConfiguredLogger("TBOAuth");
this.signatureMethod = aSignatureMethod || "HMAC-SHA1";
- this.tempCredentialsMethod = aTempCredentialsMethod || "oauth/request_token";
- this.authorizeMethod = aAuthorizeMethod || "oauth/authorize";
- this.requestCredentialsMethod = aRequestCredentialsMethod || "oauth/access_token";
+ this.tempCredentialsMethod = aTempCredentialsMethod;
+ this.authorizeMethod = aAuthorizeMethod;
+ this.requestCredentialsMethod = aRequestCredentialsMethod;
}
OAuth.prototype = {
@@ -100,10 +102,12 @@
["oauth_consumer_key", this.consumerKey],
["oauth_nonce", nonce],
["oauth_signature_method", this.signatureMethod],
- ["oauth_token", this.token],
["oauth_timestamp", Math.floor(((new Date()).getTime()) / 1000)],
["oauth_version", "1.0"]
]);
+ if (this.token) {
+ params.push(["oauth_token", this.token]);
+ }
let dataParams = [];
let url = /^https?:/.test(aUrl) ? aUrl : this.baseURI + aUrl;
@@ -191,7 +195,8 @@
onRequestTokenReceived: function(aData) {
this.log.info("Received request token.");
let data = this._parseURLData(aData);
- if (!data.oauth_token || !data.oauth_token_secret) {
+ if (!data.oauth_token ||
+ (this.signatureMethod == "HMAC-SHA1" && !data.oauth_token_secret)) {
this.log.info("didn't get request token");
this.connectFailureCallback();
return;
@@ -289,7 +294,7 @@
this.token = result.oauth_token;
this.tokenSecret = result.oauth_token_secret;
- this.connectSuccessCallback();
+ this.connectSuccessCallback(result);
},
diff -Nru thunderbird-38.0~b3+build2/mail/components/addrbook/content/abCardOverlay.js thunderbird-38.0~b6+build2/mail/components/addrbook/content/abCardOverlay.js
--- thunderbird-38.0~b3+build2/mail/components/addrbook/content/abCardOverlay.js 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/components/addrbook/content/abCardOverlay.js 2015-06-03 09:26:18.000000000 +0000
@@ -68,7 +68,6 @@
["IRC", "_IRC"]
];
-const kDefaultYear = 2000;
var gEditCard;
var gOnSaveListeners = new Array();
var gOnLoadListeners = new Array();
@@ -459,6 +458,14 @@
var birthday = doc.getElementById("Birthday");
modifyDatepicker(birthday);
+ // Get the year first, so that the following month/day
+ // calculations can take leap years into account.
+ var year = cardproperty.getProperty("BirthYear", null);
+ var birthYear = doc.getElementById("BirthYear");
+ // set the year in the datepicker to the stored year
+ birthday.year = saneBirthYear(year);
+ birthYear.value = year;
+
// get the month of the year (1 - 12)
var month = cardproperty.getProperty("BirthMonth", null);
if (month > 0 && month < 13)
@@ -473,14 +480,6 @@
else
birthday.dateField.value = null;
- // get the year
- var year = cardproperty.getProperty("BirthYear", null);
- var birthYear = doc.getElementById("BirthYear");
- // set the year in the datepicker to the stored year
- // if the year isn't present, default to 2000 (a leap year)
- birthday.year = year && year < 10000 && year > 0 ? year : kDefaultYear;
- birthYear.value = year;
-
// get the current age
calculateAge(null, birthYear);
diff -Nru thunderbird-38.0~b3+build2/mail/components/addrbook/content/abCardViewOverlay.js thunderbird-38.0~b6+build2/mail/components/addrbook/content/abCardViewOverlay.js
--- thunderbird-38.0~b3+build2/mail/components/addrbook/content/abCardViewOverlay.js 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/components/addrbook/content/abCardViewOverlay.js 2015-06-03 09:26:18.000000000 +0000
@@ -291,7 +291,7 @@
var year = card.getProperty("BirthYear", null);
var dateStr;
if (day > 0 && day < 32 && month > 0 && month < 13) {
- var date = new Date(year, month - 1, day);
+ var date;
// if the year exists, just use Date.toLocaleString
if (year) {
// use UTC-based calculations to avoid off-by-one day
@@ -302,6 +302,7 @@
}
// if the year doesn't exist, display Month DD (ex. January 01)
else {
+ date = new Date(saneBirthYear(year), month - 1, day);
// toLocaleFormat() seems to have a different implementation than
// toLocaleDateString() and returns correct results even when not
// passing UTC times; besides, it would not support an options
diff -Nru thunderbird-38.0~b3+build2/mail/components/addrbook/content/abCommon.js thunderbird-38.0~b6+build2/mail/components/addrbook/content/abCommon.js
--- thunderbird-38.0~b3+build2/mail/components/addrbook/content/abCommon.js 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/components/addrbook/content/abCommon.js 2015-06-03 09:26:18.000000000 +0000
@@ -19,6 +19,9 @@
const kDefaultSortColumn = "GeneratedName";
const kDefaultAscending = "ascending";
const kDefaultDescending = "descending";
+// kDefaultYear will be used in birthday calculations when no year is given;
+// this is a leap year so that Feb 29th works.
+const kDefaultYear = 2000;
const kAllDirectoryRoot = "moz-abdirectory://";
const kLdapUrlPrefix = "moz-abldapdirectory://";
const kPersonalAddressbookURI = "moz-abmdbdirectory://abook.mab";
@@ -897,3 +900,11 @@
return encodeURIComponent(aString).replace(/\(/g, "%28").replace(/\)/g, "%29");
}
+/**
+ * Validates the given year and returns it, if it looks sane.
+ * Returns kDefaultYear (a leap year), if no valid date is given.
+ * This ensures that month/day calculations still work.
+ */
+function saneBirthYear(aYear) {
+ return aYear && aYear < 10000 && aYear > 0 ? aYear : kDefaultYear;
+}
diff -Nru thunderbird-38.0~b3+build2/mail/components/addrbook/content/addressbook.xul thunderbird-38.0~b6+build2/mail/components/addrbook/content/addressbook.xul
--- thunderbird-38.0~b3+build2/mail/components/addrbook/content/addressbook.xul 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/components/addrbook/content/addressbook.xul 2015-06-03 09:26:18.000000000 +0000
@@ -225,6 +225,22 @@
accesskey="&customizeToolbar.accesskey;"/>
+#ifdef XP_MACOSX
+
+
+
+
+
+
+
+
+
+
+
+
+
+#endif
+
+
@@ -413,6 +414,22 @@
accesskey="&customizeToolbar.accesskey;"/>
+#ifdef XP_MACOSX
+
+
+
+
+
+
+
+
+
+
+
+
+
+#endif
+
{
+ let row;
+ while ((row = aResultSet.getNextRow())) {
+ // If the path has more than 4 components, it is not relative to
+ // the logs folder. Update it to use only the last 4 components.
+ // The absolute paths were stored as OS-specific paths, so we split
+ // them with OS.Path.split(). It's a safe assumption that nobody
+ // ported their profile folder to a different OS since the regression,
+ // so this should work.
+ let pathComponents = OS.Path.split(row.getString(1)).components;
+ if (pathComponents.length > 4) {
+ updateStatement.bindInt64Parameter(1, row.getInt64(0)); // id
+ updateStatement.bindStringParameter(0,
+ pathComponents.slice(-4).join("/")); // Last 4 path components
+ updateStatement.executeAsync({
+ handleResult: () => {},
+ handleError: aError =>
+ Cu.reportError("Error updating bad entry:\n" + aError),
+ handleCompletion: () => {}
+ });
+ }
+ }
+ },
+
+ handleError: aError =>
+ Cu.reportError("Error looking for bad entries:\n" + aError),
+
+ handleCompletion: () => {
+ store.runPostCommit(() => {
+ this.cacheVersion = 1;
+ this._scheduleCacheSave();
+ });
+ store._commitTransaction();
+ }
+ });
}
};
diff -Nru thunderbird-38.0~b3+build2/mail/components/preferences/compose.js thunderbird-38.0~b6+build2/mail/components/preferences/compose.js
--- thunderbird-38.0~b3+build2/mail/components/preferences/compose.js 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/components/preferences/compose.js 2015-06-03 09:26:18.000000000 +0000
@@ -215,7 +215,9 @@
var localFonts = enumerator.EnumerateAllFonts(localFontCount);
for (var i = 0; i < localFonts.length; ++i)
{
- if (localFonts[i] != "")
+ // Remove Linux system generic fonts that collide with CSS generic fonts.
+ if (localFonts[i] != "" && localFonts[i] != "serif" &&
+ localFonts[i] != "sans-serif" && localFonts[i] != "monospace")
fontsList.appendItem(localFonts[i], localFonts[i]);
}
}
diff -Nru thunderbird-38.0~b3+build2/mail/components/preferences/general.js thunderbird-38.0~b6+build2/mail/components/preferences/general.js
--- thunderbird-38.0~b3+build2/mail/components/preferences/general.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/components/preferences/general.js 2015-06-03 09:26:18.000000000 +0000
@@ -110,12 +110,16 @@
var soundLocation;
soundLocation = document.getElementById('soundType').value == 1 ?
- document.getElementById('soundUrlLocation').value : "_moz_mailbeep"
+ document.getElementById('soundUrlLocation').value : "";
- if (!soundLocation.contains("file://"))
- sound.playSystemSound(soundLocation);
- else
+ if (!soundLocation.contains("file://")) {
+ if (Services.appinfo.OS == "Darwin") // OS X
+ sound.beep();
+ else
+ sound.playEventSound(Components.interfaces.nsISound.EVENT_NEW_MAIL_RECEIVED);
+ } else {
sound.play(Services.io.newURI(soundLocation, null, null));
+ }
},
browseForSoundFile: function ()
diff -Nru thunderbird-38.0~b3+build2/mail/config/mozconfigs/macosx-universal/nightly thunderbird-38.0~b6+build2/mail/config/mozconfigs/macosx-universal/nightly
--- thunderbird-38.0~b3+build2/mail/config/mozconfigs/macosx-universal/nightly 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/config/mozconfigs/macosx-universal/nightly 2015-06-03 09:26:18.000000000 +0000
@@ -7,6 +7,10 @@
unset CXX
fi
+# Make sure Lightning is also unified, this needs to happen before including
+# the universal mozconfig because Lightning's univeral.mk needs to run first.
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
. $topsrcdir/build/macosx/universal/mozconfig
# Universal builds override the default of mail (bug 575283 comment 29)
@@ -28,9 +32,6 @@
# Package js shell
export MOZ_PACKAGE_JSSHELL=1
-# Make sure Lightning is also unified
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
ac_add_options --with-ccache
# Run client.py
diff -Nru thunderbird-38.0~b3+build2/mail/config/mozconfigs/macosx-universal/release thunderbird-38.0~b6+build2/mail/config/mozconfigs/macosx-universal/release
--- thunderbird-38.0~b3+build2/mail/config/mozconfigs/macosx-universal/release 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/config/mozconfigs/macosx-universal/release 2015-06-03 09:26:18.000000000 +0000
@@ -7,6 +7,10 @@
unset CXX
fi
+# Make sure Lightning is also unified, this needs to happen before including
+# the universal mozconfig because Lightning's univeral.mk needs to run first.
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
. $topsrcdir/build/macosx/universal/mozconfig
# Universal builds override the default of mail (bug 575283 comment 29)
@@ -27,9 +31,6 @@
# Package js shell
export MOZ_PACKAGE_JSSHELL=1
-# Make sure Lightning is also unified
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
# Run client.py
mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff -Nru thunderbird-38.0~b3+build2/mail/installer/Makefile.in thunderbird-38.0~b6+build2/mail/installer/Makefile.in
--- thunderbird-38.0~b3+build2/mail/installer/Makefile.in 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/installer/Makefile.in 2015-06-03 09:26:18.000000000 +0000
@@ -32,6 +32,14 @@
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+ifdef NIGHTLY_BUILD
+DEFINES += -DNIGHTLY_BUILD=1
+endif
+
+ifdef MOZ_CALENDAR
+DEFINES += -DMOZ_CALENDAR=1
+endif
+
ifdef MOZ_DEBUG
DEFINES += -DMOZ_DEBUG=1
endif
diff -Nru thunderbird-38.0~b3+build2/mail/installer/package-manifest.in thunderbird-38.0~b6+build2/mail/installer/package-manifest.in
--- thunderbird-38.0~b3+build2/mail/installer/package-manifest.in 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/installer/package-manifest.in 2015-06-03 09:26:22.000000000 +0000
@@ -857,3 +857,12 @@
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
#endif
+
+#ifdef MOZ_CALENDAR
+[calendar]
+#ifdef NIGHTLY_BUILD
+@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+#else
+@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+#endif
+#endif
diff -Nru thunderbird-38.0~b3+build2/mail/locales/Makefile.in thunderbird-38.0~b6+build2/mail/locales/Makefile.in
--- thunderbird-38.0~b3+build2/mail/locales/Makefile.in 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/locales/Makefile.in 2015-06-03 09:26:18.000000000 +0000
@@ -201,33 +201,48 @@
LIGHTNING_PATH=$(DEPTH)/calendar/lightning
GDATA_PATH=$(DEPTH)/calendar/providers/gdata
-# Define hooks for forwarding targets
-INSTALLERS_TARGETS += calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
-FORWARD_TARGETS=wget-en-US unpack
-FORWARD_PATTERN_TARGETS=clobber-% langpack-% repackage-zip-%
+define run-calendar-rule
+$(MAKE) -C $(LIGHTNING_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
+$(MAKE) -C $(GDATA_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
+endef
+
+# Add calendar targets for pattern rules. Unfortunately multiple pattern rules
+# on the left hand side do something different with make, therefore we need to
+# write a line for each target.
+calendar-merge-%:
+ $(run-calendar-rule)
+calendar-clobber-%:
+ $(run-calendar-rule)
+calendar-langpack-%:
+ $(run-calendar-rule)
+calendar-repackage-zip-%:
+ $(run-calendar-rule)
+calendar-wget-en-US:
+ $(run-calendar-rule)
+calendar-unpack:
+ $(run-calendar-rule)
+calendar-upload:
+ $(MAKE) -C $(LIGHTNING_PATH) upload AB_CD=$(AB_CD)
+
+# Hook into l10n.mk, providing extra arguments to l10n-repack.py
+ifdef NIGHTLY_BUILD
+MOZ_PKG_EXTRAL10N += extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
+else
+MOZ_PKG_EXTRAL10N += distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
+endif
-# Add calendar targets to the non-pattern rules
+# Hook calendar targets to the mail non-pattern rules
wget-en-US: calendar-wget-en-US
unpack: calendar-unpack
upload: calendar-upload
-# And finally, define the calendar targets
-$(addprefix calendar-,$(FORWARD_TARGETS)):
- $(MAKE) -C $(LIGHTNING_PATH) $(subst calendar-,,$@)
- # TODO temporarily disable gdata since it wasn't built $(MAKE) -C $(GDATA_PATH) $(subst calendar-,,$@)
-
-$(addprefix calendar-,$(FORWARD_PATTERN_TARGETS)):
- $(MAKE) -C $(LIGHTNING_PATH) $(subst calendar-,,$@)
- # TODO temporarily disable gdata since it wasn't built $(MAKE) -C $(GDATA_PATH) $(subst calendar-,,$@)
-
-calendar-upload:
- $(MAKE) -C $(LIGHTNING_PATH) upload AB_CD=$(AB_CD)
- # TODO temporarily disable gdata since it wasn't built $(MAKE) -C $(GDATA_PATH) upload AB_CD=$(AB_CD)
+# Hook into the pattern rules, this will be used later on in the installers-% target.
+CALENDAR_INSTALLERS_TARGETS = calendar-merge-% calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
endif
# This is a generic target that will make a langpack, repack ZIP (+tarball)
# builds, and repack and installer if applicable. It is called from the
# tinderbox scripts. Alter it with caution.
-INSTALLERS_TARGETS += clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
+INSTALLERS_TARGETS = clobber-% $(CALENDAR_INSTALLERS_TARGETS) langpack-% repackage-win32-installer-% repackage-zip-%
installers-%: $(INSTALLERS_TARGETS)
@echo 'repackaging done'
diff -Nru thunderbird-38.0~b3+build2/mail/test/mozmill/crypto/test-smime-mimemsg-representation.js thunderbird-38.0~b6+build2/mail/test/mozmill/crypto/test-smime-mimemsg-representation.js
--- thunderbird-38.0~b3+build2/mail/test/mozmill/crypto/test-smime-mimemsg-representation.js 2015-04-29 23:02:12.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/test/mozmill/crypto/test-smime-mimemsg-representation.js 1970-01-01 00:00:00.000000000 +0000
@@ -1,844 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Test that S/MIME messages are properly displayed and that the MimeMessage
- * representation is correct.
- */
-var MODULE_NAME = "test-display-smime";
-
-var RELATIVE_ROOT = "../shared-modules";
-var MODULE_REQUIRES = ["folder-display-helpers", "message-helpers"];
-
-var folder;
-
-function setupModule(module) {
- let fdh = collector.getModule("folder-display-helpers");
- fdh.installInto(module);
- let mh = collector.getModule("message-helpers");
- mh.installInto(module);
-
- folder = create_folder("SMIME_A");
-
- let msg = create_encrypted_smime_message({
- from: ["Tinderbox", "tinderbox@foo.invalid"],
- to: [["Tinderbox", "tinderbox@foo.invalid"]],
- subject: "Albertine disparue (La Fugitive)",
- body: { body: encrypted_blurb },
- });
- add_message_to_folder(folder, msg);
-}
-
-function test_smime_mimemsg() {
- be_in_folder(folder);
- let msgHdr = select_click_row(0);
-
- // Make sure by default, MimeMessages do not include encrypted parts
- to_mime_message(msgHdr, null, function(aMsgHdr, aMimeMsg) {
- // First make sure the MIME structure is as we expect it to be.
- assert_equals(aMimeMsg.parts.length, 1);
- // Then, make sure the MimeUnknown part there has the encrypted flag
- assert_true(aMimeMsg.parts[0].isEncrypted);
- // And that we can't "see through" the MimeUnknown container
- assert_equals(aMimeMsg.parts[0].parts.length, 0);
- // Make sure we can't see the attachment
- assert_equals(aMimeMsg.allUserAttachments.length, 0);
- }, true, {
- });
-
- // Now what about we specifically ask to "see" the encrypted parts?
- to_mime_message(msgHdr, null, function(aMsgHdr, aMimeMsg) {
- // First make sure the MIME structure is as we expect it to be.
- assert_equals(aMimeMsg.parts.length, 1);
- // Then, make sure the MimeUnknown part there has the encrypted flag
- assert_true(aMimeMsg.parts[0].isEncrypted);
- // And that we can "see through" the MimeUnknown container
- assert_equals(aMimeMsg.parts[0].parts.length, 1);
- assert_equals(aMimeMsg.parts[0].parts[0].parts.length, 1);
- assert_equals(aMimeMsg.parts[0].parts[0].parts[0].parts.length, 2);
- // Make sure we can see the attachment
- assert_equals(aMimeMsg.allUserAttachments.length, 1);
- assert_equals(aMimeMsg.allUserAttachments[0].contentType, "image/jpeg");
- // Extra little bit of testing
- }, true, {
- examineEncryptedParts: true,
- });
-}
-
-var encrypted_blurb =
- "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\n"+
- "AAAA";
diff -Nru thunderbird-38.0~b3+build2/mail/test/mozmill/crypto/wrapper.py thunderbird-38.0~b6+build2/mail/test/mozmill/crypto/wrapper.py
--- thunderbird-38.0~b3+build2/mail/test/mozmill/crypto/wrapper.py 2015-04-29 23:02:12.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/test/mozmill/crypto/wrapper.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# We install db files with the necessary preloaded certs to run tests that
-# involve S/MIME.
-
-import os, shutil, sys
-
-def on_profile_created(profile):
- """
- This installs the db files into the profile so that we can test out stuff
- such as S/MIME.
- """
-
- data_path = os.path.join(os.path.dirname(__file__),
- "../../../../mailnews/test/data/db-tinderbox-invalid")
- if not os.path.exists(data_path):
- data_path = os.path.join(os.path.dirname(__file__),
- "../../xpcshell/tests/mailnews/data/db-tinderbox-invalid")
- if not os.path.exists(data_path):
- sys.exit("TEST-UNEXPECTED-FAIL | crypto | Failed to find the appropraite data_path")
-
- db_files = ["cert8.db", "key3.db", "secmod.db"]
-
- for f in db_files:
- shutil.copy(os.path.join(data_path, f), profile)
diff -Nru thunderbird-38.0~b3+build2/mail/test/mozmill/mozmilltests.list thunderbird-38.0~b6+build2/mail/test/mozmill/mozmilltests.list
--- thunderbird-38.0~b3+build2/mail/test/mozmill/mozmilltests.list 2015-04-29 23:02:13.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/test/mozmill/mozmilltests.list 2015-06-03 09:26:19.000000000 +0000
@@ -6,7 +6,6 @@
content-policy
content-tabs
cookies
-crypto
downloads
folder-display
folder-pane
diff -Nru thunderbird-38.0~b3+build2/mail/test/mozmill/notification/test-notification.js thunderbird-38.0~b6+build2/mail/test/mozmill/notification/test-notification.js
--- thunderbird-38.0~b3+build2/mail/test/mozmill/notification/test-notification.js 2015-04-29 23:02:13.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/test/mozmill/notification/test-notification.js 2015-06-03 09:26:19.000000000 +0000
@@ -103,6 +103,12 @@
// Ensure we have enabled new mail notifications
remember_and_set_bool_pref("mail.biff.show_alert", true);
+ // Ensure that system notifications are used (relevant for Linux only)
+ if (Services.appinfo.OS == "Linux" ||
+ ("@mozilla.org/gio-service;1" in Components.classes) ||
+ ("@mozilla.org/gnome-gconf-service;1" in Components.classes))
+ remember_and_set_bool_pref("mail.biff.use_system_alert", true);
+
MailServices.accounts.localFoldersServer.performingBiff = true;
// Create a second identity to check cross-account
diff -Nru thunderbird-38.0~b3+build2/mail/themes/osx/mail/addrbook/addressbook.css thunderbird-38.0~b6+build2/mail/themes/osx/mail/addrbook/addressbook.css
--- thunderbird-38.0~b3+build2/mail/themes/osx/mail/addrbook/addressbook.css 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/themes/osx/mail/addrbook/addressbook.css 2015-06-03 09:26:19.000000000 +0000
@@ -21,10 +21,6 @@
padding: 0 4px;
}
-#ab-bar2:-moz-lwtheme {
- padding-top: 22px;
-}
-
/* ::::: primary toolbar buttons ::::: */
.toolbarbutton-1:not([type="menu-button"]),
@@ -637,6 +633,21 @@
min-height: 19px; /* aqua size for small buttons */
}
+
+#titlebar:not(:-moz-lwtheme),
+#addressbookWindow[sizemode="fullscreen"] > #titlebar {
+ display: none;
+}
+
+#titlebar-buttonbox-container {
+ margin-top: 3px;
+ -moz-margin-start: 7px;
+}
+
+#titlebar-spacer {
+ display: -moz-box;
+}
+
html|a {
-moz-padding-start: 0px;
-moz-padding-end: 2px;
diff -Nru thunderbird-38.0~b3+build2/mail/themes/osx/mail/compose/messengercompose.css thunderbird-38.0~b6+build2/mail/themes/osx/mail/compose/messengercompose.css
--- thunderbird-38.0~b3+build2/mail/themes/osx/mail/compose/messengercompose.css 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/themes/osx/mail/compose/messengercompose.css 2015-06-03 09:26:22.000000000 +0000
@@ -15,10 +15,6 @@
background-position: top right;
}
-#composeToolbar2:-moz-lwtheme {
- padding-top: 22px;
-}
-
#attachmentBucket {
width: 15em;
min-width: 15em;
@@ -1534,3 +1530,13 @@
#searchInput > .textbox-input-box #sidebar {
background-image: none !important;
}
+
+#titlebar:not(:-moz-lwtheme),
+#msgcomposeWindow[sizemode="fullscreen"] > #titlebar {
+ display: none;
+}
+
+#titlebar-buttonbox-container {
+ margin-top: 3px;
+ -moz-margin-start: 7px;
+}
diff -Nru thunderbird-38.0~b3+build2/mail/themes/osx/mail/messageWindow.css thunderbird-38.0~b6+build2/mail/themes/osx/mail/messageWindow.css
--- thunderbird-38.0~b3+build2/mail/themes/osx/mail/messageWindow.css 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/themes/osx/mail/messageWindow.css 2015-06-03 09:26:19.000000000 +0000
@@ -18,12 +18,9 @@
border-bottom: 0px;
}
-.mail-toolbox:-moz-lwtheme {
- background: none !important;
-}
-
-#mail-bar3:-moz-lwtheme {
- padding-top: 22px;
+#mail-toolbox:-moz-lwtheme {
+ background: none;
+ box-shadow: none;
}
.mail-toolbox > toolbar:not(:-moz-lwtheme) {
diff -Nru thunderbird-38.0~b3+build2/mail/themes/osx/mail/messenger.css thunderbird-38.0~b6+build2/mail/themes/osx/mail/messenger.css
--- thunderbird-38.0~b3+build2/mail/themes/osx/mail/messenger.css 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mail/themes/osx/mail/messenger.css 2015-06-03 09:26:19.000000000 +0000
@@ -13,6 +13,7 @@
#titlebar {
-moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
height: 22px;
+ -moz-window-dragging: drag;
}
@media (-moz-mac-yosemite-theme) {
@@ -180,6 +181,11 @@
opacity: .5;
}
+#messengerWindow:not([tabsintitlebar]) #titlebar-buttonbox-container {
+ margin-top: 3px;
+ -moz-margin-start: 7px;
+}
+
#messengerWindow[tabsintitlebar="true"] #titlebar-buttonbox-container,
#messengerWindow[tabsintitlebar="true"] #titlebar-fullscreen-button {
position: relative;
diff -Nru thunderbird-38.0~b3+build2/mailnews/addrbook/src/nsDirPrefs.cpp thunderbird-38.0~b6+build2/mailnews/addrbook/src/nsDirPrefs.cpp
--- thunderbird-38.0~b3+build2/mailnews/addrbook/src/nsDirPrefs.cpp 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/addrbook/src/nsDirPrefs.cpp 2015-06-03 09:26:22.000000000 +0000
@@ -42,6 +42,7 @@
static char *DIR_GetStringPref(const char *prefRoot, const char *prefLeaf, const char *defaultValue);
static int32_t DIR_GetIntPref(const char *prefRoot, const char *prefLeaf, int32_t defaultValue);
+static char *DIR_GetLocalizedStringPref(const char *prefRoot, const char *prefLeaf);
static char * dir_ConvertDescriptionToPrefName(DIR_Server * server);
@@ -130,9 +131,11 @@
}
}
- if (id == idDescription)
+ if (id == idDescription) {
// Ensure the local copy of the description is kept up to date.
- server->description = DIR_GetStringPref(prefname, "description", nullptr);
+ PR_FREEIF(server->description);
+ server->description = DIR_GetLocalizedStringPref(prefname, nullptr);
+ }
}
/* If the server is not in the unified list, we may need to add it. Servers
* are only added when the position, serverName and description are valid.
@@ -502,7 +505,7 @@
dirType = DIR_GetIntPref(prefname, "dirType", -1);
if (dirType != -1 &&
DIR_GetIntPref(prefname, "position", 0) != 0 &&
- (t1 = DIR_GetStringPref(prefname, "description", nullptr)) != nullptr)
+ (t1 = DIR_GetLocalizedStringPref(prefname, "description")) != nullptr)
{
if (dirType == PABDirectory ||
(t2 = DIR_GetStringPref(prefname, "serverName", nullptr)) != nullptr)
@@ -799,15 +802,14 @@
return ToNewCString(value);
}
-/*
- Get localized unicode string pref from properties file, convert into an UTF8 string
- since address book prefs store as UTF8 strings. So far there are 2 default
- prefs stored in addressbook.properties.
- "ldap_2.servers.pab.description"
- "ldap_2.servers.history.description"
-*/
-
-static char *DIR_GetDescription(const char *prefRoot)
+/**
+ * Get localized unicode string pref from properties file, convert into an UTF8 string
+ * since address book prefs store as UTF8 strings. So far there are 2 default
+ * prefs stored in addressbook.properties.
+ * "ldap_2.servers.pab.description"
+ * "ldap_2.servers.history.description"
+ */
+static char *DIR_GetLocalizedStringPref(const char *prefRoot, const char *prefLeaf)
{
nsresult rv;
nsCOMPtr pPref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
@@ -816,7 +818,10 @@
return nullptr;
nsAutoCString prefLocation(prefRoot);
- prefLocation.AppendLiteral(".description");
+ if (prefLeaf) {
+ prefLocation.Append('.');
+ prefLocation.Append(prefLeaf);
+ }
nsString wvalue;
nsCOMPtr locStr;
@@ -1092,8 +1097,8 @@
// For default address books, this will get the name from the chrome
// file referenced, for other address books it'll just retrieve it from prefs
// as normal.
- server->description = DIR_GetDescription(prefstring);
-
+ server->description = DIR_GetLocalizedStringPref(prefstring, "description");
+
server->dirType = (DirectoryType)DIR_GetIntPref (prefstring, "dirType", LDAPDirectory);
server->fileName = DIR_GetStringPref (prefstring, "filename", "");
diff -Nru thunderbird-38.0~b3+build2/mailnews/addrbook/test/unit/test_nsAbManager3.js thunderbird-38.0~b6+build2/mailnews/addrbook/test/unit/test_nsAbManager3.js
--- thunderbird-38.0~b3+build2/mailnews/addrbook/test/unit/test_nsAbManager3.js 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/addrbook/test/unit/test_nsAbManager3.js 2015-06-03 09:26:18.000000000 +0000
@@ -0,0 +1,100 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Tests that an address book, once renamed, is not deleted when a sibling address book is deleted.
+ */
+
+let gAbListener;
+
+function abListener() {
+}
+
+abListener.prototype = {
+ mReceived: 0,
+ mDirectory: null,
+
+ onItemAdded: function(aParentItem, aItem) {
+ this.mReceived |= Ci.nsIAbListener.itemAdded;
+ this.mDirectory = aItem;
+ },
+
+ onItemRemoved: function(aParentItem, aItem) {
+ this.mReceived |= Ci.nsIAbListener.directoryRemoved;
+ this.mDirectory = aItem;
+ },
+
+ onItemPropertyChanged: function(aItem, aProperty, aOldValue, aNewValue) {
+ this.mReceived |= Ci.nsIAbListener.itemChanged;
+ this.mDirectory = aItem;
+ },
+
+ reset: function() {
+ this.mReceived = 0;
+ this.mDirectory = null;
+ }
+}
+
+function addDirectory(dirName) {
+ MailServices.ab.newAddressBook(dirName, "", kPABData.dirType);
+
+ do_check_eq(gAbListener.mReceived, Ci.nsIAbListener.itemAdded);
+
+ let newDirectory = gAbListener.mDirectory.QueryInterface(Ci.nsIAbDirectory);
+ do_check_eq(newDirectory.dirName, dirName);
+
+ gAbListener.reset();
+
+ return newDirectory;
+}
+
+function renameDirectory(directory, newName) {
+ directory.dirName = newName;
+
+ do_check_eq(gAbListener.mReceived, Ci.nsIAbListener.itemChanged);
+ do_check_eq(gAbListener.mDirectory, directory);
+
+ gAbListener.reset();
+}
+
+function removeDirectory(directory) {
+ MailServices.ab.deleteAddressBook(directory.URI);
+
+ do_check_eq(gAbListener.mReceived, Ci.nsIAbListener.directoryRemoved);
+ do_check_eq(gAbListener.mDirectory, directory.QueryInterface(Ci.nsIAbDirectory));
+
+ gAbListener.reset();
+}
+
+/**
+ * Create 4 addressbooks (directories). Rename the second one and delete
+ * the third one. Check if their names are still correct. (bug 745664)
+ */
+function run_test() {
+ gAbListener = new abListener();
+ MailServices.ab.addAddressBookListener(gAbListener, Ci.nsIAbListener.all);
+ do_register_cleanup(function() {
+ MailServices.ab.removeAddressBookListener(gAbListener);
+ });
+
+ let dirNames = ["testAb0", "testAb1", "testAb2", "testAb3"];
+ let directories = [];
+
+ for (let dirName of dirNames) {
+ directories.push(addDirectory(dirName));
+ }
+
+ dirNames[1] = "newTestAb1";
+ renameDirectory(directories[1], dirNames[1]);
+ for (let dir in dirNames) {
+ do_check_eq(dirNames[dir], directories[dir].dirName);
+ }
+ removeDirectory(directories[2]);
+ dirNames.splice(2, 1);
+ directories.splice(2, 1);
+
+ for (let dir in dirNames) {
+ do_check_eq(dirNames[dir], directories[dir].dirName);
+ }
+}
diff -Nru thunderbird-38.0~b3+build2/mailnews/addrbook/test/unit/xpcshell.ini thunderbird-38.0~b6+build2/mailnews/addrbook/test/unit/xpcshell.ini
--- thunderbird-38.0~b3+build2/mailnews/addrbook/test/unit/xpcshell.ini 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/addrbook/test/unit/xpcshell.ini 2015-06-03 09:26:18.000000000 +0000
@@ -27,5 +27,6 @@
[test_nsAbAutoCompleteSearch7.js]
[test_nsAbManager1.js]
[test_nsAbManager2.js]
+[test_nsAbManager3.js]
[test_nsIAbCard.js]
[test_uuid.js]
diff -Nru thunderbird-38.0~b3+build2/mailnews/base/prefs/content/accountcreation/readFromXML.js thunderbird-38.0~b6+build2/mailnews/base/prefs/content/accountcreation/readFromXML.js
--- thunderbird-38.0~b3+build2/mailnews/base/prefs/content/accountcreation/readFromXML.js 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/base/prefs/content/accountcreation/readFromXML.js 2015-06-03 09:26:18.000000000 +0000
@@ -54,16 +54,6 @@
throw exception ? exception : "need proper in XML";
exception = null;
- let oauthSettings = null;
- if ("oauth2Settings" in clientConfigXML.clientConfig) {
- oauthSettings = {};
- oauthSettings.scope = sanitize.nonemptystring(
- clientConfigXML.clientConfig.oauth2Settings.scope);
- if (!oauthSettings.scope)
- throw new Error("Malformed oauth2Settings in configuration XML");
- d.oauthSettings = oauthSettings;
- }
-
// incoming server
for (let iX of array_or_undef(xml.$incomingServer)) // input (XML)
{
@@ -106,11 +96,6 @@
"GSSAPI" : Ci.nsMsgAuthMethod.GSSAPI,
"NTLM" : Ci.nsMsgAuthMethod.NTLM,
"OAuth2" : Ci.nsMsgAuthMethod.OAuth2 });
-
- // If we're using OAuth2, but don't have working settings, bail.
- if (iO.auth == Ci.nsMsgAuthMethod.OAuth2 && !oauthSettings)
- continue;
-
break; // take first that we support
} catch (e) { exception = e; }
}
@@ -194,10 +179,6 @@
"OAuth2" : Ci.nsMsgAuthMethod.OAuth2,
});
- // If we're using OAuth2, but don't have working settings, bail.
- if (oO.auth == Ci.nsMsgAuthMethod.OAuth2 && !oauthSettings)
- continue;
-
break; // take first that we support
} catch (e) { exception = e; }
}
diff -Nru thunderbird-38.0~b3+build2/mailnews/base/prefs/content/accountcreation/verifyConfig.js thunderbird-38.0~b6+build2/mailnews/base/prefs/content/accountcreation/verifyConfig.js
--- thunderbird-38.0~b3+build2/mailnews/base/prefs/content/accountcreation/verifyConfig.js 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/base/prefs/content/accountcreation/verifyConfig.js 2015-06-03 09:26:18.000000000 +0000
@@ -78,6 +78,8 @@
// Lookup issuer if needed.
if (config.incoming.auth == Ci.nsMsgAuthMethod.OAuth2 ||
config.outgoing.auth == Ci.nsMsgAuthMethod.OAuth2) {
+ if (!config.oauthSettings)
+ config.oauthSettings = {};
if (!config.oauthSettings.issuer || !config.oauthSettings.scope) {
// lookup issuer or scope from hostname
let hostname = (config.incoming.auth == Ci.nsMsgAuthMethod.OAuth2) ?
diff -Nru thunderbird-38.0~b3+build2/mailnews/base/prefs/content/AccountManager.js thunderbird-38.0~b6+build2/mailnews/base/prefs/content/AccountManager.js
--- thunderbird-38.0~b3+build2/mailnews/base/prefs/content/AccountManager.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/base/prefs/content/AccountManager.js 2015-06-03 09:26:18.000000000 +0000
@@ -1563,16 +1563,24 @@
const CATEGORY = "mailnews-accountmanager-extensions";
let catEnum = catMan.enumerateCategory(CATEGORY);
while (catEnum.hasMoreElements()) {
- var string = Components.interfaces.nsISupportsCString;
- var entryName = catEnum.getNext().QueryInterface(string).data;
- var svc = Components.classes[catMan.getCategoryEntry(CATEGORY, entryName)]
- .getService(Ci.nsIMsgAccountManagerExtension);
- if (svc.showPanel(server)) {
- let bundleName = "chrome://" + svc.chromePackageName +
- "/locale/am-" + svc.name + ".properties";
- let bundle = Services.strings.createBundle(bundleName);
- let title = bundle.GetStringFromName("prefPanel-" + svc.name);
- panelsToKeep.push({string: title, src: "am-" + svc.name + ".xul"});
+ let entryName = null;
+ try {
+ entryName = catEnum.getNext().QueryInterface(Ci.nsISupportsCString).data;
+ let svc = Components.classes[catMan.getCategoryEntry(CATEGORY, entryName)]
+ .getService(Ci.nsIMsgAccountManagerExtension);
+ if (svc.showPanel(server)) {
+ let bundleName = "chrome://" + svc.chromePackageName +
+ "/locale/am-" + svc.name + ".properties";
+ let bundle = Services.strings.createBundle(bundleName);
+ let title = bundle.GetStringFromName("prefPanel-" + svc.name);
+ panelsToKeep.push({string: title, src: "am-" + svc.name + ".xul"});
+ }
+ } catch(e) {
+ // Fetching of this extension panel failed so do not show it,
+ // just log error.
+ let extName = entryName || "(unknown)";
+ Components.utils.reportError("Error accessing panel from extension '" +
+ extName + "': " + e);
}
}
amChrome = server.accountManagerChrome;
diff -Nru thunderbird-38.0~b3+build2/mailnews/base/search/src/nsMsgFilterService.cpp thunderbird-38.0~b6+build2/mailnews/base/search/src/nsMsgFilterService.cpp
--- thunderbird-38.0~b3+build2/mailnews/base/search/src/nsMsgFilterService.cpp 2015-04-29 23:02:10.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/base/search/src/nsMsgFilterService.cpp 2015-06-03 09:26:19.000000000 +0000
@@ -902,7 +902,8 @@
NS_ENSURE_ARG_POINTER(aFilterList);
NS_ENSURE_ARG_POINTER(aFolders);
- nsMsgFilterAfterTheFact *filterExecutor = new nsMsgFilterAfterTheFact(aMsgWindow, aFilterList, aFolders, aCallback);
+ nsRefPtr filterExecutor =
+ new nsMsgFilterAfterTheFact(aMsgWindow, aFilterList, aFolders, aCallback);
if (filterExecutor)
return filterExecutor->AdvanceToNextFolder();
else
@@ -1102,8 +1103,9 @@
// Create our nsMsgApplyFiltersToMessages object which will be called when ApplyFiltersToHdr
// finds one or more filters that hit.
- nsMsgApplyFiltersToMessages * filterExecutor = new nsMsgApplyFiltersToMessages
- (aMsgWindow, filterList, folderList, aMsgHdrList, aFilterType, aCallback);
+ nsRefPtr filterExecutor =
+ new nsMsgApplyFiltersToMessages(aMsgWindow, filterList, folderList,
+ aMsgHdrList, aFilterType, aCallback);
if (filterExecutor)
return filterExecutor->AdvanceToNextFolder();
diff -Nru thunderbird-38.0~b3+build2/mailnews/base/src/nsMsgContentPolicy.cpp thunderbird-38.0~b6+build2/mailnews/base/src/nsMsgContentPolicy.cpp
--- thunderbird-38.0~b3+build2/mailnews/base/src/nsMsgContentPolicy.cpp 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/base/src/nsMsgContentPolicy.cpp 2015-06-03 09:26:22.000000000 +0000
@@ -699,10 +699,15 @@
return NS_OK;
}
+ nsCOMPtr docShellESR38(do_QueryInterface(docShell));
+ NS_ENSURE_SUCCESS(rv, rv);
+
if (!isAllowedContent) {
// Disable JavaScript on message URLs.
rv = docShell->SetAllowJavascript(false);
NS_ENSURE_SUCCESS(rv, rv);
+ rv = docShellESR38->SetAllowContentRetargetingOnChildren(false);
+ NS_ENSURE_SUCCESS(rv, rv);
rv = docShell->SetAllowPlugins(mAllowPlugins);
NS_ENSURE_SUCCESS(rv, rv);
}
@@ -710,6 +715,8 @@
// JavaScript and plugins are allowed on non-message URLs.
rv = docShell->SetAllowJavascript(true);
NS_ENSURE_SUCCESS(rv, rv);
+ rv = docShellESR38->SetAllowContentRetargetingOnChildren(true);
+ NS_ENSURE_SUCCESS(rv, rv);
rv = docShell->SetAllowPlugins(true);
NS_ENSURE_SUCCESS(rv, rv);
}
diff -Nru thunderbird-38.0~b3+build2/mailnews/base/util/nsMsgUtils.cpp thunderbird-38.0~b6+build2/mailnews/base/util/nsMsgUtils.cpp
--- thunderbird-38.0~b3+build2/mailnews/base/util/nsMsgUtils.cpp 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/base/util/nsMsgUtils.cpp 2015-06-03 09:26:19.000000000 +0000
@@ -374,6 +374,8 @@
nsresult NS_MsgHashIfNecessary(nsAutoCString &name)
{
+ if (name.IsEmpty())
+ return NS_OK; // Nothing to do.
nsAutoCString str(name);
// Given a filename, make it safe for filesystem
@@ -432,6 +434,8 @@
// because MAX_LEN is defined rather conservatively in the first place.
nsresult NS_MsgHashIfNecessary(nsAutoString &name)
{
+ if (name.IsEmpty())
+ return NS_OK; // Nothing to do.
int32_t illegalCharacterIndex = MsgFindCharInSet(name,
FILE_PATH_SEPARATOR
FILE_ILLEGAL_CHARACTERS
diff -Nru thunderbird-38.0~b3+build2/mailnews/build/nsMailModule.cpp thunderbird-38.0~b6+build2/mailnews/build/nsMailModule.cpp
--- thunderbird-38.0~b3+build2/mailnews/build/nsMailModule.cpp 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/build/nsMailModule.cpp 2015-06-03 09:26:19.000000000 +0000
@@ -1204,6 +1204,7 @@
{ NS_POP3URL_CONTRACTID, &kNS_POP3URL_CID },
{ NS_POP3SERVICE_CONTRACTID1, &kNS_POP3SERVICE_CID },
{ NS_POP3SERVICE_CONTRACTID2, &kNS_POP3SERVICE_CID },
+ { NS_POP3SERVICE_CONTRACTID3, &kNS_POP3SERVICE_CID },
{ NS_NONESERVICE_CONTRACTID, &kNS_NONESERVICE_CID },
#ifdef HAVE_MOVEMAIL
{ NS_MOVEMAILSERVICE_CONTRACTID, &kNS_MOVEMAILSERVICE_CID },
diff -Nru thunderbird-38.0~b3+build2/mailnews/compose/src/nsComposeStrings.h thunderbird-38.0~b6+build2/mailnews/compose/src/nsComposeStrings.h
--- thunderbird-38.0~b3+build2/mailnews/compose/src/nsComposeStrings.h 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/compose/src/nsComposeStrings.h 2015-06-03 09:26:22.000000000 +0000
@@ -169,7 +169,7 @@
case NS_ERROR_ILLEGAL_LOCALPART:
return MOZ_UTF16("illegalLocalPart");
default:
- return MOZ_UTF16("smtpSendFailedUnknownReason");
+ return MOZ_UTF16("sendFailed");
}
}
diff -Nru thunderbird-38.0~b3+build2/mailnews/compose/test/unit/test_attachment.js thunderbird-38.0~b6+build2/mailnews/compose/test/unit/test_attachment.js
--- thunderbird-38.0~b3+build2/mailnews/compose/test/unit/test_attachment.js 2015-04-29 23:02:11.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/compose/test/unit/test_attachment.js 2015-06-03 09:26:19.000000000 +0000
@@ -46,8 +46,8 @@
const expectedCTList0 = {
RFC2047: 'Content-Type: text/plain; charset=US-ASCII;\r\n'+
- ' name="=?UTF-8?Q?_!=22#$%&\'=28=29*+,-./0123456789:;<=3d>=3f@ABCDEFGHIJKLMNO?='+
- '=?UTF-8?Q?PQRSTUVWXYZ[\\\\]^=5f`abcdefghijklmnopqrstuvwxyz{|}~=c2=a0?='+
+ ' name="=?UTF-8?Q?_!=22#$%&\'=28=29*+=2c-./0123456789:;<=3d>=3f@ABCDEFGHIJKLM?='+
+ '=?UTF-8?Q?NOPQRSTUVWXYZ[\\\\]^=5f`abcdefghijklmnopqrstuvwxyz{|}~=c2=a0?='+
'=?UTF-8?B?wqHCosKjwqTCpcKmwqfCqMKpwqrCq8Kswq3CrsKvwrDCscKywrPCtMK1?='+
'=?UTF-8?B?wrbCt8K4wrnCusK7wrzCvcK+wr/DgMOBw4LDg8OEw4XDhsOHw4jDicOK?='+
'=?UTF-8?B?w4vDjMONw47Dj8OQw5HDksOTw5TDlcOWw5fDmMOZw5rDm8Ocw53DnsOf?='+
@@ -55,8 +55,8 @@
'=?UTF-8?B?w7XDtsO3w7jDucO6w7vDvMO9w77Dvy50eHQ=?="\r\n',
RFC2047WithCRLF: 'Content-Type: text/plain; charset=US-ASCII;\r\n'+
- ' name="=?UTF-8?Q?_!=22#$%&\'=28=29*+,-./0123456789:;<=3d>=3f@ABCDEFGHIJKLMNO?=\r\n'+
- ' =?UTF-8?Q?PQRSTUVWXYZ[\\\\]^=5f`abcdefghijklmnopqrstuvwxyz{|}~=c2=a0?=\r\n'+
+ ' name="=?UTF-8?Q?_!=22#$%&\'=28=29*+=2c-./0123456789:;<=3d>=3f@ABCDEFGHIJKLM?=\r\n'+
+ ' =?UTF-8?Q?NOPQRSTUVWXYZ[\\\\]^=5f`abcdefghijklmnopqrstuvwxyz{|}~=c2=a0?=\r\n'+
' =?UTF-8?B?wqHCosKjwqTCpcKmwqfCqMKpwqrCq8Kswq3CrsKvwrDCscKywrPCtMK1?=\r\n'+
' =?UTF-8?B?wrbCt8K4wrnCusK7wrzCvcK+wr/DgMOBw4LDg8OEw4XDhsOHw4jDicOK?=\r\n'+
' =?UTF-8?B?w4vDjMONw47Dj8OQw5HDksOTw5TDlcOWw5fDmMOZw5rDm8Ocw53DnsOf?=\r\n'+
diff -Nru thunderbird-38.0~b3+build2/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js thunderbird-38.0~b6+build2/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js
--- thunderbird-38.0~b3+build2/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js 2015-06-03 09:26:19.000000000 +0000
@@ -0,0 +1,871 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * Test that S/MIME messages are properly displayed and that the MimeMessage
+ * representation is correct.
+ */
+load("../../../../resources/logHelper.js");
+load("../../../../resources/asyncTestUtils.js");
+
+load("../../../../resources/messageGenerator.js");
+load("../../../../resources/messageModifier.js");
+load("../../../../resources/messageInjection.js");
+
+const msgGen = gMessageGenerator = new MessageGenerator();
+
+Components.utils.import("resource:///modules/FileUtils.jsm");
+Components.utils.import("resource:///modules/gloda/mimemsg.js");
+
+function initNSS() {
+ // Copy the NSS database files over.
+ let profile = FileUtils.getDir("ProfD", []);
+ let files = ['cert8.db', 'key3.db', 'secmod.db'];
+ let directory = do_get_file("../../../../data/db-tinderbox-invalid");
+ for (let f of files) {
+ let keydb = directory.clone();
+ keydb.append(f);
+ keydb.copyTo(profile, f);
+ }
+
+ // Ensure NSS is initialized.
+ Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
+}
+
+var gInbox;
+function test_smime_mimemsg() {
+ let msg = msgGen.makeEncryptedSMimeMessage({
+ from: ["Tinderbox", "tinderbox@foo.invalid"],
+ to: [["Tinderbox", "tinderbox@foo.invalid"]],
+ subject: "Albertine disparue (La Fugitive)",
+ body: { body: encrypted_blurb },
+ });
+ let synSet = new SyntheticMessageSet([msg]);
+ yield add_sets_to_folder(gInbox, [synSet]);
+
+ let msgHdr = synSet.getMsgHdr(0);
+
+ // Make sure by default, MimeMessages do not include encrypted parts
+ MsgHdrToMimeMessage(msgHdr, null, function(aMsgHdr, aMimeMsg) {
+ // First make sure the MIME structure is as we expect it to be.
+ do_check_eq(aMimeMsg.parts.length, 1);
+ // Then, make sure the MimeUnknown part there has the encrypted flag
+ do_check_true(aMimeMsg.parts[0].isEncrypted);
+ // And that we can't "see through" the MimeUnknown container
+ do_check_eq(aMimeMsg.parts[0].parts.length, 0);
+ // Make sure we can't see the attachment
+ do_check_eq(aMimeMsg.allUserAttachments.length, 0);
+ async_driver();
+ }, true, {
+ });
+
+ yield false;
+
+ // Now what about we specifically ask to "see" the encrypted parts?
+ MsgHdrToMimeMessage(msgHdr, null, function(aMsgHdr, aMimeMsg) {
+ // First make sure the MIME structure is as we expect it to be.
+ do_check_eq(aMimeMsg.parts.length, 1);
+ // Then, make sure the MimeUnknown part there has the encrypted flag
+ do_check_true(aMimeMsg.parts[0].isEncrypted);
+ // And that we can "see through" the MimeUnknown container
+ do_check_eq(aMimeMsg.parts[0].parts.length, 1);
+ do_check_eq(aMimeMsg.parts[0].parts[0].parts.length, 1);
+ do_check_eq(aMimeMsg.parts[0].parts[0].parts[0].parts.length, 2);
+ // Make sure we can see the attachment
+ do_check_eq(aMimeMsg.allUserAttachments.length, 1);
+ do_check_eq(aMimeMsg.allUserAttachments[0].contentType, "image/jpeg");
+ async_driver();
+ // Extra little bit of testing
+ }, true, {
+ examineEncryptedParts: true,
+ });
+ yield false;
+}
+
+var tests = [
+ test_smime_mimemsg,
+];
+
+function run_test() {
+ initNSS();
+ gInbox = configure_message_injection({mode: "local"});
+ async_run_tests(tests);
+}
+
+var encrypted_blurb =
+ "MIAGCSqGSIb3DQEHA6CAMIACAQAxgf8wgfwCAQAwZTBgMQswCQYDVQQGEwJTVzETMBEGA1UE\n"+
+ "CBMKVGVzdCBTdGF0ZTERMA8GA1UEBxMIVGVzdCBMb2MxETAPBgNVBAoTCFRlc3QgT3JnMRYw\n"+
+ "FAYDVQQDEw1TTUlNRSBUZXN0IENBAgEFMA0GCSqGSIb3DQEBAQUABIGAJ6gUwBMmtiIIF4ii\n"+
+ "SzkMP5vh6kCztLuF7yy/To27ZUlNOjBZZRuiwcQHiZx0aZXVhtAZcLgQKRcDwwGGd0xGvBIW\n"+
+ "dHO/gJlVX0frePMALZx/NIUtbN1cjtwDAezcTmTshiosYmlzzpPnTkgPDNDezxbN4bdBfWRu\n"+
+ "vA7aVTWGn/YwgAYJKoZIhvcNAQcBMBQGCCqGSIb3DQMHBAgV77BzGUrfiqCABIIgAGLhaWnP\n"+
+ "VOgC/TGjXhAk+kjv2g4Oi8qJIJ9CWXGnBjqMAAkTgUBspqc6rxY23gIrnYbLxX3Ik+YM9je0\n"+
+ "XP/ECiY44C8lGTKIOYAE5S58w9HCrtHn3tWid8h9Yc4TJrlJ8DRv0AnpOIsob1oqkDGuIjSt\n"+
+ "sKkr2tR8t632ARoEqyWdoHIVdKVkCE7gIICHn03e/0e5Aye4dLWttTNcCwqClXR9W6QsNPuA\n"+
+ "ZWvxBCBzN8SmqkdJilFFbFusup2ON69oFTFpX8CzaUYoXI6LgxuX435fWsXJUfDI077NWQrB\n"+
+ "LbnqM6UAoYkLPYRL+hTtYE4Z8o8sU/3n5yaq6WtCRUWz+ukQWKfDq2MDWqTVI12CCy505npv\n"+
+ "2bvNUxZHInfmSzbdmTty2aaSWnuGzWI8jnA/LdPS+0ly8fkZV9tU5n46uAYOFzcVGfA94iIr\n"+
+ "8+ftcVSSLCu5qpjOdYi1iVg/sR2sjhq3gcS+CxOGjdR1s+UWmWdBnulQ0yks7/PTjlztGVvV\n"+
+ "PYkmJQ/1io3whu0UPGdUOINTFKyfca8OHnPtkAqsTBqqxnEaXVsaD4QI859u7ZiKfUL08vC2\n"+
+ "cmwHTN7iVGyMe9IfaKxXPDi3WWbOi5Aafc5KDeX3sgzC01LoIaWqTrm756GEj7dJ9vsKzlxO\n"+
+ "Xfz95oVq1/pDwUcPtTtDLWPtQHRmBl711qzVvUozT9p3GCmvzDHETlMQa45/m5jp4jEHlA1j\n"+
+ "GFX/Y0G8Y5Zziv9JD2sYc+78H5f7IMrHibKRlnsIuCvcxazUB0CfiUO5Q4Xe82bSS09C1IvJ\n"+
+ "/I79HN0KNGN4es+x/0eyIlYD3dcm3uqDpsv0ghMEPBKogqDLMzZUwW3bQxn8bMqB/zL+6hLm\n"+
+ "1197EESFEYrs6yzVnuap+vnfaqk+vprwe2Kasl1vIl1h3K+PZvsjdQHqX1WfZRWQ41eKHX/M\n"+
+ "cR5Kn8fhi/4ddt8IK2i+OeCbkRsRnBIhGpcP2pkVaH0EtZ45nbxbs1qlFbWC4nWAJ3UlmnSe\n"+
+ "eO5QOErFgwJX9W1hUWiAgyDqMWcdWLYPQJ4Gw9yqwrEP6baILArF1oZyc9XgSBzZn/7kTw6h\n"+
+ "TeCSKu0QCK1jQXUKbftl76ftFh6L/mEPWG8CZP02GnDQx5eEoUhEIS4tf3Ltc/8ey6k62R8C\n"+
+ "gMLsUdOusI61w18bNW0ffVc+N+C8j8uWbc8w4dL4DHnfz/oFUjuk0AlpZE8ii7GNqszBgirq\n"+
+ "wQ3WdXwpD4Q/j/hru040ONElMJr7HO6ipL1oP7nbIR7JHoJmht4G39pXJ86XfJmtzMuu0MxC\n"+
+ "UTcLt1Sz87HzrMO9eWdApGo6qvwSwapAQC48nXY/WDRHgxjji6EQLwO0wF4Rlwlo4SsW3nwm\n"+
+ "NtOBsjKsEQ6/WILvRAziAPlp7+v13QfLrrzmnWFwKE6h9KQ/wpLL9/TAoy76FHoRvZgT3x20\n"+
+ "Vo9Fe7nZbc6qEc9/DbwShxWMbsU8vlzrxm4pgOC7I4jftUgolQ+NE78sQHH4XefHDKXWxRvx\n"+
+ "H8HVU/TPsj+2cEHM2WlVOXlYdtlobx20DSiOvhWdkW45Zw+9SaVkGw/IhCVkLi0UKuQV1gou\n"+
+ "lA4FeTVs0WY7jUdZB6c3DYgu4o5gxVvpRKOmwNp7rVIjsGuAjC91FN3DGQYlsyItLlZd8Yli\n"+
+ "FqGL6B2HTehmOGwtc6pfzbUJj9X9biZlQBigS3waDC0ei7HUq5M0ztyZv71dg+ZA39F0ZlVD\n"+
+ "CszjUNp847Lvt91JVmQdH0HTPu7Qfb/l3qX6LARTCgFfLGzjdcthzxyWEU/oCurUj9E1MwxX\n"+
+ "pfr8AX9/ajgCCS9bBvV0luYe/+0xqrzbnZw3m3ljfpxx5k78HFVuYhXt4iEsgtbXhJuLr/EJ\n"+
+ "B+Cu2YaQhXrvtyfi4EkOLoOcIzu5hs8V4hPebDbhDQKDcF3EhzYZ0k2YlfXnUx2Uk1Xw/x7n\n"+
+ "bLKVIpw0xSnVWdj3XeHLwEwh+T6/uthhi99iiXNQikxwbrEU4Y5IVAjh/JfKywIgPcXnaDqR\n"+
+ "1anwP8a+QQcD3U9neOvIZVx4fA/Ide5svJEkJ6gccel7kMAGD3/R14VfasqjBc0XhoEZT4PN\n"+
+ "xuW8fZIKPkxU4KEgM2VlzB9ZgTTcfUbUMmaCWioQEwfF7J2PhmIl6pBUiBFUdPv9+TnE4riG\n"+
+ "Cm5myUQEap9SFIjWRbLidy4+ZOK1rA34zNT4CnknLWFruygn8EzpgQVlru5no+qppchbOjyH\n"+
+ "O+Yz9VGs+SjoQlMl1HjtM2GQeNizP7AsLLd/R+jQ0Al4+KmM0Z8obTtYKUjG5rlwtNzcxyjv\n"+
+ "tvEhXeWjD4xGkWN8Xhf7VQX2dM7APMIiyyMNaNDVZvWxU9DpJjt4F+mhQFk4Yk5ao+Bs23MV\n"+
+ "XI4b0GanjnGzu5bHMUngkHLISMNGcDicT5JzfVYMbiM2pDakaaZWQ/ztQW5gWzjYFpj/Yffg\n"+
+ "ThvYXUi71gTZqHZiybqu6UI4iBOXc3mXbKzN3XwBSfCODFHJj5A9Lzh4pVBrndC7APfgn+Cm\n"+
+ "6ga7DmPZI1igomTOiIcF5+i7AOW/8hnv9hlsxN3D7mrIiJuRAkCD56kGBkCEMnZ1EA5nk49+\n"+
+ "k1s+XKPKPskxz8XrD2vhPL9ToSXQl/i+b+bh7jBIi+2KJh5XoiM9CCqP3B7bjxwx9qvtq7nD\n"+
+ "/+Zn4B2qCxxGI5d92mV4d1KGanbzHSZh1PJyQHrRcMMdoHMEVl1AW+YPffkwQrnRef1AZm9D\n"+
+ "ZB8B5LJvvjyNXsVGicPYM+RZwthk9Eko0W17u8fC3I/TST8c+kNqJihNhJW3y70plmSe/na4\n"+
+ "G4XeSHdbHsOWHq8CkRW83jk+2G0BE+1Y7YQt9jLOgVlIm6qYr1ov629575zV3ebyxXtkQY0g\n"+
+ "mjoal1nGJCrCp7GAl/c5KMK66T03RXEY+sBZZ2sbv6FiB6+xHreUI7k+JCUJ/uoW6c/8ithM\n"+
+ "L0gMRpxZrhksRcaBDXa8Mp4lyrqf3QWiowznSIyKPm7i0FjGGul/SESz7cKe/8RjJbKnx4TP\n"+
+ "dZ5G/+dhOZwXoisiGSj4CdXq6KKY62C1Pfvnf9elYJMo7GT8+6REYXrCQEoTIAw9zkQGD/FJ\n"+
+ "L6PvXunheXSHY454jau9JqqQdYaroYVrIHD9AINJPKluaToyT62oOL2CcG3dB0Yw1SZfUASa\n"+
+ "P36CevQjjs9GhLeFrqXXYx9ItqbYZKMiHDarjf3KgOzRhFS97n4OaZgn7Yc/tOvtXTMlYSAy\n"+
+ "M4pw2vISXcuaSl6mQzbllYuWk2sqt+rpt+/l0Hd/TfLVzp4mMq84cKerXSL271oc/2Sary/l\n"+
+ "wRHj50Wz0gIxjyfg1FgegnDmaeDCuMwSTFjrlUaV7FSKPZqaVr4LBQbyL5fsd2VrO4mQfmdO\n"+
+ "rwd7+CojtVraeyrNcwC6inBoPOa07A1aYB+bGKhwn/7n6YJEdX8AtTtir1u4r9rIPeUyv+nA\n"+
+ "QpPkPie5R481ZEgApFhyvFy6+etmHBPEpr5PguDzX1Una8sOBfBxDMVCLdn6lHA/ebDCDrLn\n"+
+ "JobzOLmW8G8cXwTmgxr1r5KbvoUaWfSZtJYL6M3b4Ix73GfAhbH30eAbgRya+IHrTx2Nhy0q\n"+
+ "pU1mgbM1aV4OhZ3wZXga8tpWnohVcTIXUfQhBYwJXCxVj6lR6mVd+4WKZT5Tz1twrYxI1ZGD\n"+
+ "HRIatLWeshiULj2KNVtTkc0w4HqIw6gVEwYSojzduuhrtXZMsBVImyV9151ZFL/oDgMQEOEm\n"+
+ "qIill8STDIz2bFF+FzkLLW+l5TeJ9rS4mrO1ffKdVWWL/PFlBvP39PHTkSv7+MYKhobbzccA\n"+
+ "ydjzdauQVn28lXVIMpF9UWmMeyWZlogGNECxb7NAPwvzONGvak//dBKEsqnGquNfNHfFJoMZ\n"+
+ "S5Ts8Br8rc0LW0zyLpLls3p+AnyJQQArteqraSodGk6X18BIbJc2avhbzGJnegacFhTr+e6a\n"+
+ "7niVgn1/P9PNo/SfMYZLWTIUKLkHq9GDhuniHqGM7tcdujI+Orit/uLVYaHDEMVKUDvJuJGj\n"+
+ "z+EybiUvIvpWjY7nWRjmtwTzR8JFUnltTGoLbcnA0Fmtu3rQCOuECYbUvH2bbtJBjatmA38+\n"+
+ "AotExnchuqDI13HVm9OY2CjyD4cJonvmjpz60xwFnr3HGp8pZNNFmvY2udGKUYhNF1X8mb9c\n"+
+ "vgs8SiT3Lf1HNXfayy+F+kLkXqBNZLnGfRHWKOAWSEj8dXiJ0ScLmAvoJTbC18s3yYoK3o2X\n"+
+ "z1sY+RERhyJ3UmFHuQ5q75w2mKz4l0kzHA6bfwHvLbTps7sNkkhT403KU8RbxNmsQDgFMCfw\n"+
+ "BaJnTNyQFJTVgljTEnFsaUAhEOgyoCAFvwe7eKTGO2NqqX9hrWcEoXSa6FgnLQvT49SZHrYC\n"+
+ "poVRVZdJ6sqnjSy7OxT+WbuQufc44TEYeGuHjH444yS7ZCMVyjNaQDRvWPYuXmFp8Anw5lO+\n"+
+ "xLb+LMEgeFKcVMjtnYLZTTgY6UtqMr18BzwHKft6+ATzyUc1zsHv9Ap7mmdRakLFa+8QbXvc\n"+
+ "+AfVbOsmcY8Bmin0nKIL9nfOUPahEMQBN1NN3dOWM/5qa3REk1Cx3rIaB/jsU9f9zUztg9MV\n"+
+ "kvplfOVYoxUsBoAhCjjzPmCgVbp6Gnr/Ebd2vFvDsokp0yHw7Cgb0mBznsntRnkb2cEB0tvw\n"+
+ "fBhK7YeETx8W3A+PKSkn1AwvoG6WeiM6CFh2yp/VYjabwfrTrfVbXpk4epzCLU8WTyPvuxv3\n"+
+ "DDH4s/Zl0CMIqL2oydtEN11ARdwXi3AImYsix/cWLzV5r1UN6NN0B0y9zmT5BrCElrJKJxYb\n"+
+ "NmafkxyrCFGnjWFIRzw4s/GGm/dBx0DGBizioedTttqjnF0rfF2pM/MVf/udCdd6uQyYlGZz\n"+
+ "AxW6ZKX0TPj7bvPyRgzqXBXTfd23kYVH/lvHEsKxnMb2F9A9LYun63jPFSiHXCahU4WcuzZK\n"+
+ "aH6h+cnY3xJn8+P2e4m4pTDMHdsgBQs4upMTxrxhH01MnUgbKz6IA2KV9y8H24PzzqJawh02\n"+
+ "xhdMHVuV396LvvjICg4OWzvFdEFdWDEZ4ph4nYTHN62TsQUwa8t3MBbKeW4mlIQXqGNAhfN6\n"+
+ "UR8nqf4H56oAMTvsvNS8EoCgcu/L9C5TrDnldYf3Zhyx51A0ufvpSNR6onWOKzVF/qwtyn/C\n"+
+ "y5l9X4c/0uCbff2nkYUqVAkfgD/hdEXiO0kdku6ptnWbNUPU76pQDQ5vD6sfe/8ZsRF68Eay\n"+
+ "XhvbZYmXCVn7azZeEps3EiOKCL4cazE508fLyjC/fNc1WMdyIve1lhXGI8uJ7/lB6tJ6CucL\n"+
+ "WT4OX6kHZh4I7mXy2+lezAELmrP3eU7YduHemlXqqlOrnw8pwGEVCsxGmCv6DdJNehk3wCJv\n"+
+ "GcdygTynL5d5fGe1mP2zxZjW9kscNX1nwf1+sz6chZ3jXpiBTRXICh66vk3UbyS3eZk8NKYL\n"+
+ "dY+/cN1O4jtipgHGq8EPUefBVRH+DmjTqFA05qHAaV/fZ53xLWm8YVTI/DS9fbbPZprOBeib\n"+
+ "GoMdA+a0Sqh6RdIWlaFXYYJUspp+rI1FlOBZvgy8Z5K5oGajE6RM06EeB7DPtI1/K+jRXa5O\n"+
+ "YXacRu/lgDlZvevVsSj27Oy6A+rbfo5oafhMMCLArtGlY4ENMk+u/ztvoxPlos9vCUV6NSFj\n"+
+ "znenH7iv5TUvv5gm4n1NCSZ9Db+zW5DQS8Gm5iGUsRj6VX5hZ1pMl2df43B6I5BwCKnq2eYn\n"+
+ "mpDzvUXUku9C/RkTxf/xfaIG30+whnY9Id4MWzWNNIJicvEdJkDgE5iRfwsVntbQYGwctmxs\n"+
+ "209aIk/KjeGWPOyg6TFYF5ZJMe/0XVSr2Bci3cj7GWeFc2FrFB/5nfExErrT4+e+9GMCyXcz\n"+
+ "bIbj45WCoA3Lgo2vh7bZV7xy6iXv358kl7bahH2/IvjUPGn3EKQY8ApoTNrRXvKAt7P4Q7zM\n"+
+ "HrRSQ+iDYZ3BCmoWfXMzRmRJbAzvC1akeduykIwQkL8QP7z7n33ntPlP2n1rDLI+LoDSOC3o\n"+
+ "bJzafHOOAH2J/MWOI61Tj7+FWyGIPihUf4rZqFXnoZkBpy/fRb/+qmSmIZ3YPiDdwICnCerU\n"+
+ "0BLeaWRD4aie51FyZ5fR+tXmTu7JDC+GRKp4EARokJgL4CTnuSGY9TaYKsoKrwST/9kKQrlM\n"+
+ "ISOGV8yTnLTzhs01EijkNEJZkJwg7QYxsJ8x9zLDL44fCL+KALLpkHEmUQdkLwy5DQV97qL+\n"+
+ "/6bSyxgLBiEHRJQns3HHGlUvNt2naUPCukRO7ieIlrPPSaL199yPcgjmFIBiXptTm9fZJRzE\n"+
+ "rkwkIeGlXzxhSpLHApOnDZaeNlVE+5NyNHOxbbBxfrc5Xmg68ZESXwxKeZAF4GM11OBLzj/f\n"+
+ "r6iGBayidg/uYZ5D0CCSyTDT1Y5RKFFe1DieQey1bj9oIuE+jo9coYLc7XUK8cnlOqLRl9Kt\n"+
+ "kcB4t5JAqob/ZttXhHnZ8J3QUpprXYYQ9c4NrYf4KEy1+femS8uGnuBZgUM1Tun5EjSeKxMB\n"+
+ "cY8gGkXcsuLzRpAtwifgHM2R6dgOq7g2nwB4wQYiILSqAsSH0QKNb+tS3NKyfNsg1tJK1PSI\n"+
+ "vOjRQCkzaII1IureIWrUikWCbQWqTDW/PazEr3HG9+BMs1JMUbEviA6ljNZz478Xbc+mA9yI\n"+
+ "RsqILUos/MCjKEhYn/qq+BsKtKmSC0nsZ3KXQcLbq7O/RZU85Dr+N+wyhieT8vu+4hb0mqrn\n"+
+ "FZwyMQt2WpnqaNk5tw92/Gw/Ad5q6ACt3PZiG4GrG3NNaKxadwkN9POzyN4zn+7gq3cyF/uN\n"+
+ "imAv6aVHaiD002PMWHIMKUOFwmS9AV3iskmW+swH9UyLPnWDejvUs8jW6mmeD3TOR8sRQv8q\n"+
+ "KwcvrscKtEXmBvFDYh3UcIcu/j5wb7WLwhNi3XOpGHEgg2MjDf5ti0kkrR68VEc+XBvnAYV7\n"+
+ "5EIrxI1qfkNcgXKRdOg6msLv6a9QSgJunwjACXM7Zv96MHMEETgkNr7DO+woHjWcPl4AYV4k\n"+
+ "HgPGUISEGUQr6/c1penqLiExW+iVj8Y5uLj3c/PNQLMhnttckHWVCz6wlqxmvoUQHgEl3Qd5\n"+
+ "pODBWHyC2FZku+Xuyu2o+GHxj10hYfsEl/qoDqqvW4TGlTz16MQrSV3SMs/i6SHmq5eiuhMf\n"+
+ "Hj6nkt3hljgHA1YawbFL58hj4x2DAyeYFfLY1YEBMH3K6JLxUdD0c02lecUDOqUxBrp+/qp2\n"+
+ "4KIqFLZ3+z7Wzx8WI0DzKYyZK79+VV7+Imv+DpOTaLFLu7nymvPeOgbzTsrJbJQo560EXpLl\n"+
+ "wID5Z36x9P/A54q0i/mhTzK/RtYYhqgaV4+GmP7XxA58zulNAJIVcsmgXKiD1GpmOR8c8EDm\n"+
+ "kMGEcrACXBOkpEJHp07J5vD8gfWublIG3MzeoTjeBhUJM7G9H5r6tNHdB4Ak+TMVfjcN0vbZ\n"+
+ "UtVCiQJqR8USTwNCumY3EtcMiXGVM3CRTTLai+IZVmLqED7SL3kpOdFcthMk5K0L0j1Ootan\n"+
+ "wFE2QhcmMVP6x8kH9cJVhbhLHWYbO/vg1AcLE7YOPRD3DVId+3dTZo0JVDC6RQKpOuUBolbH\n"+
+ "P8GpxBg4IcKqyMAA/1+FzaLicvXPzk7rKFkXjL5cgervdWF8Xx6gaihVXRfR7AiWOy38I0GH\n"+
+ "RJI8WC8NruvGHN71Oi0VKiyGD8o4tlGZyQoeRU02Z7cM1X493wCEVUuBEXYI5ax7wIcl25AD\n"+
+ "+WAv2iBZ3gHNNyCSJZM/Tqk2/2B35pfotVMgs67fnUy9tpm3n9nOdm/FgReSu3CBM3JZmYtf\n"+
+ "tOfqq3Xpu/3WnhWjkqDVmgaQ42PWtxYU32ah3M+EHHhkYSIG/csaSkVlyGYul3BsfeZ4jCvK\n"+
+ "MvVFFD2Kzkyt8zKKQlA7Zzyf900aFNhU5SkX70s94Bk3WXHXD5DRQRYHWmruCFVkFJXyaiZj\n"+
+ "qWBVKP3Gv6OXSc9IRimu6p0l0TaDxxjNoPskg6dXHTV5uTcgOKfRohgudjQC20VmamOp8IGd\n"+
+ "1muj9L82CT7elonqA0E6HFZfJqJIfxq/wSFVG7wiB9Gwjoj1xgB7bSzbglpOV/ReBPcv1ivl\n"+
+ "KsJmK9nlmfS4Y9MPWuctSROg9QVEOWq/XowOm6+Y4bpKpDhmmpsUpMsDtOJnrvSWJwcwWRRB\n"+
+ "+2Z3H6kIEUXDq1cjLsrBIWRTwb//h0Sbb2Kb1cUHnQQAjlhkSlOpaEMTzQb7GMojunx8Yeb9\n"+
+ "ff/1l4/1tqVSxX61AJuJyywGyk9AIsDIm1WW6P+P5AVRsy5xu61qrL60GHlMxtfm7ZSLAeR7\n"+
+ "GvBOgDitOE+llhzZSjwdaESxSAvnhFfM5TOCSj5YNBfLaI8bVxn4Br342GV7nufFqOLkp4rr\n"+
+ "3pcNbQvsb+k7kkdyNMNtOQfG/Ojf8YTGoanvDYrtB/0Euu0TXR86ljXPIJOT/4nhue4149SO\n"+
+ "9lboxBH6iaP8AGxn+2/pzCbcOXjDzcD/i1DoQXVcwfniiMf6S+CHb38Os3KTO49YsMYjrDPP\n"+
+ "9L2IurXfUHONlljI1T6GFV1RfRCBfO5XklduPaR4+4B0JLhU6+UKl9vdTphhwrYTuJ8I3wkD\n"+
+ "6DO4hvktTjl/IPLyYPU1w48W3cZ++P/wJNtIYl5I/ZSNfAzefc8SQh7kcnVnDoocElfWHfg6\n"+
+ "oZL0MSe088uFDAxaJTLxDaDIbzjBkwaiRYSBQ+SQVBmUlP1EjLbrwdayi2IidFj2Mr6nv4KZ\n"+
+ "4HUlmmVMSvg4K2Iv5NGgAmAjYngYSveCdDkYXQgOXldxnzVTzRRP+nEAtFepLx6TZjSjawqL\n"+
+ "nZ+N0/BCJ5UkldplLALg+5kdHCLwcdkz+H4YsB2sLE8zULM9JJW88DGBKXKue4J8GkhJlY9i\n"+
+ "1y1pdTW6mvC0J0oMAe2ULkrakIdyGgNghwjnDMaf85niB1A4+qjN0K3uGGjRyWddJH/Pnv+Z\n"+
+ "7A9dmkRNnYMFEkyFYTkbfmE2fHr4MY+YwlwjE7f69LmKEcai/is9L/Lqv5Onb8W6N06l54s1\n"+
+ "iYKzFFqo/gc0UJsiBhPmSKMNvoeoUpi0yUgXDPtw5+9HD/hqFSXqWGh2uR1vOUi85k0f1eOe\n"+
+ "zzkIBzcL3on0y03D74cB1QtjBAS2lwTXzjyEbitB4AxHyp5L13tPJs4l2uo8JXpL8u0HmJVR\n"+
+ "w6AOL/rV6elTYkuxnq5aOq8WQcm+1cYY4fPdT7ZRwVy0ZfHpN6VsqmMNIoAUyRgy86sYU2E+\n"+
+ "UMTeKZzD1+T2LbbV38AQh2kaLlSNuNkoFIjFZZvth/vubqIjHlmsw2MeZqXZIs3dBeA/1GL8\n"+
+ "s0k5ix2Obdy1t+w1e0d+y/ei1IzsxHRdBvrn1YDqdFw4xdUreJ3FSTrsTePlSWVjJXKGm13h\n"+
+ "hFjuCqELnR05+au1dFSbiAlbMPM6W/cebi+/0GmvIvfRaqrbvRJoUWxfgaFcanrlin7a11Pb\n"+
+ "6pFV47mIKHxWQiYq0z3kq+QQ1YqXvxMdM7eIg0PEOygB4Wp2FwIG0ZcEFfdq5CPveormJ/EZ\n"+
+ "NOFrIHZXkFl8fT4x8LFLWNmlQwoVqeQGOs51CYQF7YPXjFx64mV0RXz/umA5/Un6fHjKS5Yq\n"+
+ "7ZIhx+JPX4+s3RrxbUjbq4hCCa2MSBBQONhdmXtKKIf+TNvnimm9je5bt3Nu79A2OYbAzvb3\n"+
+ "cOEcQqieXzqj358oIxwd7BL2xLEMbe2Z+1bDXK+YwyJpXNF0Ech6Vbh4PSLHpW1jCoIn5HCP\n"+
+ "4K28TdrXOwwKkac1WjaQCw0RztZEatpJW1PyhQ0n8xcegTqT+6nyifeTbEKuUYXhCaJa0spg\n"+
+ "Xx1yv6G+ieBg5owSZ3DQSQ4GmaZ4GBgFePkqroihA4C1bs2FbrRWRFVRWAAEZYdcgHOyBWNG\n"+
+ "KLGntWv2VWf7yid8+oSQLExsYHBGdYMTJCbU53fuAnJYE4DJJ15Vztj0TO74KqKrkTtxfog7\n"+
+ "5CdFia/OvcCruLblCFLcrRyhsW3YKUxHmgpAPoSN4/46Bz+ob+CCkd6RJzwjnhfIgbXqKRLE\n"+
+ "8KfsCqksHp1p3hEgvm3iDuqHfBP/7O/T5V753HBhuAzFZlaOzQsjBfzK+BMXP3zp+DEpGwUL\n"+
+ "Pd/DG0fa6odMTqPs/TUblpHeANF88+XRkgB/hucv+K7h13bfRRYPMM4zephlWBzBDIaoazv9\n"+
+ "SvRyy21B4vRTXrwbTkSZXTtEFCb2027l+ycCayD9XXCLQUhjSrsI8SB+9qC/i827HcLF7X20\n"+
+ "L/8Na6qnRTinmwkBUDk+o6APUlR6sDpX+uf1bOyiV6oF0wy59+kXi9oCjupzPBOatSM8ka47\n"+
+ "6tcHJ6na0wJ+Z7EjcaOqy26OYcPT2m3wvquK00JLHCaTDisK3cQ9178FxZmpD8i09AsLVWuz\n"+
+ "r/dmucYAxjKMQzV6+q94S42EThtTbw3LJURF/8QNLk8AZKwVuaw7zz5+8F/bc2qtrUr762t1\n"+
+ "KN+9Ul8Kc2N5IxAS+klFXPfA1isfvbm88737wa3Tk1N54QIvDXVLBJg4OzvjkQAPai9lPqUK\n"+
+ "Tj3LrtYGPDTaRyRXpsH0ehIZ66TRobSaBBrL4VeopHzoWOutlTLlSSjZ1Grn6SFGdH/i998Q\n"+
+ "64ucbkyejUbFT6SgOzDN3rnl9ppqnDPOCk60WAeosAJdf4tndoYGGQQnQpsBh8uLCkyyu4z2\n"+
+ "di/om5c1yNSJsv6j2jQQiPsMX+ef+27mdAj9pUXQSRnl3oZRvQMQ7VmKsa8NBByU05MwSvOn\n"+
+ "vuEKgPq5CL+2Spnjcll+wWQsDF6OZMb2cM7PmLTGTI9LKnPnDPEhz4borQfch3jHR/EVtsmg\n"+
+ "BX6xmoD7gQdXPWBFTvwT7ljRJ4v5O0v/4p56rTneZZwBBIIgAOfncYVNGur0g1ZaFAujgzEG\n"+
+ "/PLpgIqn2rjHU+zmUuf28MvHdWxVNgSar7qMRp67M6UM6RExfuv1vzWw+ogYWeiQOYMYcBqP\n"+
+ "4p1Dm0ZxwWaqgllea7MCmniOrEGNizUMlvYIJoYcKJFVHz4Jbxy9pzGVL58Kbmwa1ZDwSXqC\n"+
+ "YHcVLer9yxoZpuDnIhRXHUnDx6Iw6QDiKpMQqJcFKf0YJTUrhN2M17kUaOD7TY0zHhDznFHY\n"+
+ "Oe0hlEu1y/FEwNxueg8tpjGVivXTX5E/81RMpUHKenlM8WbA7GQepFiIrcZTsnZ9jBCXLPGu\n"+
+ "CI00YwbNnzV/EsYsHAcvwIQBlBDVjSjkxoBaBmDsVpLawCh/SGEAl99Fe1/08OKHceGPDxko\n"+
+ "wZ3Sge2vC2ydyu4+LVnypr29R3sv53cnApKlt0uplnF4rbpBSbTCgH6IR0Aq/aYQUW032HtX\n"+
+ "wuPhxgIp7Yf5mi5rd3MwyLhsTQ7dFhXZT1kecAXAMo2x2BAo98yJfmvXM90hIwlXHwp11ped\n"+
+ "MTzc47I5XC+dR3YTHbxUKC7RCo2OjiLsT6UocM0vqyxkkJrUWHuC9vGHNEA3wmJuj/Tncr+r\n"+
+ "/bLYzx9TWcN0st02kCC4wUjQJuNlCZLjmnCrr6Y8Yrm592pv3ztcVD+cbgjwptpxN4OXTreI\n"+
+ "7Py1P0BRRC7N3I+W8OVsszHpjGsEqxFDdyRL7VtUWMR85c1cJKvmYWeSSVX0YlNsbMtVledB\n"+
+ "ViJg/2Qa6vU5lB3WXIyXOuJVEo9B6ua60Fg+HlKDHEl/5bOqOzW5pgTz2BclmAb+NvhEdl6a\n"+
+ "SzNSHFrCqmmG6Nb9DCT9wcvvs74PN2QFHm1vxPymLoEQYZ1o0oI9puayLFpMykIK4N8Kinp5\n"+
+ "iUWxh3t+V3L/yz6jHXiL2pR3UYBrfzRb+bOumTD5ENLil/3P8BngPSCvYAfRMOrBj6EAIoZi\n"+
+ "HTaCqKN2K7LefPum/AQXfE5oHHJXWkS5Zx+DiKVmwJcQuzqO5j+sJxuUlZXQnSR28g++33WK\n"+
+ "zZsrMU1MolLmEFArfC2Z1o2dxtk2FIQVq/mNhq79sfU+xmCEaGyUV84NCFpXMTe2z0m8gQA9\n"+
+ "/v+Arqi7hCbtq2AyUFNwlUlBjdAxtoPNUj5E9iPfpQVZLUTGM8H4C5kJkOXYtb+XKeoKRLx5\n"+
+ "VCESit4KBnFfx4Egptm58q2CDUOb441YhMQKUR2TCCgLPJFZBKexz0jJpWHoCBBNj5lbAeQk\n"+
+ "3Hrpj2ErGttnVxL/pFEOY0u22FWHeXdELaBs0bvbQ/8WHGUg9THFzhZtvo+utuFGpmU+gK+a\n"+
+ "XCvYMtSxSBFoSSwA4v/YTc12QBO/Dm5xINzupyx9cfkbUgrRRbP/ORXB+KIkL3uQEa6UwRzo\n"+
+ "NdZlGOySsXHLmMkICx1TxWHiTjVbrk0tAvSjIiCgdW3kFVAqGNovgl259anhCkXxbnLUMMsc\n"+
+ "sAVW0cdy3DPLjbab5tCSjbpLE8g7KxGTX6jgwjZVEDEkvhk2JwqaxQdhp6JsZIOMSxOmhhSa\n"+
+ "+zZ2V3amEkQs6Ks+3MOPRF233G33dfkmkaq8oPNOXzROimZod7RaYTJYlfl3kBHx2Gd33ID3\n"+
+ "OR2Z5ZywURCEUZ1tmidgJaChiT42hfkTNI+Y11S0DKHoQZfDQQ4gOpoGo8qn8GntVyVx25nA\n"+
+ "VpxqsbddA6diporOmNx76M7+tuSKN8KpqHpv1K1+Bv180rqa/oZ+PXxO1nu3Iv+drzvMuSXs\n"+
+ "ityJ/DRhzg3Hdz8ZJOUuKb06AfhMDcFGOpCAz5KVN6wr9/bD53Ig0KU/gUKDd2vBsPemKSL5\n"+
+ "FKKKuHf5LYVMELEfgEwhcnen5tT+wvh+UOVit6YLHSQ3uoNW9REzBwEsBcSM2xHRlg+oPw7V\n"+
+ "K6CoW1SZdRt3P6ixVDbU5IAz9oH3owqC27FK1poBSXTEg6+AodSdKD2TOqyAaP3a5+/QoGya\n"+
+ "uQntOxj2mU9rtGP2p7wQuL48ya6waALfx+8N/P18hlILF8x7K+JPBZ+0BWhMNEF9BgPOau//\n"+
+ "THHwFMvjc0yVlRtChlhzEjhAhvcK9WpM7c0R6N5vBm7M9477PbGkNZzMFqduJxTw+hxja2oZ\n"+
+ "gjcm9JXGFbYb1ATE/8WDh5dy4H49azbAb70mf9XxzvllCUCdor8TXkjqTp8qyof7P81BUknL\n"+
+ "g8vYzpY3D8eoKFwyS/f0QQic0t0/wbRVZ/tiW9qzzKaAppKINddPfVXlGUKbSKsXy5rjcg+f\n"+
+ "rD4WKauGPgTs+kOpCOAOxAd46wEP0CoLnjALeVsP6q+yNic2Mxa2FUN2fQ7Am8IWV73cnkP0\n"+
+ "RK/tcmGOmFkg73KJSl/FC3yNxG8HLQmcY/IeW+Z0PVLTj5tzWer2cey9/JTHzzOLvqEjDpZH\n"+
+ "bbsS7lOi+oxEEHHRlOM7PECSsMc9C/AQohyDyHNYPEqo1XjRmTUSU6ozbgcLDucrpAIjvVYm\n"+
+ "8Cz1icS3xZCO97XtqSGd6LsMYWlCHvQ6RJAcuBxL8sasJHkz5QZ4TG1xArSRDdz+bO/4Df+Q\n"+
+ "R5HTXGqY6cFs9CLG6O/vpzGKCaeaIjKVIZTTl93Ql988Y3Rk/NQFpWRoIWtrMC0Lpu04Vmop\n"+
+ "qYLPJCFEdCctbhiD/SXjUR6unYXHPAPGWwpRmUF8gQChRng+R5bzpmMXGAUOP8W7lvthh5+g\n"+
+ "66o+0kvtxImNox3up83hSnsU9xv5n37j9T3pttub3ozQIJTudiHS6uNLbKwDCbCvrdvY9vMu\n"+
+ "8D2LSmNC1b7QHkU7R7Bq6R8DWdvm+T+LKqgqodpoInMsN/p70ShybyVQAOg7RNUzw7k8RJKV\n"+
+ "TdxHFAxEVpS/PiBs3JFwL8QpOMVhmgK3O6Ictn/TW249fQ5qEEA7LLMY6H/TZmYWg/EWfTzL\n"+
+ "wd4bGfdMoY+IRjMsxfX4Z1vLVAo83VbtgvbKFpLb1EO7Kc7zuCS0w1BeQ5++eAnZCy3GaTUk\n"+
+ "vFAkjZkU64NaObuZ1/4hyMMGnzNZYnNraZ0+wNOFdLquhi6F5wjsbep9kf/VZfNJscWNIhsd\n"+
+ "+okxW4QlBC9smcIQJfpYx+ycVttGXQ7acP6U5NmVKf/TCu30Ltev6/SXtLlWVzFMFO6ZgKrG\n"+
+ "4xlUqiSn2L0P8AmjvWEPAyL7f3E8iarGS8mKnAq+h/LeyQPD5M8sDhrBDsBweQJghnRavj5/\n"+
+ "kg9MalKxnbYxB79uzRi3Cqz1nNJxP/sAyUi4/c7+PU4T0xQkoU3BioXURhCXZMcOOBSwSEGy\n"+
+ "LCpJbPMRSnX6gveGth2ba7os14cRSG44LPe9BDjrJwSvVV4Pv12OeNPqwH/tvyaVi5V2UvGn\n"+
+ "J9t8EK+rYLlZJs65g7oxaTIcBpkRIzElLMGNmXsEHkGc5PQeJC48C+yho5cKq84lDq0XHlMv\n"+
+ "atYV/u5N/w7Ta+nOQGn41GTOyZmAqddNwpabhszmzx32klOHwNWdM/xoqXze0SHBEMSYaXfW\n"+
+ "cOecJNbWpmIoFs+gxt6AKnOYWC/UdaBN+NPUmyQh56LNBPXHInMGc+TJpJR2BhLryKYbMRiG\n"+
+ "3KcysiWiSOujHeMhohFMUm/DUfy1LgMT8T+bQGrCIvhAjpQn5uqtB2xBMtnD4Rc6KxTyY/HT\n"+
+ "VhVtQqITCY4wy3yv15lIGxe0LLGGnVtYJqo5EEe6hQg9eXOhH6dhCDKMQ8InV+H55fAB7dnq\n"+
+ "7gZhYwjUh3+cbQHnamh/qovVNY/4sTHOP0i+13ekbw/Q7zTq27bWPGyWrfa1vsMFqBZD4vVQ\n"+
+ "1/dkZvzpdWc0uJqqSw1p0vVaHddjAwaoBqqYLwIbhrhDPYqpkQuBnNLxSoYf296ut3Z6tcxX\n"+
+ "PSOt9Z5XGK0f3XdQQSOyP2ujB9KI8sNgPCC3BpXcqb0shalUXwltnRpAsLzRnxjOujR48rxA\n"+
+ "li/1wGpRxFPNsA0dG9/kGGN/FKdYW9J38fC8YVM1gpFDrvENuiGqKxdTnAQqwNTQ4YMZKgIU\n"+
+ "spsCCOA26YRsJwRYRn3Ajw9wpTR22OG9SwmZlhgsvFxVRiDRa0KlysJVpF4n5C3F7oQtroiD\n"+
+ "86oThYaQN3ylOr8qpf4ks/rl5QHoY7j72FAaqn/9hef1C3kAh6vF85ZliGXKY4tV3gBLMgZX\n"+
+ "L08CCTUsBQG+1qeRY3UKaigBTfsbYfxU/CLayCoEV95Y4j6yFV1GDG/OuYN6hSIjw9hl3p5t\n"+
+ "4iSmAuH4jkdQFWAile59e5ewt9KuJwxjyCFpn2gREx6LBImTDAQ9YW1AManPRtvriv0mnmG/\n"+
+ "x3Pm826Jteq8pd0Vi6pLLATWjzAz+GyrtmMjk1InY0sUXdMzMfWczWBedZKCLzd2WB1tCoUt\n"+
+ "g2ZnQO3nBV/+t3yTH15cNtkG74Kk/3itRBxz1kPvLjMMwQrlErfIF5zOQ/SFXaJoiC18jIFp\n"+
+ "1aDng/elbbjpz8Y6ZQdYlwZAJt14Pgmd9oCiT8nw7cNzJkzhPw1g3MSjHiqndHNeP3J16Rp2\n"+
+ "wGnvYwGTWA2sbPgtPSv61mstrs0ZW8+JbqknLn6lRxfnODqiwH8jR723GrJGHWRwwFOLN0SY\n"+
+ "eKO7T6OPsxdiWSnDb587DzdcPV8UjwU92sdtxJPJTE5AP3ER/GFlrRtJWoJNEc4FPQPEbxSI\n"+
+ "kf8ziZWlEcwztvZyeKv/iOqmGBULuXXjFVRYn+PLXJ7rXIMo/FC4rp8wOpVy1Kr82UoJdriE\n"+
+ "+KRpOMZAqyBoQhnzqT3KSI2fzfKlKLg4XFajzjKgvA25Lt4t0FiTX0oPjT5xXy3nLMPqJkSa\n"+
+ "1xk8jA/WhFzm1H7KPjttN3Cl7Q4II+NnbxXrZ3jxZ0pAQkbR1goH3QrBDkr888Gxp4RpyUqd\n"+
+ "sgplw5FdAIGLuPZD20JkSAtJI9MuYJtndWYm1xO6aIrpCsG05E2NVSr7ziyaEEuiL1Xc8TlT\n"+
+ "//v4JMO9As9x/Pcik1mD8f7a8qLibt4+yboD1/Vra4SgfWyWaniG326q5Upk8Bl1hksCKKTO\n"+
+ "7vSEp32TaP90SOuH054HQc4Ki0ffye0aBJMifV77RVz6GErggO6iyIsFjSVpCi+bwQZ6wrkk\n"+
+ "lV3znF1li5e8dGkfMv8G/F7rCpecpvYQPD4+8PPmIELFAoRXw/PKsFXf2z9Jj3KxCirGmnWa\n"+
+ "6pV7BuKiXH2ir11ZD4zrZ8Qi2SlAJ4VfY3BIgt2nkZ8FRkmT0wroc+Basp8PDcuKzgT2HBgX\n"+
+ "r9ZhanQBsf1OZxaU33jeGUd03f4Kgf22xawruBhcdwlfRybZSUQHGpiTbhflPn6n1L697/xv\n"+
+ "kr4StZ2YIb2UHppAWbDBxZOvBct4tBi7L3A5hr+/TQr2em7kYbyrDn1x8wgNxvk7mJ2s58Dk\n"+
+ "b8Sw+XG0UnmuLhrPBF6Q7juOHN2BTaSn2X8IPtOmf5Md3KCBwb8xoIz1VUMGlgyQpvu6dL6p\n"+
+ "DDFkeCWmZloPz5tlZfwDtvgzrPxykz5sl9nwu3T5nQeufx8z76FmN1ACbxbKP4cUD29WPVRX\n"+
+ "fXQOdkzT2ogLgDkVXvOMZgeiLJ8Ws2nWPXKct4EsrykjhPvkdFLv5D65hvAnWYXBldq4DUfz\n"+
+ "tYYzorGqiyQT0p27FA6z/ohsOzkrYT5DHmOcgMJCItgnifuFh2LnXPpmW+PGPtHY4Ij7hAaC\n"+
+ "XCE++XLdlHsrEpx0Fv2f3zjmdLYRRLFkYq/g5jMWw0xAhTx9MyLBNSOTELeEZ1gOMyEUBMkg\n"+
+ "64uTVRkSZCNjOMj8QuzozG0QT8zKXUPZufka7ltYMt/LrJvUx1PqeX/Hf5hd7ZTj/2xdOZlA\n"+
+ "DcaB5H8jclPjsFn2HoLeVHnaKt1ImdQMmJpktGzC20rT1ZVqg/jIhm1hEC6rhIgXI6UaXxl7\n"+
+ "9sun22kYio6itWgJFtlQvdEgiTHlYF5Agq6Yeiv9/gw2HTnd0BFL1RHrYeUHHBxvM4Nfalu0\n"+
+ "kVRhhnJBpa5kvP74Ck1DpSaSQ6ftLOmbJ0LBZQbWxPuH1bOcztDPxW5s7F5dPqfKRfzD57s+\n"+
+ "CktZTUI5jCkxGUdsLboqCaX/9ne6mr/KQqWNbkJ6Vpl/uBMa3Iuk4UdbVdLPa9QB37vxLChI\n"+
+ "E0iRpbPCa9GBdvyf1iTlvSEAJ+xkKaxKf3DFt4ro2+CcUllEG51wegf09GacjX0vtmrJVsZm\n"+
+ "rMnt96KXdL+DtJicFFovTuu4ssf6lV2cIrKLbHBrcNuHjCAuuhsF/r3p5kewh2ZZFfkqfQ73\n"+
+ "T6XlHrAB7+jVKRPCavljLiiU/mWIZ5caadS1wDlf0Yoor76bIpr5Ifn6QiV7O1zOuboZwL4k\n"+
+ "QhLgRCCD2wn4BkeGccn4quAZSFvEpL4G9vjl5efeEI71WegKBIwEqL4w8eJCitufg1I47Bz7\n"+
+ "k8/tPa2R3qZmoS5pTW4ObX84i+nbTpuVanJ6BmaLqS/Imti8pOnu/+Nk57DYAqz/+PboZNqo\n"+
+ "wQ+d9/s7/ORYYxD085yJvTZdTsldaslunLviDXPE6WUVtt3XzNxCR7cUxNcIh8kOwbxPkwhF\n"+
+ "nLdqQVDHs8KWUb/mJPUkipwWxnwlb/nSjs+6T2P6ansxq4FNFQJeXVCLF3Mnc4ZDeC3GB/KK\n"+
+ "21Z3JYUAynAWuK5y4N3Ed3GUHhJjUReBvW6T+3MsgHapQbzvHvKTmueIuxa9nHXsUaxojV7V\n"+
+ "PNxp9TRvUX5KLJ+OPZsVhut32zpe0/HdSHeUVawdIun1chs73Gb67bZA0vnhirbASCStNnyB\n"+
+ "gTaw4o53N99N/11/i3zurK5bxqnAhEfe+H8cY5qwVOf3zksctxdjBO6OyfG7EyEbFLgxt3MK\n"+
+ "rRzwleobPeYBAp0Lotu+iBngfg9EcoC3kh7XTx2Kqc8OGISjRF7Vsf42AVWxNZc6Y1Z2kfcm\n"+
+ "zJil/iTM8sNSfbhOQ4HDA5Sn+WJXFRkz1fx+7O8bpikDBZAanEUDxO7gsn/VFezgIqJZsJGN\n"+
+ "4U2Y+C3TkRT7jxvYISFJtTr7KzQEJurFvjHUBjf+KcDc4J4CAQdDilAro4auJm9ji1k7+6dn\n"+
+ "rd5iX4Uu1GIs92wWbZ+jI7CwWDCG8GFwaPXa3+rfMgzWQLK5Z5papSZ3HTU2zEFNj4w51M5n\n"+
+ "4N9hmyZolUROZ/Md7gB5lI73EcAxVmbmpSCQ+tTarj3jIfzXU8gx3xrTx/IjhqYFX1jvzf1n\n"+
+ "Q6BNzyctkUAVpilUv8FFdCVl5qVhNHcOzzXGemxUNT/m5e/1P0dAk/dt3bgw1HfGvzvhoXG0\n"+
+ "19OMLCpf64P8uQbq53Dg6dlWXIQt8Bpg61x9z53kdD02AsK8LPy6H9O9HdQIgJX29o3BLwT5\n"+
+ "wMinuRUzgKPscuLOlHS9wCXbTJKa7mAK5gt4wf5Cpks6Ps7TYY2bq5AF0cUlHNnhiJ5XnbiA\n"+
+ "wB87rVdZLJaLHJRkw2P/Fd9xuEAHfmFqHkOHIF4g9dlPOV1nAzetM/B88QTWUta7W6uH9SrP\n"+
+ "wHkvN3D+Dri1KpAyGNauMJTXCl4iyF+9+oCD2IrXYo/imlGiNHvgoiBQeSnG//F5ZV4typ4u\n"+
+ "akQZu4NvOjI7fmkr4JW2w+hAo1zhNGCsEyl7jjU9x//xtfpKT2dZfg7JY6C2LlqyMbDXJFO0\n"+
+ "ru54525F7mHpJD1MG1a58G+bBhVGA1NxB1OSzmC9fdIpkFPsE01/bv0lcM22Shd6Y3jWW+U+\n"+
+ "4KupG6U7+RWwnNfQE8EwYAt3FLhHUz5SfdctalR8W2xG1HaUB911r7dX1/v9Hj617wYsgLwD\n"+
+ "rfQRJiQuMpleYjlsRGW9gonyH0k4WYHb4WbAB74QSkV4NYiqoYh5CRPzfpG3gCosNDw3pbil\n"+
+ "ZmA6MGB7x4EtviOMbyNbHy4SgLXpRxhOrBSFokvLseV9RsNW2xlXbS07zl1IFIo2GqZFvG7I\n"+
+ "RuvREl8D+83OMskSwKltdTIubJlLrFNPKbAXnXk4IIGRykhlkv+68zfP1hVqR2B7CTElHTvs\n"+
+ "VaLMtXKDPRvRae02HpiDCbzVKBMVlyttetXQSXg6d2YY9mT6O3ZlYri5aM47j1vwEnmgurSt\n"+
+ "hwoJF0mVCmbvNWR2JXLZ8IG8LP+xdkop7bBufL3Urt34iRucih0krQMp0txmIp3N9V8Bou5l\n"+
+ "Ce8Hc0J4uvcf5y3UHa28PydhK6XAJP8j4Lfkmkz0XrcXed4Z8psdsN+A78rJUHOsemcz1xmt\n"+
+ "r+qHdvDCW3SJ6vAS1NeaaKE7KepaWGFpIyA7uAegKvVKzSMigJZqF0DVhN6kVo675hBifJsz\n"+
+ "yZ+6douRnIqITYIrT0pF96O0D1totzUJ+zLTH+sOsrVusBDDNrad8ZX/YirSiS5vMDeyPKB5\n"+
+ "DJ6e0LgGhOyVigqNM/EBngFfk4OsKCHNi56KfQ3Egn0LAT7krK72KW2ml287CRJbnSYjLyIl\n"+
+ "PH6Alfa7wje4s48AVM2D2w7sAQl7PNr9fuOFcRnDIfjsWQUMAo/m8jsqKZYeBXy8RNXbeMdh\n"+
+ "KqieZIbWJhLJ85EGwcadWXNF60IeCa/ZXov0emYNMnN7uF1ZR5nIVUyDMV9MzG2RxcpTb1lO\n"+
+ "qaauedNmP0gI7l1OSCNz/Dt1KgzP38dg5YOi71RGrxYyz7Kva5NHiFhI3mWHJEdmRpnx142m\n"+
+ "Zy3MtpIPYoMWOxpyi9oEOPps1VvXxChVO1bePOh3CPdqzONsAXz4+P38R6MMEtiYQ3qOxv/F\n"+
+ "j+bE+UNAIyG2PAfKtaXOJ8rW8qLIMUP5aPL4/gkGDSRuvSBWpo4oWTfLwtI+FLkJSursuOha\n"+
+ "+96QakdwiSJ6p+yWaB/ex3AhULVsYWaBdV71daW9GHsa4tsPReoRcfHYHvXQy6LC6fppPiGV\n"+
+ "9iwhXbbfvuaQhn2Nb7B2j1ovG8wqtfyk+j+39asVFyNTaQiB0kA/KNu/NAi+ZNTtBaskvIjp\n"+
+ "4fFYn3pBV70OIiueCJbQTMzzCCqkPzQXtfcnvBLrDwwl4f8M59elOgPHCOBKOkEsgIf3SbNS\n"+
+ "2DreFkeMpcIed6vDDXIK1PIqmremOmSnJvoa4okRyu2SdXekQWknq2rpm20mySpeJd23/QXG\n"+
+ "gsNPPW8lVUYKDOY/YcjoxFzjRemhDZiivlN+4KBLkATO3x3sU/ZD1EOXSSCk2t8J6nzSCLPk\n"+
+ "JdLhaz/V7Lqt7ML5hmlYO30oF1wUS5U9Sx0vrWO62lvzj6FYiw75er57GfnF9n6RUl1VEwOk\n"+
+ "8NgYy+/XQkXLqExe50ueeKTICtEP0YwNekgKlrgKKwEtM2VGiyzSzZ0PL63yeNixOcVuh5zy\n"+
+ "WmsY1VgPzdZ2FwAzxtvBcYPEpkL0R5U1fmAhLjwAzd4jDG11Uo+bhpwTA+mf9KTlw6hwV83V\n"+
+ "ivNDJ+SXvLG+l2Bbu1dK+CLDB011U4lDV10EfvP+Op5keWlTY8nCozy3SLcm3LYkcnSB8aKg\n"+
+ "bRgOM2ZWO8gxxmYfub5OsOeTWoA8X1OEwOUgIA99KOu1p8PPr/tJuyuQd81KLUsdFUSlqmXs\n"+
+ "vHEpF03T825RTrmyFkusRXUCSgX3dvoxQ+Cgwkac2+Amrs3tz9FhVF3dZbgGuTXEIqb9pheB\n"+
+ "rlLGpmzJc4UXdsFZh2qSpFq5Of8aLgrXDYD2Z4S0oL2qvsjXF9rTTfqnWSTpbdKqj3AavDEO\n"+
+ "yFbhBRSNZhrI5/Fi96CWkx7JDk4boeX1REmRqQr11O+emU2eJq5em156zMBKaY5qeOX6kcyl\n"+
+ "BQrpnwq12Di+tVZ6IHamNEpobZYh7Om7l96FGsPgrCt8k7AAtsDRMbslBotcv+uzIGuiRC6N\n"+
+ "rmn6fLSbkp7M6dqDCXnQYzH1rIIIAhHH8t9kjUmv+QjdbTZV7UM/3mV/U+35i+dUi7uEoq4l\n"+
+ "pIORSDnGYj/mCvqa13pe+HKB3+dvr2G1n0Ouh8zg9weANoXwvRQ1/WQcrZLTS28woIssJgWM\n"+
+ "tRDeNQzpguB7B3GgoLf6N/4/3Nj+S9cPtnrgV3u1i7Cb3tMPOzpPmUjFtahJ09pt/CTnSKvC\n"+
+ "MZt9mu6B71hRdMb7mpwswVv50HwWtBVDIQ/nMwa1UX0iLmxZ0kRRYEzvsqyrcIPrxYzIwdgu\n"+
+ "eaoQXggEqcuEwT2k+rN5l8oBYoW6y4IHaFvuo63keiQRzGyDdtjxwvu7HaUyU0tJbcTBygcs\n"+
+ "TtBOMlVcxHGRrc2R5VD7lZTCWx86ROwI1j8WtpX94HuY+siOqLFonUiEurKss/4ehfbVSfcf\n"+
+ "TyHS4h+6lobZaFfoIkN5rW5iju5rzOWQxbtKfz0Fbl5bbs1qe4tJSHOG+Wsp16gP3W1qIB5L\n"+
+ "EgLc579ve9CFE57TBIR8zGsCRhDarWLRNk786yHSB11td0esF/9bMAA3RMMBe9UVSKIP/mdi\n"+
+ "L6C3XWzOzDWihUAs9VuDOWogl2+PZ0yMp21AjeRvo0afZYLYQwNng9fksmMC3qlD9Z0ssXX1\n"+
+ "109RZsDAo4jMOv4MZV95JTJqq5Ti2TvOf7FtyWubLkHxFTjoaoc5Vi3saXpM051if4pI1JDb\n"+
+ "WFmkxnOcxosVzcGvF36FGWuV3tx3BIPTY9p5Y3h43f8RLE2J0AmZVT9EBbWDEFYcHogjNGfT\n"+
+ "S7psFrm7FOBXwTmNQ70aUL/7sheXyftywrKl89In4E+Qfp7ARoq6hbrTUM4XP2q3Onyl6UVb\n"+
+ "qEZwvX8fzK3XACUcfyHXfunvn8NRGJk0EUgxf+GIXd4h76j8s0vyOhgTV9/m9uOs/SzPaoFg\n"+
+ "QAeiOgVWfaJTO3Ra7Lu931otDh1+e+Km/+kbx1cD55hNuHcS9wlU+ohwKD7d8jMXoLgQvXjz\n"+
+ "uKD/Zn3FMxyNgwhLJPYfD/tDqR6dRVWGQXbiibW7iieYD0IrHfsbUN2KQ/SraDEypcVSxXTh\n"+
+ "5OCJioK8C2p8fUuggfJTRhzUtVhnBwRA/eV44/b99Ifo8o52+n5g7eFo7KAnRAEAjRkHK+Gk\n"+
+ "Tm10mVPIl1Vsrz/j/NT+c6aRjq8RBIIgAEYUdOjDp3jyydz9k44SgJsSdnHnYlSeYwtsxaHI\n"+
+ "zf5Dm+cI324tx6Gdq0t7cxtrlEijUkegAVBSy+PF2kb4aeVc+GjosWjJ9r7yLzV2Lsz6j/Nl\n"+
+ "3vBXXdy9Ho4ZqOrlb7usA8ecbGxZ4wPdNysVRjiNJxDBvs2SV1BJ9HtQ3gUHek1KwrYRq4uF\n"+
+ "oxsmV2J5NV2e6mYCukTCvZyHpUA9ZIuhn/U4llnoOAaJXdgNou6FEUblyBe1QQ6FWmP0xcVq\n"+
+ "MnHKY0FpBYkGX8X6suyD6NdcCPU64wyqmmBX+hfmFEoEUjmSlpQ//au9voQPSUGBk1BHeyi1\n"+
+ "+oD7uy5xesBlcnenbmzAJVk1CWpdbvvII92ZAGLeQlK1JC/xiqvdkfQZ0ifkH56M838ZnPZJ\n"+
+ "rQCW9TB9Gv53QZ09x/P2b3VB+58X+UMxeYl2gU5dZIC1ZABOGihh0zLukCayCj3pgE5u2udu\n"+
+ "ZZjmNYvIx1khp02kWZxBl/R7mLn6sPJp8AJlHZvhg0eJFdnclPzveocADzfHPeTpFn+APBnz\n"+
+ "WPCGh5E04F5mujrGuKeRJaiRwYC8PEEIzrMSTCKthMOHts/xY3Ic26ULTMxPjI11fIZ11R8x\n"+
+ "54UYrrCZo8g7pWrxyBipkjbg85diLCQy5+rAxinVubo+gdSxnbpiVOMwRkY9lNt0/7Vy7c1Y\n"+
+ "yrTOG/2sU3DbopXfwf9JNkwP14Ba5pJXHy1yy3EsM9yR+KPc52dpz33m29BxGmOTTKIVVjov\n"+
+ "w1LFJkFkLuSX46/1bx4CTd/T8+EcGw+LRQYi8qw3xrXclhEJ171ZTp0XpE2ownDUcTwRiUjj\n"+
+ "x/E+pwFrwMnKTWt83ol+xWsU83N7w+DhoQ7jmi4CWK35J5JAh/mk5ofGNozJAmOdgk7xixbV\n"+
+ "uEkvOAGj9kwfFYtR7+N8ab69lAEFNbt/mBbd8ZfPudqi46DdMM94n26nFupuwRaNYEmZbYJf\n"+
+ "xZ1G0fCBgj9dLjw+ZlnC+nVnhkY7ZG9/WtHW1bIorRvJGnbk03MBzydKC150edeW8leqBp+v\n"+
+ "bp07c372rZHCC3G2J33xn36qlOJ3/zWf1wPbuJIrrF8tY9mcttpzzF2Qopb8oCVEECjaRlQU\n"+
+ "EkgAEb1xxIW0syvLQRuKSOKz0DU4kKUxoHbyN4PQ9lw3zYKQFTBh1CeuZqlYyuPuG0Pfj+Jh\n"+
+ "Lj6KVvRjdEgXG366qjEpa74cJ6rvqiTpbkBysvPzNfwA9SPNXUM3S+pAmOmaPwvcPsWVpevn\n"+
+ "/CYtksAPtKW7wO1wj/GmQ2kzDPZ5hKqVUkpvDPwZyLkWwLseiOX95g1/9Zz0UR0tRBnPzW0L\n"+
+ "pLttlajn3kv+zs99yQqjgrIVbuDj2kT222Q5FaiKYCaPGt6XlaHF7krMl6ojU4sLlYY5frME\n"+
+ "jKQBA79r75vHvDyRmgeBr3VstOI+su+pZCNEPlmYOzzWPOFJpZQEoz6wKhRlPMbxCufV79n3\n"+
+ "FmZFk+XIYaIXypz7TMaCiy2M1uzKD3ChuJc2SiKCLF4oGKMPG4iIcYWkKPuqxaBB4MHWSJw7\n"+
+ "FxU0SGBgQTQpuPZNNSygrHOcVThaIhsTIvPEbnYHG5FQvOHa5zuEEaep5Oj4PAy86vIj1SOp\n"+
+ "Y09gNrOt9PJgOvWIVCPYaAWUBONqx8B4SyqsccXpPVzrnTdN3qXlAhnBx6k9qwRCsttgASrx\n"+
+ "M+JSSiSakCBKpsHwuzceG8cG1NbWMYNQZbk8L3ojNVEqOG7awufWqOf1TNQv0A8a7cE6MLwy\n"+
+ "pCKrb+A/oawJq/pU4AUdEDvGKsnq771Ektk8uLXM9nxhM03vsT1Tv0CvIgtWC0DTnbT9DcpQ\n"+
+ "txMcv//WtOhZ2O2OXBhruf20KbdmbehBvYpFmLsfjVH5500MR38FaOfo7MTveaHfXIPK51TM\n"+
+ "OY1JLzLjZNtwrXDSLE2paTokynENryw60MRUnPRbqcImP3Ro5kFM/wQ4QmaHK/P8c9b+S5UY\n"+
+ "nrdDsFOCr65X+8/1DeX+jFHO8TGkZ5/+C3boM9sHEk59GTG8Ly8myYWDSEeNV1QgxAuFsRgi\n"+
+ "iz7aJ5QD2IfRIMGao++g8N7rYZg2GfprfWgBdOXV7A1CTCYmszdQDLxkLmd2uRUgrFOyJBeh\n"+
+ "1d4oAVem9rljEmhKhA9VfYR5GBxjKIauP8wUsE460dxh/Y5dx/UgTcoMM2EOozkZT07KemPY\n"+
+ "NIsLuVcIrpjx+4tIh9Jqxzj96IEf4R36sf0/mAi4Vr5i7ih7hNf9WqBQXJgmxn1jP9zyY/P5\n"+
+ "5Tj4eyAD+N7apNndwWvvWakk+RSSY1wZOs1/8qlNThl+Dx7xbQjXYGJ0l4Y1BrwmBsca/gMk\n"+
+ "hZ3KarNsb2ywJzL5ddbUr3CbSZuVVtzHQTeOEOTAkKgSYemFEwVADepFfP+N+CkQD9l/jPtb\n"+
+ "JtP3NxEne8OWrGZXDfH962jXVoVGo/n7LArJCk2eCBRLu2GeeI5U7t60+D3kvilKm3KzCNCG\n"+
+ "HoSmE3iOzRmCmzBam640WW4L2IEVrhdlYyIcLpHDev+FEIRF58KrTKR3+zsHncst8yHo2SJ+\n"+
+ "nPJor3ow4UxlPi9W5sciz0vqaBUw6GDI+4UssTWZXew5P9KnQXu27QCKFX174ol/Xj7MPK5G\n"+
+ "20QXGuHcUE6WeVbu/R046begqyWmfAIBSfsYJzh9lp/RKTwdbVd+eVI6Q96MXarLb16JdZom\n"+
+ "RCjaZKu96g6xl711JMHqP8ckYgghrqLvg67Fx7b0RmGCmX9d1UjxWWBkKRa1fcCyCNlzGdRD\n"+
+ "QjZ1/+SbAMDDnzuBjPE1r8RSfW1maD11JU506s6/N1U90oXe3jmgPovjyvPUo7Kfu7mdxc7c\n"+
+ "DAPdg2wTq79gcQ2dOKMHYUCBa9zqBAoZlXeDY8MCWBFB2oH1s4ZYVd1ZXOdo880T/QFNKmAt\n"+
+ "fkxFaXKwuVBbz832ntMngm3219LTs7dV5zQj7Ualn7XtHDUoptl14m/7K1Kvp47tW1TNdtNA\n"+
+ "5gcQsxY7enKaL1M/ymQPCB2Vtq88gAS1g81gudXWwSsgR/Ibd4chHXjX0AtLgSzQTO8njFcE\n"+
+ "tPqXcf6jxPH0hy55M1j+uTbCg0+eFHOsWvtak6DHmCXKJEVMtjDK8tu8Aqs3dszlC1vcc9wY\n"+
+ "7Tm6AJPb2NXD+Ly+/b3H2RsyUYU2GmgyKU9DTzm0Mso075CAg5Kijo0KmTbJtOdkqFdpd9rf\n"+
+ "PjA+c/Lt/VFyvyRkUppHyOmecwIqW+N/1gS3ZPWZv3CpO4kBL+I9VszGpe8OxiQBv8PVmWy2\n"+
+ "j5alpanRWLIxJUqxDrR++cwvY+zk06i/cj9PaA7ZS+IjXTgYCEJjJe5gLNikVYtXeh06biiZ\n"+
+ "NKV++wfi7BwbTk/zapIFl/aYPjricw+OioitAvtMlNy9TLfazmpMjepWGu6eyEmsJUu+PyIJ\n"+
+ "qLr4zp6nPL7NDkpC+d+NW+26UKJDFuFu/9G0zzzAFIqHCAtY4iVgHTQBeZjUXhyrkQMIlbhz\n"+
+ "/AmEAYHjNJMOcj/1fNp17bCJKsq2F9PVspsDAFWs5aM3xoiMdPZbacv/J1LnZzxqLTw4ayOq\n"+
+ "xISNpve4zdHKBaMXL711fnZ9Re5dvRxBtsikW76m/GYsZqtCXc4dAgwz5bJZTwCErKv2HEwA\n"+
+ "1czSfxIKtLZfgcn2OpUTu/pCXXwjUgrW76mMxx+Ew5lRzyQuZmh8FEWLVEfl6ZUfWF/uTp9Q\n"+
+ "2pdnrqZSfGa44NCqafNdCoBRA8+gBeAVRb4fDc3gdQMaJvgM/Q05BYk+x/7QSq33aPEteKH8\n"+
+ "WE10HHKeCF/Q72BfWs4fKAe9uLOdCSpxzzbW4ng+XcguAIsKW7BMGtH8mfr7Hx0VONL8o7Jr\n"+
+ "cE035LUC7EedjiZSXBXmIqoZ/WBd4IM3I9w0MCQqORg6eqsjcsYeioF0KEwyu8U64W88KqnV\n"+
+ "9UkUbf1pdO1vV31/r2FAfJL+zj+t2syzcDzaB931FtdFGb4mF9WBQMDAXZ/tRgyh7J/L/n/g\n"+
+ "zy6SMmsqB7XJelHjNXmi0o/Mz4GzneVzYomV5iwRctD6RP8dxhUDFgNdFZKepu5vke5Ly+ot\n"+
+ "mild9RHtQFL8tfoUVfAGdHTFByujfryb3agmM9Z1JccGa0qSXWUVOGLNWHDeBoKglSavkYGo\n"+
+ "60Ik/PVq5rn3Z9BraKsNEM1pa6IE6jyMJLmK3kxzs7F4AFpMV7fpzUMPhEPrQk+PTflWt+L8\n"+
+ "tttXzOOdeFeD0Vm8dqvmye8hhL5KwORhZ5Zj9vdKG9XZwxb3YL+o41AK1K2j5u2M/PzdpgQf\n"+
+ "oX0te214mUo+6MrYi5/2WG1Quzg4ZK3iyGDNKL8ezu380DyoYCXgzBkd3j4FxppxXVi/ARD7\n"+
+ "1mYABAPecrRIxDq9i8wf42ih+nm9M9n4CQ6LCTSLeH/uZPZeIGagFuIhHIeQe8DsQ2G9eH5p\n"+
+ "a7czcNHkWn755Uor3JcR3o+jQ9APDd43W57norYHXnRJomN+45PWIEhGyOMNozh3fZ3ySQ/C\n"+
+ "dDNiReFjxm1gWwSF1C58vZJl65nnup/r7ni6Ht2gia9yxA38EeVg5yELuthsxwTbbjk47VYv\n"+
+ "qRv3B5d2HcjfS0zg4mHjwSZLu+ia5GquBAOPKgotUkti0ianeA6SZ88owXsmqPV/fUwrwFkE\n"+
+ "qC+2TueF4hVHXXrArg+Y8HfFmNdHLFALhnCzpYKIvwAh+3ruQ6degZgl+LYW5gLPoPaZoy10\n"+
+ "c1oVkdvaIrk3WSp1wmg0X7MB5lKQwg/9pH9aZ5Fg66L/NmYHck5SKlnx/Snmc8bSMcBl1m/G\n"+
+ "QLzxOQaFVE7sTRw3hRiOos2mA/13y1pF0/yxT0sICyfy/8JtLXTFYSzIvr1YqdJWPXHRkC3d\n"+
+ "vaS3FJ7sS2zBxy/rqE5Ee7S+nkQH40BFgVBZ1Y1HC9h3PX1YyFgTT7DG884Na8mPbmkBtrw+\n"+
+ "TulraUhj9pk4Hl6sGlDyMYMJBXoNollqyVCzYAlrOWtVKroCYYo3OXV7Doa0cJBmfi6ZCDbB\n"+
+ "3g9DFd48Zn2jn93r7m3TZWlBLj+pGVieBddOhA/sV1RJcWWpojhlks2zjpPsnbg6PLo+w8Jl\n"+
+ "eJXii0rAir5oHxlGZjED7Q0vXfaaAv+eZsNHjzZrYty5sBI/5csCns/RaERoKRWnPjqAihFf\n"+
+ "G4R4n86fpR3qQXS2LCzUipcQ28qydzRGAkzJndFCLtyGhoaVkMaETK8kX/k2iuf471Xxyj0F\n"+
+ "CW8jabKPKeUCAtmGQhbwDFSrJvTmfa1QaUMRiIsNkU7wUnbdh1nEasT55GWVLZdbqWRmJzTj\n"+
+ "YB2jXv4/QN4Iie8EMRCaZyL3NLtFya/Vh2sUbqGsFw16YSZZK2E3fWfM94qcOPjHiJyPxoeT\n"+
+ "CaUdSGuSm+hTFLDoh+LZfwAJEeGMUDAZ/QgiwkunszCNI7FVEhyjcPEOjZ97ijODUhfO1r2T\n"+
+ "neGCYIoNVMzR4n0nGL8fALyxirV9F+dBZlIwCWPDZWwes+8A9buAJhoAZ7umJFYhCQiqXC+q\n"+
+ "ZY0glVYTnaS4fNQ8hTdi7SIN86WUAZiNm5LIlIUHk4ysOonExQ4VB6lCIHJrj+ucK4v4ZthK\n"+
+ "fP9w8kiqpm52fln2dqygroU73DxXsOcMCi90JqUaqAgKiXD82pYVJdGkuOFcsRVKyI3BaN4c\n"+
+ "eaJg61/PBbmGdgUUeubiuG82aGo6nxYGUa7GAD/VEKyyoyl3ba2PvhSXe+Fw5LdsKUs7GM+9\n"+
+ "YJ4gwNW9upKSDoA2ZXubC6XJ/fvAPlkDQj03sBM82GUB6Y2Y30ptrODa2RlQr4/aH1ny0Tt0\n"+
+ "fWv4rEivi8ZsKHwvAyThGW4TQi6Qa6j0d/eabNJgKHnRAPXPZPuYTeudcGg5tbaKn6OeZBoW\n"+
+ "7XzN36cOel46M+3ecBYcYkbGhtjqaMCWa/8iTA5KzXRgK0n29qZZC1sbFECkji4ObMQyjMTO\n"+
+ "sZZyFrJfLo9XUfhj2EoJZxTnF7rIznjSXhZsxN2KcOlqF4hvULDuql/2AiW7nRKa3LnlhYc9\n"+
+ "z5IJ7vyDU/0bMcu6T+bo3qdDNvMbBZ3EZQQzzQqqu0Egx/MEyyXo3UQqlhq2ueZ8VkOIpWjc\n"+
+ "x62QOVhkzn/rb0ASB98UDCMBoAHnu4Vt8HhNVj9gtYzIwsLhCWWZtXe1qslbKHG9RoANsfdk\n"+
+ "utZ/GMSuUXjoV9NyQFAomsKHf30bTAU4nYkxj3RJviAO9aQojVMRqUW/tjZ8k3hb0u1G6WWD\n"+
+ "Wa6IZAhj/WiQTnFkiiY/hSWiAKm0Er+prhJmlLuaGwMjtQIMOyNpjK80TxK1BAgJdGQnreVf\n"+
+ "8HnXz9dHAAiFGaloyC0XtjaadnXdKCW0Kq2DvyPEapfWgKoJnDc94dX80plKfwps/Dg09uoI\n"+
+ "h9ctSWicYy5q2gg/rmy6fBjw3rrv6P63Iu/Yr7d23G1lC8MukkUa8fTB89wZ3n0Eh5+SplvG\n"+
+ "YyVY7kPXxaLS9WPa7GdpEFFsdLoJ5aX0ipGibkTATFWdZEgSCGwCYUpMYJW5K+FvMtzztlCn\n"+
+ "e9ZafDobzb1UFcXTbMcQye2BlFFQl3+qq3AJQi7+OzP8tmprRws5z1WfnUr/8vvps5f1PxpW\n"+
+ "kWcQv1GNlq9ICkiX10mEOq1tVW+nVowf4tw+2y1f9VyuKnKYXWhwlfvuYWfqZG++nXZANhUO\n"+
+ "5CbHpk2IYVk9W1sMNOWq/yIoJPRcVCoNwjz2M0d/ugpAcr7RrPtdG2JWeMPaW2PVkt5UCUy7\n"+
+ "kLjx+EY+EJrSjJfTKNAwNP3zMCPohFuTL7P8zW/qWdoNdr1J6Jn5epvFXxg/4AFPM+LnchuU\n"+
+ "tDxIVNH9If++y1P7wIywzSZVjlCEk+ayGtADUqCvnzwAzlYFCoBEhwTgd+KlEZoyIQYeS8nY\n"+
+ "v6ZkgL0prWsIP5Ctg5cm8yZdXzfyWZ2VQf6qQD0amZ8HjMI1TjdWTtw+sJrTSn6Y/aA9vJeo\n"+
+ "ekNLOBvlYs9UkkxoB2/P+KlWpNswm8ykO4F+kETaPRIj+0Jquc/DFO8loLZJpomo9iyu2+BP\n"+
+ "Yi4cZjRnUNyo+aDK2DXM7wGm5cR+SYHkxPRRYmhrxDdJ8GA8Y3pw+KU+j5DeKgBInnfuZiHV\n"+
+ "sfxmjdhn3OFDW5NZ5Z9PE1M+qDxNkve22sJmiMGPmbBGP8L6icoMyikAJPrvNUll+7qpgt39\n"+
+ "eZE+P3vufj8yXa7STW781cPiWGb9b09nri2b81gwan++4n1UTWRUloMWj4m9TFFY/xw7/1lq\n"+
+ "hP09aPwIZa+sy5m4WP5wD4Hp3l8VcobFeWii2PoU7HCDRyM5J1BFAtPL9l4Mpx4CWTM5OYzB\n"+
+ "H0ihCM8sNWbQFCttc9w4Bh+vzWWpFJPDqikr50aWTEgXB7LwvTx6LiKZBV9cF/MDx/8kn9qN\n"+
+ "geqJobwdsQB8zjVzmLsSEatDHkwpn9owhFV8l+BxavMvBIMGx1lc5zOQ2mXV/n+FVDnEo9fk\n"+
+ "rurpjd663byXVgGtot3dWyr3tUjvARqNjyK7uRUT8O5mK3yDbmtE6+Gtwvwemm7nD0btP1c8\n"+
+ "pY7OaE6MXWioOnzhLH/5spqrbGGV/aP6MeQ+HNKtR4Jx5ujIp/0dVKIvRJ9g+jXSfC8o4j7N\n"+
+ "zw0/+uDrV3Lx0/6IuovFeTYLyKLyuyclVv5hnNZ7msql4Ld/+2tekKGR9Li2tLiVFJ3yfOvy\n"+
+ "YpxDMi//6FgB5tXubPRDLKCP93qurNaCpEICApW5m8NpWvbYcoSSdZKM3YNNaevmP57XVO4D\n"+
+ "IXn2H/7yvA1NdmtFkOFKkkXvhO0JnrNlEa6NMx58WUm+7owtUEv7XT22S1aOpZq4sPky2yxD\n"+
+ "gwXqB5ygbnKbNYQb+mkkLIjiTecgFM72gKmtLDz6huaNvnpxK4uPo0QEqdRUhwD55fcoYiya\n"+
+ "0RsQhNjUAQXC5056WzDuz5xRahSQ2PbrT04pI4hzrlvOdJssi8TtKiL5UFjD67pwIcbmNnps\n"+
+ "1RXo4g2O1nef5/WHe048ZaPdV/pvBdTiEp3bjKFTlD35dUwFcOmq5+W964BmljjQYu/6rGdG\n"+
+ "3Sby2g/B+RCtEz7NB4GA3/5ah7SoJ0cimcA2HRF71Pa5T0cIkyEORSCA9pXrXi3pDz0RrqRQ\n"+
+ "4MsFEiTnJvl7K8MVRfGhVpZSxyvfC1WY5dZ760HKv+fBJAKPZywaIT7wg3Ka58t38u5ZiKFc\n"+
+ "mGzN6M4mvgKTG8EMKgjCcFc9v1IdkWC9vijufVcxfW3rFkPNnakWL0td9qHKq3/mlpxVpBY5\n"+
+ "aDGpdCyzIAmshRa7zXt3LzVWSLmnCzW3aNWd/eLmjLfA05e09lE5ZRF4lOAU5bIC0EB3+iLS\n"+
+ "OSfPE4APylT+7cMlkp/CdBbAfio4xrJbkvSgqwESXWisFgZ9Zih1b/APM68woGmpf5aCY2Wy\n"+
+ "0MqzuOpHerXyh/O8nai1zTyDz0Nqe5Z60ITQR98tV2DHsQDazPSU4Jp1zAA4QuW67i2xps1p\n"+
+ "g0IlOREYGCry/mCh2SPX79USHOq3trmd7OVCaaWHSzzlCuVjm3FCplHq+11/sAw9c7Y9lriS\n"+
+ "zp5li+GbZ1ZVWt38XrVoUkGrexy5Im09C0zNNYMNMMehHkLGXhDBAmBwDWgw8xP+SP8vBa6j\n"+
+ "jCI9AB3AOr7kDL688ts8B+8oYeY9/2UiH7HA7Lb9Lpz06ifrz0/Ojt535D/WPqvJj3r3NgXT\n"+
+ "f0mrcEuuFUfcjnRyKtPQevdgzX5ZRHsvyijAFAt9yUt9AlcTiZOtJerz0RIsTgq8T2tsp0Mx\n"+
+ "vtHsZWqgzKfnW2SGiFhi2aIPZgAZA5FKq5zwT6sWJsaN3iyzqU+4reKwYrx6ZKNu4fT93y23\n"+
+ "Via+Z9s4dy3JFG8hrIY06WG+9XOyFqIoccDiwFfqHGf45mAjuuy9x8SQ5eMWe57tVSFUWxwo\n"+
+ "7zDT80Lh6wWc3cPomT5OWz379x2WXmO4MxXdrx9AKBT2tUXF8aCDbtx3IhG4QRtjQ0STbkjV\n"+
+ "ftV1iQfzx9invUZlUWJOBYYO+ZvnJ8bsS9+ZlNShwxZD3Eq5RfGAyEIF4W+PS2xpZuQxGySZ\n"+
+ "C9iaxZjBGjWJ1N8XwD0c+Vsuyavzgfv3ns7dKSiarIr4znXJaBhS4kJaq7buQ7zVf1iHySHj\n"+
+ "MxkhErY0oZ8DJTxKJDuOYPfW6GtinXZpGXE3KMy1FDXUSH3RC1DdnNtQBpsbVxEjzaYD8Gzj\n"+
+ "d/rWJzE1qtTK/OwlHwZyN/5XDN4Rul76dZbqC5En2jcVo3wlh0wiOQMk5yjycX0exzEJMlU7\n"+
+ "JTlcwkR6zY/Pjgd6l6dvATedIQbS5gxeu7f0ePCbN9coIAEJF+/LtRSeONypYb0MlKxEfena\n"+
+ "LR4XQ4kH3q0ed8jl9E9pXmGJKzEL9RuXiRZw455wx3J/f8ywNWrQ4JWdXKVklTLR1QrBRPSo\n"+
+ "K0qKkC4thqs3dyxgDdywKKq/Yz5pa1KPbp6RL6Pof348nmDbbj8QG59agAaMoRrZnqJmB4DK\n"+
+ "IS2iu+ES6KSmauUTlI+ZRV3HBj5rwu3QDrhQb8w6uC3TY33RcYlFP3MVaHQnlG76tMxkHQ59\n"+
+ "E8WL1dtVTzhOhETiZJZeAgzCqKc9L6aEtHvWZdqnUoWDV0O4UUDMjpNu2o8xYH9S7cFDbrWV\n"+
+ "coBYOkk8H0B4V1toNM8IMSSGs38G0hO0aK9LHyrGfEDO6HCF4qt8K1jcvbZmbUGUvB42a1Hu\n"+
+ "A02aNM7hRsnEOpRCp0l30VSlhdB3tgb6mI1LvNXe3pwSd61Hr+DIx8xDZ0cGA+b2DP7hnYp/\n"+
+ "Z57jk2qNwTYl3Yb/K+QTiv7AN08YDg5pcmkwfR/wuOrwqQp/remhQXUivUu13pMik8YYlwMc\n"+
+ "x0r4r8EmloRkiU8OuIv05EueMspLJItIEnXxchN6BuXdmB1G9C8NN9jl4T2xsmaE0f1vMPRI\n"+
+ "5OOHmPdwoRvGC6qWkY2rpY34haRyTAWrDhELca3kIgIVgsvIikbTkQvhY2+2mTrtlVSDcYhk\n"+
+ "ngvRPIT9Q0je0IK3+3XLog+uLQykqtOYKfsA3hfAAKgnghIQjwx9TO5ys1yR7AIGeYj0fOjI\n"+
+ "+hhwEgeUe3fttRe10FGXei10Z62TXiF1skEL7odnWMpkQ4vN2n4H7LdG+dFkVU1cgJXI16cP\n"+
+ "BKrrknaRXmURgVrJk0sItjxKGzU0OG/U9amKT39LXTc6x8hhAOwNeJLUksGCQpdjsV5XBnw9\n"+
+ "5+1ekWc+MPQK+SSgxWGaNfDPw1IxEWehrIAKjRqFhlsGLY/wbgM0Y9g4XugGMey/Ibbzdvuz\n"+
+ "M6HdffYtEHdzoAAh5CEo1g7jQvzyPHVdEwhxDxV/MmcWB+B3D2AHvgE3EDealVbtp0sOBcKj\n"+
+ "NGXbOPnaI2YzkKKC6Z2DeQBBOLzz3saaoSAi6yy4b+xxK3bcEi64nGZGJKuNi3MpCBL4v71W\n"+
+ "7eUFRwKYyaHhLY3FKwTOs2paQysjDc2NIlOBSrJLfo1wgmU9sQJx7BQdkUkPZn+p7GdfFUoN\n"+
+ "k4akjIewzRwKzPTmIPVhzb4HrmbFp3EtxPlKF7Afzt+6DC1FhzSHVqMyTOL37WBCa+Qthw6l\n"+
+ "lLRtXnwAErLnnaom2qgWl24HFkvaEKu/X98eQqcf/mGcjKgHII6zfdkdHvS+lMlbdo7ATzC4\n"+
+ "Dhx50456H4Q0/4CZ5VE91q1sGglKl7o3KdFiWu+WmgKfJo6/Q9BsHNluLxRPJMA2qEv7/e7o\n"+
+ "JeJ6HBYHHdwB+1DU9VnNXdk8d1SlAGyBjVzE3s28bHRe4pLmwCh3CIbwiNn0NCXavMTMnA7H\n"+
+ "RbrW6eHdJE0AwWs1EX+SPi4PzhFkT5k8iQxQqHbRiKAoqnD5rbhqxifapAf2SA0LNrlbvGY8\n"+
+ "22kE11mwbu3QXvbhD7Ji/1U6E+z/DpYFz9xeXGdcZAFEbo3XfuHh7LQ3FKENTKFQQhVnuX9+\n"+
+ "a301TXP6se2nBIIgALj+F1K0JvkeZE0ZxpXrM+5U3lhSBmPWT8xNBJ7c+EiJtGEhOyQVUZMR\n"+
+ "mOgMJ8sWfEPHQFpgFiRPtw3/Od4vK5IFpQUPqQWCU5wZrp9qrxlwcQAPu+VG2QFbudaIKXJk\n"+
+ "udzf8ltnEc2bjGFh2opSvUsQgh0kOSTnLLVAov9fIf3qKUVeKFcG2xpFIl1BlelOTmKAU7rH\n"+
+ "diRY9ujoLTvkIg/9o+rk83GmPHR3xz3i6RSrOGeiuLZ55PffPNc7aju38GYw0PV02E7Vex6X\n"+
+ "dtmimBHav6a2WvhFZhFzG4O0jr26UKDXYDVHKb1at4ymDgiQ34KAZxT0ZxJmeNAq/KZeXXfZ\n"+
+ "0D7hZ/xhS1+3CohTQM/fG8P6lWa/ohDJirS3tjFqbm4VSjqJaOZqMmTM6SgIeTvypH52i/ZM\n"+
+ "caYsH+/BcGn2W0nv1ZHcjmuMHkrQ5UfFH4AqR99LYahcAMFYE87unzVln/ljrM2hUCkzQjBd\n"+
+ "qeR5Kgfsstnc0O0dcGdmPTRHgJDoZdQzRFN2M6CbwpHl9OO4EselflWw6Z5QwCzBkC/3Hbmp\n"+
+ "wBLZBE45JFiiIqkrxT0t5BAxEYGGyv/JSTygvY6TrsvCoH4AFVIQTi3gsy2/TdcEFU8zwrQ2\n"+
+ "5Pui05SlMlfcccuoRTMMH3qqhuzbuQMz4JgLe7UdIvcQkPGIUdUmqliXOSd1VfSjhVIrqxJe\n"+
+ "4PxKcWNUdGbstdujHh+/KvH4AauRpn9pHw/P/verYdaFFtHpSpADHahd23SGdeWVuhvBGCV1\n"+
+ "/AUb6AoGFXU+m5TV8J+DLH//yvYfzu2ajmTWHpo85/CSnxhdhwF5MWQ2mdIq/x8TC8MwRTDv\n"+
+ "iXs6QCKTGlmSieaQnV1DS6y3np1rJvZodA2/zR6CMNvXoU/R+9aYVVA8jBI4eVeMghn6vp4e\n"+
+ "E+QAlJNU9ji1xLKMzPbWJ5tXryiB+AOF/hH1U31xfFEL/XzDTE+v4rCBpi7xgYLl6CYDIziN\n"+
+ "7AJuq9RdHhLimkxqT7dYH+rPE6BUgoS3wUi1KKy3IfRESuJ3UBPitkCaUvWeE3uZrK40vj81\n"+
+ "VDC3GnXWNXxSRAkx67hi5CBTuWlhFhIrVs9VzTiODlmlf1ln/AcCfwV/xg0QQ0NcuVj6s3a4\n"+
+ "qUm//jigFtxx+AFymf+1ABprCVxD05+eKvH010FgqX5+QPUre2ikKmh9/Cmi5/P6swC1AQgE\n"+
+ "ykXGHatZBjewwuegFIa4fMlqOwQn3VG/JzpsXiQxL5cDpWlT4e58RE8GI9bKJeL5c0ceIxDN\n"+
+ "qQnMgf5HCIUeEhPqskz8Q7nr5T5BRcxQ1oVaVkhbvCAYYJyGE2PgxZbwGcO1qgHVFahWMJnK\n"+
+ "EE2vIcig1OZ4zRdld+3zOdk6q4HExzr/YxllZjFasjr99sDXRnmVTbFQ4qdCwAKtEXfx6dx7\n"+
+ "MnhQ/B/UF3hwl8ODl8uqAu7IhWEYr5LlsOD2rd+T9WiBJW5dyLoBLbhvuVyJzw3dnajipT51\n"+
+ "bDNxbsFft2X1bje54joCjpGpcuIEGntZpU65X4OQiv/cdXI4nV9LaDFvyCsqJ2xQohXSIt2Z\n"+
+ "/pDxDT/ohuCFJDVGItjOcequa/CFwpC+/kH70Pg/84dAFPMug/WgAoIe+cgJ1q5NZSPIBu69\n"+
+ "1bRxZvvaG9cMa/Bs3KLzjWCDzH3zRDUWx+vD0M8gEPjxzF2hFVnwslVPIawHR45fRV3NdDAS\n"+
+ "DMHwVtj4xbFG94OHnBGtEnAH3LTa7dM5CcHZEamHWqnVbASuQkZuiU1xrZEHqtNlNZ+rkO6a\n"+
+ "0m6izOJtlf2Mqw02tIsd0gMD03UOtHC1uie+ZcIiO1bFw6kEoSh9BB3jxt2G2QHf7nJA8o5x\n"+
+ "tJO5Q43AwUIh1evygnVDYSCNtlQ8R2wdCQ6QfUVMhfMxqGajA+SXsCHXPI4YrXGQTawussIN\n"+
+ "E0g63Q/oBxmq+XwarM0+cILrEoq6VfMzz6t5i1DQv/jVmGBlhuKw7V7XbxZV7QKjXhsAhDXq\n"+
+ "sFYxwI/4/AEiPMv2s/p2BNa7WbkgqHrQC3QHrVzwXQglO0x3+iqqSoR2qL0H6TF4QazQiXig\n"+
+ "i3dBIBS8JhdkJFEXY1ylbfSF3xl4DsDHoxHl8KZGYVcH6sThi5aumQLzYxDcstjU26agaSwp\n"+
+ "Uy0HcsZfCK2HVJfBgGJakiEqmjayZKryijz41vqgqqPj1A818TbjUE+SlewGHnnzJY6xDStb\n"+
+ "x2i/Mmu5bvymyiFWaQKKPM5/fOwkUbSO4I+P7JwqFYOIgtuEdKbf2SM9nzatn4FRSCzK9O/E\n"+
+ "pQb5hQCwSONawekPvYfVWHj3WKnUjzuWaUGvCj+h7x1NOgvUvf3P/VrFyUSXQS0zcCiixAJc\n"+
+ "s2S4tbfafNuYSUsSG7DWcastrLHWq8mUkKW/4J/ENONFjzmuXt/iXJt8vSrhWzIx2dMwUYcj\n"+
+ "/9BhwSjTVn4NmMKagxHiOXxwyFer6GbLylVP9+fXXyCt/fODm1lRBPpAdL0ycfrs90GZ1C6q\n"+
+ "gGUvbGHhXlzUmTE8pI5Ao7+m1rm2t2NWWH7IgSK1XggHr9TqGToebgHHbT+peP+7rj50EU0N\n"+
+ "lvGzbpVdoDx8Aj0k4OKDcggHR8vaw8bkuSTNn0yrGN2OlhNrZjzvy1QtH0b1kcVvrVnzJkTs\n"+
+ "gERrq37zfYrZ3nOYegLR1dvuvnl4LScLBVmLzis12XUFoQZ72NMsS4cEVhREkaKkbYrb5kWk\n"+
+ "/nh0ATDW9lC3/yvo/tS8MWsE/MHt5Bhnfb0zH8mYeBIaotjE64S1xwXLr6C+BqO73PlfCeul\n"+
+ "7c7BKZlO8yiQxTPQ1RbWaXqiNT1o/ztvVSYtwFZGWfIdwG7pyG+ewF5aQj2iyxQBiszR0JOL\n"+
+ "KODKBVjKiFqyBjRZ6o9R9orB553QhKbuVC4+vBaGh+P3UwQxlvs3rYE8zInMafcEoSTCoRh3\n"+
+ "x2pFg+mieOPeCXQ2wTSSEd3aF0w7dCNMUv5JKKNPnGgn67sg+2e3s0HoHg6xHvNZ+7FfhDJi\n"+
+ "KydDxAPW8I4f0A6hiQayPN4BavHVIfg5JsAwMkTNbdUBvrTxVLtN1089bPPT3MSEEKf1hNjX\n"+
+ "gb8h7Rgd6zGOv4ovWQHyTncB4d0L4ycP0cBgqi7wh3qhc+FeC9+PCa7DtN6rmxC3knSVOXnY\n"+
+ "8rnDnyA3WN1WgwY/eg0geejJgZglwJU4kb6YpkC3jrZfxgnRETwxmW0ezsHV3jxfTSdntvjl\n"+
+ "EMnrkZTvRX1WWWbjNfGCX6H1qwO0IAWK8PJ6rt1ESOaFGOAQW0d2V2kZpVn/RyuzWtj9VDhf\n"+
+ "ZnpJfh6t46AtbX1eVQx+iE5LhEzxE9keI2vVHTm3m3TVincByj+M7iXz31WNqwPHe11wUgY7\n"+
+ "10q/l6ZcfuJJpv1k+GAbEqkOyMcc5O8TEuGdaVlntU2GFUw56oBYaXuaF5EZ8iu+YnBOXorP\n"+
+ "Byxc+xGM18X5E00NisCWi+Tp6NbK//ig/FHIQDne8qxgBsF2RBiDfBm7TH2i/g49K+FwTEtQ\n"+
+ "dx3Liv5WY/KqTfoK0utGmTt8/HOQmchPrRRv4UaREKFoV6Vq2lBnNsI/SjbJ5E1h4bLNIF5t\n"+
+ "PnxOH9SGzvm3t5VRkyVtWLHn/U92j4mGelwNs0+Su2R3qet6Tjn0NpZI6rkOMN6t/e2+Q/5s\n"+
+ "Ll54iPUt0U7JUiS8ltRQW9pOFLhWnJNImAkHF9CT6ka/QMFk3Q0Gt7RiJDXzHcY3AHmdJ9KU\n"+
+ "b6m8nth3jpLjfbtf0nWNV6MqrsRyPNXpx/Eh6Uu7S+FUAIS+uk9ks6vl6yxStTqFBofoZQqK\n"+
+ "qfTB5MJi+G9XA31vuuYg6V5kyjxuJ2LIYgDuO7tX6Six10eJvjMHqFTdXUekU8JYeucN6o4k\n"+
+ "D0MF0VzTHW3BRCQNJn5w9xAx8KfxB98OArnJjx8KvJ1SQFm4JqpB80bIfC1TIBaArBlN1g7k\n"+
+ "FPsb+JM7YMXrH6Y47u+1ThnmXxZwzsiPwRfD8NcNDGZGcwJvKQdGyd5IMS1db4r8PSMDjB83\n"+
+ "4v+9VOesOI68XrxFvYF49xozS7Uda0lGr3Pz7LFkZTeX+32BfYyMojy7+DrOyUFmUnaaxWpT\n"+
+ "wMp3V6Cj8pm8yGa8OW/ZidqBpMs9cOMy0+ObPvQz5x9p2Fb2yZ833xakHB2pLyNUqrsVzlvW\n"+
+ "CZo2AMGHFZ4Oz58YYWEao0QXWMtRkAEVawYcmkfVocqvuVvVWzh1Z19VujPjsD6pwRbnAGnH\n"+
+ "Gkha1w7GIRsIHvBC+zKJVnPO5VF8O9Vj7cgTgHK529o+w6OgjKrjubcPqopQgSwWAzVS42Xb\n"+
+ "FaFTvYzcdnB5te41pwy7sn3wDQq7fGXFvLfmFJQ3bWlXbc6IXwH6P0DAK8GKU/bp6dv7O+XB\n"+
+ "OBofFA6NRLCbUcBU61GsuNpVIltfLjI90CaGMGwRxGLgpfbTUxNzMBR4qn7E6wb66DR6iQ4Q\n"+
+ "4FyO5TaDHwkZmEgdr2yDWQJx7otQdEc1Gtho3rscsgP3n8wEfGzWCnWLvI4amlpF+lKL8x/I\n"+
+ "lgGUIQgbA/uHzuelF7zxhpXBVYtgiRGLCXkE25foYsTMHXvv51wyrJ+6agLd7ARNL6DVGP3l\n"+
+ "I15G8+ZTwq7ypHdab1IhTLyASjnBZZmPUjGVjC/lCDgc1smm3fFv9ORGpwpdrte9eL3X2Vkf\n"+
+ "D6K4yHuyoVdZN1Br5i1yV1jo884IT+mXgL2CvwONs/flu6cSI91qXgTtXB7m7PzQXARwS+XG\n"+
+ "UTcMaLlxq3Wy04/cg0hM4CiMSQbTcV1vnP1OetmvKXr/qaBhe5guawCfKlJu1vCPUng7Ff2h\n"+
+ "bKi97D/D1x1/ScA8+W5RdxuRLWAE8JFDMA7jHxOYrX21MTTra55pGa/V6i3fJ5NLNAR1aa+z\n"+
+ "RHDNss+/vTdiDYV+ZHkOST+rZE6SAC8KfMZfxrpIyBhaPMB2mZ+iOGi/H4vJS+q/X0COPyU5\n"+
+ "2oEMLyLUnlq+yu9kNskTJNRcn9UCCXEMzUut9/I9dN8JOXxPjF5uHZww0M7qC8DJaLa3tP2P\n"+
+ "QwRADNK1UlDFKmtkg0ZdjeYGpY5Um6sOT4zz7v6TCFLmTCXNiPlrPccvaySLANU3jbQnlJ1E\n"+
+ "ed63D1G+B7TO9IA8cJQZ3Px/H05Wv2ucAc3/rcpumpXRN1RfPKn+XNoglKcd/tM/oJwdCoNI\n"+
+ "iozf5SJmpBYBbOix/AJdb9BkD8shT2IQCevY/wjYJJfmLYA/kVyVDrzJwTYX+9EvgaiF5oNI\n"+
+ "1fBZ55iHr2tG6AdoumK8NpsxxFrOhB+uhl/BfO/YseuGi04rrlfZTn9+cA8vRB0VvFEu5It4\n"+
+ "YVVg4nVsGyoJTCalj/YJb0ZHQzb2Z9qA6l9wRx072k9kUT+iODt/TFmn+D1vVi/YV2ivX79K\n"+
+ "yTyyDprqv+iixouNXwbkqGNWSK6m8DSXfVeyK1vnDTMMUaHwDL3KhDGKIYqU2f1BIiLHNSQw\n"+
+ "XlTIxKYgMShdxCZKxXqPLebDBdkMUGKjIUV+oCryrqlaCMG8nRACZos9rmtTokXdkJA+PXve\n"+
+ "UlqiwJZyMSBjk9qdR+t/Sh0IxUXF0eAtrngJffVEgfQCXdtfUS8YqZeONpDQIYtfCfzjRuoD\n"+
+ "oN1t+FpGXp7M3t0E+CT9ImT1KQsnLAxsqeoJu2NGZVSFXRuba8l2c2tlWfq8o3dNiznWoMxC\n"+
+ "i0B+JLLBIhmzhz2pQOFWHg1FgrKhcqqlm4nnA9scFwP04Ly2uZmpvIBXyf126NMkXky24+mG\n"+
+ "D+BglZabg8au7Ndx0ROpQj6BDc8B7/MZWxDXrNtMYiYgqe1pzAZpK8CketC15t/x7l82BYUX\n"+
+ "hwpAn+Nd760mJjqhC+gzQahH09GqmjDLOe+v13KYUGmCnSEg4+FLXfiN1z9mY9St3DELfjC2\n"+
+ "m+cW3XupwZ8OQ8zErkjzW4zjsvQ4Xhz/6pmpEc3t7OJ1BMc6NhSHIYp98S9615OrfxEPPP6E\n"+
+ "QhR8d8nw0Yzi59bFFsEYRvI0ODqRfQeaM5jgqBooCNrV+KI3qvOmh2CgWg1ma+Verp8VvZNq\n"+
+ "GBnmjw3qQJC2PGGc5ioIVZNbbeZRPXzhrlbk88WaYIgUJ72gsk0Kba3diSqJJ1BuUVBJhakX\n"+
+ "Tx4qxv/seRggUgO3ell5E0e3a5xIEr/DycYI44i6LcYEn1eTCGtfuKHhcKv66nF+8iabaowN\n"+
+ "JIc8fhXO+vXK/tEBHC457Mskn5vSiAeZpWqQHQ8h2xpPTbmPnpYvgSxmmQZBpwv4R8s8PL3i\n"+
+ "XE8gtTyC4/fp8HN6WqG8Zq7wXnrdxyzA8Dw555oRnuJ+WvUXgk19rFm9VdAcXG6vwBhLYMcJ\n"+
+ "ZygnaYviqDmUldjCSZRhEWQNEeg0Xu4a4+lln7W9YeZkvQ3zj692pM5/bxfhRc2KvpfM/zNo\n"+
+ "qCP9ebJbn1vc9nFDDSfK6XAf5XH/7JoEZsXiLC7NN7R9x6RK3Rotupg1qMGtQn/FhJU7vscT\n"+
+ "JMBDfL4acoCpiII/hX54kN1nfQlPxEiVhco7FH3ZcuZ9FFpjy+uIyrsdH4QlyLXWsPq0Dajn\n"+
+ "CAi8om64U7GLayL+Lli72nHt8KWPxrCpDgVkYd1sNp4/QgBNfvsD8dOjAbCe4JzWz5Pr6k2Z\n"+
+ "OGnbXbQbptA/2r8ey/8AMHgUCU7VBZagsrYquYYskylXgtIl4QAoSieXjbsoTKRSjEs4KzUn\n"+
+ "v1C/dA0arWK4e2makIWFVrJH9OmLq7fF4nXsvKwjaz65k2rcHUCg7mQGHC07/9NyQnqE0UUx\n"+
+ "knlHKYvnRu7b5SjLBh6JqN0sbaDdh8vvmZS+zR1TlQ+Uq/ajfpWr1QPfqrgXooTI0KzVJHpw\n"+
+ "ske2e8072lsEW3sIP6WTdv4Q6vJJev7vAKmBOUMLWxtXK56/lH9H+mYlxNpi13NLpN0cNhk6\n"+
+ "1C8buigM8CNd1ePQyxbzAEbVqjP0bMDMI3PxuQBCF6MbDr2/wG6bed/qyYbRYOo4feW0Nsao\n"+
+ "itmFy7s9ZBPXynpAvDqKxSrhW3BNBQIA82KGohQKpRXhi4dr87LJTtu39bin6WLBXredeCH0\n"+
+ "5Jr5jJEdABo7Inkf+wR16svhzJzzpLAuEl8MOUDdZ6PDJS5B2Vnw1zuFbMedhbHz3EWAOkGL\n"+
+ "d35zyMy8TEudBq5lxplIZ0SjPEaJz6wuc2E1Mil2VFIYP5TAPWjFpgr4DB5LIi88aYz74/xd\n"+
+ "lX2VLkWJKuWcXnTaeff46PoXSTpQ+5AGir0fHD2FEhzT5AUx3FF0BKdvXqxeT1QBiYKDMR3p\n"+
+ "MPC0X+3efqz6wAeriiLpIOPauTBtHaaSkSjqOJtoVGkW48Anv7pyMsfwH1U8ayUDmE/6Rz7p\n"+
+ "jKiowjP2aXnGiqIjV18O6zLpW7QHFpvyylda6DrArFbBMIItElZvBmDLafqt/iOT4XKOA92U\n"+
+ "sG3KonD+ZSteuS38MPt4jxYNnnxyBdh5UIpvZ5UhVeHPTt7sjAROdyJnSvuhBUEv/OgDunQl\n"+
+ "+2gsdjn/sTvSCvg2uiXkBIxEm2rXNByEXAzt8eqlNqiNCNN3Z+3Itb8VNQFIWV22BGZWl/+3\n"+
+ "wN2uj/QfcDel5oi22wbhjNkxVfR0BmTefHIuK6yfxE0Gc/om86JLnjT1VaaXYjX8RCd/XRfo\n"+
+ "mkExlaP/JWqK4gpNWStrGHnhN1eqRQiCibAWk2ykzwe0q/QFWcYz9TNGEqbc7tZTg17vSVkX\n"+
+ "+O3FWnofEa4qV8rHBrAGL1mUjYZd8A9LUSQN4K7F+McPSE1vgzRM2146WExBEyx0n7YEtAPJ\n"+
+ "qSrpjQnz5H5TVUYgA7rs0CjQ7nHnGSzyxK+t3GUj4EMzljQO5zwsfBwQTPORvn9Skw46sUx+\n"+
+ "fLbGKt5Fo0RQiUoW6jHMmQ4d/76sBm2PiHfGLAHz5ldeeFvM9MFl1+aMjmZDjhxQkW2uNvd6\n"+
+ "iAPJJvmVf7szHloFgt8Rj2MlBMCnSUnv5cH2RTxRVrBKOuJ9sXHJWjyIABm1n4zYoI8veTzi\n"+
+ "vSjZz0zWaJpYhDC8XB3qaR3Oj29zZiUmCuVND84EVogig7sfjiRDVAmAfvEW21wTAdMwa7MH\n"+
+ "GbmgQs2dzFxfnLpsF8602HEb+41X4W4emzymxQ69YjCjpho27bNo7GM+Im/ye7afFb9dbkKB\n"+
+ "V7f1tn4fv1FkS4fyBqVx+v35rYqjOQFoA9jnFjkx/qwqG9z3MW8D5/zvlaQ7iw8sy9Vki0J3\n"+
+ "E8ge+GvtMaklCAmLsU1OSi5VM46R7h8KlJ9FEnd/ti3QA7DHxrko0gsZXna+fBVGs/wx9dLp\n"+
+ "ZKIrJy35Hi1Jz6ScpFeX3yGT3qo5WKfmLzTxDpVbZ7O06+uidndAsEO6LIEC4s+iTrylvC+4\n"+
+ "RhFt4ECZ0uqP+aOmM/l69K1RLGEAtwvZeo2/3XDyTkEmpa3g9PZtuSrN5QIQk9YKK/JdrskG\n"+
+ "oj7VqUmy3UbWam1xXaPzOF0nU8loT7ibsscCdAp9ePrn8wAJONMOPfIrcOxe+itqALWDl9OS\n"+
+ "tmR+nbLdV/pxDarCeEJphYgNxgLdKwOpN3BlB1EemKkOSwedqBGupAsszVw7uuc15hfOY5z9\n"+
+ "TV6OdnbG8Ne4JML7Iy48hcFG5i1yNk7up0xzvIrqPPOmZiBR5+0d7b5oByfHZBUy6+19ok6K\n"+
+ "0q4bddPWpNIyEErsddXcEoL1Iic2zkAPYB/IbqSyKv5aub1M/kqwvluw4FzZ0dDpJHewrO9/\n"+
+ "8uWwRhlmgHSCTqkJpUx8U2GrmX+Rn992cBFkuKoV+KceuBxwLsg+uG5c1Ml+kam5V3PrjHez\n"+
+ "TY/DoV/VnM8froXvBEaTw3NtdaYMz81+O5wzuYN1D2YnkIbZqESXEstnNna0vezcsOiEmg8Y\n"+
+ "Z/47oz3vU7+g1YXqOtWn6lnxzDTWe5W3FaCtAE4NmMgfXjn0wnIHFEEADRmwGO9+ftxvx8Uy\n"+
+ "wAMQMy753rCu5IebsKpy+Fe5UQAUSy9Xa3OptkgG14EayOCvq6rAyGa5AQdeMKX6PMT+g7co\n"+
+ "hYSVwIXUXzv32q2nV+FpfXPC2DkfgeIlWCWFaaBsSkG6G66JA/IYojkfDJDXYyQV4bjSp6A5\n"+
+ "hI5EzIcajmF45shoBa4wBJ5NrwJx1Mfu7uqfjZCUhP52gD9vIcC3975ReTQIgVfngDwNkcok\n"+
+ "xP7WWPUt/Q+2ZlYEANNgm/XMSgEN63FPvAs62ljNcLp0YCuXpsztDLXsrDKoXkM6LjGhSkXd\n"+
+ "shDR1TQ2GvWb76YWicgbNq5j5FdmWK1GbxxpdzRtkVBaqyHOFB7gAlGYFtF8CXlrhXKxySRZ\n"+
+ "jHWCPbDD0MHSZudWn3tvOoVTxDKG5PA3AqYKl8PoY0vJgNlGR6UrJQ0kDqWyeCODuXkfOVdF\n"+
+ "9ID79DTrNVDMtoQq270z6JSjRXA4VUAaZVzFdqFhsproIY7McL8J4luVfwc2lBhcNwyt0g0r\n"+
+ "M+3zfWELP0e6OxuSt5bsvuB9VtXngtmu4mEXse+oeyiHmuF9kTlsUASB2kne4AsnhqyIklVI\n"+
+ "eaofT3+JgoX4Kpy6vesU7jmUmdDQ5C5d3ccQTLJlNHiFmwQkitO7cpYN+lsLYO57kiWWMjWd\n"+
+ "tL5pg/tOycjsMcqZ+DOPQhcWa7c7WaIJilsqqQA9jKEeurQAr2sxN83BZ0ej1HDEbwA5cpu2\n"+
+ "M1gvCUIgTifKL+EdKzKTleSnMhWSgPgQHGBrkbBXoR5S7XrqCkpCXwpKhwXRCBplzSy8AHuo\n"+
+ "36LK63ofUKWSnrtqQHlLeLGs9k9lSxq5sWELRLhi0vuVe70YSY756VRvsA3V+Rh3h9zOU3mJ\n"+
+ "ob+0WCmzMzrCEkb50qF1mO6nE07gcy2nZ2fZXPlNJLBfPF48kGzNmUUuRG3dRwvGvNt6foMK\n"+
+ "+140jw8Q+/YnwOXahNM23BpkUhvrRaYhLjIOC9ak+uMdIu5ZyjT7CgerH2SDoSOD8CuGYOuI\n"+
+ "Z6vjGBKxEX92UDClwgiIK/2YfgAIpGEAQOWCSRWitU6Jhex/SFi7aVYJ92Biw4wBtcHaHuJo\n"+
+ "4TSSRe67z+LA5X823HG6ibh1nR+u1BIFCgoPKRLpt6w6LUArJZqbYSNyCc/rCynkf5Wz8ZRk\n"+
+ "kC3rDVWmeWAtvLU9k6i1KOUk4vFtaePeGxTNolybo98cOYlj+JFs5mWR+ro6/n4Ryr/IgK0n\n"+
+ "lMvvbIiQM4ckslusg7JOimp+Qvo3hKdbbLLu9ezLZbX6xgT1H5e6Zif3lg8zpbESDCoZ+ZkA\n"+
+ "2X0Q84ofDRRH7beKV+IkG1uIvai+DVlFB1aWvCbV1N2YFX2kdVVYvKuiSxlt66kehSlKsyQg\n"+
+ "U3VnWezaEUhriQrN6u3uqjgAHj0GPhfbtXLNkF7cqb77SreTM1Mkxl/Tx0NHAmPnOvs6DJYO\n"+
+ "goG5W1ywekIpkmDBzXMeFTnjCaXDyBQgpsUklUASySUeJxV39Y2iehjJRiShgyFO1MGF48u2\n"+
+ "ZYZAUN8c1J87DLgy6+pZg5m9eZ/Y5Q1uIP0vnKYA13PmCEvlOdcqb8bgimSixNpWIm58GAc8\n"+
+ "EOtQFCkrwhGq66lDiVBEEhJi7nllTV1WBiZpU//mCqPwV12MYjX45UJlAogpQH6D9rJWEfaC\n"+
+ "xjYyxSpF63jOxkkpcrD89UehYm3bq4eDOGUBW4bFj86iEX0b5Ic3dxMVtK6F/fWGWb823+fF\n"+
+ "mcVKVXV4d8kFAOboGPlC6nJTX9hP6n3CcdHBpU7D4+yamKSPMN0oorOveTkNwofDWwT/xXKC\n"+
+ "Qszrxv56awpebYOByT7CrVnyT1WdsOafrt2r9g7DPUqJwBMPjuuipBNAb5syK90bNWxRwsRz\n"+
+ "+gKSzzg0clu3UfSWof0Kdffclc5FPKPICAcfoVFonUwS2FzmiKpfOI88xVJMv6MjxtxERgiM\n"+
+ "DuBRK/ebHX775Fq/acD6EWAbqN6fysPaBLAoQ0D7RRweEFY8ULWnnVT43OJPO4cP/oYYBIIg\n"+
+ "ANKPCZsvO0TH1Rt1Q7BPtwuOKTt+RBdeXSSF6K3FaLTJH1zCtsVyeRQIjCLZKcssRJy1FGcQ\n"+
+ "OdAnbNIZ68EkC79ESzQ5w/nmXZ85BQBcy5Kez5M0w0f3T2QxBsS7+meWyArZpL1WVJOq+Sca\n"+
+ "6vT+M2Vz09xhBd03Trzyiob/YhmS9UCqlbcGNN6Q61yBT4y0FegjC3Sn5ky7hIP/528rWr4n\n"+
+ "QjjWo2GtcLLoTXRjleIL7VsZPRJ/c5oyWlkwBMX91T3Ta7uhKh85YqChm+6wq++Ov0V9tbxQ\n"+
+ "3JcVjH0lQy0U5dvLWiefkM+AsAJMkKyas+PVuRgIuBFvasILF5dnachcwF7Uunun09hq62nK\n"+
+ "zh3Coy0jSEfcHU92BHoSLisAt/A/ufIMvyqjdLMHnLX6vsWEUj+0XhlqSgAnFED2ngk4sM5q\n"+
+ "/TEH7Z7E/COP9nwJc8HHpIAz50YUgoar77TKZXFYhbc3Zw4Onvl2dYqWOkoTV6qjQ8qOR2Km\n"+
+ "34kCm4PqhHwgJvkMLp7LLX7W+YIg9cqd/rygIxEf6NoIWkp+9DJFfuCMF2qeT8jRnaSHs0To\n"+
+ "OdIrFlUi+V7SGos6AP6R44gkeuXNyon2LD3DnABmmqyjKM9JtqWgxtn/vLNBgOwBcqIp0l3q\n"+
+ "3Znk4QKEIIMCNszdCSZUJwBW5CZDQ4F3ai6X2lxN9g4kmX3n5yKtLkjrWZMfCIwjU51cQYBo\n"+
+ "15Ue0N1+E8WDXHYZ9ahvXWo+dBMmX3bf3SWl+U9xwiljAzZ9DOi/ABrdZsMkVu2N/nm2h7iE\n"+
+ "tf0YqOhwwdenGCNhRJg6MMzoXQLvB68hHO1gZj+Wo6SYLr5DKqdHT/2aXLPiLQtFtWwcwASB\n"+
+ "HGOVqMzMTLa/uqwy9Qr7kF6hddargZwGBozYNCAT1TS/eqGNBm18y7a691qoDg2vzSuHiEAN\n"+
+ "piz/kWW1skxWHFlmdtVT8zHkxg88/h0DAeMiupXvfhr3DygVOih7onC+0L1wgvAOHc/Mcuoq\n"+
+ "qr7rTdm2tdl9sYz9gGKcprVQJ94HW9Io+PJZi/cG1x483V+1K2mWcSDPUImRXNGx/VoSfaJR\n"+
+ "DlMVvNuhBYuVBvjrkx6XDndJPZSjzEDQliwV4rLb8VJJ70faOkI5WKcqesjYzebxqT5J2f48\n"+
+ "KLuZ9rjiW67e3fg8UW5RQyIjJwGwIglPKy+CEuBQaJCZxpzMZ3yzbttiDCkV0NlzuT9exdTr\n"+
+ "ExDsZg6kiZPivYQdQDOJBhhY3LpwZHr7FCjN/QhjC01W5fmbQNTanieL3IU0GjopnjvI748q\n"+
+ "cV2GFVpHWZECq2xGnPBTMfTRkmSQ8WlGcVJ/nMku+Ww0iN4UsWk/m/7ij3JK+KcgVtMHPJxG\n"+
+ "7VbxfnAzdHTSD1K3t1wI3NA5A0Imwd3erO1LPVuMw82PsjM0hUdR4Dtvd/GsCFLlCuUwePBU\n"+
+ "k2ZucLdRPWwdJT/Fy4rX+qbxhfRmvtFw12MzDcLS7sKYvGXIMd129Os6xv8h4Wk6Gag0TrnS\n"+
+ "74sdi8PWo4oK+pDTu8Cb3wZRrTEq9af9XQkFXIWCw8YHgCivEL71XUBAQGPhMF+sdifsgo6I\n"+
+ "ziwheYUtH9pXq2Jo6i4YvfedhJlPssmGento9OHGWTywi3ZHWbAc1h9A4kTivCh2zPO9ee5D\n"+
+ "VTvZuhIbhdA86G0lI+sQRCnLyLjZe7oeK0yOJDzMLUztNHFQhQ+kqQkZvt+bRqvcOYeWn9BI\n"+
+ "d3X+HdyutBWhhMSoknuEByDiK9zo30Wf1yOYt2xqb5p4fvSbFgkP3beD7jcznuEw6TNVApcc\n"+
+ "JpzyqITwXnZo+mJ38CCrPMYEr6RxNTA+XH4uav4BqrSoD5k1IrKqcXUOVoyUk1GOb/fcqUdl\n"+
+ "XJzCb3B0tCKM2qdBrtn7qUc/a7RhzNSwlousUe1OvMeZR3POIQecOjHVH7nD/ihlfhnTc5zl\n"+
+ "s03/ydPiCl5MIHNkaD8ZcIL9s+ejs+g1Mj8r15srXIqW4Q9HXYnwTyWmsTRtKKSKId3IHTmx\n"+
+ "tGycpLLhdZRuUao+lmzvwN6j4C2q3sgiISqnT3Qnti/8ZQxtaJ5yfu8tmGqX9kNlJA5JSzew\n"+
+ "CiEFf2LtG7ZPWoHrleY3zhLrMwbPWdKENohfZuCsZGmhqiqmO0FcOy2NosX3pUjiMrVet/RS\n"+
+ "x24k4Cec2xA6cThnuzBJ5TKxdclLIoNj9tNMsH2sUUEfIY0JcSLntHkdd2S6cb9NyWDCYi4W\n"+
+ "30+ibNY+RYug4Z3AjBMSUqdiKPLO+seP02kHiKm3IzVMQ1zg1abC3dMUgBfxOVOOqHcPaJ0K\n"+
+ "6/hQYhH9CxWggGF5R1yB5Rq6mHw5eD/nnUINjIc8D/dkO0j3hDpOLbtpeAW/O+3RUlAewO+K\n"+
+ "Hqy4B4WkvVTD4estRV8sl0R9hJpSMfXtlGXjkcTujVLcG5XVnzooNYr5QOHoiwS33Lk2aswV\n"+
+ "07ZFgzADntGdBV1oWlX4bEvH4Uhw0UQ3WfSu9Ejv5Lea+Ttp3ygktMGPcrAb1GMUlYBK0twr\n"+
+ "smvHaPAvW0YWN1yFsXEYC8Uhked7n/9IiYBQr1ddUVhjFPYgt9Wb7pbqj0ZXWacLsh8rybGX\n"+
+ "JhsIOKC1Q3ELNoSQU4XR6G3Iq5+sq0YF3R5doJVeqYK4ui4U4uvoqIyOIfAD+Fkd2B5ZedA9\n"+
+ "wR67vjxlsfXISLA5KGFnnFKuAO+k7XcxD5uScCPqz/7WLUl3qSZkL6FdRfJ5hDBh4OSmeqR3\n"+
+ "OkLz4x1PRUjcpcXYhSvnNmsjz88+xZE+uaUASTchKhj3GNvV8tRfXDkgeKOjFnrTCc9ti1vl\n"+
+ "hVfUhFBtVgXcZ6yTWhLTjkZxU6oK3Or1jNfGJ3+8OSGYfRIuSFT0xgi/IND8UYCg2wJVKjhb\n"+
+ "Ysah6CnUeQJuhWlAeHX0avGczd1wuVZVaxbHxtOiwi4IS/qYzTU8R0tFjT6sOOKkC8V1gHca\n"+
+ "AY8DS4uThZj8NZrKCQNRjxjLZvd4O9BqVM4zoVIc0/MumfKAzpj51QXtWsfeL6aUwLcjli4E\n"+
+ "cfk0h3FG0PXw6xmZQMZqRNbVDXydziMXg0tpwHBg9b3zTl5d10DGnMT0mkeVl5j+PhUO0Mmt\n"+
+ "sCXDiaZDVxFXwAIkSz6/5pdn2Iom+8GUe0qCctrEkL6T5hequlQsZAIw4VExd0FdW5zt1lnB\n"+
+ "cBFmUofzV36LG2BHqLXYj9FU+pUiMiOOlP3kPtvFwDmOIMBDHAsUJOIHUX4LHUjR/tAz5+Vn\n"+
+ "cPQVkqqUrps9sQ+syXLHrAPO7qZdRuRyLwjAxARhJozT1rOl39Qv2SnwK/OqP3UzTbA41U5q\n"+
+ "4zcveXZc+C/4zlufru36fLdMtzwnKnumewnUBdGF930V5aD1qsU4UAp/mDnnFZd3yN86ofWM\n"+
+ "fwcX80kZptrl2nxK5Zx3q/u5cPC0uFbbptHHYsPO+AGL5oPo+D6aJXbFh5BFT+od6+f3QFae\n"+
+ "icjnHtPnglfHlDMNCu3pjXDrCX1MpZKaNkfk2mL0rC5kXyOhsbSlZAjb74Xu76VZSIXQ7ad2\n"+
+ "P+c+67bVuG2/eTsiXwGjz/VxTfuQzdORdT6g8IFK9LxYsmeAO6dn9eoKGl4I1V6Dpwa5eLyo\n"+
+ "m6Y7Zi6h3Xe/1y7QQqsdtVRuc6HTSDnS912YqeAMCY1dBuRmRNlnBsVJvpJANAU6l937R52F\n"+
+ "yKZ82C3le/OAPYwJFy7KRpp0OyEwU+DLt7jE47Y5gA+pXJkBNBw2MJoGIKOv8CIXCEg0BPx6\n"+
+ "t7YVvs/H/qKkNLN+2Z1V+u8STlJEq+S2u5jGDBgsJ1JfrXu+difolZkLM32c8TgyplwlPtB0\n"+
+ "uQ6g56Z2Wn0hIcznfpHJLjsAAymRqa6ymEEG+RYGfG//pCyl2IBfx0tNJrdVDLdR0bkSzSEx\n"+
+ "Zmqs3mo05YW08fIaguvZI5TwShuj4VECmS19hvx++dRzg4KPB0nwbUcWXZ4cpXMCGrm37NbR\n"+
+ "wvHfaRByNmVF8e33H9lkMibyT0HMCc29twvMf3EMFSbdKvWlxt3P9hckos4nPKhzhxMKK+x1\n"+
+ "Sk8u9iV2IyNNaTKXhWn/6QdN8+yT8ALuuDyfNmvrnASD6xX1W/qA9i1KFf2ae8S0Y6YeJlgJ\n"+
+ "jq74MN02Z2DD+2EI05a/+fTPDtfnnQ7QZZKcANxXqmhjBBswQpi8fzvG+Zl+CESkJeMnNCaF\n"+
+ "9Pk0DclEeULVWNLZlsPBdfk3zvjCAVPm3L6MoxSKMb40cI5ICmTGpyfouof2YwxW/rvR1P8O\n"+
+ "2Ekkto5tesyxuFLjEkzmMbqDsVe+XBFzTXB+juygxPgkxtEmvw0EAzXp427BmLsPxBdKkA9s\n"+
+ "e5J6xGHkA+3hmOKTWizloRDR+fEQY18QkHp0oj8LYM9mlFhtVu2bbvd9AMJA0F9ypNCDsBOk\n"+
+ "Q9oBsecvfJ4W42uWXsE4jtUCthiJCljRVrNCqT8LS+wohHLKKhr7Ka70umS4PVzYHuvPE97t\n"+
+ "KmfhSJx+oO3yW9feaJQA668/Qc0lyJZ91flDEcKyKoHSWH7gFewPBwuSsU+Tk5wqI15PWf1X\n"+
+ "4lI1mOPaYg31zgckJSvh4YOME3+HTwNAun8gU8h73bMeAO8l6Fu7ijnyin+zBfNCjMgm+tWp\n"+
+ "zvecGCpqbIgbPEMYWqRbo0hvvO6BVQTNWeIMdZY3iZD4PHdHLI76Cuk3jbtvDf44k5m8e6mx\n"+
+ "w+MYOC1R7ep5STedsvmjdW5Fhs0W3oKl9OXk6DkRKFkhhEIZo7LN5KsjIzjkF1Lwj+nzJ3PH\n"+
+ "aPfPq3IAdI25DyKkeZFglrMGDNS8zlNkHzlYohNfBwi15aqwWnT+Us9KogYjpQFqYHt235aI\n"+
+ "JjqPPrQx12lh90DZSuBv00dRsT6nJ6lpAApSj1zfiOUscfc5SgJTV2/WtwmslYy4dQLQMoX3\n"+
+ "JaQwhMlp8ymkKSmTbsLGqJg0PraxzfnpNAsuH/rmr0vmsCVfePbf9ioKlvxJAzqtJ349dSOX\n"+
+ "RgFHcjSuMP/oGV5sL5Q9hKVQ+Lu+iavwR7FP8RVrK+hUzihdeLRueDbCN52UTCkdSrHkynog\n"+
+ "NMKgF/ISuQA3l28NSGdRnpCcKXH7YGbEkpoAd1JoxwtKkoPKsdZaezInM28lFvfY4EIgyeS6\n"+
+ "ec4z6bghHgQIj9CygiWsVeZWm2f8MWf/jHUcp9vZqI0t0hfHtCrsZAWbb68np+3lHhM8CiqA\n"+
+ "KDbW8M3BKeMCWNGMyadYADu+sX3MFjbgHnDncDCfNl1ZhWmtifpIPzjVkmWjwyEgYsSdC7yT\n"+
+ "L09tPrH72poWJRkoWjr0vWqHuqH2dYgUyUw3j63+7Cq6gYcG3ZUvdD8LTVfP6wj53m6GW4/f\n"+
+ "P3la/iS9jSU514dR7/ZsZvxmyxMg7ebjfiyh3oHUJQnJj8xG0gmiys2q7wL+xuKuSZSbOPsy\n"+
+ "z37Rve4xzlSR9ZltIjRx3oL0c+c2VQ2xs1+cIOhiU1udENvjseivKeFOGj+uUrJlCBXIGZep\n"+
+ "gMd6pTHNyLCuwkEnYKc3vxxWe2yeaZxQrBqfI690jq9uGRvmA9JQK9CnSAP9524300JhaGhF\n"+
+ "Mg4J8YmoSv9+gCsbsq90uAiLSrIkeIRpGmg3TAayntJ1lOXnSDZhZAJh3CTk7T8E3zJS+GG6\n"+
+ "mbAvcvo7WRL880W00ZOBtZBEhM7dkIxyqib9zn41SGyAWZAVy6g2G1aRnbz4G+edfwQ1H5jf\n"+
+ "iNGL6KTMioItA8ZpJQQ12aXTqylFi+5wT2N+pdUqBurQWoCnLhY2O1irbIfCUIwnDk5D3a7/\n"+
+ "ySgtiotJLjGkEL+dMcLGqZOo8G1yw0kbjo+iy0mM6MkmM03fTw5KNxjl26UpkjK1Il7vHhtZ\n"+
+ "SN7IqnMQ1gRIYjyIBkS8TRG1z4T/w4Lrh0fqAvy0etZj0Gv38XrlpSI03YrADGD0rI1Z+VZE\n"+
+ "VF0viG+iea7DHg4sP6AtKaHajZcUlinE2/pq9VD03enHxHBqcpo3v34VFlwBVgUfa1Bx5qky\n"+
+ "pOyqJ5XMBjjCcF3UT2GiQ2HigmyFbC8Wx0gAYy7BEmgBVhfqZAUeicrSlY/8hm300j1kkXS1\n"+
+ "QajIqPPWCM9BNqkN1fmsVnL7Npevg8h9zVKoczQH9lZmqnDzW/qckwu4McV8m75LRTNP+ADJ\n"+
+ "KDHREz2Y4VMjGjYoY/xJLwCOZyWd05yqQRiX1ijLjPQtA1BnWVvmtSY7l+V1V+jtjSMwQmNq\n"+
+ "AGirprCNyOBWfUv+lMvxAscCsdMwSWb48bFEQqGW+6onPYHi3QdtJ73U8yGYqCdX2z8Ri5OB\n"+
+ "ceLq8oe11qIIad9IOoklGwE0tvcxl8tZ+uDKV3t/sqCmrFV1/eYdTwaHn0tDVbdjwp78ZvXX\n"+
+ "7r2RgU5ePyP37f05wOgZTfD97KqO2l8oERl6SO9FgsPD7MZqA5MOL9CwLa9kFDe3PRW0OTlm\n"+
+ "5LbCWRNPR+X6qyd7zhWfOsjdyhRa9QYa82q4IOyeUtMHRiy4n9vRSzKVdGlCxbHxkoL8gVzC\n"+
+ "cjhKgnOn1xbMVD9TOPRS4ywu65DiEz3yH5ZUQdeUcxNAIfsyIJF4uLilBctx4QfRg2yk7mYZ\n"+
+ "HN/b5yrCzLIEGT50jbRqQVLdg38ZtnlG/BrvnsQesWqyfw8HQsZgY3Tr50TGxvqBIZpn+ywu\n"+
+ "UADKWcFnnxqggFmlEY/Cnove/yW/6AdZceiq6paNaW2eZY6PKSOgE6LaitOiHw1PCjUCjXVV\n"+
+ "3wts+LSjrFMf4x4QiruEXXu+V5VjX7jatDE+ko9Uz6IU0BkTHi8dublk7fgMq7UopTF/xsnR\n"+
+ "Vwv58q8+YnL+21cF+NQYj2QRPZ+s+xdIcGccrseOILXodpFbVPDGPqkKGIz8qb4STNtM5G4g\n"+
+ "qRTy/lh+oX/8tOll7q2EIYxkUBMUmeFA22S6lmCisiBzwtJT2P6571POxVvG75CvX+6YDUyt\n"+
+ "27K10jYStSrweUrNIO/KjrJ/yb9nSWOaLrni0y/42fa6L1YN9kg3VM4BCMhz9hO9N6gk1jiG\n"+
+ "aSrD6St1f91OLCoYuxjq8aKeo3uRS1mNXdpePIStKTd8ebEE9HMbYCgN9bdnTkmA7KhvQmKU\n"+
+ "5coukIyfFzgST1zngRoNU5HOJTlrb+eMgzdJqciTP64dEPtq5s39kVl18Ks8KsmUiR/eQnqZ\n"+
+ "7wESvxQEPH6JTojnzUrVctzuMWSiAU3o8EK6t7LjyZovKg1Ve1W6FKLerv6PZ+Jbmns1XjqU\n"+
+ "7pJ9pZNoCcjwWPXSx0M97cdEtrcxVMgxB05LEWIyJblPA3flZLpEOVwSAHuJyWXz4PRKJW1k\n"+
+ "56/uSuEAI0DHtfonYz9LQ5zTlmmYAneJTSGU6PZrzzuvGrHegSSZkPRtfVH8C4RmNqUK7iWT\n"+
+ "2MPaHzCAYGXa0AdX98pTh3uPx4LNuL1TrVTrofpypSbatuMVae4588PrAnCcW8yES1wG5Zvz\n"+
+ "tVCzdciw6bZ14dr6EDn9YBDcgqBeFsUpPS8zuQhQeU7/repqjRB8p4KhuZvSb8bMbACYcQhy\n"+
+ "cPvvinsGYHQJ9lrTgEhJetocgrJJxqe1OKnu10uWDg2h/sgaibl0jTmvaQ7Y9FwTZ5NUbNMG\n"+
+ "EeqvVnzsnLsgTAksIRzziIp4ZHFS3INDy+S6VvIDnca/mGTjwlkdgjC75kyihAsmdExopl9R\n"+
+ "W1awVUnXFQXaN7GQYwGApOwZV7VAUxIcfuy+TJjZYg1Fac9mI8RtsipJpfxZ7ZvKKBD7liQl\n"+
+ "kkWUxMdkkYkj0mtIG5Xpiswj/S0gl9wNxzvUNA1tZ/1zXuAmOtL1qGcJF6VBN8+sVS4vxoDb\n"+
+ "xPlWpgVJpZcnuX7qAuehsi70r/51aGCVfcEdVFapntsY8h5X0bbp4F9IcvlUaOqXrMc9IXoq\n"+
+ "nG0jrQ3rLGlYZo2i2gIMBdUCDZkLTlQ/0FGTF2nQi0htDC4cjo++c/y/PVrZ4UPcQdPJaOcE\n"+
+ "z/csRks02TriAc9dspI8dzF7/6qXUgUFPUEcRWv+hS5j2VL3zKlIhRQ14dDS8tHnAUrmoEoK\n"+
+ "YP7GrC/3L7YRaYbom5OrMhz/waZCIz/ZjSwxfd3LvrMMA8fuAKTu1t4qXGdZ7ocYMIQPLxMg\n"+
+ "pUe51B9xwnyiU7Ky0sPBX8s7KDItEO+YXJM32fwB7egddz5qzO09SskraOGloWab8nY0YX0k\n"+
+ "PDtmXUT5J+uzERFrfoZmpnta4qJoE1SKGyS/4L7+30mRrSaD2o+sUyWd+kP6pG23PiGUtqcf\n"+
+ "iQMSoGwehTfSC3cG5XyVbfkXVOukIA+jh5ysABs3KotOPikgVQJCYDS+JnTCkOZKrf0DwRfL\n"+
+ "/roKcv2/ON7W1o25W+QN2yIhNbN88Rjt/5twSB/SDFePFmItzinkibv5y+GZxr9HEaKZ/1jy\n"+
+ "myG1cI8gIUj/nihfEQ/WEjWSyJsO4smvu2Uf7ZN4zTSk/QRukyVrmoOq4dKzStiWssF980Ho\n"+
+ "LCbKzCJFcy13so3MqDtORxtDSp+960XWMOyVHZGUKRgWIKEX2AbJpaEvwCYKdeYAZzIuCwO9\n"+
+ "O1ixtfv1KvzMzCjF4Sk9mucFcVWeEeX7Uw5DDCZ01t8uXxiFkjh+bDal39a7NF+VNDiaAmrZ\n"+
+ "ezysTyjA9h7Su9uizTyeK/eZ+w8hDn1wUe9CgcCGz8PUJxOv14qcUNpZussP0hQVErIWPtH3\n"+
+ "mPRoClx/o+AGTVtLRCR7Fjy6n6Zq8SyGDKf/0xa1QufjHmoqumtnx7tNCsS748+Ys6PFwlVv\n"+
+ "OXcpimPVisL1kfrQHDdBodXnKNZW3rWNtFGYBP1VPVUxqJJ283WRyb/X9bVGx1gPaHzFQj7w\n"+
+ "z7BVhMpPmBt/vAXdIvDGsQGb/16O52bucATPWyOQMLUBVorR07v/5NolSzHYi19ehveceUHb\n"+
+ "omX5uAPXqSR6DvUFbG/n+rOTsYCTlqNIiF4Dm3iAjizMMh15MWvV0+PHyLLl8xcYze9Eb5eO\n"+
+ "5dMRERZCNejwJ6PfFKS46XkfmLCZbWbj30CU6Qb6reC4v6sucId63+TghD3CmbyQ8MZwjB7P\n"+
+ "e4gm1deP0Gw4EqvQvsi7Kq8WQii8OYLO0HSKyF8jzfb8JnIe57A0mge5Ru0KaC8blGuO0e5V\n"+
+ "Mm1SQDXuHJC1dErv4jd3+9Yj4TFgRYumplQR24jYCpC4OyFqcPEBJleAdOkrb775sa48rUqM\n"+
+ "F9dZjP+1MJNhEhgv7g/LLUUuKwwEa6o/Ksbvx6fNikWX+40EyS/wvKzpTZ1vsVxIHMmae2C/\n"+
+ "x3C5YVFN20PUc9VsXjQrFw2T7Q3rtqWgXRgFJrcoY7NDyvJY0UyCBqcWp28N6MKOhXztA6mG\n"+
+ "kS3gZXkpKE+q7yJCByjKLs6D1vTQgj241bswl8KxjlQLw+iC2VYAtZoC4O2BWyD4K9rL7H/I\n"+
+ "i6/ppxf6ofzNv5JHZ/7if19WP/n5XlX9XuMX0ZPU15nRXpapt1hOtT1ER1+bzifyOsywoKYE\n"+
+ "12IgKsb+/LK4k9KlKP+93S+yoFtSWKfunvA0Lyb3Js8h8OY8Kq1Izzw4UjO5npX/uYq18VDr\n"+
+ "LzU6q8d1IX7rYhgrWOmARkzzFbKQ7V9FGyxpbp23Fp4y/GY/F1wnZGRk9CUgdI7ZXIp+pR3R\n"+
+ "eVSECRmLpMEAgKwcoVY5SE7mZYMEh5W3T4GUKgZhIuZPL/8/OoX3HivC2q/A+BMxbJCBL/mx\n"+
+ "bsRTpRvPK8cJgf4QxgE5ylWDpamz52nuNNHxxl+Z7vm0MZ3I7Gj6Fc1pHd+ZhCCjKmIlAseq\n"+
+ "Lofz0yafH0NPd5F8T9onl9Of3ekLWjHSZqNKZVRgLqGPxcM4QMQSQ8vsme/bPABmhrMKZ1YG\n"+
+ "VBpYtJzVTnG55m3r8sFPmPNZ5tdLiLFj5WQvClnVE1Q/eU/1iOjVin9tIfDSf5O+/x6PYs4O\n"+
+ "wHayiyxiAurfPEqlzFcnPznn7R3r+L0mcwGu6YWNOduY3TwoF2NyHnaVzVQrmOQgCE0yD56X\n"+
+ "z2Ur7HwoNYi7Nzfz0CBV2gN3PLGdiYn7J6wyBa5zR5jDhMF0W+oza/+tZFPVjo73PRT4DYc3\n"+
+ "HEHjkHzDJETGdzOHPuQyTIyZGxx2BIyeReQn6oOIREtIub+Ct3KWd7CnW5wMbFaXEYHCagfj\n"+
+ "5/rl0uGBS4KsYrMEXvGCHlJcVDmelx80rBN+Vo6Yrkj8B1LOEgM1lR+9LOBXPrhf9+PRZ4Qp\n"+
+ "9HuoO7Z6x3R4JgERXrEmZUJVj/JVIaF0fjylTj88257mCRWxyO5YpfhBF2s0qLYdMvNKUAzM\n"+
+ "/NjP8oODt3TU0Xt30RTu06amfY6ZnWTX9uzaOffi2BrWrcib97frCqPdOEdPhRcqniIL5U1k\n"+
+ "YnVrSSDUQolLqs32MGdaRCkpGF1lN7YQCBRNXFf0f2KvzC4svuDfsqEnTL7R2Vcu+akAshXQ\n"+
+ "sSjEXmKd49Ky7sZZnEbmfnDaB/+4ZWAYk4gajJib5ewB2pHzp5muKInTyECgYMc2ReVD/tz/\n"+
+ "pd9NG1NzdStchS082PL8DwRJx6HvWjVo9sSd9DGIfVonx6txQ34QCTF9psQ2R0Q1LRtJLyZd\n"+
+ "Dgehsti4GCBZdAQ8dT+2sG4QxKTHwaHCp2mDNWI86eaoZ5q4m0UG+kJrKZM+bbZARbBS5Go6\n"+
+ "8cK2JiiRh465rPEh+CuWJQT12Whk89nbe5nvq+ILez8iYVj3IiBwy2FAVtidPIEgYfVI5TWD\n"+
+ "ElfmXJXR7r2bMCY7RfLR6u8JWLJEoHEGsB2DqUwWixPRaxMbvGMm6t3nwbnhqgeJFNpW+Ntc\n"+
+ "PpZF5XSFj0xTqr6M6alUd26vC7CuXc/MDe29raHZ2k95R8zEnfl/p0HiErPGGA0rA6HmY1L4\n"+
+ "m2yc4wmPwg0cW1m8T9U4bPQaXWQ19wOqrBFety/T+m+3Y/L8aGoHmQlNJpqzbw/DmorcmyjB\n"+
+ "B3EHg5pmn+AwxuQOjTolFP+mmW593LEdkuBpITZHa9mLl5Q2ts3ABIIB4IUmz0F0Z0EOYEjt\n"+
+ "lKryNdgwXjLJF5zLjcs+Rn7FuD9LWs9FRKS8hTYFxGwcnMJLbFgWobGIK8VwXUlhiuj4dlOH\n"+
+ "Llq6eerJUz96gUR5dY0pjci+uVhF9Pr0uJKeGCHJLluqJ8hvE6r0qyXJquWdMgFU480YKlAB\n"+
+ "5XXxVI2geOurRMSSoUXKOk/ZR3i41orN7/gZQPZXvZbNPSVNifbJnqhi0qy9nBsiEtV05tQ4\n"+
+ "kCBnnQmAlNgq//AnuN1H+UNjHxUvtU80yBZMsfbz0BZ6MWF/AlTXEwNnBTXpQI9hYus83AR9\n"+
+ "lht+11eNmwTEVj9VGQVk1S0OTCWe9Gv3mxrPyFGhOJ8vFtBDhpVjSZ5cFCPhGMCZxjrIbzf4\n"+
+ "xjz4fPdSnN3XpBRxuE0FW39coYHX4jNn2FhKtOljHUZjrFL91ZYYo2xdou7VgE7GfVvb7V70\n"+
+ "MiK0OsW8du1c8Iawqmb0H1cWo/GCA8TaFdjfXOWZjEfHpXJvGqW+zcYn2DN0UNYnuP4ITOd4\n"+
+ "A3OQiTaX1XV4M+vKOR1A0OzFty0IxMxcTEwSQM1JQ+zpE11DBMWf4JEo35uAmtvHXPjlyHd2\n"+
+ "YY0ohoV70z8CGMrBN6ws5zIE7n3q7klEWHds5PZMDlzoPZd2rwQIYAM4FwEheYIAAAAAAAAA\n"+
+ "AAAA";
diff -Nru thunderbird-38.0~b3+build2/mailnews/db/gloda/test/unit/xpcshell.ini thunderbird-38.0~b6+build2/mailnews/db/gloda/test/unit/xpcshell.ini
--- thunderbird-38.0~b3+build2/mailnews/db/gloda/test/unit/xpcshell.ini 2015-04-29 23:02:12.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/db/gloda/test/unit/xpcshell.ini 2015-06-03 09:26:19.000000000 +0000
@@ -33,4 +33,5 @@
[test_query_messages_imap_online.js]
[test_query_messages_imap_online_to_offline.js]
[test_query_messages_local.js]
+[test_smime_mimemsg_representation.js]
[test_startup_offline.js]
diff -Nru thunderbird-38.0~b3+build2/mailnews/imap/src/nsImapIncomingServer.cpp thunderbird-38.0~b6+build2/mailnews/imap/src/nsImapIncomingServer.cpp
--- thunderbird-38.0~b3+build2/mailnews/imap/src/nsImapIncomingServer.cpp 2015-04-29 23:02:13.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/imap/src/nsImapIncomingServer.cpp 2015-06-03 09:26:19.000000000 +0000
@@ -353,6 +353,8 @@
if (NS_SUCCEEDED(rv))
{
nsCOMPtr trashFolder;
+ // XXX GetFolder only returns folders one level below root.
+ // trashFolderName is a leaf name. So this will not find INBOX.Trash
rv = GetFolder(trashFolderNameUtf7, getter_AddRefs(trashFolder));
NS_ENSURE_SUCCESS(rv, rv);
nsCString trashURI;
@@ -1553,9 +1555,18 @@
}
else
{
- nsAutoString folderName;
- if (NS_FAILED(trashFolder->GetName(folderName)) ||
- folderName.Equals(trashName))
+ // trashName is the leaf name on the folder URI, which will be
+ // different from the folder GetName if the trash name is
+ // localized.
+ nsAutoCString trashURL;
+ trashFolder->GetFolderURL(trashURL);
+ int32_t leafPos = trashURL.RFindChar('/');
+ nsAutoCString unescapedName;
+ MsgUnescapeString(Substring(trashURL, leafPos + 1),
+ nsINetUtil::ESCAPE_URL_PATH, unescapedName);
+ nsAutoString nameUnicode;
+ if (NS_FAILED(CopyMUTF7toUTF16(unescapedName, nameUnicode)) ||
+ trashName.Equals(nameUnicode))
{
continue;
}
@@ -1563,7 +1574,7 @@
{
// We got here because the preferred trash folder does not
// exist, but a folder got discovered to be the trash folder.
- SetUnicharValue(PREF_TRASH_FOLDER_NAME, folderName);
+ SetUnicharValue(PREF_TRASH_FOLDER_NAME, nameUnicode);
continue;
}
}
diff -Nru thunderbird-38.0~b3+build2/mailnews/local/public/nsMsgLocalCID.h thunderbird-38.0~b6+build2/mailnews/local/public/nsMsgLocalCID.h
--- thunderbird-38.0~b3+build2/mailnews/local/public/nsMsgLocalCID.h 2015-04-29 23:02:16.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/local/public/nsMsgLocalCID.h 2015-06-03 09:26:19.000000000 +0000
@@ -117,6 +117,15 @@
#define NS_POP3SERVICE_CONTRACTID2 \
NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "pop"
+// Mailnews has used "pop" as the protocol scheme for pop3 in some places,
+// but "pop3" in others. Necko code needs to be able to locate protocolInfo
+// based on pop3 to get proxy information.
+//
+// TODO: fix the mailnews code to use a consistent POP3 protocol scheme.
+
+#define NS_POP3SERVICE_CONTRACTID3 \
+ NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "pop3"
+
#define NS_POP3PROTOCOLINFO_CONTRACTID \
NS_MSGPROTOCOLINFO_CONTRACTID_PREFIX NS_POP3INCOMINGSERVER_TYPE
diff -Nru thunderbird-38.0~b3+build2/mailnews/mailnews.js thunderbird-38.0~b6+build2/mailnews/mailnews.js
--- thunderbird-38.0~b3+build2/mailnews/mailnews.js 2015-04-29 23:02:16.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mailnews.js 2015-06-03 09:26:19.000000000 +0000
@@ -635,7 +635,7 @@
#elifdef XP_MACOSX
pref("mail.biff.animate_dock_icon", false);
#elifdef XP_UNIX
-pref("mail.biff.use_system_alert", true);
+pref("mail.biff.use_system_alert", false);
#endif
// add jitter to biff interval
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/jsmime/jsmime.js thunderbird-38.0~b6+build2/mailnews/mime/jsmime/jsmime.js
--- thunderbird-38.0~b3+build2/mailnews/mime/jsmime/jsmime.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/jsmime/jsmime.js 2015-06-03 09:26:22.000000000 +0000
@@ -154,6 +154,7 @@
addHeader("Resent-Bcc", parseAddress, writeAddress);
addHeader("Resent-Cc", parseAddress, writeAddress);
addHeader("Resent-From", parseAddress, writeAddress);
+addHeader("Resent-Reply-To", parseAddress, writeAddress);
addHeader("Resent-Sender", parseAddress, writeAddress);
addHeader("Resent-To", parseAddress, writeAddress);
addHeader("Sender", parseAddress, writeAddress);
@@ -166,6 +167,9 @@
addHeader("Delivered-To", parseAddress, writeAddress);
addHeader("Return-Receipt-To", parseAddress, writeAddress);
+// http://cr.yp.to/proto/replyto.html
+addHeader("Mail-Reply-To", parseAddress, writeAddress);
+addHeader("Mail-Followup-To", parseAddress, writeAddress);
// Parameter-based headers. Note that all parameters are slightly different, so
// we use slightly different variants here.
@@ -206,13 +210,27 @@
this.addUnstructured(value);
}
+// Message-ID headers.
+function parseMessageID(values) {
+ // TODO: Proper parsing support for these headers is currently unsupported).
+ return this.decodeRFC2047Words(values[0]);
+}
+function writeMessageID(value) {
+ // TODO: Proper parsing support for these headers is currently unsupported).
+ this.addUnstructured(value);
+}
+
// RFC 5322
addHeader("Comments", parseUnstructured, writeUnstructured);
addHeader("Keywords", parseUnstructured, writeUnstructured);
addHeader("Subject", parseUnstructured, writeUnstructured);
+
// RFC 2045
+addHeader("MIME-Version", parseUnstructured, writeUnstructured);
addHeader("Content-Description", parseUnstructured, writeUnstructured);
+// RFC 7231
+addHeader("User-Agent", parseUnstructured, writeUnstructured);
// Date headers
function parseDate(values) { return this.parseDateHeader(values[0]); }
@@ -226,6 +244,9 @@
addHeader("Injection-Date", parseDate, writeDate);
addHeader("NNTP-Posting-Date", parseDate, writeDate);
+// RFC 5322
+addHeader("Message-ID", parseMessageID, writeMessageID);
+addHeader("Resent-Message-ID", parseMessageID, writeMessageID);
// Miscellaneous headers (those that don't fall under the above schemes):
@@ -235,6 +256,15 @@
});
structuredEncoders.set("Content-Transfer-Encoding", writeUnstructured);
+// Some clients like outlook.com send non-compliant References headers that
+// separate values using commas. Temporarily replace commas with spaces until
+// full references header parsing is implemted. See bug 1154521.
+function replaceCommasWithSpaces(values) {
+ return values[0].replace(/,/g, " ");
+}
+structuredDecoders.set("References", replaceCommasWithSpaces);
+structuredDecoders.set("In-Reply-To", replaceCommasWithSpaces);
+
return Object.freeze({
decoders: structuredDecoders,
encoders: structuredEncoders,
@@ -315,6 +345,11 @@
* comment block (we effectively treat ctext as containing qstring).
* 2. WSP need not be between a qstring and an atom (a"b" produces two tokens,
* a and b). This is an error case, though.
+ * 3. Legacy comments as display names: We recognize address fields with
+ * comments, and (a) either drop them if inside addr-spec or (b) preserve
+ * them as part of the display-name if not. If the display-name is empty
+ * while the last comment is not, we assume it's the legacy form above and
+ * take the comment content as the display-name.
*
* @param {String} value The header value, post charset conversion but
* before RFC 2047 decoding, to be parsed.
@@ -372,11 +407,8 @@
// Quoted strings don't include their delimiters.
let text = value.slice(tokenStart + 1, i);
- // If RFC 2047 is enabled, decode the qstring only if the entire string
- // appears to be a 2047 token. Don't unquote just yet (this will better
- // match people who incorrectly treat RFC 2047 decoding as a separate,
- // earlier step).
- if (opts.rfc2047 && text.startsWith("=?") && text.endsWith("?="))
+ // If RFC 2047 is enabled, always decode the qstring.
+ if (opts.rfc2047)
text = decodeRFC2047Words(text);
tokenList.push(new Token(text));
@@ -460,18 +492,28 @@
tokenIsStarting = true;
endQuote = ']';
} else if (opts.comments && ch == '(') {
- // Comments are nested (oh joy). They also end the prior token, and need
- // to be output if the consumer requests it.
+ // Comments are nested (oh joy). We only really care for the outer
+ // delimiter, though, which also ends the prior token and needs to be
+ // output if the consumer requests it.
commentDepth++;
- tokenIsEnding = true;
- isSpecial = true;
+ if (commentDepth == 1) {
+ tokenIsEnding = true;
+ isSpecial = true;
+ } else {
+ tokenIsStarting = true;
+ }
} else if (opts.comments && ch == ')') {
- // Comments are nested (oh joy). They also end the prior token, and need
- // to be output if the consumer requests it.
+ // Comments are nested (oh joy). We only really care for the outer
+ // delimiter, though, which also ends the prior token and needs to be
+ // output if the consumer requests it.
if (commentDepth > 0)
commentDepth--;
- tokenIsEnding = true;
- isSpecial = true;
+ if (commentDepth == 0) {
+ tokenIsEnding = true;
+ isSpecial = true;
+ } else {
+ tokenIsStarting = true;
+ }
} else {
// Not a delimiter, whitespace, comment, domain literal, or quoted string.
// Must be part of an atom then!
@@ -715,30 +757,112 @@
let addrlist = [];
// Build up all of the values
- var name = '', groupName = '', address = '';
+ let name = '', groupName = '', localPart = '', address = '', comment = '';
// Indicators of current state
- var inAngle = false, needsSpace = false;
+ let inAngle = false, inComment = false, needsSpace = false;
+ let preserveSpace = false;
+ let commentClosed = false;
+
+ // RFC 5322 §3.4 notes that legacy implementations exist which use a simple
+ // recipient form where the addr-spec appears without the angle brackets,
+ // but includes the name of the recipient in parentheses as a comment
+ // following the addr-spec. While we do not create this format, we still
+ // want to recognize it, though.
+ // Furthermore, despite allowing comments in addresses, RFC 5322 §3.4 notes
+ // that legacy implementations may interpret the comment, and thus it
+ // recommends not to use them. (Also, they may be illegal as per RFC 5321.)
+ // While we do not create address fields with comments, we recognize such
+ // comments during parsing and (a) either drop them if inside addr-spec or
+ // (b) preserve them as part of the display-name if not.
+ // If the display-name is empty while the last comment is not, we assume it's
+ // the legacy form above and take the comment content as the display-name.
+ //
+ // When parsing the address field, we at first do not know whether any
+ // strings belong to the display-name (which may include comments) or to the
+ // local-part of an addr-spec (where we ignore comments) until we find an
+ // '@' or an '<' token. Thus, we collect both variants until the fog lifts,
+ // plus the last comment seen.
+ let lastComment = '';
+
+ /**
+ * Add the parsed mailbox object to the address list.
+ * If it's in the legacy form above, correct the display-name.
+ * Also reset any faked flags.
+ * @param {String} displayName display-name as per RFC 5322
+ * @param {String} addrSpec addr-spec as per RFC 5322
+ */
+ function addToAddrList(displayName, addrSpec) {
+ if (displayName === '' && lastComment !== '') {
+ // Take last comment content as the display-name.
+ let offset = lastComment[0] === ' ' ? 2 : 1;
+ displayName = lastComment.substr(offset, lastComment.length - offset - 1);
+ }
+ if (displayName !== '' || addrSpec !== '')
+ addrlist.push({name: displayName, email: addrSpec});
+ // Clear pending flags and variables.
+ name = localPart = address = lastComment = '';
+ inAngle = inComment = needsSpace = false;
+ }
+
// Main parsing loop
for (let token of getHeaderTokens(header, ":,;<>@",
{qstring: true, comments: true, dliteral: true, rfc2047: doRFC2047})) {
if (token === ':') {
groupName = name;
name = '';
+ localPart = '';
// If we had prior email address results, commit them to the top-level.
if (addrlist.length > 0)
results = results.concat(addrlist);
addrlist = [];
} else if (token === '<') {
- inAngle = true;
+ if (inAngle) {
+ // Interpret the address we were parsing as a name.
+ if (address.length > 0) {
+ name = address;
+ }
+ localPart = address = '';
+ } else {
+ inAngle = true;
+ }
} else if (token === '>') {
inAngle = false;
+ // Forget addr-spec comments.
+ lastComment = '';
+ } else if (token === '(') {
+ inComment = true;
+ // The needsSpace flag may not always be set even if it should be,
+ // e.g. for a comment behind an angle-addr.
+ // Also, we need to restore the needsSpace flag if we ignore the comment.
+ preserveSpace = needsSpace;
+ if (!needsSpace)
+ needsSpace = name !== '' && name.substr(-1) !== ' ';
+ comment = needsSpace ? ' (' : '(';
+ commentClosed = false;
+ } else if (token === ')') {
+ inComment = false;
+ comment += ')';
+ lastComment = comment;
+ // The comment may be part of the name, but not of the local-part.
+ // Enforce a space behind the comment only when not ignoring it.
+ if (inAngle) {
+ needsSpace = preserveSpace;
+ } else {
+ name += comment;
+ needsSpace = true;
+ }
+ commentClosed = true;
+ continue;
} else if (token === '@') {
// An @ means we see an email address. If we're not within <> brackets,
// then we just parsed an email address instead of a display name. Empty
// out the display name for the current production.
if (!inAngle) {
- address = name;
+ address = localPart;
name = '';
+ localPart = '';
+ // The remainder of this mailbox is part of an addr-spec.
+ inAngle = true;
}
// Keep the local-part quoted if it needs to be.
if (/[ !()<>\[\]:;@\\,"]/.exec(address) !== null)
@@ -748,16 +872,10 @@
// A comma ends the current name. If we have something that's kind of a
// name, add it to the result list. If we don't, then our input looks like
// To: , , -> don't bother adding an empty entry.
- if (name !== '' || address !== '')
- addrlist.push({
- name: name,
- email: address
- });
- name = address = '';
+ addToAddrList(name, address);
} else if (token === ';') {
// Add pending name to the list
- if (name !== '' || address !== '')
- addrlist.push({name: name, email: address});
+ addToAddrList(name, address);
// If no group name was found, treat the ';' as a ','. In any case, we
// need to copy the results of addrlist into either a new group object or
@@ -772,24 +890,35 @@
}
// ... and reset every other variable.
addrlist = [];
- groupName = name = address = '';
+ groupName = '';
} else {
- // This is either the comment delimiters, a quoted-string, or some span of
+ // This is either comment content, a quoted-string, or some span of
// dots and atoms.
// Ignore the needs space if we're a "close" delimiter token.
- if (needsSpace && token !== ')' && token.toString()[0] != '.')
- token = ' ' + token;
+ let spacedToken = token;
+ if (needsSpace && token.toString()[0] != '.')
+ spacedToken = ' ' + spacedToken;
// Which field do we add this data to?
- if (inAngle || address !== '')
- address += token;
- else
- name += token;
+ if (inComment) {
+ comment += spacedToken;
+ } else if (inAngle) {
+ address += spacedToken;
+ } else {
+ name += spacedToken;
+ // Never add a space to the local-part, if we just ignored a comment.
+ if (commentClosed) {
+ localPart += token;
+ commentClosed = false;
+ } else {
+ localPart += spacedToken;
+ }
+ }
// We need space for the next token if we aren't some kind of comment or
// . delimiter.
- needsSpace = token !== '(' && token !== ' (' && token.toString()[0] != '.';
+ needsSpace = token.toString()[0] != '.';
// The fall-through case after this resets needsSpace to false, and we
// don't want that!
continue;
@@ -802,8 +931,7 @@
// If we're missing the final ';' of a group, assume it was present. Also, add
// in the details of any email/address that we previously saw.
- if (name !== '' || address !== '')
- addrlist.push({name: name, email: address});
+ addToAddrList(name, address);
if (groupName !== '') {
results.push({name: groupName, group: addrlist});
addrlist = [];
@@ -1183,10 +1311,13 @@
* - Delivered-To
* - Disposition-Notification-To
* - From
+ * - Mail-Reply-To
+ * - Mail-Followup-To
* - Reply-To
* - Resent-Bcc
* - Resent-Cc
* - Resent-From
+ * - Resent-Reply-To
* - Resent-Sender
* - Resent-To
* - Return-Receipt-To
@@ -2681,7 +2812,7 @@
// If quoting the entire string at once could fit in the line length, then do
// so. The check here is very loose, but this will inform is if we are going
// to definitely overrun the soft margin.
- if (text.length < this._softMargin) {
+ if ((this._currentLine.length + text.length) < this._softMargin) {
try {
this.addQuotable(text, qchars, mayBreakAfter);
// If we don't have a breakpoint, and the text is encoded as a sequence of
@@ -2716,7 +2847,7 @@
const b64Prelude = "=?UTF-8?B?", qpPrelude = "=?UTF-8?Q?";
/// A list of ASCII characters forbidden in RFC 2047 encoded-words
-const qpForbidden = "=?_()\"";
+const qpForbidden = "=?_()\",";
const hexString = "0123456789abcdef";
@@ -2835,7 +2966,7 @@
if (this._currentLine.length > 0) {
this._commitLine();
}
- this.addText(name + ": ", true);
+ this.addText(name + ": ", false);
};
/**
@@ -2857,7 +2988,11 @@
this.addHeaderName(preferredSpellings.get(lowerName));
encoders.get(lowerName).call(this, value);
} else if (typeof value === "string") {
- // Assume it's an unstructured header
+ // Assume it's an unstructured header.
+ // All-lower-case-names are ugly, so capitalize first letters.
+ name = name.replace(/(^|-)[a-z]/g, function(match) {
+ return match.toUpperCase();
+ });
this.addHeaderName(name);
this.addUnstructured(value);
} else {
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_header_emitter.js thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_header_emitter.js
--- thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_header_emitter.js 2015-04-29 23:02:17.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_header_emitter.js 2015-06-03 09:26:19.000000000 +0000
@@ -97,6 +97,11 @@
[[{name: "\ud83d\udca9\ud83d\udca9\ud83d\udca9\ud83d\udca9",
email: "a@a.c"}],
"=?UTF-8?B?8J+SqfCfkqnwn5Kp?=\r\n =?UTF-8?B?8J+SqQ==?= "],
+ // Bug 1088975: Since the encoded-word should be recognized as an atom,
+ // encode commas.
+ [[{name: "B\u00fcg 1088975, FirstName", email: "a@b.c"}],
+ "=?UTF-8?Q?B=c3=bcg_1088975?=\r\n" +
+ " =?UTF-8?Q?=2c_FirstName?=\r\n "],
];
header_tests.forEach(function (data) {
arrayTest(data, function () {
@@ -127,12 +132,12 @@
["My house burned down!", "My house burned down!"],
// Which variables need to be encoded in QP encoding?
- ["! \" # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \\ ] ^ _ ` { | } ~ \x7f",
- "=?UTF-8?Q?!_=22_#_$_%_&_'_?=\r\n" +
- " =?UTF-8?Q?=28_=29_*_+_,_-_.?=\r\n" +
- " =?UTF-8?Q?_/_:_;_<_=3d_>_?=\r\n" +
- " =?UTF-8?Q?=3f_@_[_\\_]_^_=5f?=\r\n" +
- " =?UTF-8?Q?_`_{_|_}_~_=7f?="],
+ ["! \" # $ % & ' ( ) * + - .",
+ "! \" # $ % & ' ( ) * + - ."],
+ [" / : ; < = > ? , @ [ \\ ] ^ _ ` { | } ~ \x7f",
+ "=?UTF-8?Q?_/_:_;_<_=3d_>_=3f?=\r\n" +
+ " =?UTF-8?Q?_=2c_@_[_\\_]_^_?=\r\n" +
+ " =?UTF-8?Q?=5f_`_{_|_}_~_=7f?="],
// But non-printable characters don't need it in the first place!
["! \" # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \\ ] ^ _ ` { | } ~",
"! \" # $ % & ' ( ) * + , - . /\r\n" +
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_header.js thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_header.js
--- thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_header.js 2015-04-29 23:02:17.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_header.js 2015-06-03 09:26:19.000000000 +0000
@@ -329,6 +329,30 @@
["=?UTF-8?Q?Simple?= ",
[{name: "=?UTF-8?Q?Simple?=", email: "a@b.c"}]],
["No email address", [{name: "No email address", email: ""}]],
+ // Thought we were parsing an address, but it was a name.
+ ["name@example.com ",
+ [{name: "name@example.com", email: "receiver@example.com"}]],
+ ["name@huhu.com ",
+ [{name: "name@huhu.com", email: "receiver@example.com"}]],
+ // Some names with quotes.
+ ["\"name@huhu.com\" ",
+ [{name: "name@huhu.com", email: "receiver@example.com"}]],
+ ["\"Chaplin, Charlie\" ",
+ [{name: "Chaplin, Charlie", email: "receiver@example.com"}]],
+ ["\"name@huhu.com and name@haha.com\" ",
+ [{name: "name@huhu.com and name@haha.com", email: "receiver@example.com"}]],
+ // Handling of comments and legacy display-names as per RFC 5322 §3.4
+ ["(c1)n(c2) <(c3)a(c4)@(c5)b(c6).(c7)d(c8)> (c9(c10)c11)",
+ [{name: "(c1) n (c2) (c9(c10)c11)", email: "a@b.d"}]],
+ ["<(c3)a(c4)@(c5)b(c6).(c7)d(c8)> (c9(c10)c11)",
+ [{name: "(c9(c10)c11)", email: "a@b.d"}]],
+ ["(c3)a(c4)@(c5)b(c6).(c7)d(c8)(c9(c10)c11)",
+ [{name: "c9(c10)c11", email: "a@b.d"}]],
+ ["(c1)n(c2) <(c3)a(c4)@(c5)b(c6).(c7)d(c8)> (c9(c10)c11)(c12)",
+ [{name: "(c1) n (c2) (c9(c10)c11) (c12)", email: "a@b.d"}]],
+ ["<(c3)a(c4)@(c5)b(c6).(c7)d(c8)> (c9(c10)c11)(c12)",
+ [{name: "(c9(c10)c11) (c12)", email: "a@b.d"}]],
+ ["(c3)a(c4)@(c5)b(c6).(c7)d(c8)(c9(c10)c11)(c12)", [{name: "c12", email: "a@b.d"}]],
];
header_tests.forEach(function (data) {
arrayTest(data, function () {
@@ -343,13 +367,45 @@
["=?UTF-8?Q?Simple?= ", [{name: "Simple", email: "a@b.c"}]],
["=?UTF-8?Q?=3C@b.c?= ", [{name: "<@b.c", email: "a@b.c"}]],
- // RFC 2047 token should not interfer with lexical processing
+ // RFC 2047 tokens should not interfere with lexical processing
["=?UTF-8?Q?a@b.c,?= ", [{name: "a@b.c,", email: "b@b.c"}]],
["=?UTF-8?Q?a@b.c=2C?= ", [{name: "a@b.c,", email: "b@b.c"}]],
["=?UTF-8?Q?= ", [{name: "<", email: "a@b.c"}]],
["Simple =?UTF-8?Q?= a@b.c>",
[{name: "", email: '"Simple < a"@b.c'}]],
["Tag <=?UTF-8?Q?email?=@b.c>", [{name: "Tag", email: "email@b.c"}]],
+ // handling of comments and legacy display-names as per RFC 5322 §3.4
+ ["jl1@b.c (=?ISO-8859-1?Q?Joe_L=F6we?=)", [{name: "Joe Löwe", email: "jl1@b.c"}]],
+ ["(=?ISO-8859-1?Q?Joe_L=F6we?=) jl2@b.c", [{name: "Joe Löwe", email: "jl2@b.c"}]],
+ ["(=?ISO-8859-1?Q?Joe_L=F6we?=) jl3@b.c (c2)", [{name: "c2", email: "jl3@b.c"}]],
+ ["=?ISO-8859-1?Q?Joe_L=F6we?= (c2)", [{name: "Joe Löwe (c2)", email: "jl3@b.c"}]],
+ ["(=?ISO-8859-1?Q?Joe_L=F6we?=) (c2)", [{name: "(Joe Löwe) (c2)", email: "jl3@b.c"}]],
+ // Bug 1141446: Malformed From addresses with erroneous quotes,
+ // note: acute accents: a \u00E1, e \u00E9, i \u00ED, o \u00F3, u \u00FA.
+ ["\"=?UTF-8?Q?Jazzy_Fern=C3=A1ndez_Nunoz?= jazzy.f.nunoz@example.com " +
+ "[BCN-FC]\" ",
+ [{name: "Jazzy Fern\u00E1ndez Nunoz jazzy.f.nunoz@example.com [BCN-FC]",
+ email: "Barcelona-Freecycle-noreply@yahoogroups.com"}]],
+ ["\"=?UTF-8?B?TWlyaWFtIEJlcm5hYsOpIFBlcmVsbMOz?= miriam@example.com "+
+ "[BCN-FC]\" ",
+ [{name: "Miriam Bernab\u00E9 Perell\u00F3 miriam@example.com [BCN-FC]",
+ email: "Barcelona-Freecycle-noreply@yahoogroups.com"}]],
+ ["\"=?iso-8859-1?Q?First_Mar=EDa_Furi=F3_Gancho?= mail@yahoo.es "+
+ "[BCN-FC]\" ",
+ [{name: "First Mar\u00EDa Furi\u00F3 Gancho mail@yahoo.es [BCN-FC]",
+ email: "Barcelona-Freecycle-noreply@yahoogroups.com"}]],
+ ["\"=?iso-8859-1?B?U29maWEgQ2FzdGVsbPMgUm9tZXJv?= sonia@example.com "+
+ "[BCN-FC]\" ",
+ [{name: "Sofia Castell\u00F3 Romero sonia@example.com [BCN-FC]",
+ email: "Barcelona-Freecycle-noreply@yahoogroups.com"}]],
+ ["=?iso-8859-1?Q?Klaus_Eisschl=E4ger_=28k=2Eeisschlaeger=40t-onli?=" +
+ "=?iso-8859-1?Q?ne=2Ede=29?= ",
+ [{name: "Klaus Eisschläger (k.eisschlaeger@t-online.de)",
+ email: "k.eisschlaeger@t-online.de"}]],
+ ["\"=?UTF-8?Q?=22Claudia_R=C3=B6hschicht=22?= Claudia_Roehschicht@web.de [freecycle-berlin]\" " +
+ "",
+ [{name: "\"Claudia Röhschicht\" Claudia_Roehschicht@web.de [freecycle-berlin]",
+ email: "freecycle-berlin-noreply@yahoogroups.de"}]],
];
header_tests.forEach(function (data) {
arrayTest(data, function () {
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_mime_tree.js thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_mime_tree.js
--- thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_mime_tree.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_mime_tree.js 2015-06-03 09:26:19.000000000 +0000
@@ -395,12 +395,12 @@
' for domain of bugzilla-daemon@mozilla.org) smtp.mail=bugzilla-dae' +
'mon@mozilla.org'],
'Date': ['Fri, 11 Apr 2008 07:17:29 -0700'],
- 'Message-Id': ['<200804111417.m3BEHTk4030129@mrapp51.mozilla.org>'],
+ 'Message-ID': ['<200804111417.m3BEHTk4030129@mrapp51.mozilla.org>'],
'From': ['bugzilla-daemon@mozilla.org'], 'To': ['bugmail@example.org'],
'Subject': ['Bugzilla: confirm account creation'],
'X-Bugzilla-Type': ['admin'],
'Content-Type': ['text/plain; charset="UTF-8"'],
- 'Mime-Version': ['1.0']}}],
+ 'MIME-Version': ['1.0']}}],
];
parser_tests.forEach(function (data) {
arrayTest(data, function () {
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_structured_header_emitters.js thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_structured_header_emitters.js
--- thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_structured_header_emitters.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_structured_header_emitters.js 2015-06-03 09:26:19.000000000 +0000
@@ -42,7 +42,8 @@
let addressing_headers = ['From', 'To', 'Cc', 'Bcc', 'Sender', 'Reply-To',
'Resent-Bcc', 'Resent-To', 'Resent-From', 'Resent-Cc', 'Resent-Sender',
'Approved', 'Disposition-Notification-To', 'Delivered-To',
- 'Return-Receipt-To'];
+ 'Return-Receipt-To', 'Resent-Reply-To', 'Mail-Reply-To', 'Mail-Followup-To'
+ ];
let address_tests = [
[{name: "", email: ""}, ""],
[{name: "John Doe", email: "john.doe@test.invalid"},
@@ -81,10 +82,12 @@
let headers = new Map();
headers.set('From', [{name:'', email: 'bugzilla-daemon@mozilla.org'}]);
headers.set('subject', ['[Bug 939557] browsercomps.dll failed to build']);
+ headers.set('x-capitalization-test', ['should capitalize']);
let str = headeremitter.emitStructuredHeaders(headers, {});
assert.equal(str,
'From: bugzilla-daemon@mozilla.org\r\n' +
- 'Subject: [Bug 939557] browsercomps.dll failed to build\r\n');
+ 'Subject: [Bug 939557] browsercomps.dll failed to build\r\n'+
+ 'X-Capitalization-Test: should capitalize\r\n');
});
});
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_structured_headers.js thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_structured_headers.js
--- thunderbird-38.0~b3+build2/mailnews/mime/jsmime/test/test_structured_headers.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/jsmime/test/test_structured_headers.js 2015-06-03 09:26:19.000000000 +0000
@@ -94,7 +94,8 @@
let addressing_headers = ['From', 'To', 'Cc', 'Bcc', 'Sender', 'Reply-To',
'Resent-Bcc', 'Resent-To', 'Resent-From', 'Resent-Cc', 'Resent-Sender',
'Approved', 'Disposition-Notification-To', 'Delivered-To',
- 'Return-Receipt-To'];
+ 'Return-Receipt-To', 'Resent-Reply-To', 'Mail-Reply-To', 'Mail-Followup-To'
+ ];
let address_tests = [
["", []],
["a@example.invalid", [{name: "", email: "a@example.invalid"}]],
@@ -137,6 +138,18 @@
testHeader(header, date_tests);
});
+ let multiple_unstructured_headers = ['In-Reply-To', 'References'];
+ let multiple_unstructured_tests = [
+ ["", ""],
+ ["", ""],
+
+ // This test is needed for clients sending non-compliant headers, see bug 1154521
+ [",,", ""],
+ ];
+ multiple_unstructured_headers.forEach(function (header) {
+ testHeader(header, multiple_unstructured_tests);
+ });
+
let unstructured_headers = ['Comments', 'Content-Description', 'Keywords',
'Subject'];
let unstructured_tests = [
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js thunderbird-38.0~b6+build2/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js
--- thunderbird-38.0~b3+build2/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/test/unit/test_EncodeMimePartIIStr_UTF8.js 2015-06-03 09:26:19.000000000 +0000
@@ -16,8 +16,8 @@
["IamASCII", false, "IamASCII"],
// Although an invalid email, we shouldn't crash on it (bug 479206)
["crash test@foo.invalid>", true, "\"crash test\"@foo.invalid"],
- ["MXR now displays links to Github log & Blame for Gaia/Rust/Servo", false,
- "MXR now displays links to Github log & Blame for Gaia/Rust/Servo"],
+ ["MXR now displays links to Github log & Blame for\r\n Gaia/Rust/Servo", false,
+ "MXR now displays links to Github log & Blame for\r\n Gaia/Rust/Servo"],
["-----------------------:", false, "-----------------------:"],
];
diff -Nru thunderbird-38.0~b3+build2/mailnews/mime/test/unit/test_structured_headers.js thunderbird-38.0~b6+build2/mailnews/mime/test/unit/test_structured_headers.js
--- thunderbird-38.0~b3+build2/mailnews/mime/test/unit/test_structured_headers.js 2015-04-29 23:02:20.000000000 +0000
+++ thunderbird-38.0~b6+build2/mailnews/mime/test/unit/test_structured_headers.js 2015-06-03 09:26:19.000000000 +0000
@@ -168,11 +168,14 @@
headers.setHeader("From", [{name: "John Doe", email: "jdoe@test.invalid"}]);
headers.setHeader("Subject", "A subject that spans a distance quite in " +
"excess of 80 characters so as to force an intermediary CRLF");
+ headers.setHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101 Thunderbird/40.0a1");
let mimeText =
"To: =?UTF-8?Q?Fran=c3=a7ois_Smith?= \r\n" +
"From: John Doe \r\n" +
"Subject: A subject that spans a distance quite in excess of 80 characters so\r\n" +
- " as to force an intermediary CRLF\r\n";
+ " as to force an intermediary CRLF\r\n" +
+ "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101\r\n" +
+ " Thunderbird/40.0a1\r\n";
do_check_eq(headers.buildMimeText(), mimeText);
// Check the version used for the nsIMimeHeaders implementation. This requires
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/base/content/content.js thunderbird-38.0~b6+build2/mozilla/browser/base/content/content.js
--- thunderbird-38.0~b3+build2/mozilla/browser/base/content/content.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/base/content/content.js 2015-06-03 09:59:36.000000000 +0000
@@ -566,7 +566,7 @@
let principal = e.target.nodePrincipal ? e.target.nodePrincipal : e.target.document.nodePrincipal;
if (e.detail) {
- sendAsyncMessage("WebChannelMessageToChrome", e.detail, null, principal);
+ sendAsyncMessage("WebChannelMessageToChrome", e.detail, { eventTarget: e.target }, principal);
} else {
Cu.reportError("WebChannel message failed. No message detail.");
}
@@ -575,12 +575,30 @@
// Add message listener for "WebChannelMessageToContent" messages from chrome scripts
addMessageListener("WebChannelMessageToContent", function (e) {
if (e.data) {
- content.dispatchEvent(new content.CustomEvent("WebChannelMessageToContent", {
- detail: Cu.cloneInto({
- id: e.data.id,
- message: e.data.message,
- }, content),
- }));
+ // e.objects.eventTarget will be defined if sending a response to
+ // a WebChannelMessageToChrome event. An unsolicited send
+ // may not have an eventTarget defined, in this case send to the
+ // main content window.
+ let eventTarget = e.objects.eventTarget || content;
+
+ // if eventTarget is window then we want the document principal,
+ // otherwise use target itself.
+ let targetPrincipal = eventTarget instanceof Ci.nsIDOMWindow ? eventTarget.document.nodePrincipal : eventTarget.nodePrincipal;
+
+ if (e.principal.subsumes(targetPrincipal)) {
+ // if eventTarget is a window, use it as the targetWindow, otherwise
+ // find the window that owns the eventTarget.
+ let targetWindow = eventTarget instanceof Ci.nsIDOMWindow ? eventTarget : eventTarget.ownerDocument.defaultView;
+
+ eventTarget.dispatchEvent(new targetWindow.CustomEvent("WebChannelMessageToContent", {
+ detail: Cu.cloneInto({
+ id: e.data.id,
+ message: e.data.message,
+ }, targetWindow),
+ }));
+ } else {
+ Cu.reportError("WebChannel message failed. Principal mismatch.");
+ }
} else {
Cu.reportError("WebChannel message failed. No message data.");
}
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/base/content/test/general/browser_bug710878.js thunderbird-38.0~b6+build2/mozilla/browser/base/content/test/general/browser_bug710878.js
--- thunderbird-38.0~b3+build2/mozilla/browser/base/content/test/general/browser_bug710878.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/base/content/test/general/browser_bug710878.js 2015-06-03 09:57:21.000000000 +0000
@@ -5,23 +5,20 @@
{
waitForExplicitFinish();
- let doc;
-
gBrowser.selectedTab = gBrowser.addTab();
gBrowser.selectedBrowser.addEventListener("load", function onload() {
gBrowser.selectedBrowser.removeEventListener("load", onload, true);
- doc = content.document;
waitForFocus(performTest, content);
}, true);
- content.location = "data:text/html,word1 word2 word3";
+ content.location = "data:text/html;charset=utf-8,word1 word2 word3";
function performTest()
{
+ let doc = content.document;
let link = doc.querySelector("a");;
let text = gatherTextUnder(link);
is(text, "word1 word2 word3", "Text under link is correctly computed.");
- doc = null;
gBrowser.removeCurrentTab();
finish();
}
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/base/content/test/general/browser_identity_UI.js thunderbird-38.0~b6+build2/mozilla/browser/base/content/test/general/browser_identity_UI.js
--- thunderbird-38.0~b3+build2/mozilla/browser/base/content/test/general/browser_identity_UI.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/base/content/test/general/browser_identity_UI.js 2015-06-03 09:57:21.000000000 +0000
@@ -1,6 +1,7 @@
/* Tests for correct behaviour of getEffectiveHost on identity handler */
function test() {
waitForExplicitFinish();
+ requestLongerTimeout(2);
ok(gIdentityHandler, "gIdentityHandler should exist");
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/base/content/test/general/browser.ini thunderbird-38.0~b6+build2/mozilla/browser/base/content/test/general/browser.ini
--- thunderbird-38.0~b3+build2/mozilla/browser/base/content/test/general/browser.ini 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/base/content/test/general/browser.ini 2015-06-03 09:57:20.000000000 +0000
@@ -113,7 +113,7 @@
[browser_aboutHealthReport.js]
skip-if = os == "linux" # Bug 924307
[browser_aboutHome.js]
-skip-if = e10s # Bug 1093153 - no about:home support yet
+skip-if = e10s || (os == 'mac' && os_version == '10.6' && debug) # Bug 1093153 - no about:home support yet, bug 1062496
[browser_aboutSyncProgress.js]
[browser_action_keyword.js]
[browser_action_keyword_override.js]
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/advanced.js thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/advanced.js
--- thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/advanced.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/advanced.js 2015-06-03 09:57:23.000000000 +0000
@@ -246,7 +246,7 @@
document.getElementById("submitTelemetryBox").disabled = disabled;
if (disabled) {
// If we disable FHR, untick the telemetry checkbox.
- document.getElementById("submitTelemetryBox").checked = false;
+ Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);
}
document.getElementById("telemetryDataDesc").disabled = disabled;
#endif
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/advanced.js thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/advanced.js
--- thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/advanced.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/advanced.js 2015-06-03 09:57:23.000000000 +0000
@@ -275,7 +275,7 @@
document.getElementById("submitTelemetryBox").disabled = disabled;
if (disabled) {
// If we disable FHR, untick the telemetry checkbox.
- document.getElementById("submitTelemetryBox").checked = false;
+ Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);
}
document.getElementById("telemetryDataDesc").disabled = disabled;
#endif
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/content.js thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/content.js
--- thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/content.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/content.js 2015-06-03 09:57:24.000000000 +0000
@@ -190,7 +190,7 @@
*/
configureFonts: function ()
{
- gSubDialog.open("chrome://browser/content/preferences/fonts.xul");
+ gSubDialog.open("chrome://browser/content/preferences/fonts.xul", "resizable=no");
},
/**
@@ -199,7 +199,7 @@
*/
configureColors: function ()
{
- gSubDialog.open("chrome://browser/content/preferences/colors.xul");
+ gSubDialog.open("chrome://browser/content/preferences/colors.xul", "resizable=no");
},
// LANGUAGES
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/privacy.js thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/privacy.js
--- thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/privacy.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/privacy.js 2015-06-03 09:57:24.000000000 +0000
@@ -511,7 +511,7 @@
*/
showClearPrivateDataSettings: function ()
{
- gSubDialog.open("chrome://browser/content/preferences/sanitize.xul");
+ gSubDialog.open("chrome://browser/content/preferences/sanitize.xul", "resizable=no");
},
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/security.js thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/security.js
--- thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/security.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/security.js 2015-06-03 09:57:24.000000000 +0000
@@ -217,7 +217,7 @@
changeMasterPassword: function ()
{
gSubDialog.open("chrome://mozapps/content/preferences/changemp.xul",
- null, null, this._initMasterPasswordUI.bind(this));
+ "resizable=no", null, this._initMasterPasswordUI.bind(this));
},
/**
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js
--- thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js 2015-06-03 09:57:24.000000000 +0000
@@ -3,6 +3,8 @@
"use strict";
+const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
+
function runPaneTest(fn) {
open_preferences((win) => {
let doc = win.document;
@@ -28,12 +30,16 @@
let telmetryCheckbox = doc.getElementById("submitTelemetryBox");
Assert.ok(!telmetryCheckbox.disabled,
"Telemetry checkbox must be enabled if FHR is checked.");
+ Assert.ok(Services.prefs.getBoolPref(PREF_TELEMETRY_ENABLED),
+ "Telemetry must be enabled if the checkbox is ticked.");
// Uncheck the FHR checkbox and make sure that Telemetry checkbox gets disabled.
fhrCheckbox.click();
Assert.ok(telmetryCheckbox.disabled,
"Telemetry checkbox must be disabled if FHR is unchecked.");
+ Assert.ok(!Services.prefs.getBoolPref(PREF_TELEMETRY_ENABLED),
+ "Telemetry must be disabled if the checkbox is unticked.");
win.close();
finish();
@@ -41,5 +47,6 @@
function resetPreferences() {
Services.prefs.clearUserPref("datareporting.healthreport.uploadEnabled");
+ Services.prefs.clearUserPref(PREF_TELEMETRY_ENABLED);
}
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/tests/browser_telemetry.js thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/tests/browser_telemetry.js
--- thunderbird-38.0~b3+build2/mozilla/browser/components/preferences/tests/browser_telemetry.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/components/preferences/tests/browser_telemetry.js 2015-06-03 09:57:24.000000000 +0000
@@ -3,6 +3,8 @@
"use strict";
+const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
+
function runPaneTest(fn) {
function observer(win, topic, data) {
Services.obs.removeObserver(observer, "advanced-pane-loaded");
@@ -40,12 +42,16 @@
let telmetryCheckbox = doc.getElementById("submitTelemetryBox");
Assert.ok(!telmetryCheckbox.disabled,
"Telemetry checkbox must be enabled if FHR is checked.");
+ Assert.ok(Services.prefs.getBoolPref(PREF_TELEMETRY_ENABLED),
+ "Telemetry must be enabled if the checkbox is ticked.");
// Uncheck the FHR checkbox and make sure that Telemetry checkbox gets disabled.
fhrCheckbox.click();
Assert.ok(telmetryCheckbox.disabled,
"Telemetry checkbox must be disabled if FHR is unchecked.");
+ Assert.ok(!Services.prefs.getBoolPref(PREF_TELEMETRY_ENABLED),
+ "Telemetry must be disabled if the checkbox is unticked.");
win.close();
finish();
@@ -57,5 +63,6 @@
.wrappedJSObject;
service.policy._prefs.resetBranch("datareporting.policy.");
service.policy.dataSubmissionPolicyBypassNotification = true;
+ Services.prefs.clearUserPref(PREF_TELEMETRY_ENABLED);
}
diff -Nru thunderbird-38.0~b3+build2/mozilla/browser/confvars.sh thunderbird-38.0~b6+build2/mozilla/browser/confvars.sh
--- thunderbird-38.0~b3+build2/mozilla/browser/confvars.sh 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/browser/confvars.sh 2015-06-03 09:59:36.000000000 +0000
@@ -48,9 +48,9 @@
# This should usually be the same as the value MAR_CHANNEL_ID.
# If more than one ID is needed, then you should use a comma separated list
# of values.
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-release
+MAR_CHANNEL_ID=firefox-mozilla-beta
MOZ_PROFILE_MIGRATOR=1
MOZ_APP_STATIC_INI=1
MOZ_WEBAPP_RUNTIME=1
diff -Nru thunderbird-38.0~b3+build2/mozilla/docshell/base/nsDocShell.cpp thunderbird-38.0~b6+build2/mozilla/docshell/base/nsDocShell.cpp
--- thunderbird-38.0~b3+build2/mozilla/docshell/base/nsDocShell.cpp 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/docshell/base/nsDocShell.cpp 2015-06-03 09:57:32.000000000 +0000
@@ -863,6 +863,7 @@
, mAllowDNSPrefetch(true)
, mAllowWindowControl(true)
, mAllowContentRetargeting(true)
+ , mAllowContentRetargetingOnChildren(true)
, mCreatingDocument(false)
, mUseErrorPages(false)
, mObserveErrorPages(true)
@@ -1024,6 +1025,7 @@
NS_IMPL_RELEASE_INHERITED(nsDocShell, nsDocLoader)
NS_INTERFACE_MAP_BEGIN(nsDocShell)
+ NS_INTERFACE_MAP_ENTRY(nsIDocShell_ESR38)
NS_INTERFACE_MAP_ENTRY(nsIDocShell)
NS_INTERFACE_MAP_ENTRY(nsIDocShellTreeItem)
NS_INTERFACE_MAP_ENTRY(nsIWebNavigation)
@@ -2591,11 +2593,26 @@
NS_IMETHODIMP
nsDocShell::SetAllowContentRetargeting(bool aAllowContentRetargeting)
{
+ mAllowContentRetargetingOnChildren = aAllowContentRetargeting;
mAllowContentRetargeting = aAllowContentRetargeting;
return NS_OK;
}
NS_IMETHODIMP
+nsDocShell::GetAllowContentRetargetingOnChildren(bool* aAllowContentRetargetingOnChildren)
+{
+ *aAllowContentRetargetingOnChildren = mAllowContentRetargetingOnChildren;
+ return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShell::SetAllowContentRetargetingOnChildren(bool aAllowContentRetargetingOnChildren)
+{
+ mAllowContentRetargetingOnChildren = aAllowContentRetargetingOnChildren;
+ return NS_OK;
+}
+
+NS_IMETHODIMP
nsDocShell::GetFullscreenAllowed(bool* aFullscreenAllowed)
{
NS_ENSURE_ARG_POINTER(aFullscreenAllowed);
@@ -3444,7 +3461,7 @@
// If parent is another docshell, we inherit all their flags for
// allowing plugins, scripting etc.
bool value;
- nsCOMPtr parentAsDocShell(do_QueryInterface(parent));
+ nsCOMPtr parentAsDocShell(do_QueryInterface(parent));
if (parentAsDocShell) {
if (NS_SUCCEEDED(parentAsDocShell->GetAllowPlugins(&value))) {
SetAllowPlugins(value);
@@ -3465,7 +3482,7 @@
if (NS_SUCCEEDED(parentAsDocShell->GetAllowWindowControl(&value))) {
SetAllowWindowControl(value);
}
- SetAllowContentRetargeting(parentAsDocShell->GetAllowContentRetargeting());
+ SetAllowContentRetargeting(parentAsDocShell->GetAllowContentRetargetingOnChildren());
if (NS_SUCCEEDED(parentAsDocShell->GetIsActive(&value))) {
SetIsActive(value);
}
@@ -8716,7 +8733,7 @@
// Now we simulate appending child docshells for subframes.
for (i = 0; i < childShells.Count(); ++i) {
nsIDocShellTreeItem* childItem = childShells.ObjectAt(i);
- nsCOMPtr childShell = do_QueryInterface(childItem);
+ nsCOMPtr childShell = do_QueryInterface(childItem);
// Make sure to not clobber the state of the child. Since AddChild
// always clobbers it, save it off first.
@@ -8741,6 +8758,7 @@
childShell->GetAllowDNSPrefetch(&allowDNSPrefetch);
bool allowContentRetargeting = childShell->GetAllowContentRetargeting();
+ bool allowContentRetargetingOnChildren = childShell->GetAllowContentRetargetingOnChildren();
uint32_t defaultLoadFlags;
childShell->GetDefaultLoadFlags(&defaultLoadFlags);
@@ -8759,6 +8777,7 @@
childShell->SetAllowMedia(allowMedia);
childShell->SetAllowDNSPrefetch(allowDNSPrefetch);
childShell->SetAllowContentRetargeting(allowContentRetargeting);
+ childShell->SetAllowContentRetargetingOnChildren(allowContentRetargetingOnChildren);
childShell->SetDefaultLoadFlags(defaultLoadFlags);
rv = childShell->BeginRestore(nullptr, false);
diff -Nru thunderbird-38.0~b3+build2/mozilla/docshell/base/nsDocShell.h thunderbird-38.0~b6+build2/mozilla/docshell/base/nsDocShell.h
--- thunderbird-38.0~b3+build2/mozilla/docshell/base/nsDocShell.h 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/docshell/base/nsDocShell.h 2015-06-03 09:59:36.000000000 +0000
@@ -137,7 +137,7 @@
class nsDocShell final
: public nsDocLoader
- , public nsIDocShell
+ , public nsIDocShell_ESR38
, public nsIWebNavigation
, public nsIBaseWindow
, public nsIScrollable
@@ -169,6 +169,7 @@
NS_DECL_ISUPPORTS_INHERITED
+ NS_DECL_NSIDOCSHELL_ESR38
NS_DECL_NSIDOCSHELL
NS_DECL_NSIDOCSHELLTREEITEM
NS_DECL_NSIWEBNAVIGATION
@@ -883,6 +884,7 @@
bool mAllowDNSPrefetch;
bool mAllowWindowControl;
bool mAllowContentRetargeting;
+ bool mAllowContentRetargetingOnChildren;
bool mCreatingDocument; // (should be) debugging only
bool mUseErrorPages;
bool mObserveErrorPages;
diff -Nru thunderbird-38.0~b3+build2/mozilla/docshell/base/nsIDocShell.idl thunderbird-38.0~b6+build2/mozilla/docshell/base/nsIDocShell.idl
--- thunderbird-38.0~b3+build2/mozilla/docshell/base/nsIDocShell.idl 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/docshell/base/nsIDocShell.idl 2015-06-03 09:57:33.000000000 +0000
@@ -1054,3 +1054,13 @@
*/
attribute boolean windowDraggingAllowed;
};
+
+[scriptable, builtinclass, uuid(395c6a79-80ae-4ede-9e05-93bee6c3d9a1)]
+interface nsIDocShell_ESR38 : nsIDocShell
+{
+ /**
+ * True if new child docshells should allow content retargeting.
+ * Setting allowContentRetargeting also overwrites this value.
+ */
+ [infallible] attribute boolean allowContentRetargetingOnChildren;
+};
diff -Nru thunderbird-38.0~b3+build2/mozilla/dom/base/test/test_performance_user_timing.html thunderbird-38.0~b6+build2/mozilla/dom/base/test/test_performance_user_timing.html
--- thunderbird-38.0~b3+build2/mozilla/dom/base/test/test_performance_user_timing.html 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/dom/base/test/test_performance_user_timing.html 2015-06-03 09:57:36.000000000 +0000
@@ -36,7 +36,7 @@
performance.mark("test");
var marks_type = performance.getEntriesByType("mark");
is(marks_type.length, 3, "Number of marks by type should be 3");
- var marks_name = performance.getEntriesByType("mark");
+ var marks_name = performance.getEntriesByName("test");
is(marks_name.length, 3, "Number of marks by name should be 3");
var mark = marks_name[0];
is(mark.name, "test", "mark name should be 'test'");
diff -Nru thunderbird-38.0~b3+build2/mozilla/dom/browser-element/mochitest/browserElement_CopyPaste.js thunderbird-38.0~b6+build2/mozilla/dom/browser-element/mochitest/browserElement_CopyPaste.js
--- thunderbird-38.0~b3+build2/mozilla/dom/browser-element/mochitest/browserElement_CopyPaste.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/dom/browser-element/mochitest/browserElement_CopyPaste.js 2015-06-03 09:57:37.000000000 +0000
@@ -52,7 +52,7 @@
iframeOuter = document.createElement('iframe');
iframeOuter.setAttribute('mozbrowser', 'true');
if (createEmbededFrame) {
- iframeOuter.src = "file_NestedFramesOuter_CopyPaste.html";
+ iframeOuter.src = "file_empty.html";
}
document.body.appendChild(iframeOuter);
@@ -67,7 +67,10 @@
.QueryInterface(SpecialPowers.Ci.nsIFrameLoaderOwner)
.frameLoader.docShell.contentViewer.DOMDocument.defaultView;
var contentDoc = contentWin.document;
- iframeInner = contentDoc.getElementById('iframeInner');
+ iframeInner = contentDoc.createElement('iframe');
+ iframeInner.setAttribute('mozbrowser', true);
+ iframeInner.setAttribute('remote', 'false');
+ contentDoc.body.appendChild(iframeInner);
iframeInner.addEventListener("mozbrowserloadend", function onloadendinner(e) {
iframeInner.removeEventListener("mozbrowserloadend", onloadendinner);
mm = SpecialPowers.getBrowserFrameMessageManager(iframeInner);
diff -Nru thunderbird-38.0~b3+build2/mozilla/dom/browser-element/mochitest/file_NestedFramesOuter_CopyPaste.html thunderbird-38.0~b6+build2/mozilla/dom/browser-element/mochitest/file_NestedFramesOuter_CopyPaste.html
--- thunderbird-38.0~b3+build2/mozilla/dom/browser-element/mochitest/file_NestedFramesOuter_CopyPaste.html 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/dom/browser-element/mochitest/file_NestedFramesOuter_CopyPaste.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-
-
-
file_NestedFramesOuter_CopyPaste.html
-
-
-
diff -Nru thunderbird-38.0~b3+build2/mozilla/dom/browser-element/mochitest/mochitest.ini thunderbird-38.0~b6+build2/mozilla/dom/browser-element/mochitest/mochitest.ini
--- thunderbird-38.0~b3+build2/mozilla/dom/browser-element/mochitest/mochitest.ini 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/dom/browser-element/mochitest/mochitest.ini 2015-06-03 09:57:37.000000000 +0000
@@ -114,7 +114,6 @@
file_inputmethod.html
file_post_request.html
file_wyciwyg.html
- file_NestedFramesOuter_CopyPaste.html
# Note: browserElementTestHelpers.js looks at the test's filename to determine
# whether the test should be OOP. "_oop_" signals OOP, "_inproc_" signals in
diff -Nru thunderbird-38.0~b3+build2/mozilla/dom/tests/browser/browser_test_new_window_from_content.js thunderbird-38.0~b6+build2/mozilla/dom/tests/browser/browser_test_new_window_from_content.js
--- thunderbird-38.0~b3+build2/mozilla/dom/tests/browser/browser_test_new_window_from_content.js 2015-04-29 23:36:48.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/dom/tests/browser/browser_test_new_window_from_content.js 2015-06-03 09:57:44.000000000 +0000
@@ -49,6 +49,8 @@
const kNewWin = "new window";
const kNewTab = "new tab";
+requestLongerTimeout(2);
+
// The following "matrices" represent the result of content attempting to
// open a window with window.open with the default feature set. The key of
// the kWinOpenDefault object represents the value of browser.link.open_newwindow.
diff -Nru thunderbird-38.0~b3+build2/mozilla/editor/libeditor/nsEditor.cpp thunderbird-38.0~b6+build2/mozilla/editor/libeditor/nsEditor.cpp
--- thunderbird-38.0~b3+build2/mozilla/editor/libeditor/nsEditor.cpp 2015-04-29 23:35:52.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/editor/libeditor/nsEditor.cpp 2015-06-03 09:59:36.000000000 +0000
@@ -618,23 +618,28 @@
}
-
NS_IMETHODIMP
-nsEditor::GetSelection(nsISelection **aSelection)
+nsEditor::GetSelection(nsISelection** aSelection)
+{
+ return GetSelection(nsISelectionController::SELECTION_NORMAL, aSelection);
+}
+
+nsresult
+nsEditor::GetSelection(int16_t aSelectionType, nsISelection** aSelection)
{
NS_ENSURE_TRUE(aSelection, NS_ERROR_NULL_POINTER);
*aSelection = nullptr;
nsCOMPtr selcon;
GetSelectionController(getter_AddRefs(selcon));
NS_ENSURE_TRUE(selcon, NS_ERROR_NOT_INITIALIZED);
- return selcon->GetSelection(nsISelectionController::SELECTION_NORMAL, aSelection); // does an addref
+ return selcon->GetSelection(aSelectionType, aSelection); // does an addref
}
Selection*
-nsEditor::GetSelection()
+nsEditor::GetSelection(int16_t aSelectionType)
{
nsCOMPtr sel;
- nsresult res = GetSelection(getter_AddRefs(sel));
+ nsresult res = GetSelection(aSelectionType, getter_AddRefs(sel));
NS_ENSURE_SUCCESS(res, nullptr);
return static_cast(sel.get());
@@ -2592,23 +2597,42 @@
// BEGIN nsEditor public helper methods
+struct SavedRange {
+ nsRefPtr mSelection;
+ nsCOMPtr mStartNode;
+ nsCOMPtr mEndNode;
+ int32_t mStartOffset;
+ int32_t mEndOffset;
+};
+
nsresult
nsEditor::SplitNodeImpl(nsIContent& aExistingRightNode,
int32_t aOffset,
nsIContent& aNewLeftNode)
{
- // Get selection
- nsRefPtr selection = GetSelection();
- NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
+ // Remember all selection points.
+ nsAutoTArray savedRanges;
+ for (size_t i = 0; i < nsISelectionController::NUM_SELECTIONTYPES - 1; ++i) {
+ SelectionType type(1 << i);
+ SavedRange range;
+ range.mSelection = GetSelection(type);
+ if (type == nsISelectionController::SELECTION_NORMAL) {
+ NS_ENSURE_TRUE(range.mSelection, NS_ERROR_NULL_POINTER);
+ } else if (!range.mSelection) {
+ // For non-normal selections, skip over the non-existing ones.
+ continue;
+ }
+
+ for (uint32_t j = 0; j < range.mSelection->RangeCount(); ++j) {
+ nsRefPtr r = range.mSelection->GetRangeAt(j);
+ MOZ_ASSERT(r->IsPositioned());
+ range.mStartNode = r->GetStartParent();
+ range.mStartOffset = r->StartOffset();
+ range.mEndNode = r->GetEndParent();
+ range.mEndOffset = r->EndOffset();
- // Remember some selection points, if selection is set
- nsCOMPtr selStartNode, selEndNode;
- int32_t selStartOffset = 0, selEndOffset = 0;
- if (selection->GetRangeAt(0)) {
- selStartNode = selection->GetRangeAt(0)->GetStartParent();
- selStartOffset = selection->GetRangeAt(0)->StartOffset();
- selEndNode = selection->GetRangeAt(0)->GetEndParent();
- selEndOffset = selection->GetRangeAt(0)->EndOffset();
+ savedRanges.AppendElement(range);
+ }
}
nsCOMPtr parent = aExistingRightNode.GetParentNode();
@@ -2659,28 +2683,59 @@
ps->FlushPendingNotifications(Flush_Frames);
}
- if (GetShouldTxnSetSelection()) {
- // Editor wants us to set selection at split point
- selection->Collapse(&aNewLeftNode, aOffset);
- } else if (selStartNode) {
- // Else adjust the selection if needed. If selStartNode is null, then
- // there was no selection.
- if (selStartNode == &aExistingRightNode) {
- if (selStartOffset < aOffset) {
- selStartNode = &aNewLeftNode;
+ bool shouldSetSelection = GetShouldTxnSetSelection();
+
+ nsRefPtr previousSelection;
+ for (size_t i = 0; i < savedRanges.Length(); ++i) {
+ // Adjust the selection if needed.
+ SavedRange& range = savedRanges[i];
+
+ // If we have not seen the selection yet, clear all of its ranges.
+ if (range.mSelection != previousSelection) {
+ nsresult rv = range.mSelection->RemoveAllRanges();
+ NS_ENSURE_SUCCESS(rv, rv);
+ previousSelection = range.mSelection;
+ }
+
+ if (shouldSetSelection &&
+ range.mSelection->Type() ==
+ nsISelectionController::SELECTION_NORMAL) {
+ // If the editor should adjust the selection, don't bother restoring
+ // the ranges for the normal selection here.
+ continue;
+ }
+
+ // Split the selection into existing node and new node.
+ if (range.mStartNode == &aExistingRightNode) {
+ if (range.mStartOffset < aOffset) {
+ range.mStartNode = &aNewLeftNode;
} else {
- selStartOffset -= aOffset;
+ range.mStartOffset -= aOffset;
}
}
- if (selEndNode == &aExistingRightNode) {
- if (selEndOffset < aOffset) {
- selEndNode = &aNewLeftNode;
+
+ if (range.mEndNode == &aExistingRightNode) {
+ if (range.mEndOffset < aOffset) {
+ range.mEndNode = &aNewLeftNode;
} else {
- selEndOffset -= aOffset;
+ range.mEndOffset -= aOffset;
}
}
- selection->Collapse(selStartNode, selStartOffset);
- selection->Extend(selEndNode, selEndOffset);
+
+ nsRefPtr newRange;
+ nsresult rv = nsRange::CreateRange(range.mStartNode, range.mStartOffset,
+ range.mEndNode, range.mEndOffset,
+ getter_AddRefs(newRange));
+ NS_ENSURE_SUCCESS(rv, rv);
+ rv = range.mSelection->AddRange(newRange);
+ NS_ENSURE_SUCCESS(rv, rv);
+ }
+
+ if (shouldSetSelection) {
+ // Editor wants us to set selection at split point.
+ nsRefPtr selection = GetSelection();
+ NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
+ selection->Collapse(&aNewLeftNode, aOffset);
}
return NS_OK;
@@ -2695,25 +2750,6 @@
MOZ_ASSERT(aNodeToJoin);
MOZ_ASSERT(aParent);
- nsRefPtr selection = GetSelection();
- NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
-
- // remember some selection points
- nsCOMPtr selStartNode;
- int32_t selStartOffset;
- nsresult result = GetStartNodeAndOffset(selection, getter_AddRefs(selStartNode), &selStartOffset);
- if (NS_FAILED(result)) {
- selStartNode = nullptr;
- }
-
- nsCOMPtr selEndNode;
- int32_t selEndOffset;
- result = GetEndNodeAndOffset(selection, getter_AddRefs(selEndNode), &selEndOffset);
- // Joe or Kin should comment here on why the following line is not a copy/paste error
- if (NS_FAILED(result)) {
- selStartNode = nullptr;
- }
-
uint32_t firstNodeLength = aNodeToJoin->Length();
int32_t joinOffset;
@@ -2721,24 +2757,51 @@
int32_t keepOffset;
nsINode* parent = GetNodeLocation(aNodeToKeep, &keepOffset);
- // if selection endpoint is between the nodes, remember it as being
- // in the one that is going away instead. This simplifies later selection
- // adjustment logic at end of this method.
- if (selStartNode) {
- if (selStartNode == parent &&
- joinOffset < selStartOffset && selStartOffset <= keepOffset) {
- selStartNode = aNodeToJoin;
- selStartOffset = firstNodeLength;
- }
- if (selEndNode == parent &&
- joinOffset < selEndOffset && selEndOffset <= keepOffset) {
- selEndNode = aNodeToJoin;
- selEndOffset = firstNodeLength;
+ // Remember all selection points.
+ nsAutoTArray savedRanges;
+ for (size_t i = 0; i < nsISelectionController::NUM_SELECTIONTYPES - 1; ++i) {
+ SelectionType type(1 << i);
+ SavedRange range;
+ range.mSelection = GetSelection(type);
+ if (type == nsISelectionController::SELECTION_NORMAL) {
+ NS_ENSURE_TRUE(range.mSelection, NS_ERROR_NULL_POINTER);
+ } else if (!range.mSelection) {
+ // For non-normal selections, skip over the non-existing ones.
+ continue;
+ }
+
+ for (uint32_t j = 0; j < range.mSelection->RangeCount(); ++j) {
+ nsRefPtr r = range.mSelection->GetRangeAt(j);
+ MOZ_ASSERT(r->IsPositioned());
+ range.mStartNode = r->GetStartParent();
+ range.mStartOffset = r->StartOffset();
+ range.mEndNode = r->GetEndParent();
+ range.mEndOffset = r->EndOffset();
+
+ // If selection endpoint is between the nodes, remember it as being
+ // in the one that is going away instead. This simplifies later selection
+ // adjustment logic at end of this method.
+ if (range.mStartNode) {
+ if (range.mStartNode == parent &&
+ joinOffset < range.mStartOffset &&
+ range.mStartOffset <= keepOffset) {
+ range.mStartNode = aNodeToJoin;
+ range.mStartOffset = firstNodeLength;
+ }
+ if (range.mEndNode == parent &&
+ joinOffset < range.mEndOffset &&
+ range.mEndOffset <= keepOffset) {
+ range.mEndNode = aNodeToJoin;
+ range.mEndOffset = firstNodeLength;
+ }
+ }
+
+ savedRanges.AppendElement(range);
}
}
- // ok, ready to do join now.
- // if it's a text node, just shuffle around some text
+ // OK, ready to do join now.
+ // If it's a text node, just shuffle around some text.
nsCOMPtr keepNodeAsText( do_QueryInterface(aNodeToKeep) );
nsCOMPtr joinNodeAsText( do_QueryInterface(aNodeToJoin) );
if (keepNodeAsText && joinNodeAsText) {
@@ -2749,15 +2812,15 @@
leftText += rightText;
keepNodeAsText->SetData(leftText);
} else {
- // otherwise it's an interior node, so shuffle around the children
+ // Otherwise it's an interior node, so shuffle around the children.
nsCOMPtr childNodes = aNodeToJoin->ChildNodes();
MOZ_ASSERT(childNodes);
- // remember the first child in aNodeToKeep, we'll insert all the children of aNodeToJoin in front of it
- // GetFirstChild returns nullptr firstNode if aNodeToKeep has no children, that's ok.
+ // Remember the first child in aNodeToKeep, we'll insert all the children of aNodeToJoin in front of it
+ // GetFirstChild returns nullptr firstNode if aNodeToKeep has no children, that's OK.
nsCOMPtr firstNode = aNodeToKeep->GetFirstChild();
- // have to go through the list backwards to keep deletes from interfering with iteration
+ // Have to go through the list backwards to keep deletes from interfering with iteration.
for (uint32_t i = childNodes->Length(); i > 0; --i) {
nsCOMPtr childNode = childNodes->Item(i - 1);
if (childNode) {
@@ -2770,41 +2833,60 @@
}
}
- // delete the extra node
+ // Delete the extra node.
ErrorResult err;
aParent->RemoveChild(*aNodeToJoin, err);
- if (GetShouldTxnSetSelection()) {
- // editor wants us to set selection at join point
+ bool shouldSetSelection = GetShouldTxnSetSelection();
+
+ nsRefPtr previousSelection;
+ for (size_t i = 0; i < savedRanges.Length(); ++i) {
+ // And adjust the selection if needed.
+ SavedRange& range = savedRanges[i];
+
+ // If we have not seen the selection yet, clear all of its ranges.
+ if (range.mSelection != previousSelection) {
+ nsresult rv = range.mSelection->RemoveAllRanges();
+ NS_ENSURE_SUCCESS(rv, rv);
+ previousSelection = range.mSelection;
+ }
+
+ if (shouldSetSelection &&
+ range.mSelection->Type() ==
+ nsISelectionController::SELECTION_NORMAL) {
+ // If the editor should adjust the selection, don't bother restoring
+ // the ranges for the normal selection here.
+ continue;
+ }
+
+ // Check to see if we joined nodes where selection starts.
+ if (range.mStartNode == aNodeToJoin) {
+ range.mStartNode = aNodeToKeep;
+ } else if (range.mStartNode == aNodeToKeep) {
+ range.mStartOffset += firstNodeLength;
+ }
+
+ // Check to see if we joined nodes where selection ends.
+ if (range.mEndNode == aNodeToJoin) {
+ range.mEndNode = aNodeToKeep;
+ } else if (range.mEndNode == aNodeToKeep) {
+ range.mEndOffset += firstNodeLength;
+ }
+
+ nsRefPtr newRange;
+ nsresult rv = nsRange::CreateRange(range.mStartNode, range.mStartOffset,
+ range.mEndNode, range.mEndOffset,
+ getter_AddRefs(newRange));
+ NS_ENSURE_SUCCESS(rv, rv);
+ rv = range.mSelection->AddRange(newRange);
+ NS_ENSURE_SUCCESS(rv, rv);
+ }
+
+ if (shouldSetSelection) {
+ // Editor wants us to set selection at join point.
+ nsRefPtr selection = GetSelection();
+ NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
selection->Collapse(aNodeToKeep, AssertedCast(firstNodeLength));
- } else if (selStartNode) {
- // and adjust the selection if needed
- // HACK: this is overly simplified - multi-range selections need more work than this
- bool bNeedToAdjust = false;
-
- // check to see if we joined nodes where selection starts
- if (selStartNode == aNodeToJoin) {
- bNeedToAdjust = true;
- selStartNode = aNodeToKeep;
- } else if (selStartNode == aNodeToKeep) {
- bNeedToAdjust = true;
- selStartOffset += firstNodeLength;
- }
-
- // check to see if we joined nodes where selection ends
- if (selEndNode == aNodeToJoin) {
- bNeedToAdjust = true;
- selEndNode = aNodeToKeep;
- } else if (selEndNode == aNodeToKeep) {
- bNeedToAdjust = true;
- selEndOffset += firstNodeLength;
- }
-
- // adjust selection if needed
- if (bNeedToAdjust) {
- selection->Collapse(selStartNode, selStartOffset);
- selection->Extend(selEndNode, selEndOffset);
- }
}
return err.ErrorCode();
diff -Nru thunderbird-38.0~b3+build2/mozilla/editor/libeditor/nsEditor.h thunderbird-38.0~b6+build2/mozilla/editor/libeditor/nsEditor.h
--- thunderbird-38.0~b3+build2/mozilla/editor/libeditor/nsEditor.h 2015-04-29 23:35:52.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/editor/libeditor/nsEditor.h 2015-06-03 09:59:36.000000000 +0000
@@ -18,6 +18,7 @@
#include "nsIObserver.h" // for NS_DECL_NSIOBSERVER, etc
#include "nsIPhonetic.h" // for NS_DECL_NSIPHONETIC, etc
#include "nsIPlaintextEditor.h" // for nsIPlaintextEditor, etc
+#include "nsISelectionController.h" // for nsISelectionController constants
#include "nsISupportsImpl.h" // for nsEditor::Release, etc
#include "nsIWeakReferenceUtils.h" // for nsWeakPtr
#include "nsLiteralString.h" // for NS_LITERAL_STRING
@@ -421,6 +422,8 @@
*/
void EnsureComposition(mozilla::WidgetGUIEvent* aEvent);
+ nsresult GetSelection(int16_t aSelectionType, nsISelection** aSelection);
+
public:
/** All editor operations which alter the doc should be prefaced
@@ -618,7 +621,8 @@
#if DEBUG_JOE
static void DumpNode(nsIDOMNode *aNode, int32_t indent=0);
#endif
- mozilla::dom::Selection* GetSelection();
+ mozilla::dom::Selection* GetSelection(int16_t aSelectionType =
+ nsISelectionController::SELECTION_NORMAL);
// Helpers to add a node to the selection.
// Used by table cell selection methods
diff -Nru thunderbird-38.0~b3+build2/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js thunderbird-38.0~b6+build2/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js
--- thunderbird-38.0~b3+build2/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js 2015-04-29 23:35:53.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js 2015-06-03 09:59:36.000000000 +0000
@@ -522,15 +522,9 @@
"S-Proposed-SM:e.f.w_TEXT-1_SIR-3-dM": true,
"S-Proposed-SM:e.f.w_TEXT-1_SIR-3-body": true,
"S-Proposed-SM:e.f.w_TEXT-1_SIR-3-div": true,
- "S-Proposed-SM:e.f.lb_BR.BR-1_SC-1-dM": true,
- "S-Proposed-SM:e.f.lb_BR.BR-1_SC-1-body": true,
- "S-Proposed-SM:e.f.lb_BR.BR-1_SC-1-div": true,
"S-Proposed-SM:e.f.lb_BR.BR-1_SI-1-dM": true,
"S-Proposed-SM:e.f.lb_BR.BR-1_SI-1-body": true,
"S-Proposed-SM:e.f.lb_BR.BR-1_SI-1-div": true,
- "S-Proposed-SM:e.f.lb_BR.BR-1_SM-1-dM": true,
- "S-Proposed-SM:e.f.lb_BR.BR-1_SM-1-body": true,
- "S-Proposed-SM:e.f.lb_BR.BR-1_SM-1-div": true,
"S-Proposed-SM:e.f.lb_P.P.P-1_SI-1-dM": true,
"S-Proposed-SM:e.f.lb_P.P.P-1_SI-1-body": true,
"S-Proposed-SM:e.f.lb_P.P.P-1_SI-1-div": true,
diff -Nru thunderbird-38.0~b3+build2/mozilla/editor/libeditor/tests/chrome.ini thunderbird-38.0~b6+build2/mozilla/editor/libeditor/tests/chrome.ini
--- thunderbird-38.0~b3+build2/mozilla/editor/libeditor/tests/chrome.ini 2015-04-29 23:35:53.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/editor/libeditor/tests/chrome.ini 2015-06-03 09:59:36.000000000 +0000
@@ -19,8 +19,10 @@
[test_bug780908.xul]
[test_bug830600.html]
[test_bug1053048.html]
+[test_bug1100966.html]
[test_bug1102906.html]
[test_bug1101392.html]
+[test_bug1154791.html]
[test_composition_event_created_in_chrome.html]
[test_contenteditable_text_input_handling.html]
[test_dragdrop.html]
diff -Nru thunderbird-38.0~b3+build2/mozilla/editor/libeditor/tests/test_bug1100966.html thunderbird-38.0~b6+build2/mozilla/editor/libeditor/tests/test_bug1100966.html
--- thunderbird-38.0~b3+build2/mozilla/editor/libeditor/tests/test_bug1100966.html 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-38.0~b6+build2/mozilla/editor/libeditor/tests/test_bug1100966.html 2015-06-03 09:59:36.000000000 +0000
@@ -0,0 +1,64 @@
+
+
+
+
+ Test for Bug 1100966
+
+
+
+
+
+