Merge branch 'appstrings' into 'master'

Add appstrings.properties override

See merge request mer-core/embedlite-components!100

link_to_system.sh

@@ -84,6 +84,7 @@ mkdir -p $TARGET_DIR/chrome/chrome/skin;
 mkdir -p $TARGET_DIR/chrome/chrome/skin/images;
 ln -s $(pwd)/overrides/aboutCertError.xhtml $TARGET_DIR/chrome/chrome/content/
 ln -s $(pwd)/overrides/netError.xhtml $TARGET_DIR/chrome/chrome/content/
+ln -s $(pwd)/overrides/appstrings.properties $TARGET_DIR/chrome/chrome/content/
 ln -s $(pwd)/overrides/netError.css $TARGET_DIR/chrome/chrome/skin/
 ln -s $(pwd)/overrides/touchcontrols.css $TARGET_DIR/chrome/chrome/skin/
 ln -s $(pwd)/overrides/images/clicktoplay-bgtexture.png $TARGET_DIR/chrome/chrome/skin/images/

overrides/EmbedLiteOverrides.manifest

@@ -7,5 +7,6 @@ override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dt
 locale browser en-US en-US/locale/en-US/browser/
 locale branding en-US en-US/locale/branding/
 override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
+override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
 locale browser en-US en-US/locale/en-US/browser/
 override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css

overrides/Makefile.am

@@ -44,6 +44,7 @@ localebrand_manifest_DATA = \
 localebrowser_manifestdir=$(libdir)/mozembedlite/chrome/en-US/locale/en-US/browser
 localebrowser_manifest_DATA = \
 	aboutCertError.dtd \
+	appstrings.properties \
 	netError.dtd \
 	$(NULL)
 

overrides/appstrings.properties

@@ -0,0 +1,42 @@
+# 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/.
+
+malformedURI2=The URL is not valid and cannot be loaded.
+fileNotFound=Browser can't find the file at %S.
+fileAccessDenied=The file at %S is not readable.
+dnsNotFound2=Browser can't find the server at %S.
+unknownProtocolFound=Browser doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context.
+connectionFailure=Browser can't establish a connection to the server at %S.
+netInterrupt=The connection to %S was interrupted while the page was loading.
+netTimeout=The server at %S is taking too long to respond.
+redirectLoop=Browser has detected that the server is redirecting the request for this address in a way that will never complete.
+## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
+confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
+resendButton.label=Resend
+unknownSocketType=Browser doesn't know how to communicate with the server.
+netReset=The connection to the server was reset while the page was loading.
+notCached=This document is no longer available.
+netOffline=Browser is currently in offline mode and can't browse the Web.
+isprinting=The document cannot change while Printing or in Print Preview.
+deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Browser has canceled the request for your protection.
+proxyResolveFailure=Browser is configured to use a proxy server that can't be found.
+proxyConnectFailure=Browser is configured to use a proxy server that is refusing connections.
+contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
+unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
+externalProtocolTitle=External Protocol Request
+externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n
+#LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
+externalProtocolUnknown=<Unknown>
+externalProtocolChkMsg=Remember my choice for all links of this type.
+externalProtocolLaunchBtn=Launch application
+malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
+harmfulBlocked=The site at %S has been reported as a potentially harmful site and has been blocked based on your security preferences.
+deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
+unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
+cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
+corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
+remoteXUL=This page uses an unsupported technology that is no longer available by default in Browser.
+sslv3Used=Browser cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
+weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Browser has not connected to this website.
+inadequateSecurityError=The website tried to negotiate an inadequate level of security.