diff --git a/android-components b/android-components index a2934ef2..24f6ba5b 160000 --- a/android-components +++ b/android-components @@ -1 +1 @@ -Subproject commit a2934ef2d89153e3f7842dcfe71fa81af9888d68 +Subproject commit 24f6ba5bf0e38bdd50b73baa5c8670af6bebb1d0 diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt index b5ca7b10..98766063 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt @@ -277,6 +277,7 @@ class DownloadTest { } // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2299297 + @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1842154") @Test fun notificationCanBeDismissedIfDownloadIsInterruptedTest() { downloadRobot { diff --git a/app/src/debug/res/drawable/animated_splash_screen.xml b/app/src/debug/res/drawable/animated_splash_screen.xml index 74d44157..e2b7ead5 100644 --- a/app/src/debug/res/drawable/animated_splash_screen.xml +++ b/app/src/debug/res/drawable/animated_splash_screen.xml @@ -1,11 +1,1036 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/forkRelease/res/drawable/ic_wordmark_text_normal.png b/app/src/forkRelease/res/drawable/ic_wordmark_text_normal.png index 06f4b4a6..5b58c0a1 100644 Binary files a/app/src/forkRelease/res/drawable/ic_wordmark_text_normal.png and b/app/src/forkRelease/res/drawable/ic_wordmark_text_normal.png differ diff --git a/app/src/forkRelease/res/drawable/ic_wordmark_text_private.png b/app/src/forkRelease/res/drawable/ic_wordmark_text_private.png index ab96fc8c..ec8f2de8 100644 Binary files a/app/src/forkRelease/res/drawable/ic_wordmark_text_private.png and b/app/src/forkRelease/res/drawable/ic_wordmark_text_private.png differ diff --git a/app/src/forkRelease/res/values/static_strings.xml b/app/src/forkRelease/res/values/static_strings.xml index 7be98b62..0587640e 100644 --- a/app/src/forkRelease/res/values/static_strings.xml +++ b/app/src/forkRelease/res/values/static_strings.xml @@ -4,5 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - LeOSium + Iceraven diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index bd938329..e0e8e281 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -116,6 +116,7 @@ class HomeMenu( @Suppress("ComplexMethod") private fun coreMenuItems(): List { + val settings = context.components.settings val bookmarksItem = BrowserMenuImageText( context.getString(R.string.library_bookmarks), @@ -227,7 +228,7 @@ class HomeMenu( helpItem, customizeHomeItem, settingsItem, - quitItem, + if (settings.shouldDeleteBrowsingDataOnQuit) quitItem else null, ).also { items -> items.getHighlight()?.let { onHighlightPresent(it) } } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 2108dc14..46646758 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -281,6 +281,7 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan context?.let { requireContext().bookmarkStorage .getTree(guid, recursive) + ?.minus(pendingBookmarksToDelete) ?.let { desktopFolders.withOptionalDesktopFolders(it) } } } diff --git a/app/src/main/res/drawable/animated_splash_screen.xml b/app/src/main/res/drawable/animated_splash_screen.xml index 74d44157..e2b7ead5 100644 --- a/app/src/main/res/drawable/animated_splash_screen.xml +++ b/app/src/main/res/drawable/animated_splash_screen.xml @@ -1,11 +1,1036 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_wordmark_logo.webp b/app/src/main/res/drawable/ic_wordmark_logo.webp index c9dabae9..64d34379 100644 Binary files a/app/src/main/res/drawable/ic_wordmark_logo.webp and b/app/src/main/res/drawable/ic_wordmark_logo.webp differ diff --git a/app/src/main/res/drawable/ic_wordmark_text_normal.webp b/app/src/main/res/drawable/ic_wordmark_text_normal.webp index 636c6707..a18fa108 100644 Binary files a/app/src/main/res/drawable/ic_wordmark_text_normal.webp and b/app/src/main/res/drawable/ic_wordmark_text_normal.webp differ diff --git a/app/src/main/res/drawable/ic_wordmark_text_private.webp b/app/src/main/res/drawable/ic_wordmark_text_private.webp index 8abe1a19..fd2a1880 100644 Binary files a/app/src/main/res/drawable/ic_wordmark_text_private.webp and b/app/src/main/res/drawable/ic_wordmark_text_private.webp differ diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index fdded2c0..53d86a98 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -24,13 +24,13 @@ android:layout_marginStart="@dimen/about_header_icon_margin_start_end" android:layout_marginTop="@dimen/about_header_icon_margin_top" android:layout_marginEnd="@dimen/about_header_icon_margin_start_end" - android:contentDescription="LeOSearch" + android:contentDescription="@string/app_name" android:importantForAccessibility="no" + app:srcCompat="?fenixLogo" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_percent="0.75" - app:srcCompat="?attr/fenixWordmarkText" /> + app:layout_constraintWidth_percent="0.75" /> = 0) && (language in ['en'])))", + "startDate": "2024-01-23", + "enrollmentEndDate": null, + "endDate": null, + "proposedDuration": 43, + "proposedEnrollment": 14, + "referenceBranch": "control", + "featureValidationOptOut": false, + "localizations": null, + "locales": null + }, { "schemaVersion": "1.12.0", "slug": "splash-screen-test", diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml index a861a101..5ea6dd9b 100644 --- a/app/src/main/res/values/static_strings.xml +++ b/app/src/main/res/values/static_strings.xml @@ -4,8 +4,8 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - LeOSium - LeOSium + Iceraven Fenix + Iceraven LeakCanary @@ -20,8 +20,8 @@ Top Articles Wikipedia - - G**gle + + Google AS @@ -59,17 +59,17 @@ Custom Push server - Stop LeOSium + Stop Firefox - Custom server changes will take effect on the next LeOSium run. + Custom server changes will take effect on the next Firefox run. Enable Tabs Tray to Compose rewrite Enable Compose Top Sites - Enable LeOSium Translations - - Enable LeOSium Suggest + Enable Firefox Translations + + Enable Firefox Suggest Enable Toolbar Redesign incomplete portions @@ -92,15 +92,15 @@ Stop Profiler Profiler Settings - LeOSium + Firefox Profiler is currently running - Recommended preset for profiling LeOSium + Recommended preset for profiling Firefox Graphics - Preset for investigating graphics bugs in LeOSium + Preset for investigating graphics bugs in Firefox Media - Preset for investigating audio and video bugs in LeOSium + Preset for investigating audio and video bugs in Firefox Networking - Preset for investigating networking bugs in LeOSium + Preset for investigating networking bugs in Firefox Profiler started diff --git a/patches/0012-strings__change.patch b/patches/0012-strings__change.patch index 1b8aed50..5a61e4c4 100644 --- a/patches/0012-strings__change.patch +++ b/patches/0012-strings__change.patch @@ -4,8 +4,6 @@ Date: Tue, 30 Jan 2024 09:52:55 +0100 Subject: [PATCH] strings__change --- - 002-name_change.patch | 144 +++++++ - 003-icons_and_about_screen.patch | 395 +----------------- app/src/forkDebug/ic_launcher-playstore.png | Bin 0 -> 182460 bytes .../res/drawable/ic_launcher_background.xml | 78 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + @@ -208,7 +206,6 @@ Subject: [PATCH] strings__change docs/Home.md | 4 +- .../002-name_and_icon.patch | 0 203 files changed, 4607 insertions(+), 4627 deletions(-) - create mode 100644 002-name_change.patch create mode 100644 app/src/forkDebug/ic_launcher-playstore.png create mode 100644 app/src/forkDebug/res/drawable/ic_launcher_background.xml create mode 100644 app/src/forkDebug/res/mipmap-anydpi-v26/ic_launcher.xml @@ -272,564 +269,7 @@ Subject: [PATCH] strings__change create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - rename 002-name_and_icon.patch => patches/002-name_and_icon.patch (100%) -diff --git a/002-name_change.patch b/002-name_change.patch -new file mode 100644 -index 000000000..bae9d9432 ---- /dev/null -+++ b/002-name_change.patch -@@ -0,0 +1,144 @@ -+From 03c390eb12d56374a3df3674e93524771088408b Mon Sep 17 00:00:00 2001 -+From: harvey186 -+Date: Tue, 30 Jan 2024 09:46:26 +0100 -+Subject: [PATCH] name_change -+ -+--- -+ 002-name_and_icon.patch | 19 +------------ -+ app/build.gradle | 14 +++++----- -+ .../forkRelease/res/values/static_strings.xml | 2 +- -+ app/src/main/res/values/static_strings.xml | 28 +++++++++---------- -+ 4 files changed, 23 insertions(+), 40 deletions(-) -+ -+ -+diff --git a/app/build.gradle b/app/build.gradle -+index d894c4a2c..40e5da7d5 100644 -+--- a/app/build.gradle -++++ b/app/build.gradle -+@@ -31,7 +31,7 @@ android { -+ } -+ -+ defaultConfig { -+- applicationId "io.github.forkmaintainers" -++ applicationId "com.leos" -+ minSdkVersion config.minSdkVersion -+ compileSdk config.compileSdkVersion -+ targetSdkVersion config.targetSdkVersion -+@@ -159,15 +159,15 @@ android { -+ forkDebug { -+ shrinkResources false -+ minifyEnabled false -+- applicationIdSuffix ".iceraven.debug" -++ applicationIdSuffix ".leosium.debug" -+ pseudoLocalesEnabled true -+ // Need to replicate default debug config features -+ signingConfig signingConfigs.debug -+ debuggable true -+- def deepLinkSchemeValue = "iceraven-debug" -++ def deepLinkSchemeValue = "leosium-debug" -+ buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" -+ manifestPlaceholders.putAll([ -+- "sharedUserId": "io.github.forkmaintainers.iceraven.sharedID", -++ "sharedUserId": "io.github.forkmaintainers.leosium.sharedID", -+ "deepLinkScheme": deepLinkSchemeValue, -+ ]) -+ // Use custom default allowed addon list -+@@ -178,11 +178,11 @@ android { -+ } -+ forkRelease releaseTemplate >> { -+ buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" -+- applicationIdSuffix ".iceraven" -+- def deepLinkSchemeValue = "iceraven" -++ applicationIdSuffix ".leosium" -++ def deepLinkSchemeValue = "leosium" -+ buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" -+ manifestPlaceholders.putAll([ -+- "sharedUserId": "io.github.forkmaintainers.iceraven.sharedID", -++ "sharedUserId": "io.github.forkmaintainers.leosium.sharedID", -+ "deepLinkScheme": deepLinkSchemeValue, -+ ]) -+ // Use custom default allowed addon list -+diff --git a/app/src/forkRelease/res/values/static_strings.xml b/app/src/forkRelease/res/values/static_strings.xml -+index 0587640ee..7be98b62e 100644 -+--- a/app/src/forkRelease/res/values/static_strings.xml -++++ b/app/src/forkRelease/res/values/static_strings.xml -+@@ -4,5 +4,5 @@ -+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -+ -+ -+- Iceraven -++ LeOSium -+ -+diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml -+index 5ea6dd9ba..a861a101c 100644 -+--- a/app/src/main/res/values/static_strings.xml -++++ b/app/src/main/res/values/static_strings.xml -+@@ -4,8 +4,8 @@ -+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -+ -+ -+- Iceraven Fenix -+- Iceraven -++ LeOSium -++ LeOSium -+ -+ -+ LeakCanary -+@@ -20,8 +20,8 @@ -+ Top Articles -+ -+ Wikipedia -+- -+- Google -++ -++ G**gle -+ -+ AS -+ -+@@ -59,17 +59,17 @@ -+ -+ Custom Push server -+ -+- Stop Firefox -++ Stop LeOSium -+ -+- Custom server changes will take effect on the next Firefox run. -++ Custom server changes will take effect on the next LeOSium run. -+ -+ Enable Tabs Tray to Compose rewrite -+ -+ Enable Compose Top Sites -+ -+- Enable Firefox Translations -+- -+- Enable Firefox Suggest -++ Enable LeOSium Translations -++ -++ Enable LeOSium Suggest -+ -+ Enable Toolbar Redesign incomplete portions -+ -+@@ -92,15 +92,15 @@ -+ Stop Profiler -+ -+ Profiler Settings -+- Firefox -++ LeOSium -+ Profiler is currently running -+- Recommended preset for profiling Firefox -++ Recommended preset for profiling LeOSium -+ Graphics -+- Preset for investigating graphics bugs in Firefox -++ Preset for investigating graphics bugs in LeOSium -+ Media -+- Preset for investigating audio and video bugs in Firefox -++ Preset for investigating audio and video bugs in LeOSium -+ Networking -+- Preset for investigating networking bugs in Firefox -++ Preset for investigating networking bugs in LeOSium -+ -+ Profiler started -+ -+-- -+2.34.1 -+ -diff --git a/003-icons_and_about_screen.patch b/003-icons_and_about_screen.patch -index 8a0f59b47..abf5ca79c 100644 ---- a/003-icons_and_about_screen.patch -+++ b/003-icons_and_about_screen.patch -@@ -429,400 +429,7 @@ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/ - + - + - \ No newline at end of file --Index: app/src/main/res/values-nn-rNO/strings.xml --IDEA additional info: --Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP --<+>UTF-8 --=================================================================== --diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml ----- a/app/src/main/res/values-nn-rNO/strings.xml (revision 31c3e83236b2bd980d168f651af7a022b5e6a8b3) --+++ b/app/src/main/res/values-nn-rNO/strings.xml (revision 056c1126f9ccff0c90bb873e7ecbd0981fbcd0e9) --@@ -74,7 +74,7 @@ -- -- -- %1$s slettar alle infokaspslar, historikk og nettstaddata når du lèt att alle private vindauge. %2$s -- -- --- Bruk Firefox som din faforittnettlesar --+ Note: The word "LeOSium" should NOT be translated --> --+ Bruk LeOSium som din faforittnettlesar -- -- Vi vernar deg gjerne -- --- Firefox set menneske over forteneste og forsvarar retten din til personvern ved å blokkere sporarar på fleire nettstadar.\n\nLes meir i personvernerklæringa vår. --+ Note: The word "LeOSium" should NOT be translated --> --+ LeOSium set menneske over forteneste og forsvarar retten din til personvern ved å blokkere sporarar på fleire nettstadar.\n\nLes meir i personvernerklæringa vår. -- -- peronvernerklæring --@@ -354,25 +354,25 @@ -- -- Ikkje no -- --- Varsel hjelper deg å gjere meir med Firefox --+ Note: The word "LeOSium" should NOT be translated --> --+ Varsel hjelper deg å gjere meir med LeOSium -- --- Send faner mellom einingar, administrer nedlastingar og få tips om korleis du får mest muleg ut av Firefox. --+ Note: The word "LeOSium" should NOT be translated --> --+ Send faner mellom einingar, administrer nedlastingar og få tips om korleis du får mest muleg ut av LeOSium. -- -- Slå på varsel -- -- Ikkje no -- -- --- Prøv Firefox-søkjeminiprogrammet --+ Note: The word "LeOSium" should NOT be translated --> --+ Prøv LeOSium-søkjeminiprogrammet -- --- Med Firefox på startskjermen din, har du enkel tilgang til den personvernfokuserte nettlesaren som blokkerer sporarar på fleire nettstadar. --+ Note: The word "LeOSium" should NOT be translated --> --+ Med LeOSium på startskjermen din, har du enkel tilgang til den personvernfokuserte nettlesaren som blokkerer sporarar på fleire nettstadar. -- --- Legg til Firefox-miniprogram --+ Note: The word "LeOSium" should NOT be translated --> --+ Legg til LeOSium-miniprogram -- -- Ikkje no -- --@@ -508,14 +508,14 @@ -- Det er òg mogleg at ein angripar er involvert. Dersom du fortset til nettstaden, bør du ikkje skrive inn sensitiv informasjon. Dersom du fortset, vil berre HTTPS-modus bli slått av mellombels for nettstaden. -- -- Tilgjenge --- --- Tilpassa server for Firefox-konto --+ --+ Tilpassa server for LeOSium-konto -- -- Tilpassa Mozilla-kontoserver -- -- Tilpassa synkroniseringsserver -- --- Firefox-konto/synkroniseringsserver endra. Avsluttar applikasjonen for å bruke endringar… --+ LeOSium-konto/synkroniseringsserver endra. Avsluttar applikasjonen for å bruke endringar… -- -- Mozilla-konto/synkroniseringsserver er endra. Avsluttar programmet for å kunne bruke endringane… -- --@@ -534,7 +534,7 @@ -- -- Logg inn for å synkronisere faner, bokmerke, passord med meir. -- --- Firefox-konto --+ LeOSium-konto -- -- Mozilla-konto -- --@@ -568,15 +568,15 @@ -- Kontoinnstillingar -- -- Autofullfør nettadresser --- --+ -- Forslag frå sponsorar --- -- Stø %1$s med enkelte sponsa forslag --- -- Forslag frå %1$s --- --+ -- Få forslag frå nettet relatert til søkinga di -- -- Opne lenker i appar --@@ -656,7 +656,7 @@ -- -- Les meir -- --- --+ -- Klassisk %s -- -- Artist-serien --@@ -736,7 +736,7 @@ -- -- Mottekne faner -- --- Varsel for faner mottekne frå andre Firefox-einingar. --+ Varsel for faner mottekne frå andre LeOSium-einingar. -- -- Fane motteken -- --@@ -776,7 +776,7 @@ -- -- -- --- firefox.com/pair]]> --+ LeOSium.com/pair]]> -- -- -- --@@ -922,7 +922,7 @@ -- Fjern -- -- Aktiv --- --+ -- %1$s kan installere og køyre studiar frå tid til annan. -- -- Les meir --@@ -1302,7 +1302,7 @@ -- Kople til ei anna eining -- -- --- For å sende ei fane, logg deg på Firefox på minst ei anna eining. --+ For å sende ei fane, logg deg på LeOSium på minst ei anna eining. -- -- Skjønar -- --@@ -1325,10 +1325,10 @@ -- -- --- Firefox er rask og privat --+ LeOSium er rask og privat -- --- Bruk Firefox som din standardnettlesar --+ Bruk LeOSium som din standardnettlesar -- -- Prøv privat nettlesing -- -- --- Bidra til å gjere Firefox betre ved å ta ei kort spørjeundersøkjing. --+ Bidra til å gjere LeOSium betre ved å ta ei kort spørjeundersøkjing. -- -- Ver med på undersøkinga -- --@@ -1496,16 +1496,16 @@ -- -- Skann QR-kode -- --- https://firefox.com/pair]]> --+ https://LeOSium.com/pair]]> -- -- Klar for å skanne -- -- Logg inn med kameraet ditt -- -- Bruk e-post i staden --- --- Lag ein for å synkronisere Firefox mellom einingar.]]> --- --+ --+ Lag ein for å synkronisere LeOSium mellom einingar.]]> --+ -- %s vil stoppe synkroniseringa med kontoen din, men vil ikkje slette nettleserdataa dine på denne eiinga. -- -- Kople frå --@@ -1522,7 +1522,7 @@ -- Utvida sporingsvern -- -- No med totalt vern mot infokapslar, den mest kraftfulle barrieren vår til no mot sporarar på fleire nettstadar. --- --+ -- %s vernar deg frå mange av dei vanlegaste sporarane som følgjer det du gjer på nettet. -- -- Les meir --@@ -1680,9 +1680,9 @@ -- -- Lagre aldri -- --- --+ -- Autofyll i %1$s --- --+ -- Fyll inn og lagre brukarnamn og passord på nettstadar mens du brukar %1$s. -- -- Autofyll i andre appar --@@ -1934,7 +1934,7 @@ -- -- Søkjeforslag-API nettadresse -- --- Erstatt spørjinga med «%s». Eksempel:\nhttps://suggestqueries.google.com/complete/search?client=firefox&q=%s --+ Erstatt spørjinga med «%s». Eksempel:\nhttps://suggestqueries.google.com/complete/search?client=LeOSium&q=%s -- -- Lagre -- --@@ -2040,13 +2040,13 @@ -- Kople til ei anna eining. -- -- Godkjenn på nytt. --- --+ -- Slå på fane-synkronisering. -- --- Du har ingen faner opne i Firefox på andre einingar. --- --+ Du har ingen faner opne i LeOSium på andre einingar. --+ -- Vis ei liste over faner frå andre einingar. --- --+ -- Logg inn for å synkronisere -- -- --@@ -2101,15 +2101,15 @@ -- Late att automatisk etter ein måned? -- -- --- Firefox kan late att faner du ikkje har sett den siste månaden. --+ LeOSium kan late att faner du ikkje har sett den siste månaden. -- -- SLÅ PÅ AUTO-ATTLATING -- -- Automatisk attlating aktivert -- -- --- --- Firefox-forslag --+ --+ LeOSium-forslag -- -- -- Søk med Google --@@ -2117,7 +2117,7 @@ -- Søk med %s -- -- --- Vel at lenker frå nettstadar, e-postmeldingar og meldingar skal opnast automatisk i Firefox. --+ Vel at lenker frå nettstadar, e-postmeldingar og meldingar skal opnast automatisk i LeOSium. -- -- -- Fjern --@@ -2141,7 +2141,7 @@ -- -- Driven av %s. -- --- Del av Firefox-familien. %s --+ Del av LeOSium-familien. %s -- -- Les meir -- --@@ -2272,7 +2272,7 @@ -- Kontroller kvaliteten på vurderinga -- -- Prøv den pålitelege guiden vår for produktvurderingar --- --+ -- Sjå kor påliteleg produktvurderingar er på %1$s før du kjøper. Vurderingskontrolløren, ein eksperimentell funksjon frå %2$s, er direkte inbyggd i nettlesaren. Han fungerer på %3$s og på %4$s. -- -- Med krafta i %1$s frå Mozilla hjelper vi deg med å unngå einsidige og ikkje-truverdige vurderingar. AI-modellen vår vert alltid forbetra for å beskytte deg når du handlar. %2$s --@@ -2328,6 +2328,6 @@ -- opne lenka for å lære meir om denne samlinga -- -- les artikkelen --- --+ -- opne lenke for å lese meir -- --Index: app/src/main/res/values/strings.xml --IDEA additional info: --Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP --<+>UTF-8 --=================================================================== --diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml ----- a/app/src/main/res/values/strings.xml (revision 31c3e83236b2bd980d168f651af7a022b5e6a8b3) --+++ b/app/src/main/res/values/strings.xml (revision 056c1126f9ccff0c90bb873e7ecbd0981fbcd0e9) --@@ -54,7 +54,7 @@ -- Remove -- -- --- %1$s is produced by @fork-maintainers. --+ %1$s is produced by @harvey186. -- -- -- -- --- Make Firefox your go-to browser --+ Make LeOSium your go-to browser -- -- We love keeping you safe -- --- Firefox puts people over profits and defends your privacy by blocking cross-site trackers.\n\nLearn more in our privacy notice. --+ LeOSium puts people over profits and defends your privacy by blocking cross-site trackers.\n\nLearn more in our privacy notice. -- -- Our non-profit backed browser helps stop companies from secretly following you around the web.\n\nLearn more in our privacy notice. -- --- When you’re signed in and synced, you’re safer. Firefox encrypts your passwords, bookmarks, and more. --+ When you’re signed in and synced, you’re safer. LeOSium encrypts your passwords, bookmarks, and more. -- -- Sign in -- -- Not now -- --- Notifications help you do more with Firefox --+ Notifications help you do more with LeOSium -- --+ Note: The word "LeOSium" should NOT be translated --> -- Notifications help you stay safer with Firefox -- --- Send tabs between devices, manage downloads, and get tips on getting the most out of Firefox. --+ Send tabs between devices, manage downloads, and get tips on getting the most out of LeOSium. -- -- Securely send tabs between your devices and discover other privacy features in Firefox. --@@ -359,13 +359,13 @@ -- Not now -- --- Try the Firefox search widget --+ Try the LeOSium search widget -- --- With Firefox on your home screen, you’ll have easy access to the privacy-first browser that blocks cross-site trackers. --+ With LeOSium on your home screen, you’ll have easy access to the privacy-first browser that blocks cross-site trackers. -- --- Add Firefox widget --+ Add LeOSium widget -- -- Not now -- --@@ -409,9 +409,9 @@ -- -- Address bar preferences -- --- Address bar - Firefox Suggest --+ Address bar - LeOSium Suggest -- --- Learn more about Firefox Suggest --+ Learn more about LeOSium Suggest -- -- Rate on Google Play --