From 90d2620288c0d8c0b62e892f7a2ea80bf46f61aa Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Fri, 18 May 2018 14:55:54 +0200
Subject: [PATCH 001/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/173: Toolbar: Add
support for dynamic display actions.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d93c285828d62452dabf409f158d8217f127f051
---
_meta/mozilla-mobile-firefox-android.json | 6 ++++++
l10n.toml | 3 +++
.../browser/toolbar/src/main/res/values/strings.xml | 13 -------------
3 files changed, 9 insertions(+), 13 deletions(-)
create mode 100644 _meta/mozilla-mobile-firefox-android.json
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
new file mode 100644
index 00000000000..63a3e101018
--- /dev/null
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -0,0 +1,6 @@
+{
+ "name": "mozilla-mobile/firefox-android",
+ "revs": {
+ "ac-prep": "d93c285828d62452dabf409f158d8217f127f051"
+ }
+}
\ No newline at end of file
diff --git a/l10n.toml b/l10n.toml
index 3b204c006bf..7679fba12bc 100644
--- a/l10n.toml
+++ b/l10n.toml
@@ -6,5 +6,8 @@ basepath = "."
[[includes]]
path = "mozilla-mobile/fenix/l10n.toml"
+[[includes]]
+ path = "mozilla-mobile/firefox-android/android-component/l10n.toml"
+
[[includes]]
path = "mozilla-mobile/focus-android/l10n.toml"
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 63bd4a57696..bc3ca630e4a 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -2,17 +2,4 @@
Menu
- Clear
-
- Tracking Protection is on
-
- Tracking Protection has blocked trackers
-
- Tracking Protection is off for this site
-
- Site information
-
- Loading
-
- Some content has been blocked by the autoplay setting
From 3a652b10e7100163a8bba1b533a49553e43bccab Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Thu, 5 Jul 2018 15:18:19 +0200
Subject: [PATCH 002/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/174: Add
"feature-tabs" component that connects a trabs tray implementation with the
session and a toolbar implementation.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@5ffb861551a5a54c0fcd28f9d40cf8d0a3fc0365
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 63a3e101018..da0036f280e 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "d93c285828d62452dabf409f158d8217f127f051"
+ "ac-prep": "5ffb861551a5a54c0fcd28f9d40cf8d0a3fc0365"
}
}
\ No newline at end of file
From 4448b0065f4624b161b4470fb7f5e61883718812 Mon Sep 17 00:00:00 2001
From: cnevinc
Date: Fri, 3 Aug 2018 17:56:50 +0800
Subject: [PATCH 003/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/536: Add
ui-tabcounter
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@eb69899a705d510bd2b50b5369b6cedd4e023f3d
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../ui/tabcounter/src/main/res/values/strings.xml | 15 +--------------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index da0036f280e..ca16e25f6b0 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "5ffb861551a5a54c0fcd28f9d40cf8d0a3fc0365"
+ "ac-prep": "eb69899a705d510bd2b50b5369b6cedd4e023f3d"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/ui/tabcounter/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/ui/tabcounter/src/main/res/values/strings.xml
index 04c14f2b614..39ff27827c7 100644
--- a/mozilla-mobile/android-components/components/ui/tabcounter/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/ui/tabcounter/src/main/res/values/strings.xml
@@ -1,17 +1,4 @@
-
- 1 open tab. Tap to switch tabs.
-
- %1$s open tabs. Tap to switch tabs.
-
- New tab
-
- New private tab
-
- Close tab
-
- Duplicate tab
-
- The tab counter toolbar button.
+ Tab Counter
From 6e1d76299377d9a3df6fe0be534d86f158b84ee3 Mon Sep 17 00:00:00 2001
From: Christian Sadilek
Date: Tue, 21 Aug 2018 10:42:51 -0400
Subject: [PATCH 004/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/508: Move URL
matching functionality to system engine
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@687ce3eda78874f0ce94dac2f771c3aaa21691ce
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../engine-system/src/main/res/values/strings.xml | 14 ++++++--------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index ca16e25f6b0..1ff6a279c6e 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "eb69899a705d510bd2b50b5369b6cedd4e023f3d"
+ "ac-prep": "687ce3eda78874f0ce94dac2f771c3aaa21691ce"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
index d35cb503c84..4863e650f6c 100644
--- a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
@@ -1,10 +1,8 @@
-
-
- The page at %1$s says:
-
- %2$s is requesting your username and password. The site says: “%1$s”
-
- %1$s is requesting your username and password.
+
+ pref_privacy_block_ads
+ pref_privacy_block_analytics
+ pref_privacy_block_social
+ pref_privacy_block_other
+ pref_performance_block_webfonts
From 92e8c2e6c749cf7d378e950d051a9c3780409200 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Tue, 11 Sep 2018 14:32:33 -0400
Subject: [PATCH 005/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/744: EditToolbar
content description
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@c56df56464ac697dd25489b5f69fbc53fc39db58
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/browser/toolbar/src/main/res/values/strings.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 1ff6a279c6e..3fcacf79e1f 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "687ce3eda78874f0ce94dac2f771c3aaa21691ce"
+ "ac-prep": "c56df56464ac697dd25489b5f69fbc53fc39db58"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index bc3ca630e4a..691c9f3170e 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
Menu
+ Close
From 73669a6c483958cc38cea460921caf7f65d6f383 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Thu, 27 Sep 2018 15:59:05 +0200
Subject: [PATCH 006/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/874:
browser-engine-system: Rename strings file.
Background: We are going to reserve the name "strings.xml" for translatable strings. This avoids that
our L10N tools need to be able to parse and process all kinds of resources that are not strings.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ff58c451ca6ee08f4d4d21853bb61538202bbd40
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 3fcacf79e1f..208ec22f926 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "c56df56464ac697dd25489b5f69fbc53fc39db58"
+ "ac-prep": "ff58c451ca6ee08f4d4d21853bb61538202bbd40"
}
}
\ No newline at end of file
From 6cffe81fe62a5e79a2819dde5a8e4eafa34f3e7d Mon Sep 17 00:00:00 2001
From: Manuel Martin
Date: Tue, 18 Sep 2018 20:11:38 +0200
Subject: [PATCH 007/235] [components] Added support for GeckoView error pages
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@7228c4592707143ace6ec78d500530f3b8220b2c
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 549 +++++++++---------
2 files changed, 265 insertions(+), 286 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 208ec22f926..11c40168794 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "ff58c451ca6ee08f4d4d21853bb61538202bbd40"
+ "ac-prep": "7228c4592707143ace6ec78d500530f3b8220b2c"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index dba19b50ee2..010c87c6128 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -1,308 +1,287 @@
-
-
- Try Again
-
-
- Cannot Complete Request
-
- Additional information about this problem or error is currently unavailable.
- ]]>
-
-
- Secure Connection Failed
-
-
-
The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
-
Please contact the website owners to inform them of this problem.
-
- ]]>
-
-
- Secure Connection Failed
-
-
-
This could be a problem with the server’s configuration, or it could be someone trying to impersonate the server.
-
If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.
-
- ]]>
-
-
- Advanced…
-
- Someone could be trying to impersonate the site and you should not continue.
-
-
- ]]>
-
- Go Back (Recommended)
-
- Accept the Risk and Continue
-
-
- This website requires a secure connection.
-
-
-
The page you are trying to view cannot be shown because this website requires a secure connection.
-
The issue is most likely with the website, and there is nothing you can do to resolve it.
-
You can notify the website’s administrator about the problem.
-
- ]]>
-
-
- Advanced…
-
-
- %1$s has a security policy called HTTP Strict Transport Security (HSTS), which means that %2$s can only connect to it securely. You can’t add an exception to visit this site.
- ]]>
-
- %1$s has a security policy called HTTP Strict Transport Security (HSTS), which means that %2$s can only connect to it securely. You can’t add an exception to visit this site.
- ]]>
-
- Go Back
-
-
- The connection was interrupted
-
- The browser connected successfully, but the connection was interrupted while transferring information. Please try again.
-
-
The site could be temporarily unavailable or too busy. Try again in a few moments.
-
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
-
- ]]>
-
-
- The connection has timed out
-
- The requested site did not respond to a connection request and the browser has stopped waiting for a reply.
-
-
Could the server be experiencing high demand or a temporary outage? Try again later.
-
Are you unable to browse other sites? Check the device’s network connection.
-
Is your device or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
-
- ]]>
-
-
- Unable to connect
-
-
+
+ Unable to connect
+
+
The site could be temporarily unavailable or too busy. Try again in a few moments.
-
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
-
- ]]>
-
-
- Unexpected response from server
-
- The site responded to the network request in an unexpected way and the browser cannot continue.
- ]]>
-
-
- The page isn’t redirecting properly
-
- The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.
-
-
Have you disabled or blocked cookies required by this site?
-
If accepting the site’s cookies does not resolve the problem, it is likely a server configuration issue and not your device.
+
If you are unable to load any pages, check your mobile device’s data or Wi-Fi connection.
- ]]>
+ ]]>
+
-
- Offline Mode
-
- The browser is operating in its offline mode and cannot connect to the requested item.
-
-
Is the device connected to an active network?
-
Press “Try Again” to switch to online mode and reload the page.
-
- ]]>
+ @string/error_connectionfailure_title
+ @string/error_connectionfailure_message
-
- Port restricted for security reasons
-
- The requested address specified a port (e.g., mozilla.org:80 for port 80 on mozilla.org) normally used for purposes other than Web browsing. The browser has canceled the request for your protection and security.
- ]]>
+ The connection timed out
+ @string/error_connectionfailure_message
-
- The connection was reset
-
- The network link was interrupted while negotiating a connection. Please try again.
-
-
The site could be temporarily unavailable or too busy. Try again in a few moments.
-
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
-
- ]]>
-
-
- Unsafe File Type
-
-
-
Please contact the website owners to inform them of this problem.
-
- ]]>
-
-
- Corrupted Content Error
-
- The page you are trying to view cannot be shown because an error in the data transmission was detected.
-
-
Please contact the website owners to inform them of this problem.
-
- ]]>
-
-
- Content crashed
- The page you are trying to view cannot be shown because an error in the data transmission was detected.
-
-
Please contact the website owners to inform them of this problem.
-
- ]]>
-
-
- Content Encoding Error
- The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
-
-
Please contact the website owners to inform them of this problem.
-
- ]]>
-
-
- Address Not Found
-
- The browser could not find the host server for the provided address.
+ Server not found
+
Check the address for typing errors such as
ww.example.com instead of
- www.example.com.
+ www.example.com
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
]]>
-
- No internet connection
-
- Check your network connection or try reloading the page in a few moments.
-
- Reload
-
-
- Invalid Address
- The provided address is not in a recognized format. Please check the location bar for mistakes and try again.
- ]]>
-
- The address isn’t valid
-
-
-
Web addresses are usually written like http://www.example.com/
-
Make sure that you’re using forward slashes (i.e. /).
-
- ]]>
-
- Unknown Protocol
- The address specifies a protocol (e.g., wxyz://) the browser does not recognize, so the browser cannot properly connect to the site.
-
-
Are you trying to access multimedia or other non-text services? Check the site for extra requirements.
-
Some protocols may require third-party software or plugins before the browser can recognize them.
-
+ The address isn’t valid
+
+
Web addresses are usually written like http://www.example.com/
+
Make sure that you’re using forward slashes (i.e. /).
+
]]>
-
- File Not Found
-
-
Could the item have been renamed, removed, or relocated?
-
Is there a spelling, capitalization, or other typographical error in the address?
-
Do you have sufficient access permissions to the requested item?
-
+ The page isn’t redirecting properly
+
+
This problem can sometimes be caused by disabling or refusing to accept cookies.
+
]]>
-
- Access to the file was denied
-
-
It may have been removed, moved, or file permissions may be preventing access.
-
+ The address wasn’t understood
+
+
You might need to install other software to open this address.
+
]]>
-
- Proxy Server Refused Connection
- The browser is configured to use a proxy server, but the proxy refused a connection.
-
-
Is the browser’s proxy configuration correct? Check the settings and try again.
-
Does the proxy service allow connections from this network?
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
-
- ]]>
-
-
- Proxy Server Not Found
- The browser is configured to use a proxy server, but the proxy could not be found.
-
-
Is the browser’s proxy configuration correct? Check the settings and try again.
-
Is the device connected to an active network?
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
-
- ]]>
-
-
- Malware site issue
-
- The site at %1$s has been reported as an attack site and has been blocked based on your security preferences.
- ]]>
-
-
- Unwanted site issue
-
- The site at %1$s has been reported as serving unwanted software and has been blocked based on your security preferences.
- ]]>
-
-
- Harmful site issue
-
- The site at %1$s has been reported as a potentially harmful site and has been blocked based on your security preferences.
- ]]>
-
-
- Deceptive site issue
-
- This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
- ]]>
+ Secure connection failed
+
+
This could be a problem with the server’s configuration, or it could be
+someone trying to impersonate the server.
+
If you have connected to this server successfully in the past, the error may
+be temporary, and you can try again later.
+
+ ]]>
+
+
+ Problem loading page
+ Try Again
+
+
+ Cannot Complete Request
+ Additional information about this problem or error is currently unavailable.
+ ]]>
+
+
+ Secure Connection Failed
+ The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
+
Please contact the website owners to inform them of this problem.
+ ]]>
+
+ Secure Connection Failed
+
+
This could be a problem with the server\'s configuration, or it could be someone trying to impersonate the server.
+
If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.
+
+ ]]>
+
+
+ Data Transfer Interrupted
+ The browser connected successfully, but the connection was interrupted while transferring information. Please try again.
+
+
Are you unable to browse other sites? Check the computer\'s network connection.
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
+ Network Timeout
+ The requested site did not respond to a connection request and the browser has stopped waiting for a reply.
+
+
Could the server be experiencing high demand or a temporary outage? Try again later.
+
Are you unable to browse other sites? Check the computer\'s network connection.
+
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
+ Failed to Connect
+ Though the site seems valid, the browser was unable to establish a connection.
+
+
Could the site be temporarily unavailable? Try again later.
+
Are you unable to browse other sites? Check the computer\'s network connection.
+
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
+ ]]>
+
+ Incorrect Response
+ The site responded to the network request in an unexpected way and the browser cannot continue.
+ ]]>
+
+ Redirect Loop
+ The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.
+
+
Have you disabled or blocked cookies required by this site?
+
NOTE: If accepting the site\'s cookies does not resolve the problem, it is likely a server configuration issue and not your computer.
+
+ ]]>
+
+ Offline Mode
+ The browser is operating in its offline mode and cannot connect to the requested item.
+
+
Is the computer connected to an active network?
+
Press "Try Again" to switch to online mode and reload the page.
+
+ ]]>
+
+ Port Restricted for Security Reasons
+ The requested address specified a port (e.g. mozilla.org:80 for port 80 on mozilla.org) normally used for purposes other than Web browsing. The browser has canceled the request for your protection and security.
+ ]]>
+
+ Connection Interrupted
+ The network link was interrupted while negotiating a connection. Please try again.
+ ]]>
+
+
+ Unsafe File Type
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
+ Corrupted Content Error
+ The page you are trying to view cannot be shown because an error in the data transmission was detected.
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
+ Content crashed
+ The page you are trying to view cannot be shown because an error in the data transmission was detected.
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
+ Content Encoding Error
+ The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
+
+
Please contact the website owners to inform them of this problem.
+
+
+ ]]>
+
+
+ Address Not Found
+ The browser could not find the host server for the provided address.
+
+
Did you make a mistake when typing the domain? (e.g. ww.mozilla.org instead of www.mozilla.org)
Are you certain this domain address exists? Its registration may have expired.
+
Are you unable to browse other sites? Check your network connection and DNS server settings.
+
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
+ ]]>
+
+ Invalid Address
+ The provided address is not in a recognized format. Please check the location bar for mistakes and try again.
+ ]]>
+
+ Unknown Protocol
+ The address specifies a protocol (e.g. wxyz://) the browser does not recognize, so the browser cannot properly connect to the site.
+
+
Are you trying to access multimedia or other non-text services? Check the site for extra requirements.
+
Some protocols may require third-party software or plugins before the browser can recognize them.
+
+ ]]>
+
+ File Not Found
+
+
Could the item have been renamed, removed, or relocated?
+
Is there a spelling, capitalization, or other typographical error in the address?
+
Do you have sufficient access permissions to the requested item?
+
+ ]]>
+
+ Access to the file was denied
+
+
It may have been removed, moved, or file permissions may be preventing access.
+
+ ]]>
+
+
+ Proxy Server Refused Connection
+ The browser is configured to use a proxy server, but the proxy refused a connection.
+
+
Is the browser\'s proxy configuration correct? Check the settings and try again.
+
Does the proxy service allow connections from this network?
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
+ Proxy Server Not Found
+ The browser is configured to use a proxy server, but the proxy could not be found.
+
+
Is the browser\'s proxy configuration correct? Check the settings and try again.
+
Is the computer connected to an active network?
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
+
+ Malware site issue
+ The site at %1$s has been reported as an attack site and has been blocked based on your security preferences.
+ ]]>
+
+ Unwanted site issue
+ The site at %1$s has been reported as serving unwanted software and has been blocked based on your security preferences.
+ ]]>
+
+ Harmful site issue
+ The site at %1$s has been reported as a potentially harmful site and has been blocked based on your security preferences.
+ ]]>
+
+ Deceptive site issue
+ This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
+ ]]>
+
+
+ Private Browsing
+ Private Browsing
+
+
When you browse in a Private Window, Firefox Reality does not save:
+
+
+
visited pages
+
searches
+
cookies
+
temporary files
+
+
+
Private Browsing doesn\'t make you anonymous on the Internet. Your employer or Internet service provider can still know what page you visit.
+ ]]>
-
- Secure Site Not Available
-
- %1$s is not available.]]>
-
- Continue to HTTP Site
From 0fc684dbeb73b7c2c2f36d1191ec50ca6c5bb55c Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Mon, 1 Oct 2018 10:05:21 -0400
Subject: [PATCH 008/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/881: Error Page
support for both engines
I decided to move the mappings to the respective EngineSession instead
of having them in the Engine, since it wasn't possible to have them
easily accessible from there via the RequestInterceptor. It made more
sense to keep them hidden inside the session as a companion function for
easier testing.
On the same note, tests have also been included.
Added an interceptor the SystemEngine sample app.
Cleaned up the styling of the actual error page HTML to make them more
mobile friendly.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@706fe98bb94d6ba323b9e31b5ab7d7cb47fb4b42
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 19 -------------------
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 11c40168794..c272d5cfbe1 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "7228c4592707143ace6ec78d500530f3b8220b2c"
+ "ac-prep": "706fe98bb94d6ba323b9e31b5ab7d7cb47fb4b42"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 010c87c6128..b5b23d2d2ac 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -265,23 +265,4 @@ be temporary, and you can try again later.
This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
]]>
-
- Private Browsing
- Private Browsing
-
-
When you browse in a Private Window, Firefox Reality does not save:
-
-
-
visited pages
-
searches
-
cookies
-
temporary files
-
-
-
Private Browsing doesn\'t make you anonymous on the Internet. Your employer or Internet service provider can still know what page you visit.
- ]]>
-
From 0fbfd2f1d2ea59526b235ee07bfc4d431abab253 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Fri, 12 Oct 2018 18:35:53 +0200
Subject: [PATCH 009/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/506: Add new
generic crash reporting component (lib-crash).
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b3d7937ea82d90c18c2cffcdb8d749733cabe968
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../lib/crash/src/main/res/values/strings.xml | 27 -------------------
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index c272d5cfbe1..da6dff02b4b 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "706fe98bb94d6ba323b9e31b5ab7d7cb47fb4b42"
+ "ac-prep": "b3d7937ea82d90c18c2cffcdb8d749733cabe968"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
index 38b0b2e6475..26cfc0827e6 100644
--- a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -11,31 +11,4 @@
Restart %1$s
-
-
- Crashes
-
-
- Sorry. A problem occurred in %1$s.
-
-
- Report
-
-
- Sending crash report to %1$s
-
-
- Gathering crash data
-
-
- Gathering crash telemetry data
-
-
- Crash Reports
-
-
- No crash reports have been submitted.
-
-
- Share
From 3ffea2cea6819e38e5cb27c05b6359bd8f9643df Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Tue, 16 Oct 2018 13:29:33 -0400
Subject: [PATCH 010/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1057: Add
localization notes to Error Pages
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@62e5ea0f325ef5ac0f149c7e9e50fa36043976a5
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 358 ++++++++++--------
2 files changed, 194 insertions(+), 166 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index da6dff02b4b..59bedb2c519 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b3d7937ea82d90c18c2cffcdb8d749733cabe968"
+ "ac-prep": "62e5ea0f325ef5ac0f149c7e9e50fa36043976a5"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index b5b23d2d2ac..69f0b55f604 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
-
- Unable to connect
-
+
+ Unable to connect
+
The site could be temporarily unavailable or too busy. Try again in a few moments.
@@ -11,14 +11,11 @@
]]>
- @string/error_connectionfailure_title
- @string/error_connectionfailure_message
+
+ Server not found
- The connection timed out
- @string/error_connectionfailure_message
-
- Server not found
-
+
Check the address for typing errors such as
ww.example.com instead of
@@ -27,242 +24,273 @@
]]>
+
+ The address isn’t valid
+
+
+
Web addresses are usually written like http://www.example.com/
+
Make sure that you’re using forward slashes (i.e. /).
+
+ ]]>
- The address isn’t valid
-
-
Web addresses are usually written like http://www.example.com/
-
Make sure that you’re using forward slashes (i.e. /).
-
+
+ The page isn’t redirecting properly
+
+
This problem can sometimes be caused by disabling or refusing to accept cookies.
+
]]>
- The page isn’t redirecting properly
-
-
This problem can sometimes be caused by disabling or refusing to accept cookies.
-
+
+ The address wasn’t understood
+
+
You might need to install other software to open this address.
+
]]>
- The address wasn’t understood
-
-
You might need to install other software to open this address.
-
+
+ Secure connection failed
+
+
This could be a problem with the server’s configuration, or it could be
+ someone trying to impersonate the server.
+
If you have connected to this server successfully in the past, the error may
+ be temporary, and you can try again later.
+
]]>
- Secure connection failed
-
-
This could be a problem with the server’s configuration, or it could be
-someone trying to impersonate the server.
-
If you have connected to this server successfully in the past, the error may
-be temporary, and you can try again later.
-
- ]]>
-
-
- Problem loading page
- Try Again
-
-
+
+ Problem loading page
+
+
+ Try Again
+
+
Cannot Complete RequestAdditional information about this problem or error is currently unavailable.
- ]]>
+
Additional information about this problem or error is currently unavailable.
+ ]]>
-
+
Secure Connection FailedThe page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
-
Please contact the website owners to inform them of this problem.
- ]]>
+
The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
Secure Connection Failed
-
This could be a problem with the server\'s configuration, or it could be someone trying to impersonate the server.
-
If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.
-
- ]]>
+
+
This could be a problem with the server’s configuration, or it could be someone trying to impersonate the server.
+
If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.
+
+ ]]>
-
+
Data Transfer InterruptedThe browser connected successfully, but the connection was interrupted while transferring information. Please try again.
-
-
Are you unable to browse other sites? Check the computer\'s network connection.
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
-
- ]]>
+
The browser connected successfully, but the connection was interrupted while transferring information. Please try again.
+
+
Are you unable to browse other sites? Check the computer’s network connection.
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
Network TimeoutThe requested site did not respond to a connection request and the browser has stopped waiting for a reply.
-
-
Could the server be experiencing high demand or a temporary outage? Try again later.
-
Are you unable to browse other sites? Check the computer\'s network connection.
-
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
-
- ]]>
+
The requested site did not respond to a connection request and the browser has stopped waiting for a reply.
+
+
Could the server be experiencing high demand or a temporary outage? Try again later.
+
Are you unable to browse other sites? Check the computer’s network connection.
+
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
Failed to ConnectThough the site seems valid, the browser was unable to establish a connection.
-
-
Could the site be temporarily unavailable? Try again later.
-
Are you unable to browse other sites? Check the computer\'s network connection.
-
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
-
- ]]>
+
Though the site seems valid, the browser was unable to establish a connection.
+
+
Could the site be temporarily unavailable? Try again later.
+
Are you unable to browse other sites? Check the computer’s network connection.
+
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
+ ]]>
+
Incorrect ResponseThe site responded to the network request in an unexpected way and the browser cannot continue.
- ]]>
+
The site responded to the network request in an unexpected way and the browser cannot continue.
+ ]]>
+
Redirect LoopThe browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.
-
-
Have you disabled or blocked cookies required by this site?
-
NOTE: If accepting the site\'s cookies does not resolve the problem, it is likely a server configuration issue and not your computer.
-
- ]]>
+
The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.
+
+
Have you disabled or blocked cookies required by this site?
+
NOTE: If accepting the site’s cookies does not resolve the problem, it is likely a server configuration issue and not your computer.
+
+ ]]>
+
Offline ModeThe browser is operating in its offline mode and cannot connect to the requested item.
-
-
Is the computer connected to an active network?
-
Press "Try Again" to switch to online mode and reload the page.
-
- ]]>
+
The browser is operating in its offline mode and cannot connect to the requested item.
+
+
Is the computer connected to an active network?
+
Press “Try Again” to switch to online mode and reload the page.
+
+ ]]>
+
Port Restricted for Security ReasonsThe requested address specified a port (e.g. mozilla.org:80 for port 80 on mozilla.org) normally used for purposes other than Web browsing. The browser has canceled the request for your protection and security.
- ]]>
+
The requested address specified a port (e.g., mozilla.org:80 for port 80 on mozilla.org) normally used for purposes other than Web browsing. The browser has canceled the request for your protection and security.
+ ]]>
+
Connection InterruptedThe network link was interrupted while negotiating a connection. Please try again.
- ]]>
+
The network link was interrupted while negotiating a connection. Please try again.
+ ]]>
-
+
Unsafe File Type
-
Please contact the website owners to inform them of this problem.
-
- ]]>
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
Corrupted Content ErrorThe page you are trying to view cannot be shown because an error in the data transmission was detected.
-
-
Please contact the website owners to inform them of this problem.
-
- ]]>
+
The page you are trying to view cannot be shown because an error in the data transmission was detected.
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
Content crashedThe page you are trying to view cannot be shown because an error in the data transmission was detected.
-
-
Please contact the website owners to inform them of this problem.
-
- ]]>
+
The page you are trying to view cannot be shown because an error in the data transmission was detected.
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
Content Encoding ErrorThe page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
-
-
Please contact the website owners to inform them of this problem.
-
-
- ]]>
-
-
+
The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
+
+
Please contact the website owners to inform them of this problem.
+
+ ]]>
+
+
Address Not Found
+
The browser could not find the host server for the provided address.
-
-
Did you make a mistake when typing the domain? (e.g. ww.mozilla.org instead of www.mozilla.org)
Are you certain this domain address exists? Its registration may have expired.
-
Are you unable to browse other sites? Check your network connection and DNS server settings.
-
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
-
- ]]>
+
The browser could not find the host server for the provided address.
+
+
Did you make a mistake when typing the domain? (e.g., ww.mozilla.org instead of www.mozilla.org)
Are you certain this domain address exists? It’s registration may have expired.
+
Are you unable to browse other sites? Check your network connection and DNS server settings.
+
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
+ ]]>
+
Invalid AddressThe provided address is not in a recognized format. Please check the location bar for mistakes and try again.
- ]]>
+
The provided address is not in a recognized format. Please check the location bar for mistakes and try again.
+ ]]>
+
Unknown ProtocolThe address specifies a protocol (e.g. wxyz://) the browser does not recognize, so the browser cannot properly connect to the site.
-
-
Are you trying to access multimedia or other non-text services? Check the site for extra requirements.
-
Some protocols may require third-party software or plugins before the browser can recognize them.
-
- ]]>
+
The address specifies a protocol (e.g., wxyz://) the browser does not recognize, so the browser cannot properly connect to the site.
+
+
Are you trying to access multimedia or other non-text services? Check the site for extra requirements.
+
Some protocols may require third-party software or plugins before the browser can recognize them.
+
+ ]]>
+
File Not Found
-
Could the item have been renamed, removed, or relocated?
-
Is there a spelling, capitalization, or other typographical error in the address?
-
Do you have sufficient access permissions to the requested item?
-
- ]]>
+
+
Could the item have been renamed, removed, or relocated?
+
Is there a spelling, capitalization, or other typographical error in the address?
+
Do you have sufficient access permissions to the requested item?
+
+ ]]>
+
Access to the file was denied
-
It may have been removed, moved, or file permissions may be preventing access.
-
- ]]>
+
+
It may have been removed, moved, or file permissions may be preventing access.
+
+ ]]>
-
+
Proxy Server Refused ConnectionThe browser is configured to use a proxy server, but the proxy refused a connection.
-
-
Is the browser\'s proxy configuration correct? Check the settings and try again.
-
Does the proxy service allow connections from this network?
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
-
- ]]>
+
The browser is configured to use a proxy server, but the proxy refused a connection.
+
+
Is the browser’s proxy configuration correct? Check the settings and try again.
+
Does the proxy service allow connections from this network?
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
Proxy Server Not FoundThe browser is configured to use a proxy server, but the proxy could not be found.
-
-
Is the browser\'s proxy configuration correct? Check the settings and try again.
-
Is the computer connected to an active network?
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
-
- ]]>
-
-
+
The browser is configured to use a proxy server, but the proxy could not be found.
+
+
Is the browser’s proxy configuration correct? Check the settings and try again.
+
Is the computer connected to an active network?
+
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
+ ]]>
+
+
Malware site issue
+
The site at %1$s has been reported as an attack site and has been blocked based on your security preferences.
- ]]>
+
The site at %1$s has been reported as an attack site and has been blocked based on your security preferences.
+ ]]>
+
Unwanted site issue
+
The site at %1$s has been reported as serving unwanted software and has been blocked based on your security preferences.
- ]]>
+
The site at %1$s has been reported as serving unwanted software and has been blocked based on your security preferences.
+ ]]>
+
Harmful site issue
+
The site at %1$s has been reported as a potentially harmful site and has been blocked based on your security preferences.
- ]]>
+
The site at %1$s has been reported as a potentially harmful site and has been blocked based on your security preferences.
+ ]]>
+
Deceptive site issue
+
This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
- ]]>
+
This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
+ ]]>
From d0c012fcbed6f1e467f9cdb082c0f9595e1aeeff Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Wed, 17 Oct 2018 10:58:56 -0400
Subject: [PATCH 011/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1056: Add error
page string resource namespacing
All `error_*` string resources now use `mozac_browser_errorpages_`
instead.
[ci skip]
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@4b39024a9314cbe11022ae9cfc4d55cadd34f972
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 132 +++++++++---------
2 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 59bedb2c519..428ee91812f 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "62e5ea0f325ef5ac0f149c7e9e50fa36043976a5"
+ "ac-prep": "4b39024a9314cbe11022ae9cfc4d55cadd34f972"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 69f0b55f604..ab557cb32b7 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
- Unable to connect
-
+ Unable to connect
+
The site could be temporarily unavailable or too busy. Try again in a few moments.
@@ -12,10 +12,10 @@
- Server not found
+ Server not found
-
Check the address for typing errors such as
ww.example.com instead of
@@ -25,9 +25,9 @@
]]>
- The address isn’t valid
+ The address isn’t valid
-
Web addresses are usually written like http://www.example.com/
Make sure that you’re using forward slashes (i.e. /).
@@ -35,24 +35,24 @@
]]>
- The page isn’t redirecting properly
- The page isn’t redirecting properly
+
This problem can sometimes be caused by disabling or refusing to accept cookies.
]]>
- The address wasn’t understood
- The address wasn’t understood
+
You might need to install other software to open this address.
This could be a problem with the server’s configuration, or it could be
someone trying to impersonate the server.
@@ -62,20 +62,20 @@
]]>
- Problem loading page
+ Problem loading page
- Try Again
+ Try Again
- Cannot Complete Request
- Cannot Complete Request
+ Additional information about this problem or error is currently unavailable.
]]>
- Secure Connection Failed
- Secure Connection Failed
+ The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
Please contact the website owners to inform them of this problem.
This could be a problem with the server’s configuration, or it could be someone trying to impersonate the server.
If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.
@@ -92,8 +92,8 @@
]]>
- Data Transfer Interrupted
- Data Transfer Interrupted
+ The browser connected successfully, but the connection was interrupted while transferring information. Please try again.
Are you unable to browse other sites? Check the computer’s network connection.
@@ -102,8 +102,8 @@
]]>
- Network Timeout
- Network Timeout
+ The requested site did not respond to a connection request and the browser has stopped waiting for a reply.
Could the server be experiencing high demand or a temporary outage? Try again later.
@@ -114,8 +114,8 @@
]]>
- Failed to Connect
- Failed to Connect
+ Though the site seems valid, the browser was unable to establish a connection.
Could the site be temporarily unavailable? Try again later.
@@ -125,14 +125,14 @@
]]>
- Incorrect Response
- Incorrect Response
+ The site responded to the network request in an unexpected way and the browser cannot continue.
]]>
- Redirect Loop
- Redirect Loop
+ The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.
Have you disabled or blocked cookies required by this site?
@@ -141,8 +141,8 @@
]]>
- Offline Mode
- Offline Mode
+ The browser is operating in its offline mode and cannot connect to the requested item.
Is the computer connected to an active network?
@@ -151,28 +151,28 @@
]]>
- Port Restricted for Security Reasons
- Port Restricted for Security Reasons
+ The requested address specified a port (e.g., mozilla.org:80 for port 80 on mozilla.org) normally used for purposes other than Web browsing. The browser has canceled the request for your protection and security.
]]>
- Connection Interrupted
- Connection Interrupted
+ The network link was interrupted while negotiating a connection. Please try again.
]]>
- Unsafe File Type
- Unsafe File Type
+
Please contact the website owners to inform them of this problem.
]]>
- Corrupted Content Error
- Corrupted Content Error
+ The page you are trying to view cannot be shown because an error in the data transmission was detected.
Please contact the website owners to inform them of this problem.
@@ -180,8 +180,8 @@
]]>
- Content crashed
- Content crashed
+ The page you are trying to view cannot be shown because an error in the data transmission was detected.
Please contact the website owners to inform them of this problem.
@@ -189,8 +189,8 @@
]]>
- Content Encoding Error
- Content Encoding Error
+ The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
Please contact the website owners to inform them of this problem.
@@ -198,9 +198,9 @@
]]>
- Address Not Found
+ Address Not Found
- The browser could not find the host server for the provided address.
Did you make a mistake when typing the domain? (e.g., ww.mozilla.org instead of www.mozilla.org)
Are you certain this domain address exists? It’s registration may have expired.
@@ -210,14 +210,14 @@
]]>
- Invalid Address
- Invalid Address
+ The provided address is not in a recognized format. Please check the location bar for mistakes and try again.
]]>
- Unknown Protocol
- Unknown Protocol
+ The address specifies a protocol (e.g., wxyz://) the browser does not recognize, so the browser cannot properly connect to the site.
Are you trying to access multimedia or other non-text services? Check the site for extra requirements.
@@ -226,8 +226,8 @@
]]>
- File Not Found
- File Not Found
+
Could the item have been renamed, removed, or relocated?
Is there a spelling, capitalization, or other typographical error in the address?
@@ -236,16 +236,16 @@
]]>
- Access to the file was denied
- Access to the file was denied
+
It may have been removed, moved, or file permissions may be preventing access.
]]>
- Proxy Server Refused Connection
- Proxy Server Refused Connection
+ The browser is configured to use a proxy server, but the proxy refused a connection.
Is the browser’s proxy configuration correct? Check the settings and try again.
@@ -255,8 +255,8 @@
]]>
- Proxy Server Not Found
- Proxy Server Not Found
+ The browser is configured to use a proxy server, but the proxy could not be found.
Is the browser’s proxy configuration correct? Check the settings and try again.
@@ -266,30 +266,30 @@
]]>
- Malware site issue
+ Malware site issue
- The site at %1$s has been reported as an attack site and has been blocked based on your security preferences.
]]>
- Unwanted site issue
+ Unwanted site issue
- The site at %1$s has been reported as serving unwanted software and has been blocked based on your security preferences.
]]>
- Harmful site issue
+ Harmful site issue
- The site at %1$s has been reported as a potentially harmful site and has been blocked based on your security preferences.
]]>
- Deceptive site issue
+ Deceptive site issue
- This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
]]>
From 44af3293374966fa226fe9b7721b2aba2531bbed Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Tue, 16 Oct 2018 14:38:31 +0200
Subject: [PATCH 012/235] [components] Add l10n.toml configuration to specify
what's localized and tested.
We're not specifying a list of locales yet, we're going to add those once
we actually localize.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@12fa5772d8be6b7db95404275980e9f5c4d3b78e
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 136 +++-----------------
2 files changed, 16 insertions(+), 122 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 428ee91812f..2c9148a9926 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "4b39024a9314cbe11022ae9cfc4d55cadd34f972"
+ "ac-prep": "12fa5772d8be6b7db95404275980e9f5c4d3b78e"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 8e6a1c17d5d..d7fb60377cd 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -2,128 +2,22 @@
basepath = "."
locales = [
- "ab",
- "an",
- "ann",
- "ar",
- "ast",
- "az",
- "ban",
- "be",
- "bg",
- "bn",
- "br",
- "bs",
- "ca",
- "cak",
- "ceb",
- "ckb",
- "co",
- "cs",
- "cy",
- "da",
- "de",
- "dsb",
- "el",
- "en-CA",
- "en-GB",
- "eo",
- "es",
- "es-AR",
- "es-CL",
- "es-ES",
- "es-MX",
- "et",
- "eu",
- "fa",
- "ff",
- "fi",
- "fr",
- "fy-NL",
- "ga-IE",
- "gd",
- "gl",
- "gn",
- "gu-IN",
- "he",
- "hi-IN",
- "hil",
- "hr",
- "hsb",
- "hu",
- "hy-AM",
- "ia",
- "id",
- "is",
- "it",
- "ja",
- "ka",
- "kab",
- "kk",
- "kmr",
- "kn",
- "ko",
- "lij",
- "lo",
- "lt",
- "mix",
- "ml",
- "mr",
- "ms",
- "my",
- "nb-NO",
- "ne-NP",
- "nl",
- "nn-NO",
- "nv",
- "oc",
- "or",
- "pa-IN",
- "pl",
- "pt-BR",
- "pt-PT",
- "rm",
- "ro",
- "ru",
- "sat",
- "si",
- "sk",
- "skr",
- "sl",
- "sq",
- "sr",
- "su",
- "sv-SE",
- "szl",
- "ta",
- "te",
- "tg",
- "th",
- "tl",
- "tok",
- "tr",
- "trs",
- "tt",
- "tzm",
- "ug",
- "uk",
- "ur",
- "uz",
- "vec",
- "vi",
- "yo",
- "zh-CN",
- "zh-TW",
-]
-
-# Expose the following branches to localization
-# Changes to this list should be announced to the l10n team ahead of time.
-branches = [
- "main",
-]
+ ]
[env]
[[paths]]
- reference = "components/**/src/main/res/values/strings.xml"
- l10n = "components/**/src/main/res/values-{android_locale}/strings.xml"
+ reference = "components/ui/tabcounter/src/main/res/values/strings.xml"
+ l10n = "{l10n_base}/components/ui/tabcounter/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/browser/errorpages/src/main/res/values/strings.xml"
+ l10n = "{l10n_base}/components/browser/errorpages/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/browser/toolbar/src/main/res/values/strings.xml"
+ l10n = "{l10n_base}/components/browser/toolbar/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/feature/tabs/src/main/res/values/strings.xml"
+ l10n = "{l10n_base}/components/feature/tabs/src/main/res/values-{android_locale}/strings.xml"
From e52ea9c056d27173f00e26c998393439a8367e5b Mon Sep 17 00:00:00 2001
From: Christopher Van Wiemeersch
Date: Wed, 17 Oct 2018 16:57:46 -0700
Subject: [PATCH 013/235] [components] tweak errorpages L10n strings
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f947622b122d1082590fdb3534867d3414e38807
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 177 +++++++-----------
2 files changed, 71 insertions(+), 108 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 2c9148a9926..5e1334e0145 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "12fa5772d8be6b7db95404275980e9f5c4d3b78e"
+ "ac-prep": "f947622b122d1082590fdb3534867d3414e38807"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index ab557cb32b7..42a4cb9aae2 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -1,89 +1,31 @@
-
- Unable to connect
-
-
-
The site could be temporarily unavailable or too busy. Try again in a few moments.
-
If you are unable to load any pages, check your mobile device’s data or Wi-Fi connection.
-
- ]]>
-
-
-
- Server not found
-
-
-
-
Check the address for typing errors such as
- ww.example.com instead of
- www.example.com
-
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
-
- ]]>
-
-
- The address isn’t valid
-
-
-
Web addresses are usually written like http://www.example.com/
-
Make sure that you’re using forward slashes (i.e. /).
This problem can sometimes be caused by disabling or refusing to accept cookies.
-
- ]]>
-
-
- The address wasn’t understood
-
-
You might need to install other software to open this address.
-
- ]]>
-
-
- Secure connection failed
-
-
This could be a problem with the server’s configuration, or it could be
- someone trying to impersonate the server.
-
If you have connected to this server successfully in the past, the error may
- be temporary, and you can try again later.
-
- ]]>
-
-
+
Problem loading pageTry Again
-
+
Cannot Complete Request
+
Additional information about this problem or error is currently unavailable.
]]>
-
+
Secure Connection Failed
+
The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
+
The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.
Please contact the website owners to inform them of this problem.
]]>
-
+
Secure Connection Failed
+
This could be a problem with the server’s configuration, or it could be someone trying to impersonate the server.
@@ -91,18 +33,20 @@
]]>
-
- Data Transfer Interrupted
+
+ The connection was interrupted
+
The browser connected successfully, but the connection was interrupted while transferring information. Please try again.
-
Are you unable to browse other sites? Check the computer’s network connection.
-
Still having trouble? Consult your network administrator or Internet provider for assistance.
+
The site could be temporarily unavailable or too busy. Try again in a few moments.
+
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
]]>
-
- Network Timeout
+
+ The connection has timed out
+
The requested site did not respond to a connection request and the browser has stopped waiting for a reply.
@@ -113,35 +57,37 @@
]]>
-
- Failed to Connect
+
+ Unable to connect
+
Though the site seems valid, the browser was unable to establish a connection.
-
Could the site be temporarily unavailable? Try again later.
-
Are you unable to browse other sites? Check the computer’s network connection.
-
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
The site could be temporarily unavailable or too busy. Try again in a few moments.
+
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
]]>
-
- Incorrect Response
+
+ Unexpected response from server
+
The site responded to the network request in an unexpected way and the browser cannot continue.
]]>
-
- Redirect Loop
+
+ The page isn’t redirecting properly
+
The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.
Have you disabled or blocked cookies required by this site?
-
NOTE: If accepting the site’s cookies does not resolve the problem, it is likely a server configuration issue and not your computer.
+
If accepting the site’s cookies does not resolve the problem, it is likely a server configuration issue and not your computer.
]]>
-
+
Offline Mode
+
The browser is operating in its offline mode and cannot connect to the requested item.
@@ -150,28 +96,36 @@
]]>
-
- Port Restricted for Security Reasons
+
+ Port restricted for security reasons
+
The requested address specified a port (e.g., mozilla.org:80 for port 80 on mozilla.org) normally used for purposes other than Web browsing. The browser has canceled the request for your protection and security.
]]>
-
- Connection Interrupted
+
+ The connection was reset
+
The network link was interrupted while negotiating a connection. Please try again.
+
+
The site could be temporarily unavailable or too busy. Try again in a few moments.
+
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
+
]]>
-
+
Unsafe File Type
+
Please contact the website owners to inform them of this problem.
]]>
-
+
Corrupted Content Error
+
The page you are trying to view cannot be shown because an error in the data transmission was detected.
@@ -179,7 +133,7 @@
]]>
-
+
Content crashedThe page you are trying to view cannot be shown because an error in the data transmission was detected.
@@ -188,7 +142,7 @@
]]>
-
+
Content Encoding ErrorThe page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
@@ -197,25 +151,35 @@
]]>
-
+
Address Not FoundThe browser could not find the host server for the provided address.
-
Did you make a mistake when typing the domain? (e.g., ww.mozilla.org instead of www.mozilla.org)
Are you certain this domain address exists? It’s registration may have expired.
-
Are you unable to browse other sites? Check your network connection and DNS server settings.
-
Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.
+
Check the address for typing errors such as
+ ww.example.com instead of
+ www.example.com.
+
If you are unable to load any pages, check your device’s data or Wi-Fi connection.
]]>
-
+
Invalid AddressThe provided address is not in a recognized format. Please check the location bar for mistakes and try again.
]]>
+
+ The address isn’t valid
+
+
+
Web addresses are usually written like http://www.example.com/
+
Make sure that you’re using forward slashes (i.e. /).
+
+ ]]>
-
+
Unknown ProtocolThe address specifies a protocol (e.g., wxyz://) the browser does not recognize, so the browser cannot properly connect to the site.
@@ -225,7 +189,7 @@
]]>
-
+
File Not Found
@@ -235,7 +199,7 @@
]]>
-
+
Access to the file was denied
@@ -243,7 +207,7 @@
]]>
-
+
Proxy Server Refused ConnectionThe browser is configured to use a proxy server, but the proxy refused a connection.
@@ -254,7 +218,7 @@
]]>
-
+
Proxy Server Not FoundThe browser is configured to use a proxy server, but the proxy could not be found.
@@ -265,32 +229,31 @@
]]>
-
+
Malware site issueThe site at %1$s has been reported as an attack site and has been blocked based on your security preferences.
]]>
-
+
Unwanted site issueThe site at %1$s has been reported as serving unwanted software and has been blocked based on your security preferences.
]]>
-
+
Harmful site issueThe site at %1$s has been reported as a potentially harmful site and has been blocked based on your security preferences.
]]>
-
+
Deceptive site issueThis web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
]]>
-
From 0881294937df4dcbcbf0d24bfb772b98e450090e Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 16 Oct 2018 17:02:36 -0400
Subject: [PATCH 014/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/988: Create
feature-download (UI)
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@8b18d2db92855b9fd007bc947a9715c73ee09812
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../downloads/src/main/res/values/strings.xml | 51 ++-----------------
mozilla-mobile/android-components/l10n.toml | 4 ++
3 files changed, 8 insertions(+), 49 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5e1334e0145..74d12d3d32d 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "f947622b122d1082590fdb3534867d3414e38807"
+ "ac-prep": "8b18d2db92855b9fd007bc947a9715c73ee09812"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index 7250ffc1160..5313c29fbd7 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -1,56 +1,11 @@
-
- Downloads
+
+ Download File
-
- Download paused
-
- Download completed
-
- Download failed
-
-
- Download (%1$s)Download
+
Cancel
-
- %1$s can’t download this file type
-
-
- Could not open file
-
-
- No app found to open %1$s files
-
-
- Pause
-
- Resume
-
- Cancel
-
- Open
-
- Try Again
-
-
- Close
-
- Complete action using
- -->
- Unable to open %1$s
-
- Files and media permission access needed to download files. Go to Android settings, tap permissions, and tap allow.
-
-
- Cancel private downloads?
-
- If you close all Private tabs now, %1$s download will be canceled. Are you sure you want to leave Private Browsing?
-
- Cancel downloads
-
- Stay in private browsing
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index d7fb60377cd..2f131fe76da 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -21,3 +21,7 @@ locales = [
[[paths]]
reference = "components/feature/tabs/src/main/res/values/strings.xml"
l10n = "{l10n_base}/components/feature/tabs/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/feature/downloads/src/main/res/values/strings.xml"
+ l10n = "{l10n_base}/components/feature/downloads/src/main/res/values-{android_locale}/strings.xml"
\ No newline at end of file
From c51b3c5c6be079ee05e9afed7cc1dd9c9a2248b9 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Thu, 22 Nov 2018 21:37:38 +0100
Subject: [PATCH 015/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/1386:
feature-contextmenu: A component for for displaying context menus when
long-pressing web content.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b89ebb26b2c3368cb5ee4421f343b0e5f62f899d
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 52 +++++++------------
mozilla-mobile/android-components/l10n.toml | 6 ++-
3 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 74d12d3d32d..8196af8ceaf 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "8b18d2db92855b9fd007bc947a9715c73ee09812"
+ "ac-prep": "b89ebb26b2c3368cb5ee4421f343b0e5f62f899d"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
index 8b47b9ae50f..40324c11063 100644
--- a/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
@@ -1,51 +1,35 @@
- Open link in new tab
+ Open Link in New Tab
+
- Open link in private tab
+ Open Link in Private Tab
+
- Open image in new tab
-
- Download link
+ Open Image in New Tab
+
- Share link
-
- Share image
+ Share Link
+
- Copy link
+ Copy Link
+
- Copy image location
+ Copy Image Location
+
- Save image
-
- Save file to device
+ Save Image
+
New tab opened
+
New private tab opened
+
- Link copied to clipboard
+ Text copied to clipboard
+
Switch
-
- Open link in external app
-
- Share email address
-
- Copy email address
-
- Email address copied to clipboard
-
- Add to contact
-
- Search
-
- Private Search
-
- Share
-
- Email
-
- Call
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 2f131fe76da..3b02ad5ac06 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -24,4 +24,8 @@ locales = [
[[paths]]
reference = "components/feature/downloads/src/main/res/values/strings.xml"
- l10n = "{l10n_base}/components/feature/downloads/src/main/res/values-{android_locale}/strings.xml"
\ No newline at end of file
+ l10n = "{l10n_base}/components/feature/downloads/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/feature/contextmenu/src/main/res/values/strings.xml"
+ l10n = "{l10n_base}/components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
From 1f2c0b10b2693148e68f036c66e9b089286639c0 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 20 Nov 2018 11:37:07 -0500
Subject: [PATCH 016/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1434: Add support
for choice html elements for GeckoEngine
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@9a4aebdc98c34dbf99b839a71e74a44984b1b6f0
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../prompts/src/main/res/values/strings.xml | 126 +-----------------
2 files changed, 3 insertions(+), 125 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 8196af8ceaf..04d85eb9e4a 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b89ebb26b2c3368cb5ee4421f343b0e5f62f899d"
+ "ac-prep": "9a4aebdc98c34dbf99b839a71e74a44984b1b6f0"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 028e1bac9e1..3aa9ad94b98 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -1,130 +1,8 @@
-
+OK
+
Cancel
-
- Prevent this page from creating additional dialogs
-
- Set
-
- Clear
-
- Sign in
-
- Username
-
- Password
-
- Don’t save
-
- Never save
-
- Not now
-
- Save
-
- Don’t update
-
- Update
-
- Password field must not be empty
-
- Unable to save login
-
- Save this login?
-
- Update this login?
-
- Add username to saved password?
-
-
- Label for entering a text input field
-
- Choose a color
-
- Allow
-
- Deny
-
- Are you sure?
-
- Do you want to leave this site? Data you have entered may not be saved
-
- Stay
-
- Leave
-
- Pick a month
-
- Jan
-
- Feb
-
- Mar
-
- Apr
-
- May
-
- Jun
-
- Jul
-
- Aug
-
- Sep
-
- Oct
-
- Nov
-
- Dec
-
- Set time
-
- Manage logins
-
- Expand suggested logins
-
- Collapse suggested logins
-
- Suggested logins
-
-
- Resend data to this site?
- Refreshing this page could duplicate recent actions, such as sending a payment or posting a comment twice.
-
- Resend data
-
- Cancel
-
-
-
- Select credit card
-
- Expand suggested credit cards
-
- Collapse suggested credit cards
-
- Manage credit cards
-
- Securely save this card?
-
- Update card expiration date?
-
- Card number will be encrypted. Security code won’t be saved.
-
-
-
- Select addresses
-
- Select address
-
- Expand suggested addresses
-
- Collapse suggested addresses
-
- Manage addresses
From 4ebb1a4423de85854124622774f3185365639402 Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Thu, 6 Dec 2018 14:51:13 +0100
Subject: [PATCH 017/235] [components] Update compare-locales to recent major
version, stop using l10n_base in config
l10n_base is actually in the way of creating a l10n-only cross-product repo,
it turns out. It's not really needed for Android projects anyway, removing it.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@626027aeb04bac2265e99dd1e79445a815ab7b50
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 04d85eb9e4a..0e1e0b0091a 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "9a4aebdc98c34dbf99b839a71e74a44984b1b6f0"
+ "ac-prep": "626027aeb04bac2265e99dd1e79445a815ab7b50"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 3b02ad5ac06..11c80ec6aab 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -8,24 +8,24 @@ locales = [
[[paths]]
reference = "components/ui/tabcounter/src/main/res/values/strings.xml"
- l10n = "{l10n_base}/components/ui/tabcounter/src/main/res/values-{android_locale}/strings.xml"
+ l10n = "components/ui/tabcounter/src/main/res/values-{android_locale}/strings.xml"
[[paths]]
reference = "components/browser/errorpages/src/main/res/values/strings.xml"
- l10n = "{l10n_base}/components/browser/errorpages/src/main/res/values-{android_locale}/strings.xml"
+ l10n = "components/browser/errorpages/src/main/res/values-{android_locale}/strings.xml"
[[paths]]
reference = "components/browser/toolbar/src/main/res/values/strings.xml"
- l10n = "{l10n_base}/components/browser/toolbar/src/main/res/values-{android_locale}/strings.xml"
+ l10n = "components/browser/toolbar/src/main/res/values-{android_locale}/strings.xml"
[[paths]]
reference = "components/feature/tabs/src/main/res/values/strings.xml"
- l10n = "{l10n_base}/components/feature/tabs/src/main/res/values-{android_locale}/strings.xml"
+ l10n = "components/feature/tabs/src/main/res/values-{android_locale}/strings.xml"
[[paths]]
reference = "components/feature/downloads/src/main/res/values/strings.xml"
- l10n = "{l10n_base}/components/feature/downloads/src/main/res/values-{android_locale}/strings.xml"
+ l10n = "components/feature/downloads/src/main/res/values-{android_locale}/strings.xml"
[[paths]]
reference = "components/feature/contextmenu/src/main/res/values/strings.xml"
- l10n = "{l10n_base}/components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
+ l10n = "components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
From 4588d0dd88b675bf482b5b7be9170c1995daacfd Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Fri, 7 Dec 2018 15:26:06 +0100
Subject: [PATCH 018/235] [components] Add locales from FirefoxReality to
android-components
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@90b9a25ad5583fddfecbf25f78546740ffc1de89
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 0e1e0b0091a..7ac9651efa7 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "626027aeb04bac2265e99dd1e79445a815ab7b50"
+ "ac-prep": "90b9a25ad5583fddfecbf25f78546740ffc1de89"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 11c80ec6aab..880d7a03040 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -2,8 +2,15 @@
basepath = "."
locales = [
-
- ]
+ "de",
+ "es",
+ "fr",
+ "it",
+ "ja",
+ "ko",
+ "zh-CN",
+ "zh-TW",
+]
[env]
[[paths]]
From a2cc1563b8d51ffd7c7833b41e88dcb5a7892f94 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 28 Nov 2018 09:20:06 -0500
Subject: [PATCH 019/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1435: Add support
for alert popup for GeckoEngine.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@4f8e0156d0921dbd02974ed051f06f50cc30f576
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/feature/prompts/src/main/res/values/strings.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 7ac9651efa7..f41632c6677 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "90b9a25ad5583fddfecbf25f78546740ffc1de89"
+ "ac-prep": "4f8e0156d0921dbd02974ed051f06f50cc30f576"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 3aa9ad94b98..b8f4f763d09 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -5,4 +5,7 @@
Cancel
+
+
+ Prevent this page from creating additional dialogs
From f039e710fa8bf802fdd6149f023077a3fbc0f9f1 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 12 Dec 2018 11:28:19 -0500
Subject: [PATCH 020/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1436: Add support
for html input type date for GeckoEngine.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@837f67c9c56bc49009747dc14b2573fe245b48c4
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/prompts/src/main/res/values/strings.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index f41632c6677..dd1c3ef25fc 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "4f8e0156d0921dbd02974ed051f06f50cc30f576"
+ "ac-prep": "837f67c9c56bc49009747dc14b2573fe245b48c4"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index b8f4f763d09..261cec6bf30 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -8,4 +8,13 @@
Prevent this page from creating additional dialogs
+
+
+ Pick a date
+
+
+ Set
+
+
+ Clear
From 9bfa8336b34e898f41579297f50331f0a8384292 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 2 Jan 2019 13:45:46 -0500
Subject: [PATCH 021/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1504: Add support
for alert popup in WebView.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b1ab769c03af21f05c3a934d5cb71deed2e66997
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../engine-system/src/main/res/values/strings.xml | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index dd1c3ef25fc..d3ede8cd0f6 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "837f67c9c56bc49009747dc14b2573fe245b48c4"
+ "ac-prep": "b1ab769c03af21f05c3a934d5cb71deed2e66997"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
index 4863e650f6c..58d7b0b6479 100644
--- a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
@@ -1,8 +1,5 @@
-
- pref_privacy_block_ads
- pref_privacy_block_analytics
- pref_privacy_block_social
- pref_privacy_block_other
- pref_performance_block_webfonts
+
+
+ The page at %1$s says:
From a625b40e96032431ba2187b9e15afd7bbfe1460f Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Thu, 10 Jan 2019 08:37:38 -0500
Subject: [PATCH 022/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1470: Add support
for Authentication dialogs.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d4ac33d40aaa8b50f2a52553bdaa7f7e5ea5fa3c
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/prompts/src/main/res/values/strings.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index d3ede8cd0f6..d8c19e6bbde 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b1ab769c03af21f05c3a934d5cb71deed2e66997"
+ "ac-prep": "d4ac33d40aaa8b50f2a52553bdaa7f7e5ea5fa3c"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 261cec6bf30..cacd7964702 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -17,4 +17,13 @@
Clear
+
+
+ Sign In
+
+
+ Username
+
+
+ Password
From 9a513ca302415f254953156983302f17ecaf3a01 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Fri, 11 Jan 2019 13:49:08 -0500
Subject: [PATCH 023/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1469: Added
support for input type color.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d31bb089b031fd2260349236c2bec706eea4b7e1
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/prompts/src/main/res/values/strings.xml | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index d8c19e6bbde..5a76f96dc78 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "d4ac33d40aaa8b50f2a52553bdaa7f7e5ea5fa3c"
+ "ac-prep": "d31bb089b031fd2260349236c2bec706eea4b7e1"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index cacd7964702..6900febdab5 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
Clear
-
+
Sign In
@@ -26,4 +26,8 @@
Password
+
+
+ Choose a color
+
From 3f42d9af79d69d7478940d5c3b677a3a02573760 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Fri, 4 Jan 2019 11:40:06 -0500
Subject: [PATCH 024/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1530: Add support
for html input datetime-local and time for GeckoEngine.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@794341ef7bcb0757c3030a5eac7e757e09f823b0
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/prompts/src/main/res/values/strings.xml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5a76f96dc78..82bb9b43919 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "d31bb089b031fd2260349236c2bec706eea4b7e1"
+ "ac-prep": "794341ef7bcb0757c3030a5eac7e757e09f823b0"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 6900febdab5..fefb87867de 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -12,6 +12,12 @@
Pick a date
+
+ Pick a time
+
+
+ Pick a date and time
+
Set
From 3113706fdd407f5c589f0421d3459127b151e4ca Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 8 Jan 2019 09:26:59 -0500
Subject: [PATCH 025/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1471: Add support
for text prompts dialogs.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@c4570b5cbff052aef47d89c22179f7fb43df0f56
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/prompts/src/main/res/values/strings.xml | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 82bb9b43919..1af995fed25 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "794341ef7bcb0757c3030a5eac7e757e09f823b0"
+ "ac-prep": "c4570b5cbff052aef47d89c22179f7fb43df0f56"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index fefb87867de..0e98f708fea 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -33,7 +33,10 @@
Password
+
+
+ Label for entering a text input field
+
Choose a color
-
From b26293098e3c9dc71932f348ff202d9d9b7907f4 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Tue, 8 Jan 2019 16:52:44 -0500
Subject: [PATCH 026/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1400: Add close
button to custom tabs
Also makes the toolbar unclickable so it can't be switching into
edit mode, and removes all other actions.
Moved the custom tab back button bitmap checking to the feature from the
CustomTabConfig since we needed to know the DisplayMetrics for the
current screen to properly compare it to the max dp value.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@be9fd3a06afb26de96e6e19c2ea0f85dcbcfb083
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/customtabs/src/main/res/values/strings.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 1af995fed25..eb482505164 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "c4570b5cbff052aef47d89c22179f7fb43df0f56"
+ "ac-prep": "be9fd3a06afb26de96e6e19c2ea0f85dcbcfb083"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml
index 7d001b2872e..19a3b433c92 100644
--- a/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
+ Share viaReturn to previous app
- Share link
+ Share…
From f189ad14c4c8f99cea5f0ff93a7e3cf69a00cf8e Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Sat, 19 Jan 2019 00:26:10 -0500
Subject: [PATCH 027/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1401: Add default
share menu for CustomTabs
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@64aaf72fffb57302a8bc1a04276b283fb98b9259
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/customtabs/src/main/res/values/strings.xml | 3 +--
.../components/support/ktx/src/main/res/values/strings.xml | 4 ----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index eb482505164..94977a51879 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "be9fd3a06afb26de96e6e19c2ea0f85dcbcfb083"
+ "ac-prep": "64aaf72fffb57302a8bc1a04276b283fb98b9259"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml
index 19a3b433c92..7d001b2872e 100644
--- a/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/customtabs/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
- Share viaReturn to previous app
- Share…
+ Share link
diff --git a/mozilla-mobile/android-components/components/support/ktx/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/support/ktx/src/main/res/values/strings.xml
index 1c874564cf7..53798a8a618 100644
--- a/mozilla-mobile/android-components/components/support/ktx/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/support/ktx/src/main/res/values/strings.xml
@@ -1,9 +1,5 @@
-
- Call with…
-
- Email with…Share with…Share via
From 46e5b4a769df3d07c314c8ce36040f627c0f69cc Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 22 Jan 2019 18:19:14 -0500
Subject: [PATCH 028/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1473: Adding
support for pop-up dialog when opening a new window for GeckoEngine.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ccc4eb5ff4bc449ed1dad026ce820df575bb0dd6
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/prompts/src/main/res/values/strings.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 94977a51879..a6ebe9ea139 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "64aaf72fffb57302a8bc1a04276b283fb98b9259"
+ "ac-prep": "ccc4eb5ff4bc449ed1dad026ce820df575bb0dd6"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 0e98f708fea..673a7a18146 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -39,4 +39,13 @@
Choose a color
+
+
+ Allow
+
+
+ Deny
+
+
+ Prevent this site from opening this pop-up window?
From edca3fed91253a0ee59a6a0df95ff0fce581ae37 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 23 Jan 2019 16:16:24 -0500
Subject: [PATCH 029/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1079: Adding find
in page feature component.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@89419f2202839bb0f19ee754746045e5050df0ff
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index a6ebe9ea139..adca63e1838 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "ccc4eb5ff4bc449ed1dad026ce820df575bb0dd6"
+ "ac-prep": "89419f2202839bb0f19ee754746045e5050df0ff"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 880d7a03040..b56309c3efb 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -36,3 +36,7 @@ locales = [
[[paths]]
reference = "components/feature/contextmenu/src/main/res/values/strings.xml"
l10n = "components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/feature/findinpage/src/main/res/values/strings.xml"
+ l10n = "components/feature/findinpage/src/main/res/values-{android_locale}/strings.xml"
\ No newline at end of file
From 61a9d4fcba6e0d750c56012c082a37c3fc9b4857 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 6 Feb 2019 12:07:10 -0500
Subject: [PATCH 030/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1949: Adding
feature-sitepermissions component
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@eca86233813d2a69e86bce96375d8e4b36ef4fdf
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 47 +++++++++----------
mozilla-mobile/android-components/l10n.toml | 6 ++-
3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index adca63e1838..a0609305078 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "89419f2202839bb0f19ee754746045e5050df0ff"
+ "ac-prep": "eca86233813d2a69e86bce96375d8e4b36ef4fdf"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
index 9d9ff2ee683..6a90673b0b8 100644
--- a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
@@ -1,48 +1,47 @@
-
+
+
Allow %1$s to send notifications?
+
Allow %1$s to use your camera?
+
Allow %1$s to use your microphone?
+
Allow %1$s to use your location?
+
Allow %1$s to use your camera and microphone?
+
Microphone 1
+
- Rear-facing camera
+ Back facing camera
+
- Front-facing camera
+ Selfie back camera
+
Allow
+
- Don’t allow
-
- Remember decision for this site
-
- Always
-
- Never
-
- Allow %1$s to store data in persistent storage?
-
- Allow %1$s to play DRM-controlled content?
-
- Allow %1$s to use its cookies on %2$s?
-
- You may want to block access if it\'s not clear why %s needs this data.
-
- Block
-
- Learn more
+ Don\'t allow
+
+
+ Permission Icon
+
+
+ Camera Icon
+
+
+ Microphone Icon
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index b56309c3efb..c1231e0c017 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -39,4 +39,8 @@ locales = [
[[paths]]
reference = "components/feature/findinpage/src/main/res/values/strings.xml"
- l10n = "components/feature/findinpage/src/main/res/values-{android_locale}/strings.xml"
\ No newline at end of file
+ l10n = "components/feature/findinpage/src/main/res/values-{android_locale}/strings.xml"
+
+ [[paths]]
+ reference = "components/feature/sitepermissions/src/main/res/values/strings.xml"
+ l10n = "components/feature/sitepermissions/src/main/res/values-{android_locale}/strings.xml"
\ No newline at end of file
From fb2a58f3ed81fb3e546ff703825818e4cee037c6 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 12 Feb 2019 18:55:38 -0500
Subject: [PATCH 031/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2026: Ignoring
schemes that are not https or http when downloading a file.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@8bd5434deef1122a97348d0caf40f326d72616b8
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/downloads/src/main/res/values/strings.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index a0609305078..aed5115ca54 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "eca86233813d2a69e86bce96375d8e4b36ef4fdf"
+ "ac-prep": "8bd5434deef1122a97348d0caf40f326d72616b8"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index 5313c29fbd7..598a88039d9 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -8,4 +8,7 @@
Cancel
+
+
+ Download protocol not supported
From d26a5207ce60dc990a10e72b1cfe1f2b70b98ea5 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Fri, 15 Feb 2019 13:52:06 -0500
Subject: [PATCH 032/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1951: Adding UI
for microphone content permission.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@a2bb0030d98fb07d0068cdec6be6b03d6f13e71e
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../sitepermissions/src/main/res/values/strings.xml | 11 +----------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index aed5115ca54..7242feff3a9 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "8bd5434deef1122a97348d0caf40f326d72616b8"
+ "ac-prep": "a2bb0030d98fb07d0068cdec6be6b03d6f13e71e"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
index 6a90673b0b8..baf7c867cce 100644
--- a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
-
+Allow %1$s to send notifications?
@@ -35,13 +35,4 @@
Don\'t allow
-
-
- Permission Icon
-
-
- Camera Icon
-
-
- Microphone Icon
From 4f8d40d9ad6c0239db15e695a4c6c73338e91620 Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Thu, 7 Mar 2019 12:25:58 +0100
Subject: [PATCH 033/235] [components] Sort entries in l10n.toml
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@dffe2babc51d79c334dece9a0bb22990e142f04b
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 26 ++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 7242feff3a9..d8bdd44b33a 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "a2bb0030d98fb07d0068cdec6be6b03d6f13e71e"
+ "ac-prep": "dffe2babc51d79c334dece9a0bb22990e142f04b"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index c1231e0c017..5a7721a013f 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -13,10 +13,6 @@ locales = [
]
[env]
-[[paths]]
- reference = "components/ui/tabcounter/src/main/res/values/strings.xml"
- l10n = "components/ui/tabcounter/src/main/res/values-{android_locale}/strings.xml"
-
[[paths]]
reference = "components/browser/errorpages/src/main/res/values/strings.xml"
l10n = "components/browser/errorpages/src/main/res/values-{android_locale}/strings.xml"
@@ -26,21 +22,25 @@ locales = [
l10n = "components/browser/toolbar/src/main/res/values-{android_locale}/strings.xml"
[[paths]]
- reference = "components/feature/tabs/src/main/res/values/strings.xml"
- l10n = "components/feature/tabs/src/main/res/values-{android_locale}/strings.xml"
+ reference = "components/feature/contextmenu/src/main/res/values/strings.xml"
+ l10n = "components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
[[paths]]
reference = "components/feature/downloads/src/main/res/values/strings.xml"
l10n = "components/feature/downloads/src/main/res/values-{android_locale}/strings.xml"
-[[paths]]
- reference = "components/feature/contextmenu/src/main/res/values/strings.xml"
- l10n = "components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
-
[[paths]]
reference = "components/feature/findinpage/src/main/res/values/strings.xml"
l10n = "components/feature/findinpage/src/main/res/values-{android_locale}/strings.xml"
- [[paths]]
- reference = "components/feature/sitepermissions/src/main/res/values/strings.xml"
- l10n = "components/feature/sitepermissions/src/main/res/values-{android_locale}/strings.xml"
\ No newline at end of file
+[[paths]]
+ reference = "components/feature/sitepermissions/src/main/res/values/strings.xml"
+ l10n = "components/feature/sitepermissions/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/feature/tabs/src/main/res/values/strings.xml"
+ l10n = "components/feature/tabs/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/ui/tabcounter/src/main/res/values/strings.xml"
+ l10n = "components/ui/tabcounter/src/main/res/values-{android_locale}/strings.xml"
From 94db1eff01db5c21d235e13cce95b507e440f271 Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Thu, 7 Mar 2019 12:40:14 +0100
Subject: [PATCH 034/235] [components] Add missing components to l10n config,
fixes https://github.com/mozilla-mobile/android-components/issues/1338
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@bdf29a4a4f54280528b6cac6ce5c194d78cde88f
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index d8bdd44b33a..29be236ced7 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "dffe2babc51d79c334dece9a0bb22990e142f04b"
+ "ac-prep": "bdf29a4a4f54280528b6cac6ce5c194d78cde88f"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 5a7721a013f..a43f0e8b63c 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -13,6 +13,10 @@ locales = [
]
[env]
+[[paths]]
+ reference = "components/browser/engine-system/src/main/res/values/strings.xml"
+ l10n = "components/browser/engine-system/src/main/res/values-{android_locale}/strings.xml"
+
[[paths]]
reference = "components/browser/errorpages/src/main/res/values/strings.xml"
l10n = "components/browser/errorpages/src/main/res/values-{android_locale}/strings.xml"
@@ -25,6 +29,10 @@ locales = [
reference = "components/feature/contextmenu/src/main/res/values/strings.xml"
l10n = "components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
+[[paths]]
+ reference = "components/feature/customtabs/src/main/res/values/strings.xml"
+ l10n = "components/feature/customtabs/src/main/res/values-{android_locale}/strings.xml"
+
[[paths]]
reference = "components/feature/downloads/src/main/res/values/strings.xml"
l10n = "components/feature/downloads/src/main/res/values-{android_locale}/strings.xml"
@@ -33,6 +41,10 @@ locales = [
reference = "components/feature/findinpage/src/main/res/values/strings.xml"
l10n = "components/feature/findinpage/src/main/res/values-{android_locale}/strings.xml"
+[[paths]]
+ reference = "components/feature/prompts/src/main/res/values/strings.xml"
+ l10n = "components/feature/prompts/src/main/res/values-{android_locale}/strings.xml"
+
[[paths]]
reference = "components/feature/sitepermissions/src/main/res/values/strings.xml"
l10n = "components/feature/sitepermissions/src/main/res/values-{android_locale}/strings.xml"
@@ -41,6 +53,14 @@ locales = [
reference = "components/feature/tabs/src/main/res/values/strings.xml"
l10n = "components/feature/tabs/src/main/res/values-{android_locale}/strings.xml"
+[[paths]]
+ reference = "components/lib/crash/src/main/res/values/strings.xml"
+ l10n = "components/lib/crash/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/support/ktx/src/main/res/values/strings.xml"
+ l10n = "components/support/ktx/src/main/res/values-{android_locale}/strings.xml"
+
[[paths]]
reference = "components/ui/tabcounter/src/main/res/values/strings.xml"
l10n = "components/ui/tabcounter/src/main/res/values-{android_locale}/strings.xml"
From 68092c75c8fa0beaf7f13c4040669c01da9e6db0 Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Thu, 7 Mar 2019 12:42:23 +0100
Subject: [PATCH 035/235] [components] Add a list of branches to expose to l10n
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@455aba0bc7018d7f879dd21e6e3e5267e717b5fc
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 29be236ced7..48cb296db6e 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "bdf29a4a4f54280528b6cac6ce5c194d78cde88f"
+ "ac-prep": "455aba0bc7018d7f879dd21e6e3e5267e717b5fc"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index a43f0e8b63c..8a86ddd39c3 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -11,6 +11,13 @@ locales = [
"zh-CN",
"zh-TW",
]
+
+# Expose the following branches to localization
+# Changes to this list should be announced to the l10n team ahead of time.
+branches = [
+ "master",
+]
+
[env]
[[paths]]
From 5a0c57822ae6f1280ab87ab54786d2c833b8a32a Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 5 Mar 2019 15:43:55 -0500
Subject: [PATCH 036/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2127 and
https://github.com/mozilla-mobile/android-components/issues/2351: Integrating
store to site permissions feature flow.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@043fe945d1eb3cb5a2f262e4548c6c3f3b454f41
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/sitepermissions/src/main/res/values/strings.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 48cb296db6e..7689ae490c3 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "455aba0bc7018d7f879dd21e6e3e5267e717b5fc"
+ "ac-prep": "043fe945d1eb3cb5a2f262e4548c6c3f3b454f41"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
index baf7c867cce..2914f6d7da6 100644
--- a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
@@ -35,4 +35,7 @@
Don\'t allow
+
+
+ Don\'t ask again on this site
From ae56d106088225bcd3f6dc7bb12ea1846f299307 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 20 Mar 2019 11:33:15 -0400
Subject: [PATCH 037/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2426: Updating
apostrophes on Site Permissions prompts.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ddca4cb1ea31e2a3dbffb85905e8bb2e54f0e7bd
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/sitepermissions/src/main/res/values/strings.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 7689ae490c3..0d47495b8dc 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "043fe945d1eb3cb5a2f262e4548c6c3f3b454f41"
+ "ac-prep": "ddca4cb1ea31e2a3dbffb85905e8bb2e54f0e7bd"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
index 2914f6d7da6..20c76ef30f8 100644
--- a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
@@ -34,8 +34,8 @@
- Don\'t allow
+ Don’t allow
- Don\'t ask again on this site
+ Don’t ask again on this site
From 0c3bc9c56364ab18fca633e70e8703948b60310c Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Mon, 25 Mar 2019 16:50:37 +0100
Subject: [PATCH 038/235] [components] Update strings from review.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@45b9d4337a59f3f0c2e34fb0638ceab210149d66
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 24 ++++++-------------
.../downloads/src/main/res/values/strings.xml | 9 +++----
.../prompts/src/main/res/values/strings.xml | 19 ++-------------
.../src/main/res/values/strings.xml | 17 +++----------
5 files changed, 16 insertions(+), 55 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 0d47495b8dc..fa05700b5d3 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "ddca4cb1ea31e2a3dbffb85905e8bb2e54f0e7bd"
+ "ac-prep": "45b9d4337a59f3f0c2e34fb0638ceab210149d66"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
index 40324c11063..b72cd43ea7e 100644
--- a/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
@@ -1,35 +1,25 @@
- Open Link in New Tab
-
+ Open link in new tab
- Open Link in Private Tab
-
+ Open link in private tab
- Open Image in New Tab
-
+ Open image in new tab
- Share Link
-
+ Share link
- Copy Link
-
+ Copy link
- Copy Image Location
-
+ Copy image location
- Save Image
-
+ Save imageNew tab opened
-
New private tab opened
-
Text copied to clipboard
-
Switch
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index 598a88039d9..46e3f7c0477 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -1,14 +1,11 @@
- Download File
-
+ Download fileDownload
-
Cancel
-
-
- Download protocol not supported
+
+ %1$s can’t download this file type
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 673a7a18146..1bab1879678 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -2,50 +2,35 @@
OK
-
Cancel
-
Prevent this page from creating additional dialogs
-
Pick a date
-
Pick a time
-
Pick a date and time
-
Set
-
Clear
-
- Sign In
-
+ Sign inUsername
-
Password
-
Label for entering a text input field
-
Choose a color
-
Allow
-
Deny
-
- Prevent this site from opening this pop-up window?
+ Prevent this site from opening a pop-up window?
diff --git a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
index 20c76ef30f8..c1e9498ccf5 100644
--- a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
@@ -1,41 +1,30 @@
-
Allow %1$s to send notifications?
-
Allow %1$s to use your camera?
-
Allow %1$s to use your microphone?
-
Allow %1$s to use your location?
-
Allow %1$s to use your camera and microphone?
-
Microphone 1
-
- Back facing camera
-
+ Rear-facing camera
- Selfie back camera
-
+ Front-facing cameraAllow
-
Don’t allow
-
- Don’t ask again on this site
+ Remember decision for this site
From a86e8a0bd4332b307a796752c9b016da8f78e10c Mon Sep 17 00:00:00 2001
From: Eitan Isaacson
Date: Tue, 26 Mar 2019 09:35:30 -0700
Subject: [PATCH 039/235] [components] Rename ToolBar entry button to Clear.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ce8079f0d01ede1a5ef52cc0937b373bf49ec15f
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/browser/toolbar/src/main/res/values/strings.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index fa05700b5d3..6169bafee1d 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "45b9d4337a59f3f0c2e34fb0638ceab210149d66"
+ "ac-prep": "ce8079f0d01ede1a5ef52cc0937b373bf49ec15f"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 691c9f3170e..592be2fe15e 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -2,5 +2,5 @@
Menu
- Close
+ Clear
From d978329780442a8efb8ebfa0d3453874eac7fe55 Mon Sep 17 00:00:00 2001
From: vladikoff
Date: Thu, 24 Jan 2019 23:36:58 -0500
Subject: [PATCH 040/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1542: Add QR
scanning component
Co-authored-by: Christian Sadilek
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@aa8f734a182939e00724126e918d99ee7c4bf075
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/feature/qr/src/main/res/values/strings.xml | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 6169bafee1d..5c3b00c6b7b 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "ce8079f0d01ede1a5ef52cc0937b373bf49ec15f"
+ "ac-prep": "aa8f734a182939e00724126e918d99ee7c4bf075"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/qr/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/qr/src/main/res/values/strings.xml
index 5fae94c403f..02d47596b6a 100644
--- a/mozilla-mobile/android-components/components/feature/qr/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/qr/src/main/res/values/strings.xml
@@ -4,7 +4,4 @@
QR scanner
-
- No camera available on device
-
From 6ccb811c67c70af48968f0e0b994084a7a2895bb Mon Sep 17 00:00:00 2001
From: Eitan Isaacson
Date: Tue, 26 Mar 2019 09:08:37 -0700
Subject: [PATCH 041/235] [components] Make loading page progress bar
accessible to TalkBack.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@657828022d09a8b8c73ddaed13b11f5023097f8f
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/browser/toolbar/src/main/res/values/strings.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5c3b00c6b7b..c2ff613d8ff 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "aa8f734a182939e00724126e918d99ee7c4bf075"
+ "ac-prep": "657828022d09a8b8c73ddaed13b11f5023097f8f"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 592be2fe15e..69fb2a9138d 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -3,4 +3,6 @@
MenuClear
+
+ Loading
From 9149862a56393fbdbc863bf3e5874058787dc480 Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Wed, 3 Apr 2019 10:54:19 +0200
Subject: [PATCH 042/235] [components] Move prompt string under discussion out
of l10n, fixes
https://github.com/mozilla-mobile/android-components/issues/2541
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@e7a32dbfe3b2c9b5ce04cfdc16b0a6bc8bc2fced
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/feature/prompts/src/main/res/values/strings.xml | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index c2ff613d8ff..a2f9ddaca7f 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "657828022d09a8b8c73ddaed13b11f5023097f8f"
+ "ac-prep": "e7a32dbfe3b2c9b5ce04cfdc16b0a6bc8bc2fced"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 1bab1879678..8b7f847c657 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -31,6 +31,4 @@
AllowDeny
-
- Prevent this site from opening a pop-up window?
From e97c1547e4f0f35addf6e9585e00a8908d81a945 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Tue, 16 Apr 2019 00:10:04 -0400
Subject: [PATCH 043/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2623: Add
customizable ReaderView UI
Co-authored-by: Christian Sadilek
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@0b3ee483a44bf7f721116fd0c37352ba066a6552
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 20 ++++---------------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index a2f9ddaca7f..066c8f00815 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "e7a32dbfe3b2c9b5ce04cfdc16b0a6bc8bc2fced"
+ "ac-prep": "0b3ee483a44bf7f721116fd0c37352ba066a6552"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml
index c82bc128ac1..e8c6992a2b5 100644
--- a/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml
@@ -1,29 +1,17 @@
-
- Sans serif
-
+ Sans serifSans Serif font
-
- Serif
-
+ SerifSerif font
-
-
+ -Font size decrease
-
-
+ +Font size increase
-
Dark
-
Dark color scheme
-
Sepia
-
Sepia color scheme
-
Light
-
Light color scheme
From c050d8af33a184a645b9cf0c82a692a0678b1a53 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz
Date: Wed, 17 Apr 2019 13:46:18 -0700
Subject: [PATCH 044/235] [components] For
https://github.com/mozilla-mobile/android-components/issues/2718: Adds
backButton string replacement
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@3f52250ab9f5c7b4b0ca8d1f0daa17acdc4537fc
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/errorpages/src/main/res/values/strings.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 066c8f00815..a5abb9c88df 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "0b3ee483a44bf7f721116fd0c37352ba066a6552"
+ "ac-prep": "3f52250ab9f5c7b4b0ca8d1f0daa17acdc4537fc"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 42a4cb9aae2..e2d2fb4a9a9 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -6,6 +6,9 @@
Try Again
+
+ Go Back
+
Cannot Complete Request
From c70f338f1e767f8dc3a228aa1afd49e6c0ce2fa8 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Wed, 17 Apr 2019 18:43:18 +0200
Subject: [PATCH 045/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2428: Update
strings after L10N review.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@067f29aaecea772a79d2bb1209a2cb36b3a8595f
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/engine-system/src/main/res/values/strings.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index a5abb9c88df..ba33aa6207c 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "3f52250ab9f5c7b4b0ca8d1f0daa17acdc4537fc"
+ "ac-prep": "067f29aaecea772a79d2bb1209a2cb36b3a8595f"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
index 58d7b0b6479..8778a301a6e 100644
--- a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
-
+
The page at %1$s says:
From 14665e45994d23e8d5148dcb1ed538839bd897cf Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Fri, 26 Apr 2019 13:45:45 +0200
Subject: [PATCH 046/235] [components] Import strings from android-l10n
Status: mozilla-l10n/android-l10n@6f5b72b05bb7e250f72f0c931565c38e2b490714
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@2a3917f91dc4544c7829146e04fd867cfc997d63
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index ba33aa6207c..8317910eeda 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "067f29aaecea772a79d2bb1209a2cb36b3a8595f"
+ "ac-prep": "2a3917f91dc4544c7829146e04fd867cfc997d63"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 8a86ddd39c3..5e2ca4f9865 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -4,10 +4,12 @@ basepath = "."
locales = [
"de",
"es",
+ "es-ES",
"fr",
"it",
"ja",
"ko",
+ "ru",
"zh-CN",
"zh-TW",
]
@@ -67,7 +69,3 @@ branches = [
[[paths]]
reference = "components/support/ktx/src/main/res/values/strings.xml"
l10n = "components/support/ktx/src/main/res/values-{android_locale}/strings.xml"
-
-[[paths]]
- reference = "components/ui/tabcounter/src/main/res/values/strings.xml"
- l10n = "components/ui/tabcounter/src/main/res/values-{android_locale}/strings.xml"
From dfb9d63d2b3b61fb5610622b5723d0fc214a86c1 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Thu, 2 May 2019 09:37:20 -0400
Subject: [PATCH 047/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2489
https://github.com/mozilla-mobile/android-components/issues/2125
https://github.com/mozilla-mobile/android-components/issues/2097 Using
DialogFragment in site permission prompts
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@7bc30eb7f988ccafed4d6b2764d1286a3d4ed898
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/sitepermissions/src/main/res/values/strings.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 8317910eeda..0e6de2fbfcf 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "2a3917f91dc4544c7829146e04fd867cfc997d63"
+ "ac-prep": "7bc30eb7f988ccafed4d6b2764d1286a3d4ed898"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
index c1e9498ccf5..f0ed6a682dc 100644
--- a/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/sitepermissions/src/main/res/values/strings.xml
@@ -27,4 +27,8 @@
Don’t allowRemember decision for this site
+
+ Always
+
+ Never
From 6b27d9fa56a3d969ceb9b99a9250c217ba5de3e0 Mon Sep 17 00:00:00 2001
From: Stas Parshin
Date: Fri, 3 May 2019 19:09:35 +0700
Subject: [PATCH 048/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/1740: Add support
for authentication alerts for SystemEngineView.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@44449a60acdbd423eb067cdeea3ea7d02164627c
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/engine-system/src/main/res/values/strings.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 0e6de2fbfcf..22dd1a3653f 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "7bc30eb7f988ccafed4d6b2764d1286a3d4ed898"
+ "ac-prep": "44449a60acdbd423eb067cdeea3ea7d02164627c"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
index 8778a301a6e..b70ef57248c 100644
--- a/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/engine-system/src/main/res/values/strings.xml
@@ -2,4 +2,9 @@
The page at %1$s says:
+
+ %2$s is requesting your username and password. The site says: “%1$s”
+
+ %1$s is requesting your username and password.
From d4be1a63044fcd18f0a7a34977ce16c29970edb6 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Wed, 1 May 2019 09:11:55 -0400
Subject: [PATCH 049/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2799: Add
ReaderView L10N comments
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@19ed0e31d0d5746f4d45264a8d952268fe1ca6b6
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 20 +++++++++++++++----
mozilla-mobile/android-components/l10n.toml | 4 ++++
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 22dd1a3653f..30da3b2f175 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "44449a60acdbd423eb067cdeea3ea7d02164627c"
+ "ac-prep": "19ed0e31d0d5746f4d45264a8d952268fe1ca6b6"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml
index e8c6992a2b5..c82bc128ac1 100644
--- a/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/readerview/src/main/res/values/strings.xml
@@ -1,17 +1,29 @@
- Sans serif
+
+ Sans serif
+
Sans Serif font
- Serif
+
+ Serif
+
Serif font
- -
+
+
Font size decrease
- +
+
+
Font size increase
+
Dark
+
Dark color scheme
+
Sepia
+
Sepia color scheme
+
Light
+
Light color scheme
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 5e2ca4f9865..812d2c6992b 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -50,6 +50,10 @@ branches = [
reference = "components/feature/findinpage/src/main/res/values/strings.xml"
l10n = "components/feature/findinpage/src/main/res/values-{android_locale}/strings.xml"
+[[paths]]
+ reference = "components/feature/readerview/src/main/res/values/strings.xml"
+ l10n = "components/feature/readerview/src/main/res/values-{android_locale}/strings.xml"
+
[[paths]]
reference = "components/feature/prompts/src/main/res/values/strings.xml"
l10n = "components/feature/prompts/src/main/res/values-{android_locale}/strings.xml"
From a22d0fb1e6f92b9bd0ed52b5a43023231db14837 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Fri, 24 May 2019 17:34:59 -0400
Subject: [PATCH 050/235] [components] Add strings for media notifications.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@5e69419065342c909e280ce012fb46a61261a685
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/media/src/main/res/values/strings.xml | 11 +----------
mozilla-mobile/android-components/l10n.toml | 4 ++++
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 30da3b2f175..e856abbcf6d 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "19ed0e31d0d5746f4d45264a8d952268fe1ca6b6"
+ "ac-prep": "5e69419065342c909e280ce012fb46a61261a685"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
index a8ed5478204..39e85dd4c23 100644
--- a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
@@ -8,14 +8,5 @@
Microphone is on
- Camera and microphone are on
-
-
- Play
-
-
- Pause
-
-
- A site is playing media
+ Camera and microphone is on
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 812d2c6992b..8cf3d571deb 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -50,6 +50,10 @@ branches = [
reference = "components/feature/findinpage/src/main/res/values/strings.xml"
l10n = "components/feature/findinpage/src/main/res/values-{android_locale}/strings.xml"
+[[paths]]
+ reference = "components/feature/media/src/main/res/values/strings.xml"
+ l10n = "components/feature/media/src/main/res/values-{android_locale}/strings.xml"
+
[[paths]]
reference = "components/feature/readerview/src/main/res/values/strings.xml"
l10n = "components/feature/readerview/src/main/res/values-{android_locale}/strings.xml"
From 21fc910a737ff6e4139fbc6e916267ab3bd8de60 Mon Sep 17 00:00:00 2001
From: mheubusch
Date: Fri, 24 May 2019 16:40:34 -0500
Subject: [PATCH 051/235] [components] Update strings.xml
2 items (camera and microphone) take the plural form (are)
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@5546f54f69cbf24b238d6f116ae9f1025c55813d
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/feature/media/src/main/res/values/strings.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index e856abbcf6d..fe8d8ded852 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "5e69419065342c909e280ce012fb46a61261a685"
+ "ac-prep": "5546f54f69cbf24b238d6f116ae9f1025c55813d"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
index 39e85dd4c23..df5b3d3b992 100644
--- a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
@@ -8,5 +8,5 @@
Microphone is on
- Camera and microphone is on
+ Camera and microphone are on
From eee1b56724ab1265267a0b07b33c2a6d77e89416 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Fri, 24 May 2019 18:13:15 -0400
Subject: [PATCH 052/235] [components] Add applink strings to error pages
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@c77feea6e54e9b1281b07ed7be599bd381cdf0a1
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/errorpages/src/main/res/values/strings.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index fe8d8ded852..f99054a3481 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "5546f54f69cbf24b238d6f116ae9f1025c55813d"
+ "ac-prep": "c77feea6e54e9b1281b07ed7be599bd381cdf0a1"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index e2d2fb4a9a9..29d228f9eac 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -259,4 +259,13 @@
This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
]]>
+
+
+ Open in…
+
+ Open in app? Your activity may no longer be private.
+
+ Open
+
+ Cancel
From 45e3b6f64f8cfaaf511f4169f4b5d076ac7bbe7f Mon Sep 17 00:00:00 2001
From: James Hugman
Date: Tue, 14 May 2019 13:20:51 +0100
Subject: [PATCH 053/235] [components] Fixes
https://github.com/mozilla-mobile/android-components/issues/2976 Introduce
feature-app-links
This includes UI in private tabs.
Squashed commits:
[180e515e8] Connect to Session Observer and thence to AppLinksFeature.
[77922dcc0] browser-engine-system tests passing
[045717868] lint etc
[6f7b44cad] Thread another Boolean through EngineObserver -> Session onLoadRequest
[18693cad0] Start testing the feature.
[5e0a93556] Fixup tests to use shadow package manager, and catch some new bugs.
[3a5976dde] Split use cases up for menu and intercepting cases.
[f7eae96dd] Address reviewer comments re: dead code and docs
[b15ffb88c] Rename triggeredByUserInteraction to loadRequestTriggeredByUserInteraction
[edc49b573] Move session observer into member of feature
[91ed1f5ac] Add changelog entry
[098dc5067] Add boolean flag to prevent interception of links
[f92731a44] Add load request/trigger by user interaction to session.observer
[46385577d] Move opening to another use case, with test
[56da7e7c1] Change into using feature
[643c9f453] Remove duplicate copyright
[6b3f80bbc] Add testing of get and a fragment for open use cases
[669c84567] Add AppLinksRedirectConfig and supporting use cases.
There is a url redirect creation use case, a load URL use case and an interceptor.
[72896a567] AppLinksUseCases detects if a URL can be opened with another non-browser app
[939eb62fa] Initial commit of empty feature-app-links
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@5f99ead9cada2a213db88fb4eefedc601bfbe506
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/app-links/src/main/res/values/strings.xml | 6 +-----
mozilla-mobile/android-components/l10n.toml | 4 ++++
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index f99054a3481..165d3ad5fdd 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "c77feea6e54e9b1281b07ed7be599bd381cdf0a1"
+ "ac-prep": "5f99ead9cada2a213db88fb4eefedc601bfbe506"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml
index c91c76627f6..7618e8c59b6 100644
--- a/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml
@@ -1,11 +1,7 @@
-
Open in…
-
- Open in app? Your activity may no longer be private.
-
+ Open in external app?Open
-
Cancel
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 8cf3d571deb..7b2ad1dc3a2 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -34,6 +34,10 @@ branches = [
reference = "components/browser/toolbar/src/main/res/values/strings.xml"
l10n = "components/browser/toolbar/src/main/res/values-{android_locale}/strings.xml"
+[[paths]]
+ reference = "components/feature/app-links/src/main/res/values/strings.xml"
+ l10n = "components/feature/app-links/src/main/res/values-{android_locale}/strings.xml"
+
[[paths]]
reference = "components/feature/contextmenu/src/main/res/values/strings.xml"
l10n = "components/feature/contextmenu/src/main/res/values-{android_locale}/strings.xml"
From 99a08d183734883a9c7350c310b15f65339bfc9f Mon Sep 17 00:00:00 2001
From: Jonathan Almeida
Date: Fri, 31 May 2019 20:59:37 -0400
Subject: [PATCH 054/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3113: Move
app-links to correct component
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f09cbc52553cc79c688a2f5b75249d84f0ea4889
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/errorpages/src/main/res/values/strings.xml | 9 ---------
.../feature/app-links/src/main/res/values/strings.xml | 6 +++++-
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 165d3ad5fdd..482339d89b3 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "5f99ead9cada2a213db88fb4eefedc601bfbe506"
+ "ac-prep": "f09cbc52553cc79c688a2f5b75249d84f0ea4889"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 29d228f9eac..e2d2fb4a9a9 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -259,13 +259,4 @@
This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.
]]>
-
-
- Open in…
-
- Open in app? Your activity may no longer be private.
-
- Open
-
- Cancel
diff --git a/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml
index 7618e8c59b6..c91c76627f6 100644
--- a/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/app-links/src/main/res/values/strings.xml
@@ -1,7 +1,11 @@
+
Open in…
- Open in external app?
+
+ Open in app? Your activity may no longer be private.
+
Open
+
Cancel
From 30dd204f46f95f9db80575a41ff87729b6ff036c Mon Sep 17 00:00:00 2001
From: Tiger Oakes
Date: Wed, 5 Jun 2019 16:39:41 -0400
Subject: [PATCH 055/235] [components] Replace TimePicker and DatePicker with
Dialogs
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@0d0c4fd717c9eee605007643a9d5606d90c1037e
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/prompts/src/main/res/values/strings.xml | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 482339d89b3..2ae2a03b7da 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "f09cbc52553cc79c688a2f5b75249d84f0ea4889"
+ "ac-prep": "0d0c4fd717c9eee605007643a9d5606d90c1037e"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 8b7f847c657..bfd16892177 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -6,12 +6,6 @@
CancelPrevent this page from creating additional dialogs
-
- Pick a date
-
- Pick a time
-
- Pick a date and timeSet
From e612aa876785b9d587c942de572dbded35c7baef Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Thu, 13 Jun 2019 12:26:37 +0200
Subject: [PATCH 056/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3097: Show
notification for fatal crashes on Android Q+.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@32b3e70b7b0ca4a26fcc9199bb766558da2ad609
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/lib/crash/src/main/res/values/strings.xml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 2ae2a03b7da..c3d9df8449c 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "0d0c4fd717c9eee605007643a9d5606d90c1037e"
+ "ac-prep": "32b3e70b7b0ca4a26fcc9199bb766558da2ad609"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
index 26cfc0827e6..6c5ae67173e 100644
--- a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -11,4 +11,10 @@
Restart %1$s
+
+
+ Crashes
+
+ Report
+
From 50c0d721080a1383b16a1bc2c12b95d28fd20191 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Thu, 4 Jul 2019 18:02:26 +0200
Subject: [PATCH 057/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3643: Add
localization comment to mozac_lib_crash_notification_action_report.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b469211987ec43e4ed23acaa45cc160f5efff916
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/lib/crash/src/main/res/values/strings.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index c3d9df8449c..5304096ab1d 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "32b3e70b7b0ca4a26fcc9199bb766558da2ad609"
+ "ac-prep": "b469211987ec43e4ed23acaa45cc160f5efff916"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
index 6c5ae67173e..003a5b67d29 100644
--- a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
Crashes
+
Report
From cdc5b24a1849e8dab2534f0c5ced7f6d711391a8 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 2 Jul 2019 11:49:38 -0400
Subject: [PATCH 058/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3584: Api for
supporting language switching.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ce4d369a5b30b1ffa576184a462fd5c76bc42d6a
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/support/base/src/main/res/values/strings.xml | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5304096ab1d..48b5994121e 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b469211987ec43e4ed23acaa45cc160f5efff916"
+ "ac-prep": "ce4d369a5b30b1ffa576184a462fd5c76bc42d6a"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml
index 815bb46e4f0..021ff2dcc18 100644
--- a/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml
@@ -1,7 +1,4 @@
-
- Go to settings
-
- Dismiss
+ mozac_support_base_locale_preference_key_locale
From 430a78fd8aa36389c8d1eed8b5a04772296fd175 Mon Sep 17 00:00:00 2001
From: Tiger Oakes
Date: Fri, 7 Jun 2019 14:57:00 -0400
Subject: [PATCH 059/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/1968 - Add
FetchDownloadManager
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@0ef484b2897708e388b45d8849e14c03c671f25b
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/downloads/src/main/res/values/strings.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 48b5994121e..365da126132 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "ce4d369a5b30b1ffa576184a462fd5c76bc42d6a"
+ "ac-prep": "0ef484b2897708e388b45d8849e14c03c671f25b"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index 46e3f7c0477..49cb5b9c3d2 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -1,5 +1,12 @@
+
+ Downloads
+
+ Downloading
+
+ Download in progress
+
Download file
From d6aacd646b1c0fee9f5538019383995460cb40b0 Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Wed, 17 Jul 2019 12:46:18 +0200
Subject: [PATCH 060/235] [components] Import strings from android-l10n
State: mozilla-l10n/android-l10n@e521a2aab2cc7d45f47523f7c620cb5c4228ff89
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@17a617e9d49064649c271ab61e32f9937a46d80f
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 365da126132..85fddafd71d 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "0ef484b2897708e388b45d8849e14c03c671f25b"
+ "ac-prep": "17a617e9d49064649c271ab61e32f9937a46d80f"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 7b2ad1dc3a2..b3c31bd90bf 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -5,11 +5,19 @@ locales = [
"de",
"es",
"es-ES",
+ "et",
+ "eu",
"fr",
+ "gd",
+ "id",
"it",
"ja",
"ko",
+ "nl",
+ "pl",
"ru",
+ "sk",
+ "sv-SE",
"zh-CN",
"zh-TW",
]
From 758a95d759c672056385c0fef65e76569709a19d Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Sun, 21 Jul 2019 18:22:54 -0400
Subject: [PATCH 061/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3843: Ported the
Month picker widget from Fennec
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d607f4dada655740ba776bbbff4b715e323f1fae
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../prompts/src/main/res/values/strings.xml | 26 +++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 85fddafd71d..e2ea922c8ee 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "17a617e9d49064649c271ab61e32f9937a46d80f"
+ "ac-prep": "d607f4dada655740ba776bbbff4b715e323f1fae"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index bfd16892177..7849cfd1560 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -25,4 +25,30 @@
AllowDeny
+
+ Pick a month
+
+ Jan
+
+ Feb
+
+ Mar
+
+ Apr
+
+ May
+
+ Jun
+
+ Jul
+
+ Aug
+
+ Sep
+
+ Oct
+
+ Nov
+
+ Dec
From f5e3f20ba6c97bc3f7e5a98be54f5306ff9730aa Mon Sep 17 00:00:00 2001
From: Tiger Oakes
Date: Thu, 18 Jul 2019 11:56:47 -0400
Subject: [PATCH 062/235] [components] Fixes
https://github.com/mozilla-mobile/android-components/issues/3782 - Add
fallback shortcut label
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@09ca08a4d487d791f0b947bc10647d38c3ad13c0
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/pwa/src/main/res/values/strings.xml | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index e2ea922c8ee..b5f97357030 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "d607f4dada655740ba776bbbff4b715e323f1fae"
+ "ac-prep": "09ca08a4d487d791f0b947bc10647d38c3ad13c0"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml
index 35087f8f0e4..e531624c65e 100644
--- a/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml
@@ -2,13 +2,4 @@
Website
-
-
- Full screen site controls
-
- Tap to copy the URL for this app
-
- Refresh
-
- URL copied.
From 70b74014b3bc81125bfe8b8e8af940c99fbeefa3 Mon Sep 17 00:00:00 2001
From: Tiger Oakes
Date: Thu, 25 Jul 2019 14:36:29 -0400
Subject: [PATCH 063/235] [components] Fixes
https://github.com/mozilla-mobile/android-components/issues/3900 - Catch
download IOExceptions
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@4832efb67ff5ef1198c3faba256ac3d91ed44cac
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/downloads/src/main/res/values/strings.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index b5f97357030..56b3475ecf8 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "09ca08a4d487d791f0b947bc10647d38c3ad13c0"
+ "ac-prep": "4832efb67ff5ef1198c3faba256ac3d91ed44cac"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index 49cb5b9c3d2..df0fc3c8caa 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -7,6 +7,11 @@
Download in progress
+
+ Download completed.
+
+ Failed to download.
+
Download file
From ac20330691e8d57a6c5707c318b599b30fef1a6b Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Tue, 30 Jul 2019 12:40:38 +0200
Subject: [PATCH 064/235] [components] Import strings from android-l10n
State: mozilla-l10n/android-l10n@1412258878edd800c038c4cc11b042fb6d862b7a
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@15f0b842f66ff9ca8a0c092a3ca7a1d33a6b60d9
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 56b3475ecf8..f2a1c783292 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "4832efb67ff5ef1198c3faba256ac3d91ed44cac"
+ "ac-prep": "15f0b842f66ff9ca8a0c092a3ca7a1d33a6b60d9"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index b3c31bd90bf..4c0b421c0a3 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -2,11 +2,15 @@
basepath = "."
locales = [
+ "ca",
+ "cs",
"de",
"es",
+ "es-AR",
"es-ES",
"et",
"eu",
+ "fi",
"fr",
"gd",
"id",
@@ -14,6 +18,7 @@ locales = [
"ja",
"ko",
"nl",
+ "pa-IN",
"pl",
"ru",
"sk",
From 33a9bcd4769a61d3e52911b9623f5bc279353f8c Mon Sep 17 00:00:00 2001
From: Tiger Oakes
Date: Mon, 22 Jul 2019 14:30:15 -0400
Subject: [PATCH 065/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3487 - Display
PWA controls notification
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d8344ae75e4f61794c473f74f7287dc6843ce446
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/pwa/src/main/res/values/strings.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index f2a1c783292..c89e038b10b 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "15f0b842f66ff9ca8a0c092a3ca7a1d33a6b60d9"
+ "ac-prep": "d8344ae75e4f61794c473f74f7287dc6843ce446"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml
index e531624c65e..35087f8f0e4 100644
--- a/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/pwa/src/main/res/values/strings.xml
@@ -2,4 +2,13 @@
Website
+
+
+ Full screen site controls
+
+ Tap to copy the URL for this app
+
+ Refresh
+
+ URL copied.
From 75099aada95d8c245f48a239e45fda1924153eff Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Thu, 1 Aug 2019 11:23:02 +0200
Subject: [PATCH 066/235] [components] Issue
https://github.com/mozilla-mobile/android-components/issues/3937: Add
controls to media notification.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b4c03eb43c00417091d1784d5b5156ec23d31863
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/media/src/main/res/values/strings.xml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index c89e038b10b..b9452673768 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "d8344ae75e4f61794c473f74f7287dc6843ce446"
+ "ac-prep": "b4c03eb43c00417091d1784d5b5156ec23d31863"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
index df5b3d3b992..b4269d06551 100644
--- a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
@@ -9,4 +9,10 @@
Microphone is onCamera and microphone are on
+
+
+ Play
+
+
+ Pause
From d0cac920e4cf0bffb812466354cbb626010e54c1 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Fri, 26 Jul 2019 01:02:23 -0400
Subject: [PATCH 067/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3824: Adding the
site tracking protection icon on the toolbar.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@61f085dccea278c204c2fb2b362872ba25d9e51c
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/toolbar/src/main/res/values/strings.xml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index b9452673768..ed232e59c3e 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b4c03eb43c00417091d1784d5b5156ec23d31863"
+ "ac-prep": "61f085dccea278c204c2fb2b362872ba25d9e51c"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 69fb2a9138d..114b8735e0c 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -3,6 +3,12 @@
MenuClear
+
+ Tracking Protection is on
+
+ Tracking Protection is active blocking trackers
+
+ Tracking Protection is disabled for this siteLoading
From ed65dc6066dc52ec22bb65584cd8cd012b319a7c Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari
Date: Tue, 13 Aug 2019 13:42:33 +0200
Subject: [PATCH 068/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3797: Do not
display site title/url/icon in media notification in private mode.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@7b0d0b83d898cafbe7d1764e3b6ef452a877754e
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/feature/media/src/main/res/values/strings.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index ed232e59c3e..5e5bfd526cd 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "61f085dccea278c204c2fb2b362872ba25d9e51c"
+ "ac-prep": "7b0d0b83d898cafbe7d1764e3b6ef452a877754e"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
index b4269d06551..a8ed5478204 100644
--- a/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/media/src/main/res/values/strings.xml
@@ -15,4 +15,7 @@
Pause
+
+
+ A site is playing media
From 1f41a0242f20592b61789a1dc07eb6ccf34d64ba Mon Sep 17 00:00:00 2001
From: Roger Yang
Date: Wed, 14 Aug 2019 10:58:48 -0400
Subject: [PATCH 069/235] [components] For
https://github.com/mozilla-mobile/android-components/issues/3439 - Add
"report" action to crash notification
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@58310fd85818fe5cb736fc03d2529d5350d1e875
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/lib/crash/src/main/res/values/strings.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5e5bfd526cd..5efef1527b9 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "7b0d0b83d898cafbe7d1764e3b6ef452a877754e"
+ "ac-prep": "58310fd85818fe5cb736fc03d2529d5350d1e875"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
index 003a5b67d29..a542a29c19c 100644
--- a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -18,4 +18,6 @@
Report
+
+ Sending crash report to %1$s
From 7ed268c5b08fc780faccf317063b23341a1c5126 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 14 Aug 2019 19:25:21 -0400
Subject: [PATCH 070/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/3925: Adding
meaningful content descriptions to tracking protection toolbar icon for
different states.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@01affcf6c800f0801233a43c41eb78f2b8607704
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/toolbar/src/main/res/values/strings.xml | 4 ++--
.../components/lib/crash/src/main/res/values/strings.xml | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5efef1527b9..7416def50d2 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "58310fd85818fe5cb736fc03d2529d5350d1e875"
+ "ac-prep": "01affcf6c800f0801233a43c41eb78f2b8607704"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 114b8735e0c..cb42acf50e3 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -6,9 +6,9 @@
Tracking Protection is on
- Tracking Protection is active blocking trackers
+ Tracking Protection has blocked trackers
- Tracking Protection is disabled for this site
+ Tracking Protection is off for this siteLoading
diff --git a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
index a542a29c19c..003a5b67d29 100644
--- a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -18,6 +18,4 @@
Report
-
- Sending crash report to %1$s
From 26c7150d48081047825cc560e6b8361c2e2478c3 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Thu, 15 Aug 2019 13:49:49 -0400
Subject: [PATCH 071/235] [components] Update month chooser strings
descriptions
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f2b1549ae36cd1142d3ec00a72d7d01832a1936c
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../toolbar/src/main/res/values/strings.xml | 4 ++--
.../prompts/src/main/res/values/strings.xml | 24 +++++++++----------
.../lib/crash/src/main/res/values/strings.xml | 2 ++
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 7416def50d2..3e105f60ff8 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "01affcf6c800f0801233a43c41eb78f2b8607704"
+ "ac-prep": "f2b1549ae36cd1142d3ec00a72d7d01832a1936c"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index cb42acf50e3..114b8735e0c 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -6,9 +6,9 @@
Tracking Protection is on
- Tracking Protection has blocked trackers
+ Tracking Protection is active blocking trackers
- Tracking Protection is off for this site
+ Tracking Protection is disabled for this siteLoading
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 7849cfd1560..8b377175d9e 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -27,28 +27,28 @@
DenyPick a month
-
+
Jan
-
+
Feb
-
+
Mar
-
+
Apr
-
+
May
-
+
Jun
-
+
Jul
-
+
Aug
-
+
Sep
-
+
Oct
-
+
Nov
-
+
Dec
diff --git a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
index 003a5b67d29..a542a29c19c 100644
--- a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -18,4 +18,6 @@
Report
+
+ Sending crash report to %1$s
From eee5eddad5bc6b2d60a7256547c804468859e49f Mon Sep 17 00:00:00 2001
From: Axel Hecht
Date: Fri, 23 Aug 2019 12:33:53 +0200
Subject: [PATCH 072/235] [components] Import strings from android-l10n
State: mozilla-l10n/android-l10n@90a28fd458121912326bb5fa6ad55cde0097a2ff
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@1bbaf50133bd57062d2bf9248bfc542fddef2ff4
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 3e105f60ff8..f462eeb7df5 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "f2b1549ae36cd1142d3ec00a72d7d01832a1936c"
+ "ac-prep": "1bbaf50133bd57062d2bf9248bfc542fddef2ff4"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 4c0b421c0a3..b83a665c1ae 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -2,8 +2,10 @@
basepath = "."
locales = [
+ "bg",
"ca",
"cs",
+ "da",
"de",
"es",
"es-AR",
@@ -13,16 +15,22 @@ locales = [
"fi",
"fr",
"gd",
+ "hu",
"id",
"it",
"ja",
"ko",
+ "nb-NO",
"nl",
+ "nn-NO",
"pa-IN",
"pl",
"ru",
"sk",
+ "tr",
+ "ta",
"sv-SE",
+ "vi",
"zh-CN",
"zh-TW",
]
From 1d60a959af23d15b86cbc96fcfda8e00aa4816d8 Mon Sep 17 00:00:00 2001
From: MozLando
Date: Fri, 23 Aug 2019 19:32:43 +0000
Subject: [PATCH 073/235] [components] Merge
https://github.com/mozilla-mobile/android-components/pull/4130
4130: Closes https://github.com/mozilla-mobile/android-components/issues/3925: Adding meaningful content descriptions to tracking protection toolbar icon for different states. r=rocketsroger a=Amejia481
Co-authored-by: Arturo Mejia
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@a5f043c2becd030d7856d2ee93a1cef2652c8f22
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/toolbar/src/main/res/values/strings.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index f462eeb7df5..e97c052a027 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "1bbaf50133bd57062d2bf9248bfc542fddef2ff4"
+ "ac-prep": "a5f043c2becd030d7856d2ee93a1cef2652c8f22"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 114b8735e0c..cb42acf50e3 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -6,9 +6,9 @@
Tracking Protection is on
- Tracking Protection is active blocking trackers
+ Tracking Protection has blocked trackers
- Tracking Protection is disabled for this site
+ Tracking Protection is off for this siteLoading
From 0daa8af1d1cb38c47b89c9ac6edcfc65f59ac6f3 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 28 Aug 2019 15:24:22 -0400
Subject: [PATCH 074/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/4250: Update the
tracking protection icon content description XML IDS.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@10cc2c0609f4a7e09625cee5c61bfded0dfc6983
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/toolbar/src/main/res/values/strings.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index e97c052a027..82f2033be29 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "a5f043c2becd030d7856d2ee93a1cef2652c8f22"
+ "ac-prep": "10cc2c0609f4a7e09625cee5c61bfded0dfc6983"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index cb42acf50e3..f2a8e51d870 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -6,9 +6,9 @@
Tracking Protection is on
- Tracking Protection has blocked trackers
+ Tracking Protection has blocked trackers
- Tracking Protection is off for this site
+ Tracking Protection is off for this siteLoading
From fd593dc40596945e7b46b2806ef0a994ff1d06b0 Mon Sep 17 00:00:00 2001
From: mcarare
Date: Wed, 18 Sep 2019 11:49:23 +0300
Subject: [PATCH 075/235] [components] For
https://github.com/mozilla-mobile/android-components/issues/4451 Changed
string to "Link copied to clipboard"
Changed string identifier to enable re-translation
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@09826d661f6b6565d6b9ad37569456e203a7eb6c
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/contextmenu/src/main/res/values/strings.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 82f2033be29..e81e2fb7616 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "10cc2c0609f4a7e09625cee5c61bfded0dfc6983"
+ "ac-prep": "09826d661f6b6565d6b9ad37569456e203a7eb6c"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
index b72cd43ea7e..132dda9708d 100644
--- a/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/contextmenu/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
New private tab opened
- Text copied to clipboard
+ Link copied to clipboardSwitch
From 2c1a0f64b32dc9116f2d235e680f1cd1585ba6e8 Mon Sep 17 00:00:00 2001
From: mcarare
Date: Wed, 23 Oct 2019 17:17:27 +0300
Subject: [PATCH 076/235] [components] For
https://github.com/mozilla-mobile/android-components/issues/4765 Added
content description to site security info icon
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@881382faf7043f9cbd6bf9cf482802f922bc5966
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/browser/toolbar/src/main/res/values/strings.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index e81e2fb7616..5aff72efb2c 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "09826d661f6b6565d6b9ad37569456e203a7eb6c"
+ "ac-prep": "881382faf7043f9cbd6bf9cf482802f922bc5966"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index f2a8e51d870..678e3911015 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -9,6 +9,8 @@
Tracking Protection has blocked trackersTracking Protection is off for this site
+
+ Site informationLoading
From e9ab7929bcc17e4cdba123cd84b65f8fab645c0e Mon Sep 17 00:00:00 2001
From: Roger Yang
Date: Wed, 16 Oct 2019 18:35:50 -0400
Subject: [PATCH 077/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/2295,
https://github.com/mozilla-mobile/android-components/issues/4549: Implement
Web Notification Feature
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@01a7da06d15692780655935d40dce7201e56a13a
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5aff72efb2c..a417612e1ab 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "881382faf7043f9cbd6bf9cf482802f922bc5966"
+ "ac-prep": "01a7da06d15692780655935d40dce7201e56a13a"
}
}
\ No newline at end of file
From 786431b63ca33a9fc7c1183175a15493c6638889 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz
Date: Mon, 14 Oct 2019 14:30:03 -0700
Subject: [PATCH 078/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/4896: Adds
download management
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b9f1c76c75282ca7590810d5f98f1b1d9c0d1e42
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../downloads/src/main/res/values/strings.xml | 26 ++++++++++++++-----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index a417612e1ab..a95ba6c4821 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "01a7da06d15692780655935d40dce7201e56a13a"
+ "ac-prep": "b9f1c76c75282ca7590810d5f98f1b1d9c0d1e42"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index df0fc3c8caa..4c3b0106e2e 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -2,22 +2,34 @@
Downloads
-
- Downloading
-
- Download in progress
+
+ Download paused
- Download completed.
+ Download completed
- Failed to download.
+ Download failed
- Download file
+ Download (%1$s)DownloadCancel%1$s can’t download this file type
+
+
+ Pause
+
+ Resume
+
+ Cancel
+
+ Open
+
+ Try Again
+
+
+ Close
From 4fbe280bbdc038c1796f3d878cf7cc8a22d12714 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz
Date: Tue, 5 Nov 2019 10:26:56 -0800
Subject: [PATCH 079/235] [components] No issue: Fixes download file string for
l10n
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@791236154afd24759cecb7a8930f0165adafe817
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/downloads/src/main/res/values/strings.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index a95ba6c4821..1303c485069 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b9f1c76c75282ca7590810d5f98f1b1d9c0d1e42"
+ "ac-prep": "791236154afd24759cecb7a8930f0165adafe817"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index 4c3b0106e2e..48fe52874f6 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
Download failed
-
+
Download (%1$s)Download
From 663680ebae8a9f24fc69299944d21a574bc7cf63 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Wed, 6 Nov 2019 16:41:05 -0500
Subject: [PATCH 080/235] [components] Closes issue
https://github.com/mozilla-mobile/android-components/issues/4871: Provide a
mapping for translations of permissions from AMO API.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f81c4cf08d8f63443235b19f8ad933800a575446
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../addons/src/main/res/values/strings.xml | 166 +-----------------
2 files changed, 3 insertions(+), 165 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 1303c485069..330130c6345 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "791236154afd24759cecb7a8930f0165adafe817"
+ "ac-prep": "f81c4cf08d8f63443235b19f8ad933800a575446"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index cd3217137ea..bfb6e5e6422 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -1,27 +1,9 @@
-
+Read and modify privacy settingsAccess your data for all websites
-
- Access your data for %1$s
-
- Access your data for sites in the %1$s domain
-
- Access your data on 1 other site
-
- Access your data on %1$d other sites
-
- Access your data on 1 other domain
-
- Access your data on %1$d other domainsAccess browser tabs
@@ -38,8 +20,6 @@
Get data from the clipboardInput data to the clipboard
-
- Block content on any pageDownload files and read and modify the browser’s download history
@@ -53,7 +33,7 @@
Monitor extension usage and manage themes
- Exchange messages with apps other than this one
+ Exchange messages with apps other that this oneDisplay notifications to you
@@ -68,146 +48,4 @@
Access browsing historyExtend developer tools to access your data in open tabs
-
- Version
-
- Authors
-
- Last updated
-
- Homepage
-
- Learn more about permissions
-
- Rating
-
- Settings
-
- On
-
- Off
-
- Allow in private browsing
-
- Run in private browsing
-
- Enabled
-
- Disabled
-
- Installed
-
- Recommended
-
- Not yet supported
-
- Not yet available
-
- Disabled
-
- Details
-
- Permissions
-
- Remove
-
- Add %1$s?
-
- It requires your permission to:
-
- Add
-
- Cancel
-
- Install Add-on
-
- Cancel
-
- Reviews: %1$s
-
- %1$.02f/5
-
- Add-ons
-
- Add-ons Manager
-
- Allow
-
- Deny
-
- %1$s has a new update
-
- %1$d new permissions are required
-
- A new permission is required
-
- Add-on updates
-
- Supported add-ons checker
-
- New add-on available
-
- New add-ons available
-
- Add %1$s to %2$s
-
- Add %1$s and %2$s to %3$s
-
- Add them to %1$s
-
- Firefox add-on technology is modernizing. These add-ons use frameworks that are not compatible with Firefox 75 & beyond.
-
- We‘re currently building support for an initial selection of Recommended Extensions.
-
- Downloading and verifying add-on…
-
- Failed to query Add-ons!
-
- Translation not found, for locale %1$s neither default language %2$s
-
- Successfully installed %1$s
-
- Failed to install %1$s
-
- Successfully enabled %1$s
-
- Failed to enable %1$s
-
- Successfully disabled %1$s
-
- Failed to disable %1$s
-
- Successfully uninstalled %1$s
-
- Failed to uninstall %1$s
-
- Successfully removed %1$s
-
- Failed to remove %1$s
-
- This add-on was migrated from a previous version of %1$s
-
- 1 add-on
-
- %1$s add-ons
-
- Learn more
-
- Successfully updated
-
- No update available
-
- Error
-
- Updater Information
-
- Last attempt:
-
- Status:
-
- %1$s has been added to %2$s
-
- Open it in the menu
-
- Okay, Got it
From 31e2ff13c2f2254de0337f8b54d85281089b476f Mon Sep 17 00:00:00 2001
From: Sawyer Blatz
Date: Fri, 8 Nov 2019 14:03:18 -0800
Subject: [PATCH 081/235] [components] For
https://github.com/mozilla-mobile/android-components/issues/5021: Adds
failure case for openFile
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f6c08efbabd5b4f1bccc1400bf560c1f4ddb4f4c
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/downloads/src/main/res/values/strings.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 330130c6345..0ff8988dd19 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "f81c4cf08d8f63443235b19f8ad933800a575446"
+ "ac-prep": "f6c08efbabd5b4f1bccc1400bf560c1f4ddb4f4c"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
index 48fe52874f6..a4aac461a4f 100644
--- a/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/downloads/src/main/res/values/strings.xml
@@ -19,6 +19,9 @@
%1$s can’t download this file type
+
+ Could not open file
+
Pause
From 16c5167628bf32714bed17126e00171aa9cf9e02 Mon Sep 17 00:00:00 2001
From: Severin Rudie
Date: Tue, 26 Nov 2019 09:11:15 -0800
Subject: [PATCH 082/235] [components] For
https://github.com/mozilla-mobile/fenix/issues/5540: add 'no internet' error
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b074c752059114176c5b38f3982135287244834d
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/errorpages/src/main/res/values/strings.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 0ff8988dd19..9bc4dfcfb34 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "f6c08efbabd5b4f1bccc1400bf560c1f4ddb4f4c"
+ "ac-prep": "b074c752059114176c5b38f3982135287244834d"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index e2d2fb4a9a9..e8c164c438e 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -167,6 +167,13 @@
]]>
+
+ No internet connection
+
+ Check your network connection or try reloading the page in a few moments.
+
+ Reload
+
Invalid Address
Date: Fri, 6 Dec 2019 00:01:30 +0000
Subject: [PATCH 083/235] [components] Import l10n.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@3b8ed4c92050e89724eb1ca2ed758c42c34c46bd
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 9bc4dfcfb34..c6b1ff73ce9 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b074c752059114176c5b38f3982135287244834d"
+ "ac-prep": "3b8ed4c92050e89724eb1ca2ed758c42c34c46bd"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index b83a665c1ae..514d2fe96b5 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -20,6 +20,7 @@ locales = [
"it",
"ja",
"ko",
+ "ml",
"nb-NO",
"nl",
"nn-NO",
From 4b7843ff258ac363df96b03a2a73f1810dd2fe6f Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 17 Dec 2019 11:24:42 -0500
Subject: [PATCH 084/235] [components] Add addons strings in l10n to be
localized
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@3ef613faaaf73482236917c636074d5060941655
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../addons/src/main/res/values/strings.xml | 44 +++++++++++++++++++
mozilla-mobile/android-components/l10n.toml | 4 ++
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index c6b1ff73ce9..de7ec8d870f 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "3b8ed4c92050e89724eb1ca2ed758c42c34c46bd"
+ "ac-prep": "3ef613faaaf73482236917c636074d5060941655"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index bfb6e5e6422..4a63724d8dc 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -48,4 +48,48 @@
Access browsing historyExtend developer tools to access your data in open tabs
+
+ Version
+
+ Authors
+
+ Last updated
+
+ Homepage
+
+ Learn more about permissions
+
+ Rating
+
+ Settings
+
+ On
+
+ Off
+
+ Installed
+
+ Recommended
+
+ Details
+
+ Permissions
+
+ Remove
+
+ Add %1$s?
+
+ It requires your permission to:
+
+ Add
+
+ Cancel
+
+ Install Add-on
+
+ Users: %1$s
+
+ %1$.02f/5
+
+ Add-ons
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 514d2fe96b5..488d010732a 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -103,3 +103,7 @@ branches = [
[[paths]]
reference = "components/support/ktx/src/main/res/values/strings.xml"
l10n = "components/support/ktx/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/feature/addons/src/main/res/values/strings.xml"
+ l10n = "components/feature/addons/src/main/res/values/values-{android_locale}/strings.xml"
\ No newline at end of file
From 1dac0898941de87520c5bf7cf0a7a6c7ab1c686f Mon Sep 17 00:00:00 2001
From: Mozilla L10n Automation Bot
Date: Tue, 17 Dec 2019 18:39:45 +0000
Subject: [PATCH 085/235] [components] Import l10n.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@48cc8f188a2e8802c4a6a989a8ff26ee723091e6
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../addons/src/main/res/values/strings.xml | 44 -------------------
mozilla-mobile/android-components/l10n.toml | 10 +++--
3 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index de7ec8d870f..5271e246050 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "3ef613faaaf73482236917c636074d5060941655"
+ "ac-prep": "48cc8f188a2e8802c4a6a989a8ff26ee723091e6"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index 4a63724d8dc..bfb6e5e6422 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -48,48 +48,4 @@
Access browsing historyExtend developer tools to access your data in open tabs
-
- Version
-
- Authors
-
- Last updated
-
- Homepage
-
- Learn more about permissions
-
- Rating
-
- Settings
-
- On
-
- Off
-
- Installed
-
- Recommended
-
- Details
-
- Permissions
-
- Remove
-
- Add %1$s?
-
- It requires your permission to:
-
- Add
-
- Cancel
-
- Install Add-on
-
- Users: %1$s
-
- %1$.02f/5
-
- Add-ons
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 488d010732a..759d69fdfae 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -5,6 +5,7 @@ locales = [
"bg",
"ca",
"cs",
+ "cy",
"da",
"de",
"es",
@@ -12,18 +13,23 @@ locales = [
"es-ES",
"et",
"eu",
+ "fa",
"fi",
"fr",
"gd",
+ "he",
"hu",
"id",
"it",
"ja",
+ "kab",
"ko",
+ "lo",
"ml",
"nb-NO",
"nl",
"nn-NO",
+ "oc",
"pa-IN",
"pl",
"ru",
@@ -103,7 +109,3 @@ branches = [
[[paths]]
reference = "components/support/ktx/src/main/res/values/strings.xml"
l10n = "components/support/ktx/src/main/res/values-{android_locale}/strings.xml"
-
-[[paths]]
- reference = "components/feature/addons/src/main/res/values/strings.xml"
- l10n = "components/feature/addons/src/main/res/values/values-{android_locale}/strings.xml"
\ No newline at end of file
From 8967cf5ecc8a64c0ce209050c7cdff48d5d3e906 Mon Sep 17 00:00:00 2001
From: MozLando
Date: Tue, 17 Dec 2019 19:30:53 +0000
Subject: [PATCH 086/235] [components] Merge
https://github.com/mozilla-mobile/android-components/pull/5337
5337: Add addons strings in l10n to be localized r=psymoon a=Amejia481
Co-authored-by: Arturo Mejia
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@0cc55504f1a8cd367aa28d33b998495201c2bea5
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../addons/src/main/res/values/strings.xml | 44 +++++++++++++++++++
mozilla-mobile/android-components/l10n.toml | 4 ++
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5271e246050..e8ed69738e6 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "48cc8f188a2e8802c4a6a989a8ff26ee723091e6"
+ "ac-prep": "0cc55504f1a8cd367aa28d33b998495201c2bea5"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index bfb6e5e6422..4a63724d8dc 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -48,4 +48,48 @@
Access browsing historyExtend developer tools to access your data in open tabs
+
+ Version
+
+ Authors
+
+ Last updated
+
+ Homepage
+
+ Learn more about permissions
+
+ Rating
+
+ Settings
+
+ On
+
+ Off
+
+ Installed
+
+ Recommended
+
+ Details
+
+ Permissions
+
+ Remove
+
+ Add %1$s?
+
+ It requires your permission to:
+
+ Add
+
+ Cancel
+
+ Install Add-on
+
+ Users: %1$s
+
+ %1$.02f/5
+
+ Add-ons
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 759d69fdfae..725b9f00396 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -109,3 +109,7 @@ branches = [
[[paths]]
reference = "components/support/ktx/src/main/res/values/strings.xml"
l10n = "components/support/ktx/src/main/res/values-{android_locale}/strings.xml"
+
+[[paths]]
+ reference = "components/feature/addons/src/main/res/values/strings.xml"
+ l10n = "components/feature/addons/src/main/res/values/values-{android_locale}/strings.xml"
\ No newline at end of file
From 17639172d1144c0a00a0379f4c56c5bc4c68380a Mon Sep 17 00:00:00 2001
From: Mozilla L10n Automation Bot
Date: Fri, 27 Dec 2019 00:08:43 +0000
Subject: [PATCH 087/235] [components] Import l10n.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@483e307f4b645561eaf7cb36070e9604565e4647
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index e8ed69738e6..f90866c60d9 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "0cc55504f1a8cd367aa28d33b998495201c2bea5"
+ "ac-prep": "483e307f4b645561eaf7cb36070e9604565e4647"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 725b9f00396..66d40bcbcb6 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -4,6 +4,7 @@ basepath = "."
locales = [
"bg",
"ca",
+ "co",
"cs",
"cy",
"da",
@@ -16,7 +17,9 @@ locales = [
"fa",
"fi",
"fr",
+ "fy-NL",
"gd",
+ "gu-IN",
"he",
"hu",
"id",
@@ -29,7 +32,6 @@ locales = [
"nb-NO",
"nl",
"nn-NO",
- "oc",
"pa-IN",
"pl",
"ru",
@@ -112,4 +114,4 @@ branches = [
[[paths]]
reference = "components/feature/addons/src/main/res/values/strings.xml"
- l10n = "components/feature/addons/src/main/res/values/values-{android_locale}/strings.xml"
\ No newline at end of file
+ l10n = "components/feature/addons/src/main/res/values/values-{android_locale}/strings.xml"
From 4e19719a8b5e4775b0f6b5b37b2bda3a9bb7e83c Mon Sep 17 00:00:00 2001
From: Mozilla L10n Automation Bot
Date: Tue, 31 Dec 2019 00:01:21 +0000
Subject: [PATCH 088/235] [components] Import l10n.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@56b9ef40685cfa09e619ae77acbe3e60572450a0
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index f90866c60d9..d4f4798a501 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "483e307f4b645561eaf7cb36070e9604565e4647"
+ "ac-prep": "56b9ef40685cfa09e619ae77acbe3e60572450a0"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 66d40bcbcb6..c0613a9fbfe 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -36,9 +36,12 @@ locales = [
"pl",
"ru",
"sk",
+ "su",
+ "sv-SE",
"tr",
"ta",
- "sv-SE",
+ "uk",
+ "ur",
"vi",
"zh-CN",
"zh-TW",
From 6e4724842784ba72c0a260eb133b652fe8c1b4d7 Mon Sep 17 00:00:00 2001
From: Simon Chae
Date: Tue, 31 Dec 2019 10:32:50 -0500
Subject: [PATCH 089/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/5446: Move addon
install progress caption to feature-addon
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@d39df6fc364131bf8c1529741858d6d707e5a980
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/addons/src/main/res/values/strings.xml | 2 ++
mozilla-mobile/android-components/l10n.toml | 5 +----
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index d4f4798a501..a755ff164a9 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "56b9ef40685cfa09e619ae77acbe3e60572450a0"
+ "ac-prep": "d39df6fc364131bf8c1529741858d6d707e5a980"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index 4a63724d8dc..1bff49a86b7 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -92,4 +92,6 @@
%1$.02f/5Add-ons
+
+ Downloading and verifying add-on…
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index c0613a9fbfe..66d40bcbcb6 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -36,12 +36,9 @@ locales = [
"pl",
"ru",
"sk",
- "su",
- "sv-SE",
"tr",
"ta",
- "uk",
- "ur",
+ "sv-SE",
"vi",
"zh-CN",
"zh-TW",
From de62d97dd695ff542f0e0c7fddff93294d3d0ab9 Mon Sep 17 00:00:00 2001
From: MozLando
Date: Tue, 31 Dec 2019 15:43:22 +0000
Subject: [PATCH 090/235] [components] Merge
https://github.com/mozilla-mobile/android-components/pull/5447
5447: Closes https://github.com/mozilla-mobile/android-components/issues/5446: Move addon install progress caption to feature-addon r=csadilek a=psymoon
Co-authored-by: Simon Chae
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@956e0d4ae035210323f10cb794d6ee7e565c9a66
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index a755ff164a9..0c39169a05c 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "d39df6fc364131bf8c1529741858d6d707e5a980"
+ "ac-prep": "956e0d4ae035210323f10cb794d6ee7e565c9a66"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index 66d40bcbcb6..c0613a9fbfe 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -36,9 +36,12 @@ locales = [
"pl",
"ru",
"sk",
+ "su",
+ "sv-SE",
"tr",
"ta",
- "sv-SE",
+ "uk",
+ "ur",
"vi",
"zh-CN",
"zh-TW",
From a5f9525f3e3dcd346a7f1ed7efdba88cbc4f957e Mon Sep 17 00:00:00 2001
From: Mozilla L10n Automation Bot
Date: Fri, 3 Jan 2020 00:06:56 +0000
Subject: [PATCH 091/235] [components] Import l10n.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f47ef1b2fac794551f72809271511fcbb5d569f1
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
mozilla-mobile/android-components/l10n.toml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 0c39169a05c..3de921c6f35 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "956e0d4ae035210323f10cb794d6ee7e565c9a66"
+ "ac-prep": "f47ef1b2fac794551f72809271511fcbb5d569f1"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/l10n.toml b/mozilla-mobile/android-components/l10n.toml
index c0613a9fbfe..6aadc22bbd7 100644
--- a/mozilla-mobile/android-components/l10n.toml
+++ b/mozilla-mobile/android-components/l10n.toml
@@ -9,6 +9,7 @@ locales = [
"cy",
"da",
"de",
+ "en-GB",
"es",
"es-AR",
"es-ES",
@@ -32,6 +33,7 @@ locales = [
"nb-NO",
"nl",
"nn-NO",
+ "nv",
"pa-IN",
"pl",
"ru",
From f02538a7f8c3527ba8be9e1e5b1537ca08b92a09 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Sun, 15 Dec 2019 11:44:11 -0500
Subject: [PATCH 092/235] [components] Closes issue
https://github.com/mozilla-mobile/android-components/issues/5143 Adds support
for while updating an Addon it requires new permissions.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@2bdcb4ee9fcf6152d465e70d05b4154f4c827286
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../feature/addons/src/main/res/values/strings.xml | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 3de921c6f35..edb0788b86d 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "f47ef1b2fac794551f72809271511fcbb5d569f1"
+ "ac-prep": "2bdcb4ee9fcf6152d465e70d05b4154f4c827286"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index 1bff49a86b7..70c1a318674 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
-
+Read and modify privacy settings
@@ -92,6 +92,17 @@
%1$.02f/5Add-ons
+
+ Allow
+
+ Deny
+
+ %1$s has a new update
+
+ %1$d new permissions are required
+
+ Addon updatesDownloading and verifying add-on…
+
From 5fb12dc36e3ffc8b4bcf38982433cf0e6c4989c9 Mon Sep 17 00:00:00 2001
From: Simon Chae
Date: Thu, 9 Jan 2020 11:53:44 -0500
Subject: [PATCH 093/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/5433: Add UX flow
for unsupported add-ons
Also allow AddonManager.getAddons() to return unsupported add-ons
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@71da671203d057269d356053203f4f6ef6e280e2
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/feature/addons/src/main/res/values/strings.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index edb0788b86d..bca3ecb9547 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "2bdcb4ee9fcf6152d465e70d05b4154f4c827286"
+ "ac-prep": "71da671203d057269d356053203f4f6ef6e280e2"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index 70c1a318674..aff755e553b 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -70,6 +70,8 @@
InstalledRecommended
+
+ Not yet supportedDetails
@@ -102,6 +104,8 @@
%1$d new permissions are requiredAddon updates
+
+ Firefox add-on technology is modernizing. These add-ons use frameworks that are not compatible with Firefox 75 & beyond.Downloading and verifying add-on…
From dfadf403b93a996d1abc29039d01efbdee13cd05 Mon Sep 17 00:00:00 2001
From: Manuel Martin
Date: Fri, 10 Jan 2020 12:28:29 +0100
Subject: [PATCH 094/235] [components] Adds support for bypassing SSL
certificates
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@02193db25faa37d78316997130d3b46eab2496b2
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../errorpages/src/main/res/values/strings.xml | 13 +++++++++++++
.../feature/addons/src/main/res/values/strings.xml | 4 ----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index bca3ecb9547..3111d70d18b 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "71da671203d057269d356053203f4f6ef6e280e2"
+ "ac-prep": "02193db25faa37d78316997130d3b46eab2496b2"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index e8c164c438e..7cecaa72d60 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -36,6 +36,19 @@
]]>
+
+ Advanced…
+
+ Someone could be trying to impersonate the site and you should not continue.
+
+
+ ]]>
+
+ Go Back (Recommended)
+
+ Accept the Risk and Continue0
+
The connection was interrupted
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index aff755e553b..70c1a318674 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -70,8 +70,6 @@
InstalledRecommended
-
- Not yet supportedDetails
@@ -104,8 +102,6 @@
%1$d new permissions are requiredAddon updates
-
- Firefox add-on technology is modernizing. These add-ons use frameworks that are not compatible with Firefox 75 & beyond.Downloading and verifying add-on…
From 871af91ba2a0221104fdc7e2376bb412ea53d93b Mon Sep 17 00:00:00 2001
From: MozLando
Date: Fri, 10 Jan 2020 15:27:09 +0000
Subject: [PATCH 095/235] [components] Merge
https://github.com/mozilla-mobile/android-components/pull/5484
5484: Closes https://github.com/mozilla-mobile/android-components/issues/3960 Support for bypassing SSL certificates r=jonalmeida a=keianhzo
This PR adds support for bypassing SSL certificates. Only temporary bypass is supported by GV right now.
Closes https://github.com/mozilla-mobile/android-components/issues/3960.
Co-authored-by: Manuel Martin
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@b66ca8ba599f775ce187d95d0ee892b175122d01
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../components/feature/addons/src/main/res/values/strings.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 3111d70d18b..3c69ec41d19 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "02193db25faa37d78316997130d3b46eab2496b2"
+ "ac-prep": "b66ca8ba599f775ce187d95d0ee892b175122d01"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index 70c1a318674..aff755e553b 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -70,6 +70,8 @@
InstalledRecommended
+
+ Not yet supportedDetails
@@ -102,6 +104,8 @@
%1$d new permissions are requiredAddon updates
+
+ Firefox add-on technology is modernizing. These add-ons use frameworks that are not compatible with Firefox 75 & beyond.Downloading and verifying add-on…
From 7907b4d44f767ed9b6d0adba4d554abb31793bf8 Mon Sep 17 00:00:00 2001
From: Severin Rudie
Date: Fri, 10 Jan 2020 10:04:26 -0800
Subject: [PATCH 096/235] [components] For Fenix:5543, Fenix:5542: add
delegates for login autofill
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ad79e89f93d4c3711c5ff4b52fcb10199e5f9dcd
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../errorpages/src/main/res/values/strings.xml | 13 -------------
.../feature/prompts/src/main/res/values/strings.xml | 12 ++++++++++++
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 3c69ec41d19..0f80830f58f 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "b66ca8ba599f775ce187d95d0ee892b175122d01"
+ "ac-prep": "ad79e89f93d4c3711c5ff4b52fcb10199e5f9dcd"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 7cecaa72d60..e8c164c438e 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -36,19 +36,6 @@
]]>
-
- Advanced…
-
- Someone could be trying to impersonate the site and you should not continue.
-
-
- ]]>
-
- Go Back (Recommended)
-
- Accept the Risk and Continue0
-
The connection was interrupted
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 8b377175d9e..1663ed6f4ce 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -16,6 +16,18 @@
UsernamePassword
+
+ Don’t save
+
+ Save
+
+ Update
+
+ Password field must not be empty
+
+ Unable to save login
+
+ Do you want %s to save this login?Label for entering a text input field
From f0dc6c2dda119b6e8444b8bf96829d028ad62328 Mon Sep 17 00:00:00 2001
From: MozLando
Date: Fri, 10 Jan 2020 18:55:09 +0000
Subject: [PATCH 097/235] [components] Merge
https://github.com/mozilla-mobile/android-components/pull/5316
5316: Add LoginPromptDelegate to support password autofill r=grigoryk a=Baron-Severin
For https://github.com/mozilla-mobile/fenix/issues/1284 adds LoginPromptDelegate to support password autofill
Co-authored-by: Severin Rudie
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@78f3fb8ae0463aa6faa317b369be0066aeaf462d
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../errorpages/src/main/res/values/strings.xml | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 0f80830f58f..172e928dd80 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "ad79e89f93d4c3711c5ff4b52fcb10199e5f9dcd"
+ "ac-prep": "78f3fb8ae0463aa6faa317b369be0066aeaf462d"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index e8c164c438e..7cecaa72d60 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -36,6 +36,19 @@
]]>
+
+ Advanced…
+
+ Someone could be trying to impersonate the site and you should not continue.
+
+
+ ]]>
+
+ Go Back (Recommended)
+
+ Accept the Risk and Continue0
+
The connection was interrupted
From 01b00d87736f53ce18d1f7acf82be5857ca71413 Mon Sep 17 00:00:00 2001
From: Manuel Martin
Date: Tue, 14 Jan 2020 16:45:17 +0100
Subject: [PATCH 098/235] [components] Added description for a string variable
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ec3c171c23ee072d8470e1a67e71186198dab464
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/errorpages/src/main/res/values/strings.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 172e928dd80..dfbe47afb6f 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "78f3fb8ae0463aa6faa317b369be0066aeaf462d"
+ "ac-prep": "ec3c171c23ee072d8470e1a67e71186198dab464"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 7cecaa72d60..2fcf0507afc 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -38,7 +38,7 @@
Advanced…
-
+
Someone could be trying to impersonate the site and you should not continue.
From 67276bd2432ec4df6b3fa6334ae2b314cf1c52d8 Mon Sep 17 00:00:00 2001
From: Arturo Mejia
Date: Tue, 14 Jan 2020 11:20:07 -0500
Subject: [PATCH 099/235] [components] Closes
https://github.com/mozilla-mobile/android-components/issues/5564: Fix typo on
add-ons strings xml file.
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@7e6977ad11437ee7cec9b080379f6f4e30461cc8
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../src/main/res/values/strings.xml | 2 +-
.../addons/src/main/res/values/strings.xml | 58 +++++++++----------
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index dfbe47afb6f..ebd0cd197d7 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "ec3c171c23ee072d8470e1a67e71186198dab464"
+ "ac-prep": "7e6977ad11437ee7cec9b080379f6f4e30461cc8"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 2fcf0507afc..7cecaa72d60 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -38,7 +38,7 @@
Advanced…
-
+
Someone could be trying to impersonate the site and you should not continue.
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index aff755e553b..cfed9c9c306 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -48,65 +48,65 @@
Access browsing historyExtend developer tools to access your data in open tabs
-
+
Version
-
+
Authors
-
+
Last updated
-
+
Homepage
-
+
Learn more about permissions
-
+
Rating
-
+
Settings
-
+
On
-
+
Off
-
+
Installed
-
+
Recommended
-
+
Not yet supported
-
+
Details
-
+
Permissions
-
+
Remove
-
+
Add %1$s?
-
+
It requires your permission to:
-
+
Add
-
+
Cancel
-
+
Install Add-on
-
+
Users: %1$s
-
+
%1$.02f/5Add-ons
-
+
Allow
-
+
Deny
-
+
%1$s has a new update
-
+
%1$d new permissions are required
-
- Addon updates
+
+ Add-on updatesFirefox add-on technology is modernizing. These add-ons use frameworks that are not compatible with Firefox 75 & beyond.
-
+
Downloading and verifying add-on…
From 4734a5b695ba7a77804c57f4532795a8f581b168 Mon Sep 17 00:00:00 2001
From: MozLando
Date: Tue, 14 Jan 2020 20:57:08 +0000
Subject: [PATCH 100/235] [components] Merge
https://github.com/mozilla-mobile/android-components/pull/5566
5566: Closes https://github.com/mozilla-mobile/android-components/issues/5564: Fix typo on add-ons strings xml file r=flodolo,delphine a=Amejia481
Co-authored-by: Arturo Mejia
X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@60081e789a5e8ae296f611b863886c74e3f0eaf8
---
_meta/mozilla-mobile-firefox-android.json | 2 +-
.../browser/errorpages/src/main/res/values/strings.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index ebd0cd197d7..7e7e7a01650 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android",
"revs": {
- "ac-prep": "7e6977ad11437ee7cec9b080379f6f4e30461cc8"
+ "ac-prep": "60081e789a5e8ae296f611b863886c74e3f0eaf8"
}
}
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 7cecaa72d60..2fcf0507afc 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -38,7 +38,7 @@
Advanced…
-
+
Someone could be trying to impersonate the site and you should not continue.