Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 19 insertions, 0 deletions

diff --git a/application/basilisk/locales/en-US/pdfviewer/chrome.properties b/application/basilisk/locales/en-US/pdfviewer/chrome.properties
new file mode 100644
index 000000000..e42ac790c
--- /dev/null
+++ b/application/basilisk/locales/en-US/pdfviewer/chrome.properties
@@ -0,0 +1,19 @@
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Chrome notification bar messages and buttons
+unsupported_feature=This PDF document might not be displayed correctly.
+unsupported_feature_forms=This PDF document contains forms. The filling of form fields is not supported.
+open_with_different_viewer=Open With Different Viewer
+open_with_different_viewer.accessKey=o