diff --git a/app/build.gradle b/app/build.gradle
index 6418535f6..3ac53b31e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -167,7 +167,7 @@ android {
setIgnore true
}
- if (buildType.name == 'fenixProduction' && flavors.contains("geckonightly")) {
+ if (buildType.name == 'fenixProduction' && flavors.contains("geckobeta")) {
setIgnore true
}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 216562458..44cec2fa6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -422,7 +422,7 @@ class BookmarksTest {
}
@Test
- fun multipleBookmarkDeletions() {
+ fun multipleBookmarkDeletionsTest() {
homeScreen {
}.openThreeDotMenu {
}.openBookmarks {
@@ -527,7 +527,7 @@ class BookmarksTest {
}
@Test
- fun verifyCloseMenu() {
+ fun verifyCloseMenuTest() {
homeScreen {
}.openThreeDotMenu {
}.openBookmarks {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
index 8113ad30e..28ccdad03 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
@@ -11,7 +11,6 @@ import org.mozilla.fenix.helpers.HomeActivityTestRule
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.By
import androidx.test.uiautomator.Until
-import org.junit.Ignore
import org.mozilla.fenix.helpers.ext.waitNotNull
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
import org.mozilla.fenix.ui.robots.PRIVATE_SESSION_MESSAGE
@@ -117,7 +116,6 @@ class HomeScreenTest {
}
}
- @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
@Test
fun privateModeScreenItemsTest() {
homeScreen { }.dismissOnboarding()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
index fd54a7502..26368bd0a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
@@ -10,7 +10,6 @@ import okhttp3.mockwebserver.MockWebServer
import org.junit.Rule
import org.junit.Before
import org.junit.After
-import org.junit.Ignore
import org.junit.Test
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -70,7 +69,6 @@ class SettingsAboutTest {
}
- @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
@Test
fun verifyAboutFirefoxPreview() {
homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index 0dd1ee8f0..d75a58608 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -9,7 +9,6 @@ import androidx.test.uiautomator.UiDevice
import okhttp3.mockwebserver.MockWebServer
import org.junit.After
import org.junit.Before
-import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
@@ -23,7 +22,6 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
* These tests will verify different functionalities of the app as a way to quickly detect regressions in main areas
*/
-@Ignore("Temp disable for triggering a native Gecko crash - https://github.com/mozilla-mobile/fenix/issues/11642")
class SmokeTest {
private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
private lateinit var mockWebServer: MockWebServer
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
index d3a987aee..5ac044f6c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
@@ -8,7 +8,6 @@ import androidx.test.platform.app.InstrumentationRegistry
import okhttp3.mockwebserver.MockWebServer
import org.junit.After
import org.junit.Before
-import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.mozilla.fenix.ext.settings
@@ -157,7 +156,6 @@ class StrictEnhancedTrackingProtectionTest {
}
}
- @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
@Test
fun testStrictVisitDisableExceptionToggle() {
val trackingProtectionTest =
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
index 3d86476c5..14f5b94e3 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
@@ -10,7 +10,6 @@ import okhttp3.mockwebserver.MockWebServer
import org.junit.After
import org.junit.Before
import org.junit.BeforeClass
-import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
@@ -53,7 +52,6 @@ class ThreeDotMenuMainTest {
mockWebServer.shutdown()
}
- @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
@Test
fun threeDotMenuItemsTest() {
homeScreen {
diff --git a/app/src/fenixProduction/AndroidManifest.xml b/app/src/fenixProduction/AndroidManifest.xml
new file mode 100644
index 000000000..5fdb32de4
--- /dev/null
+++ b/app/src/fenixProduction/AndroidManifest.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/fenixProduction/res/drawable/ic_launcher_foreground.xml b/app/src/fenixProduction/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..1e3b546ce
--- /dev/null
+++ b/app/src/fenixProduction/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/fenixProduction/res/ic_launcher-web.png b/app/src/fenixProduction/res/ic_launcher-web.png
new file mode 100644
index 000000000..872099fde
Binary files /dev/null and b/app/src/fenixProduction/res/ic_launcher-web.png differ
diff --git a/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..5b017a545
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..66cb587b5
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..079117be9
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..02755d9d1
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..3a1117b60
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..814740c15
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..6be395ba3
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..44ffba047
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..a6c5e03b5
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..653dea8f0
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/values/colors.xml b/app/src/fenixProduction/res/values/colors.xml
new file mode 100644
index 000000000..55f8481dc
--- /dev/null
+++ b/app/src/fenixProduction/res/values/colors.xml
@@ -0,0 +1,7 @@
+
+
+
+ @color/nightly_launcher_background
+
diff --git a/app/src/fenixProduction/res/values/static_strings.xml b/app/src/fenixProduction/res/values/static_strings.xml
new file mode 100644
index 000000000..9e477567e
--- /dev/null
+++ b/app/src/fenixProduction/res/values/static_strings.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ Firefox Nightly
+
diff --git a/app/src/fenixProduction/res/xml/shortcuts.xml b/app/src/fenixProduction/res/xml/shortcuts.xml
new file mode 100644
index 000000000..e250a8904
--- /dev/null
+++ b/app/src/fenixProduction/res/xml/shortcuts.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png b/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png
index 22a4a3fc7..45c81acbd 100644
Binary files a/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png and b/app/src/fennecBeta/res/drawable-hdpi/fenix_search_widget.png differ
diff --git a/app/src/fennecBeta/res/drawable/ic_launcher_foreground.xml b/app/src/fennecBeta/res/drawable/ic_launcher_foreground.xml
index b3fec7e48..736e0f6ae 100644
--- a/app/src/fennecBeta/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/fennecBeta/res/drawable/ic_launcher_foreground.xml
@@ -8,10 +8,30 @@
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -59,7 +79,7 @@
-
-
-
-
-
-
@@ -142,7 +162,7 @@
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher.png b/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher.png
index 4cd0e4075..55f4b7622 100644
Binary files a/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher.png and b/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher_round.png b/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher_round.png
index 53c557b5d..3d3296abb 100644
Binary files a/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/fennecBeta/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher.png b/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher.png
index 4d3610f52..5ef32aee0 100644
Binary files a/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher.png and b/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher_round.png b/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher_round.png
index 903776fdd..c97422236 100644
Binary files a/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/fennecBeta/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png b/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png
index eada33642..4d2b67de2 100644
Binary files a/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png and b/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher_round.png
index ff414b0ac..d5ab8835a 100644
Binary files a/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/fennecBeta/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher.png b/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher.png
index 9997f6831..6e984131c 100644
Binary files a/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher_round.png
index 840542e34..da1845da7 100644
Binary files a/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/fennecBeta/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher.png
index 3723672c9..0c8b293ac 100644
Binary files a/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher_round.png
index af56fcba6..dab5de0c1 100644
Binary files a/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/fennecBeta/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/fennecBeta/res/values/static_strings.xml b/app/src/fennecBeta/res/values/static_strings.xml
index c13e4d452..18bddf2c9 100644
--- a/app/src/fennecBeta/res/values/static_strings.xml
+++ b/app/src/fennecBeta/res/values/static_strings.xml
@@ -4,5 +4,5 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
- Firefox
+ Firefox Beta
diff --git a/app/src/main/java/org/mozilla/fenix/Config.kt b/app/src/main/java/org/mozilla/fenix/Config.kt
index db3d19d5e..bc7f819d1 100644
--- a/app/src/main/java/org/mozilla/fenix/Config.kt
+++ b/app/src/main/java/org/mozilla/fenix/Config.kt
@@ -52,6 +52,7 @@ enum class ReleaseChannel {
FenixNightly -> true
FennecNightly -> true
FenixDebug -> true
+ FenixProduction -> true
else -> false
}
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index de660bbef..2f76237ed 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -10,11 +10,6 @@ object FeatureFlags {
*/
const val pullToRefreshEnabled = false
- /**
- * Enables tip feature
- */
- val tips = Config.channel.isDebug
-
/**
* Allows edit of saved logins.
*/
@@ -29,10 +24,4 @@ object FeatureFlags {
* Enables new tab tray pref
*/
val tabTray = Config.channel.isNightlyOrDebug
-
- /**
- * Allows search widget CFR to be displayed.
- * This is a placeholder for the experimentation framework determining cohorts.
- */
- val searchWidgetCFR = Config.channel.isDebug
}
diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt b/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt
index 1c0769db7..1cb82131f 100644
--- a/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt
@@ -4,8 +4,6 @@
package org.mozilla.fenix.components.tips
-import org.mozilla.fenix.FeatureFlags
-
sealed class TipType {
data class Button(val text: String, val action: () -> Unit) : TipType()
}
@@ -31,7 +29,6 @@ class FenixTipManager(
private val providers: List
) : TipManager {
override fun getTip(): Tip? {
- if (!FeatureFlags.tips) { return null }
return providers
.firstOrNull { it.shouldDisplay }
?.tip
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index d640e8b8e..b128ff917 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -1041,6 +1041,11 @@
Дадаць
+
+ Перайсці на вэб-сайт
+
+ Назва ярлыка
+
Лагіны і паролі
@@ -1080,6 +1085,10 @@
Імя карыстальніка
Пароль
+
+ Паўторна ўвядзіце свой PIN-код
+
+ Разблакуйце, каб пабачыць захаваныя лагіны
Даведацца больш
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index de1d719bc..573d7b3f2 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -805,7 +805,7 @@
Tab wedi’i gau
- Ychwanegwyd at y gwefannau gorau!
+ Ychwanegwyd at fy hoff wefannau!
Tab preifat wedi’i gau
@@ -884,8 +884,6 @@
Yn dileu data pori’n awtomatig pan fyddwch yn dewis "Gadael" o’r brif ddewislen
Yn dileu data pori’n awtomatig pan fyddwch yn dewis \"Gadael\" o’r brif ddewislen
-
- Hanes pori
Gadael
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 076a79b7a..b8fee3a96 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -16,14 +16,17 @@
Buscar o ingresar dirección
-
- No hay pestañas abiertas
Las pestañas abiertas aparecerán aquí.
Tus pestañas privadas se mostrarán aquí.
+
+ 1 pestaña abierta. Tocar para cambiar de pestaña.
+
+ %1$s pestañas abiertas. Tocar para cambiar de pestaña.
+
%1$s es producido por Mozilla.
@@ -298,7 +301,7 @@
Inicios de sesión
- Pestañas
+ Pestañas abiertas
Cerrar sesión
@@ -487,7 +490,7 @@
Compartir pestañas
- Guardar en la colección
+ Guardar pestañas en la colección
Menú de pestañas
@@ -704,17 +707,15 @@
Desactivado
-
- Guarda las cosas que te importan. Para empezar, guarda las pestañas abiertas en una nueva colección.
Colecciones
Menú de la colección
-
- No hay colecciones
-
- Tus colecciones aparecerán aquí.
+
+ Colecciona las cosas que te importan
+
+ Agrupar búsquedas, sitios y pestañas similares para acceder rápidamente más tarde.
Seleccionar pestañas
@@ -914,8 +915,6 @@
Eliminar automáticamente los datos de navegación cuando selecciones "Salir" en el menú principal
Eliminar automáticamente los datos de navegación cuando selecciones \"Salir\" en el menú principal
-
- Historial de navegación
Salir
@@ -939,8 +938,9 @@
Firefox Nightly se actualiza todas las noches y tiene nuevas funciones experimentales.
Sin embargo, puede ser menos estable. Descarga nuestro navegador beta para una experiencia más estable.
-
- Obtén el navegador Mozilla Firefox
+
+
+ Obtener Firefox para Android Beta
Firefox Nightly se movió
@@ -1449,6 +1449,9 @@
Habla ahora
+
+ Ya existe un inicio de sesión con ese nombre de usuario
+
Conectarse con una cuenta de Firefox.
@@ -1458,5 +1461,19 @@
Por favor, vuelve a autentificarte.
Por favor, activa la sincronización de pestañas.
+
+ No tienes ninguna pestaña abierta en Firefox en tus otros dispositivos.
+
+ Ver una lista de pestañas de tus otros dispositivos.
+
+ Iniciar sesión para sincronizar
+
+
+
+ Límite de sitios frecuentes alcanzado
+
+ Para añadir un nuevo sitio frecuente, elimina uno. Mantén presionado el sitio y selecciona eliminar.
+
+ Vale, entendido
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 5126ed41a..9a715a1e5 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -13,14 +13,17 @@
Afvirkja huliðsvöfrun
Leitaðu eða sláðu inn vistfang
-
- Engir opnir flipar
Opnu fliparnir þínir verða sýndir hér.
Opnu einkafliparnir þínir verða sýndir hér.
+
+ 1 opinn flipi. Snertu til að skipta um flipa.
+
+ %1$s opnir flipar. Snertu til að skipta um flipa.
+
%1$s er framleitt af Mozilla.
@@ -105,8 +108,6 @@
Nýr flipi
Vista í safn
-
- Viltu láta vita af veseni á vefsvæði
Deila
@@ -121,8 +122,10 @@
Knúið af %1$s
-
+
Leshamur
+
+ Loka lesham
Opna í smáforriti
@@ -293,7 +296,7 @@
Innskráningar
- Flipar
+ Opnir flipar
Útskráning
@@ -450,6 +453,24 @@
Huliðsflipar
Bæta við flipa
+
+ Bæta við einkaflipa
+
+ Einka
+
+ Opnir flipar
+
+ Vista í safn
+
+ Deila flipum
+
+ Loka öllum flipum
+
+ Nýr flipi
+
+ Á upphafsreit
+
+ Skiptu um flipa
Fjarlæga flipann úr safni
@@ -464,7 +485,7 @@
Deila flipum
- Vista í safn
+ Vista flipa í safn
Valmynd flipa
@@ -675,16 +696,14 @@
Óvirkt
-
- Safna því sem skiptir þig máli. Þú getur byrjað á því að vista opna flipa í nýtt safn.
Söfn
Valmynd safns
- Engin söfn
-
- Söfnin þín birtast hér.
+ Safnaðu því sem skiptir þig máli
+
+ Hópaðu saman svipaðar leitir, síður og flipa svo auðvelt sé að opna seinna.
Veldu flipa
@@ -714,6 +733,9 @@
Vista
+
+ Skoða
+
Safn %d
@@ -863,8 +885,6 @@
Eyðir vafragögnum sjálfvirkt þegar þú ýtir á "Hætta" í aðalvalmyndinni
Eyðir vafragögnum sjálfvirkt þegar þú ýtir á \"Hætta\" í aðalvalmyndinni
-
- Leitarsaga
Hætta
@@ -888,8 +908,9 @@
¶
· Firefox Nightly er uppfærður á hverju kvöldi og er með virkni sem verið er að prófa sig áfram með.¶
· Hins vegar gæti hann verið óstöðugari fyrir vikið. Sæktu betu útgáfu af vafranum ef þú vilt stöðugri vafra.
-
- Sæktu Mozilla Firefox vafra
+
+
+ Sækja Firefox fyrir Android, beta útgáfu
Firefox Nightly er kominn á nýjan stað
@@ -946,20 +967,20 @@
Innskráning mistókst
- Verndaðu sjálfan þig
+ Sjálfvirkt næði
- %s hjálpar til við að hindra vefsíður í að rekja þig á netinu.
+ Persónuverndar- og öryggisstillingar loka á rekjara, spilliforrit og fyrirtæki sem fylgja þér.
- Staðlað
+ Staðlað (sjálfgefið)
- Hindrar færri rekjara en leyfir síðum að hlaðast eðlilega
+ Loka á færri rekjara. Síður hlaðast venjulega.
Strangt (mælt með)
Strangt
- Hindrar fleiri rekjara, sem veitir betri vörn, en gæti valdið því að sumar síður virka ekki eðlilega
+ Lokar á fleiri rekjara, auglýsingar og sprettiglugga. Síður hlaðast hraðar en sum virkni gæti verið í ólagi.
@@ -1047,31 +1068,21 @@
Fræðast meira
- Staðlað
-
- Staðlað (mælt með)
+ Staðlað (sjálfgefið)
- Jöfn vernd og afköst .
-
- Síður hlaða venjulega en loka fyrir færri rekjara.
+ Loka á færri rekjara. Síður hlaðast venjulega.
Hvað er lokað af með staðlaðri rekjaravernd
Strangt
-
- Strangt (sjálfgefið)
- Sterkari rekjaravörn og hraðari afköst en sumar síður virka ef til vill ekki eðlilega
-
- Strangt (mælt með)
-
- Sterkari vernd en getur valdið því að sumar síður eða efni virki ekki.
+ Lokar á fleiri rekjara, auglýsingar og sprettiglugga. Síður hlaðast hraðar en sum virkni gæti verið í ólagi.
Hvað er lokað af með strangari rekjaravernd
Sérsniðið
- Veldu hvaða rekjara og forskriftir á að loka fyrir
+ Veldu hvaða rekjara og forskriftir á að loka fyrir.
Hvað er lokað á með sérsniðinni rekjaravernd
@@ -1121,7 +1132,7 @@
Stöðvar utanaðkomandi auglýsingar myndbönd og annað efni sem inniheldur kóða til að rekja hegðun frá því að hlaðast. Getur haft áhrif á virkni vefsetra.
- %s hindrar rekjara á þessu vefsvæði þegar skjöldurinn er fjólublár. Snertu skjöldinn til að sjá hvað er lokað á.
+ Í hvert skipti sem skjöldurinn er fjólublár þá hefur %s lokað fyrir rekjara á vefsetrinu. Snertu til að fá meiri upplýsingar.
Kveikt er á vörn fyrir þetta vefsvæði
@@ -1408,6 +1419,9 @@
Talaðu núna
+
+ Innskráning með þessu notandanafni er þegar til
+
Tengjast við Firefox reikning.
@@ -1417,5 +1431,19 @@
Vinsamlegast endurauðkenndu þig.
Vinsamlegast virkjaðu samstillingu flipa.
+
+ Þú ert ekki með neina Firefox flipa opna á hinum tækjunum þínum.
+
+ Skoða lista yfir flipa frá öðrum tækjum.
+
+ Skráðu þig inn til að samstilla
+
+
+
+ Ekki hægt að bæta fleiri vefsetrum við efstu vefsvæði
+
+ Fjarlægðu eina til að bæta við nýju efstu vefsvæði. Ýttu lengi á síðuna og veldu fjarlægja.
+
+ Í lagi, ég skil
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 8f6ffd76a..ac183e2f1 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -460,6 +460,10 @@
Zapri vse zavihke
Nov zavihek
+
+ Domov
+
+ Preklopi način zavihkov
Odstrani zavihek iz zbirke
@@ -472,6 +476,8 @@
Zapri vse zavihke
Deli zavihke
+
+ Shrani zavihke v zbirko
Meni zavihka
@@ -720,6 +726,9 @@
Shrani
+
+ Prikaži
+
Zbirka %d
@@ -895,6 +904,9 @@
Firefox Nightly se posodablja vsak dan in vsebuje poskusne nove možnosti.
Njegovo delovanje je lahko nezanesljivo. Za zanesljivejše brskanje prenesite različico beta našega brskalnika.
+
+ Prenesite Firefox za Android Beta
+
Firefox Nightly se je preselil
@@ -1418,6 +1430,9 @@
Oglejte si seznam zavihkov drugih naprav.
+
+ Prijava v Sync
+
V redu, razumem
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6a506efb1..26d2ccbf5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -887,8 +887,6 @@
Ana menüden "Çık"ı seçtiğinizde gezinti verilerini otomatik olarak siler
Ana menüden \"Çık\"ı seçtiğinizde gezinti verilerini otomatik olarak siler
-
- Gezinti geçmişi
Çık
@@ -950,7 +948,7 @@
Yanıtlar burada
- %s’dan en iyi şekilde yararlanın.
+ %s tarayıcınızdan en iyi şekilde yararlanın.
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 106463fca..5d2534f8c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -157,7 +157,7 @@
Lần này, tìm kiếm với:
- Điền liên kết từ clipboard
+ Điền liên kết từ bộ nhớ tạm
Cho phép
@@ -271,7 +271,7 @@
Hiển thị trong phiên riêng tư
- Hiển thị đề xuất clipboard
+ Hiển thị đề xuất bộ nhớ tạm
Tìm kiếm lịch sử duyệt web
@@ -882,8 +882,6 @@
Tự động xóa dữ liệu duyệt khi bạn chọn "Thoát" từ menu chính
Tự động xóa dữ liệu duyệt khi bạn chọn \"Thoát\" từ menu chính
-
- Lịch sử duyệt web
Thoát
@@ -1178,7 +1176,7 @@
Dán
- Đã sao chép URL vào clipboard
+ Đã sao chép URL vào bộ nhớ tạm
Thêm vào màn hình chính
@@ -1253,11 +1251,11 @@
Không lưu
- Đã sao chép mật khẩu vào clipboard
+ Đã sao chép mật khẩu vào bộ nhớ tạm
- Đã sao chép tên người dùng vào clipboard
+ Đã sao chép tên người dùng vào bộ nhớ tạm
- Đã sao chép URL trang web vào clipboard
+ Đã sao chép trang web vào bộ nhớ tạm
Sao chép mật khẩu
diff --git a/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt b/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt
index 0d01986e0..f9ed1f9d0 100644
--- a/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt
@@ -4,54 +4,12 @@
package org.mozilla.fenix.components.tips
-import io.mockk.every
import io.mockk.mockk
-import io.mockk.mockkObject
-import io.mockk.unmockkObject
-import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
-import org.junit.Before
import org.junit.Test
-import org.mozilla.fenix.FeatureFlags
class TipManagerTest {
-
- @Before
- fun setup() {
- mockkObject(FeatureFlags)
- every { FeatureFlags.tips } returns true
- }
-
- @After
- fun after() {
- unmockkObject(FeatureFlags)
- }
-
- @Test
- fun `test feature flag off`() {
- every { FeatureFlags.tips } returns false
- assertNull(FenixTipManager(emptyList()).getTip())
- assertNull(FenixTipManager(listOf(
- object : TipProvider {
- override val tip = mockk()
- override val shouldDisplay = true
- },
- object : TipProvider {
- override val tip = mockk()
- override val shouldDisplay = false
- },
- object : TipProvider {
- override val tip: Tip? = null
- override val shouldDisplay = true
- },
- object : TipProvider {
- override val tip: Tip? = null
- override val shouldDisplay = false
- }
- )).getTip())
- }
-
@Test
fun `test first with shouldDisplay`() {
val shouldDisplayProvider = object : TipProvider {
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index 476845f70..47c627617 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object AndroidComponents {
- const val VERSION = "49.0.20200630133320"
+ const val VERSION = "49.0.20200701130905"
}
diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index 5f7a6fab5..9314d59b7 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -129,14 +129,15 @@ jobs:
treeherder:
symbol: beta(B)
+ # XXX `production` is now the new nightly. We keep this name around while we officially remove
+ # `nightly` and `fennec-nightly`
production:
attributes:
- release-type: production
- include-release-version: true
+ nightly: true
+ include-nightly-version: true
include-shippable-secrets: true
- filter-incomplete-translations: true
run:
- geckoview-engine: geckoBeta
+ geckoview-engine: geckoNightly
gradle-build-type: fenixProduction
run-on-tasks-for: [github-release]
treeherder:
diff --git a/taskcluster/ci/mark-as-shipped/kind.yml b/taskcluster/ci/mark-as-shipped/kind.yml
index 86226ddd5..af8d210f4 100644
--- a/taskcluster/ci/mark-as-shipped/kind.yml
+++ b/taskcluster/ci/mark-as-shipped/kind.yml
@@ -17,8 +17,8 @@ primary-dependency: push-apk
group-by: build-type
only-for-build-types:
- - beta
- - production
+ - fenix-beta
+ - fenix-production
job-template:
description: Mark Fenix as shipped in ship-it