Merge branch 'main' into find-in-page-buttons-fix

focus-ios/Blockzilla.xcodeproj/project.pbxproj

@@ -6547,7 +6547,7 @@
 			repositoryURL = "https://github.com/mozilla/rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 124.0.20240208050312;
+				version = 125.0.20240302000149;
 			};
 		};
 		CDFA746D27ABD43D0055FE55 /* XCRemoteSwiftPackageReference "glean-swift" */ = {

focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/mozilla/rust-components-swift",
         "state": {
           "branch": null,
-          "revision": "6e9e2923ff107b7aca95e401843d8c50291675f2",
-          "version": "124.0.20240208050312"
+          "revision": "c110d9f8204568ec3950c233cf48b8b40136d806",
+          "version": "125.0.20240302000149"
         }
       },
       {

focus-ios/Blockzilla/pt-PT.lproj/Intro.strings

@@ -14,7 +14,7 @@
 "Intro.Slides.Search.Title" = "A sua pesquisa, à sua maneira";
 
 /* Button to skip onboarding in Focus */
-"Intro.Slides.Skip.Button" = "Saltar";
+"Intro.Slides.Skip.Button" = "Ignorar";
 
 /* Description for the 'Welcome' panel in the First Run tour. */
 "Intro.Slides.Welcome.Description" = "Leve a navegação privada ao próximo nível. Bloqueie anúncios e outro conteúdo que pode monitorizá-lo(a) através de sites e tornar o carregamento de páginas lento.";

focus-ios/Blockzilla/pt-PT.lproj/Localizable.strings

@@ -134,7 +134,7 @@
 "browserShortcutDescription.selectLocationBar" = "Selecionar barra de localização";
 
 /* Label on button to complete edits */
-"Done" = "Feito";
+"Done" = "Concluído";
 
 /* Label on button to allow edits */
 "Edit" = "Editar";
@@ -161,7 +161,7 @@
 "ExternalLink.emailButton" = "Email";
 
 /* Accessibility label for done button in Find in Page Toolbar. */
-"FindInPage.Done" = "Localizar na página feito";
+"FindInPage.Done" = "Localizar na página concluído";
 
 /* Accessibility label for next result button in Find in Page Toolbar. */
 "FindInPage.NextResult" = "Localizar seguinte na página";
@@ -476,7 +476,7 @@
 "ShortcutView.RenameShortcutAlertSecondaryAction" = "Cancelar";
 
 /* This is the button text that is displayed in the Show Me How Onboarding Screen */
-"ShowMeHowOnboarding.ButtonText.V2" = "Feito";
+"ShowMeHowOnboarding.ButtonText.V2" = "Concluído";
 
 /* This is the subtitle text for step one that is displayed in the Show Me How Onboarding Screen */
 "ShowMeHowOnboarding.SubtitleStepOne.V2" = "Toque longo no ecrã inicial até que os ícones comecem a tremer.";

focus-ios/Blockzilla/tr.lproj/Localizable.strings

@@ -8,7 +8,7 @@
 "About.privateBullet1" = "Doğrudan uygulamada arama yapabilir ve web’de gezinebilirsiniz";
 
 /* Label on About screen */
-"About.privateBullet2" = "Takipçileri engelleyebilirsiniz (veya belli takipçilere izin verebilirsiniz)";
+"About.privateBullet2" = "Takip kodlarını engelleyebilirsiniz (veya belli takip kodlarına izin verebilirsiniz)";
 
 /* Label on About screen */
 "About.privateBullet3" = "Tek düğmeyle çerezleri, arama ve gezinti geçmişinizi silebilirsiniz";
@@ -26,7 +26,7 @@
 "About.rowRights" = "Haklarınız";
 
 /* Label on About screen */
-"About.safariBullet1" = "Gizliliğinizi artırmak için takipçileri engelleyebilirsiniz";
+"About.safariBullet1" = "Gizliliğinizi artırmak için takip kodlarını engelleyebilirsiniz";
 
 /* Label on About screen */
 "About.safariBullet2" = "Sayfa boyutunu azaltmak için web fontlarını engelleyebilirsiniz";
@@ -266,13 +266,13 @@
 "Settings.autocompleteSection" = "Otomatik adres tamamlama";
 
 /* Alert message shown when toggling the Content blocker */
-"Settings.blockOtherMessage" = "Diğer içerik takipçilerini engellemek bazı videoları ve web sayfalarını bozabilir.";
+"Settings.blockOtherMessage" = "Diğer içerik takip kodlarını engellemek bazı videoları ve web sayfalarını bozabilir.";
 
 /* Button label for declining Content blocker alert */
 "Settings.blockOtherNo2" = "İptal";
 
 /* Button label for accepting Content blocker alert */
-"Settings.blockOtherYes2" = "İçerik takipçilerini engelle";
+"Settings.blockOtherYes2" = "İçerik takip kodlarını engelle";
 
 /* Dark theme option in settings menu */
 "Settings.darkTheme" = "Koyu";
@@ -530,7 +530,7 @@
 "Tip.RequestDesktop.Title" = "Bir sitenin masaüstü sürümünü mü görmek istiyorsunuz?";
 
 /* Text for a label that indicates the description for share trackers tip. The placeholder is the number of trackers blocked. Only shown when there are more than 10 trackers blocked. For locales where we would need plural support, please feel free to translate this string as `Trackers blocked so far: %@` instead. */
-"Tip.ShareTrackers.Description" = "Şimdiye kadar %@ takipçi engellendi";
+"Tip.ShareTrackers.Description" = "Şimdiye kadar %@ takip kodu engellendi";
 
 /* Text for a label that indicates the title for share trackers tip. The placeholder is replaced with the long product name (Firefox Focus or Firefox Klar). */
 "Tip.ShareTrackers.Title" = "Siz gezinin, %@ engellesin.";
@@ -584,7 +584,7 @@
 "TooltipBodyText.TrashIcon.V2" = "Geçmişi ve çerezleri temizleyip yeni bir sekmede yeni bir başlangıç yapmak için buraya dokunun.";
 
 /* This is the title text that is displayed for the Privacy tooltip */
-"TooltipTitleText.Privacy" = "Koruma altındasınız!";
+"TooltipTitleText.Privacy" = "Koruma altındasınız! ";
 
 /* Text for tracking protection screen showing the connection is not secure */
 "trackingProtection.connectionNotSecureLabel" = "Bağlantı güvenli değil";
@@ -605,10 +605,10 @@
 "trackingProtection.toggleLabel2" = "Gelişmiş izlenme koruması";
 
 /* Text for tracking protection screen showing the number of trackers blocked since the app install. The placeholder is replaced with the install date of the application. */
-"trackingProtection.trackersBlockedLabel" = "%@ tarihinden beri engellenen takipçi";
+"trackingProtection.trackersBlockedLabel" = "%@ tarihinden beri engellenen takip kodu";
 
 /* Text for the header of trackers section from Tracking Protection. */
-"trackingProtection.trackersHeader" = "ENGELLENECEK TAKİPÇİLER VE BETİKLER";
+"trackingProtection.trackersHeader" = "ENGELLENECEK TAKİP KODLARI VE BETİKLER";
 
 /* Label displayed for button used as a shortcut to add a link to the list of URLs to autocomplete. */
 "URL.addToAutocompleteLabel" = "Bağlantıyı otomatik tamamlamaya ekle";
@@ -635,7 +635,7 @@
 "URL.searchLabel" = "%@ terimini ara";
 
 /* Text for the URL bar showing the number of trackers blocked on a webpage. */
-"URL.trackersBlockedLabel" = "Engellenen takipçi";
+"URL.trackersBlockedLabel" = "Engellenen takip kodu";
 
 /* Title for the action button shown on card view that will take the user to a tutorial explaining the user how to add an widget */
 "WidgetOnboardingCard.ActionButton" = "Nasıl yapılacağını göster";

focus-ios/Blockzilla/uk.lproj/Intro.strings

@@ -8,7 +8,7 @@
 "Intro.Slides.Next.Button" = "Далі";
 
 /* Description for the 'Favorite Search Engine' panel in the First Run tour. */
-"Intro.Slides.Search.Description" = "Шукаєте щось інше? Оберіть інший пошуковий засіб.";
+"Intro.Slides.Search.Description" = "Шукаєте щось інше? Оберіть іншу пошукову систему.";
 
 /* Title for the second  panel 'Search' in the First Run tour. */
 "Intro.Slides.Search.Title" = "Ваш пошук, ваш шлях";

focus-ios/Blockzilla/uk.lproj/Localizable.strings

@@ -44,7 +44,7 @@
 "actionSheet.openIn" = "Відкрити в %@";
 
 /* Button to dismiss the 'Add Pass Failed' alert. */
-"AddPass.Error.Dismiss" = "Гаразд";
+"AddPass.Error.Dismiss" = "OK";
 
 /* Message of the 'Add Pass Failed' alert. */
 "AddPass.Error.Message" = "При додаванні картки до Wallet сталася помилка. Спробуйте знову пізніше.";
@@ -248,7 +248,7 @@
 "Save" = "Зберегти";
 
 /* Label for error state when entering an invalid search engine URL. %s is a search term in a URL. */
-"SearchEngine.addEngineError" = "Це не спрацювало. Спробуйте замінити пошуковий запит цим: %s.";
+"SearchEngine.addEngineError" = "Це не спрацювало. Спробуйте змінити пошуковий запит цим: %s.";
 
 /* Label for disable option on search suggestions prompt */
 "SearchSuggestions.promptDisable" = "Ні";
@@ -257,7 +257,7 @@
 "SearchSuggestions.promptEnable" = "Так";
 
 /* %@ is the name of the app (Focus / Klar). Label for search suggestions prompt message */
-"SearchSuggestions.promptMessage" = "Для отримання пропозицій %@ повинен відправляти введений в адресному рядку текст провайдеру пошуку.";
+"SearchSuggestions.promptMessage" = "Для отримання пропозицій %@ повинен відправляти пошуковій системі введений в адресному рядку текст.";
 
 /* Title for search suggestions prompt */
 "SearchSuggestions.promptTitle" = "Показувати пошукові пропозиції?";
@@ -278,7 +278,7 @@
 "Settings.darkTheme" = "Темна";
 
 /* Description associated to the Search Suggestions toggle on main screen. %@ is the app name (Focus/Klar) */
-"Settings.detailTextSearchSuggestion" = "%@ відправлятиме провайдеру пошуку текст, введений в адресному рядку.";
+"Settings.detailTextSearchSuggestion" = "%@ відправлятиме пошуковій системі текст, введений в адресному рядку.";
 
 /* Description associated to the Send Usage Data toggle on main screen. %@ is the app name (Focus/Klar) */
 "Settings.detailTextSendUsageData" = "Mozilla зобов'язується збирати лише ті дані, що необхідні для роботи та вдосконалення %@.";
@@ -308,25 +308,25 @@
 "Settings.screenTitle" = "Параметри";
 
 /* Text for button to add another search engine in settings */
-"Settings.Search.AddSearchEngineButton" = "Додати інший засіб пошуку";
+"Settings.Search.AddSearchEngineButton" = "Додати іншу пошукову систему";
 
 /* Title on add search engine settings screen */
-"Settings.Search.AddSearchEngineTitle" = "Додати засіб пошуку";
+"Settings.Search.AddSearchEngineTitle" = "Додати пошукову систему";
 
 /* Header for rows of installed search engines */
-"Settings.Search.InstalledSearchEngines" = "ВСТАНОВЛЕНІ ЗАСОБИ ПОШУКУ";
+"Settings.Search.InstalledSearchEngines" = "ВСТАНОВЛЕНІ ПОШУКОВІ СИСТЕМИ";
 
 /* Label for input field for the name of the search engine to be added */
 "Settings.Search.NameToDisplay" = "Назва для показу";
 
 /* Toast displayed after adding a search engine */
-"Settings.Search.NewSearchEngineAdded" = "Новий засіб пошуку додано.";
+"Settings.Search.NewSearchEngineAdded" = "Нову пошукову систему додано.";
 
 /* Label for button to bring deleted default engines back */
-"Settings.Search.RestoreEngine" = "Відновити типові засоби пошуку";
+"Settings.Search.RestoreEngine" = "Відновити типові пошукові системи";
 
 /* Placeholder text for input of new search engine name */
-"Settings.Search.SearchEngineName" = "Назва засобу пошуку";
+"Settings.Search.SearchEngineName" = "Назва пошукової системи";
 
 /* Label for input of search engine template */
 "Settings.Search.SearchTemplate" = "Запит для пошуку";
@@ -338,7 +338,7 @@
 "Settings.Search.SearchTemplatePlaceholder" = "Вставте або введіть запит для пошуку. Якщо необхідно, замініть пошуковий термін на: %s.";
 
 /* Label for the search engine in the search screen */
-"Settings.searchLabel" = "Засіб пошуку";
+"Settings.searchLabel" = "Пошукова система";
 
 /* Label for the Search Suggestions toggle row */
 "Settings.searchSuggestions" = "Отримувати пошукові пропозиції";

focus-ios/Widgets/uk.lproj/Localizable.strings

@@ -2,7 +2,7 @@
 "TodayWidget.QuickActionGalleryDescription" = "Додайте ярлик %@ на головний екран. Після додавання віджета торкніться й утримуйте, щоб змінити його та вибрати інший ярлик.";
 
 /* Description for small size widget to add it to home screen. %@ is the name of the app(Focus/Klar). */
-"TodayWidget.QuickActionGalleryDescriptionV2" = "Почніть приватний пошук у %@ за допомогою типового пошукового засобу.";
+"TodayWidget.QuickActionGalleryDescriptionV2" = "Почніть приватний пошук у %@ за допомогою типової пошукової системи.";
 
 /* Quick Actions title when widget enters edit mode */
 "TodayWidget.QuickActionsGalleryTitle" = "Швидкі дії";

focus-ios/focus-ios-tests/XCUITest/OnboardingTest.swift

@@ -38,6 +38,7 @@ class OnboardingTest: XCTestCase {
        }
 
     // Smoketest
+    // https://testrail.stage.mozaws.net/index.php?/cases/view/394959
     func testPressingDots() throws {
         let pageIndicatorButton = app.pageIndicators.firstMatch
         XCTAssertEqual(pageIndicatorButton.value as? String, "page 1 of 2")