diff --git a/mobile/lib/l10n/intl_be.arb b/mobile/lib/l10n/intl_be.arb index 4e41eabcb6..96cf8a2814 100644 --- a/mobile/lib/l10n/intl_be.arb +++ b/mobile/lib/l10n/intl_be.arb @@ -208,14 +208,5 @@ "darkTheme": "Цёмная", "systemTheme": "Сістэма", "freeTrial": "Бясплатная пробная версія", -<<<<<<< HEAD - "faqs": "Частыя пытанні", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "faqs": "Частыя пытанні" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_bg.arb b/mobile/lib/l10n/intl_bg.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_bg.arb +++ b/mobile/lib/l10n/intl_bg.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ca.arb b/mobile/lib/l10n/intl_ca.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_ca.arb +++ b/mobile/lib/l10n/intl_ca.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_cs.arb b/mobile/lib/l10n/intl_cs.arb index fa16e34a60..cfe52cf83c 100644 --- a/mobile/lib/l10n/intl_cs.arb +++ b/mobile/lib/l10n/intl_cs.arb @@ -439,14 +439,5 @@ "selfiesWithThem": "Selfie s {name}", "cLIcon": "Nová ikona", "cLMemories": "Vzpomínky", -<<<<<<< HEAD - "cLWidgets": "Widgety", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "cLWidgets": "Widgety" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_da.arb b/mobile/lib/l10n/intl_da.arb index 225ee76f31..dfd9dee37f 100644 --- a/mobile/lib/l10n/intl_da.arb +++ b/mobile/lib/l10n/intl_da.arb @@ -322,14 +322,5 @@ "longPressAnEmailToVerifyEndToEndEncryption": "Langt tryk på en e-mail for at bekræfte slutningen af krypteringen.", "developerSettingsWarning": "Er du sikker på, at du vil ændre udviklerindstillingerne?", "next": "Næste", -<<<<<<< HEAD - "enterPin": "Indtast PIN", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "enterPin": "Indtast PIN" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_de.arb b/mobile/lib/l10n/intl_de.arb index f4e69d69e3..205cbc65ec 100644 --- a/mobile/lib/l10n/intl_de.arb +++ b/mobile/lib/l10n/intl_de.arb @@ -1741,17 +1741,9 @@ "cLBulkEdit": "Massenbearbeitung von Datumsangaben", "cLBulkEditDesc": "Du kannst jetzt mehrere Fotos auswählen, und das Datum/Uhrzeit für alle mit einer Aktion ändern. Das Verschieben von Daten wird auch unterstützt.", "curatedMemories": "Ausgewählte Erinnerungen", -<<<<<<< HEAD - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "onThisDay": "An diesem Tag", "deleteMultipleAlbumDialog": "Sollen die Fotos (und Videos) aus diesen {count} Alben auch aus allen anderen Alben gelöscht werden, in denen sie enthalten sind?", "addParticipants": "Teilnehmer hinzufügen", "selectedAlbums": "{count} ausgewählt", "actionNotSupportedOnFavouritesAlbum": "Aktion für das Favoritenalbum nicht unterstützt" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_el.arb b/mobile/lib/l10n/intl_el.arb index d0365016b9..ce8b1a1a54 100644 --- a/mobile/lib/l10n/intl_el.arb +++ b/mobile/lib/l10n/intl_el.arb @@ -1,13 +1,4 @@ { "@@locale ": "en", -<<<<<<< HEAD - "enterYourEmailAddress": "Εισάγετε την διεύθυνση ηλ. ταχυδρομείου σας", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "enterYourEmailAddress": "Εισάγετε την διεύθυνση ηλ. ταχυδρομείου σας" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_es.arb b/mobile/lib/l10n/intl_es.arb index 3fd428bdbe..f5348065ba 100644 --- a/mobile/lib/l10n/intl_es.arb +++ b/mobile/lib/l10n/intl_es.arb @@ -1734,14 +1734,5 @@ "cLFamilyPlanDesc": "Ahora puede establecer límites en cuanto al almacenamiento que los miembros de tu familia pueden utilizar.", "cLBulkEdit": "Edición masiva de fechas", "cLBulkEditDesc": "Ahora puedes seleccionar múltiples fotos y editar la fecha/hora para todas ellas con una acción rápida. También es posible cambiar las fechas.", -<<<<<<< HEAD - "curatedMemories": "Memorias revisadas", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "curatedMemories": "Memorias revisadas" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_et.arb b/mobile/lib/l10n/intl_et.arb index 869a05cf35..dfe1fba1a4 100644 --- a/mobile/lib/l10n/intl_et.arb +++ b/mobile/lib/l10n/intl_et.arb @@ -218,14 +218,5 @@ "storageBreakupYou": "Sina", "@storageBreakupYou": { "description": "Label to indicate how much storage you are using when you are part of a family plan" -<<<<<<< HEAD - }, - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= } ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_eu.arb b/mobile/lib/l10n/intl_eu.arb index 749abba54b..b08aaee4ef 100644 --- a/mobile/lib/l10n/intl_eu.arb +++ b/mobile/lib/l10n/intl_eu.arb @@ -458,14 +458,5 @@ "iOSLockOut": "Autentifikazio biometrikoa deuseztatuta dago. Mesedez, blokeatu eta desblokeatu zure pantaila indarrean jartzeko.", "@iOSLockOut": { "description": "Message advising the user to re-enable biometrics on their device. It shows in a dialog on iOS side." -<<<<<<< HEAD - }, - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= } ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_fa.arb b/mobile/lib/l10n/intl_fa.arb index 4fa1ea222b..edabff8132 100644 --- a/mobile/lib/l10n/intl_fa.arb +++ b/mobile/lib/l10n/intl_fa.arb @@ -307,14 +307,5 @@ "developerSettings": "تنظیمات توسعه‌دهنده", "search": "جستجو", "whatsNew": "تغییرات جدید", -<<<<<<< HEAD - "reviewSuggestions": "مرور پیشنهادها", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "reviewSuggestions": "مرور پیشنهادها" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_fr.arb b/mobile/lib/l10n/intl_fr.arb index 652e8b9fb1..3f4dc5004c 100644 --- a/mobile/lib/l10n/intl_fr.arb +++ b/mobile/lib/l10n/intl_fr.arb @@ -1733,17 +1733,9 @@ "cLBulkEdit": "Dates de modification multiples", "cLBulkEditDesc": "Vous pouvez maintenant sélectionner plusieurs photos et modifier la date/heure pour toutes celles-ci, en une seule action rapide. Les dates de décalage sont également prises en charge.", "curatedMemories": "Souvenirs conservés", -<<<<<<< HEAD - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "onThisDay": "Ce jour-ci", "deleteMultipleAlbumDialog": "Supprimer également les photos (et les vidéos) présentes dans ces {count} albums de tous les autres albums dont ils font partie ?", "addParticipants": "Ajouter des participants", "selectedAlbums": "{count} sélectionné(s)", "actionNotSupportedOnFavouritesAlbum": "Action non prise en charge sur l'album des Favoris" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_gu.arb b/mobile/lib/l10n/intl_gu.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_gu.arb +++ b/mobile/lib/l10n/intl_gu.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_he.arb b/mobile/lib/l10n/intl_he.arb index 7f59c73d48..c4232070a8 100644 --- a/mobile/lib/l10n/intl_he.arb +++ b/mobile/lib/l10n/intl_he.arb @@ -791,14 +791,5 @@ "addPhotos": "הוסף תמונות", "create": "צור", "viewAll": "הצג הכל", -<<<<<<< HEAD - "hiding": "מחביא...", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "hiding": "מחביא..." ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_hi.arb b/mobile/lib/l10n/intl_hi.arb index 3d6320bd55..b79d9682f2 100644 --- a/mobile/lib/l10n/intl_hi.arb +++ b/mobile/lib/l10n/intl_hi.arb @@ -48,14 +48,5 @@ "sorry": "क्षमा करें!", "noRecoveryKeyNoDecryption": "हमारे एंड-टू-एंड एन्क्रिप्शन प्रोटोकॉल की प्रकृति के कारण, आपके डेटा को आपके पासवर्ड या रिकवरी कुंजी के बिना डिक्रिप्ट नहीं किया जा सकता है", "verifyEmail": "ईमेल सत्यापित करें", -<<<<<<< HEAD - "toResetVerifyEmail": "अपना पासवर्ड रीसेट करने के लिए, कृपया पहले अपना ईमेल सत्यापित करें।", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "toResetVerifyEmail": "अपना पासवर्ड रीसेट करने के लिए, कृपया पहले अपना ईमेल सत्यापित करें।" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_hu.arb b/mobile/lib/l10n/intl_hu.arb index 1b9e55ca71..92bdab9095 100644 --- a/mobile/lib/l10n/intl_hu.arb +++ b/mobile/lib/l10n/intl_hu.arb @@ -10,14 +10,5 @@ "deleteAccount": "Fiók törlése", "askDeleteReason": "Miért törli a fiókját?", "deleteAccountFeedbackPrompt": "Sajnáljuk, hogy távozik. Kérjük, ossza meg velünk visszajelzéseit, hogy segítsen nekünk a fejlődésben.", -<<<<<<< HEAD - "feedback": "Visszajelzés", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "feedback": "Visszajelzés" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_id.arb b/mobile/lib/l10n/intl_id.arb index b3d9bf85d4..4515504579 100644 --- a/mobile/lib/l10n/intl_id.arb +++ b/mobile/lib/l10n/intl_id.arb @@ -1096,14 +1096,5 @@ "rotate": "Putar", "left": "Kiri", "right": "Kanan", -<<<<<<< HEAD - "whatsNew": "Hal yang baru", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "whatsNew": "Hal yang baru" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_it.arb b/mobile/lib/l10n/intl_it.arb index 65b32a34e0..7c718f6ab8 100644 --- a/mobile/lib/l10n/intl_it.arb +++ b/mobile/lib/l10n/intl_it.arb @@ -1548,14 +1548,5 @@ "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages." }, "processingVideos": "Elaborando video", -<<<<<<< HEAD - "onThisDay": "On this day", - "joinAlbumConfirmationDialogBody": "Unirsi a un album renderà visibile la tua email ai suoi partecipanti.", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "joinAlbumConfirmationDialogBody": "Unirsi a un album renderà visibile la tua email ai suoi partecipanti." ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ja.arb b/mobile/lib/l10n/intl_ja.arb index 31e4614895..e4082bd51b 100644 --- a/mobile/lib/l10n/intl_ja.arb +++ b/mobile/lib/l10n/intl_ja.arb @@ -1676,14 +1676,5 @@ "cLFamilyPlan": "ファミリープランの制限", "cLFamilyPlanDesc": "ファミリーメンバーが使用できるストレージ容量の制限を設定できるようになりました。", "cLBulkEdit": "日付を一括編集", -<<<<<<< HEAD - "cLBulkEditDesc": "複数の写真を、1回の操作で日付/時刻を編集することもできるようになりました。", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "cLBulkEditDesc": "複数の写真を、1回の操作で日付/時刻を編集することもできるようになりました。" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_km.arb b/mobile/lib/l10n/intl_km.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_km.arb +++ b/mobile/lib/l10n/intl_km.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ko.arb b/mobile/lib/l10n/intl_ko.arb index 65d2c8b3e4..06c81195f7 100644 --- a/mobile/lib/l10n/intl_ko.arb +++ b/mobile/lib/l10n/intl_ko.arb @@ -12,14 +12,5 @@ "feedback": "피드백", "confirmAccountDeletion": "계정 삭제 확인", "deleteAccountPermanentlyButton": "계정을 영구적으로 삭제", -<<<<<<< HEAD - "yourAccountHasBeenDeleted": "계정이 삭제되었습니다.", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "yourAccountHasBeenDeleted": "계정이 삭제되었습니다." ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_lt.arb b/mobile/lib/l10n/intl_lt.arb index b64a6f97ff..5b71c6fba1 100644 --- a/mobile/lib/l10n/intl_lt.arb +++ b/mobile/lib/l10n/intl_lt.arb @@ -1595,13 +1595,5 @@ "cLBulkEdit": "Masiškai redaguokite datas", "cLBulkEditDesc": "Dabar galite pasirinkti kelias nuotraukas ir vienu sparčiu veiksmu redaguoti visų nuotraukų datą ir laiką. Taip pat palaikomas datų perkėlimas.", "curatedMemories": "Kuruoti prisiminimai", -<<<<<<< HEAD - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "onThisDay": "Šią dieną" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_lv.arb b/mobile/lib/l10n/intl_lv.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_lv.arb +++ b/mobile/lib/l10n/intl_lv.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ml.arb b/mobile/lib/l10n/intl_ml.arb index a7a3a8a72b..7cfd3a2887 100644 --- a/mobile/lib/l10n/intl_ml.arb +++ b/mobile/lib/l10n/intl_ml.arb @@ -99,14 +99,5 @@ "nothingToSeeHere": "ഇവിടൊന്നും കാണ്മാനില്ല! 👀", "calculating": "കണക്കുകൂട്ടുന്നു...", "close": "അടക്കുക", -<<<<<<< HEAD - "count": "എണ്ണം", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "count": "എണ്ണം" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_nl.arb b/mobile/lib/l10n/intl_nl.arb index 3638a6052c..2afe314f56 100644 --- a/mobile/lib/l10n/intl_nl.arb +++ b/mobile/lib/l10n/intl_nl.arb @@ -1740,18 +1740,10 @@ "cLFamilyPlanDesc": "Je kunt nu limieten instellen voor hoeveel opslag je familieleden kunnen gebruiken.", "cLBulkEdit": "Bulk datums wijzigen", "cLBulkEditDesc": "Je kunt nu meerdere foto's selecteren en de datum/tijd van ze allemaal bewerken met één snelle actie. Verschuiven van datums wordt ook ondersteund.", -<<<<<<< HEAD - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "curatedMemories": "Samengestelde herinneringen", "onThisDay": "Op deze dag", "deleteMultipleAlbumDialog": "Verwijder de foto's (en video's) van deze {count} albums ook uit alle andere albums waar deze deel van uitmaken?", "addParticipants": "Voeg deelnemers toe", "selectedAlbums": "{count} geselecteerd", "actionNotSupportedOnFavouritesAlbum": "Actie niet ondersteund op Favorieten album" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_no.arb b/mobile/lib/l10n/intl_no.arb index ebf1a21019..f6d8a704c3 100644 --- a/mobile/lib/l10n/intl_no.arb +++ b/mobile/lib/l10n/intl_no.arb @@ -1699,14 +1699,5 @@ "cLFamilyPlan": "Begrensninger for familieabonnement", "cLFamilyPlanDesc": "Du kan nå sette grenser for hvor mye lagringsplass familiemedlemmer kan bruke.", "cLBulkEdit": "Masseendring av datoer", -<<<<<<< HEAD - "cLBulkEditDesc": "Du kan nå velge flere bilder, og redigere dato/klokkeslett for alle med en rask handling. Forskyving av datoer støttes også.", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "cLBulkEditDesc": "Du kan nå velge flere bilder, og redigere dato/klokkeslett for alle med en rask handling. Forskyving av datoer støttes også." ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_or.arb b/mobile/lib/l10n/intl_or.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_or.arb +++ b/mobile/lib/l10n/intl_or.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_pl.arb b/mobile/lib/l10n/intl_pl.arb index bd64267fa4..6181cdb0a8 100644 --- a/mobile/lib/l10n/intl_pl.arb +++ b/mobile/lib/l10n/intl_pl.arb @@ -1533,14 +1533,5 @@ "joinAlbumSubtextViewer": "aby dodać to do udostępnionych albumów", "join": "Dołącz", "linkEmail": "Połącz adres e-mail", -<<<<<<< HEAD - "noEnteAccountExclamation": "Brak konta Ente!", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "noEnteAccountExclamation": "Brak konta Ente!" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_pt_BR.arb b/mobile/lib/l10n/intl_pt_BR.arb index b14df1d5a1..a8754df05f 100644 --- a/mobile/lib/l10n/intl_pt_BR.arb +++ b/mobile/lib/l10n/intl_pt_BR.arb @@ -1741,17 +1741,9 @@ "cLBulkEdit": "Editar todas as datas", "cLBulkEditDesc": "Agora você pode selecionar várias fotos, editar data e hora de todos com um só clique. Alternar datas também são suportados.", "curatedMemories": "Memórias restauradas", -<<<<<<< HEAD - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "onThisDay": "Neste dia", "deleteMultipleAlbumDialog": "E também excluir todas as fotos (e vídeos) presente dentro desses {count} álbuns e de todos os álbuns que eles fazem parte?", "addParticipants": "Adicionar participante", "selectedAlbums": "{count} selecionado(s)", "actionNotSupportedOnFavouritesAlbum": "Ação não suportada em álbum favorito" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_pt_PT.arb b/mobile/lib/l10n/intl_pt_PT.arb index 20e8a54e69..b1bd6e5ac2 100644 --- a/mobile/lib/l10n/intl_pt_PT.arb +++ b/mobile/lib/l10n/intl_pt_PT.arb @@ -1387,14 +1387,5 @@ "example": "no network" } } -<<<<<<< HEAD - }, - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= } ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ro.arb b/mobile/lib/l10n/intl_ro.arb index 333ef45857..6cc353ab2b 100644 --- a/mobile/lib/l10n/intl_ro.arb +++ b/mobile/lib/l10n/intl_ro.arb @@ -1522,14 +1522,5 @@ "joinAlbum": "Alăturați-vă albumului", "joinAlbumSubtext": "pentru a vedea și a adăuga fotografii", "joinAlbumSubtextViewer": "pentru a adăuga la albumele distribuite", -<<<<<<< HEAD - "join": "Alăturare", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "join": "Alăturare" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ru.arb b/mobile/lib/l10n/intl_ru.arb index 7abdf94ae3..b58ff60291 100644 --- a/mobile/lib/l10n/intl_ru.arb +++ b/mobile/lib/l10n/intl_ru.arb @@ -1734,14 +1734,5 @@ "cLFamilyPlanDesc": "Теперь вы можете установить ограничения на объём хранилища, которое могут использовать члены вашей семьи.", "cLBulkEdit": "Массовое редактирование дат", "cLBulkEditDesc": "Теперь вы можете выбрать несколько фото и отредактировать дату/время быстро и сразу для всех. Также поддерживается смещение дат.", -<<<<<<< HEAD - "curatedMemories": "Отобранные воспоминания", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "curatedMemories": "Отобранные воспоминания" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_sl.arb b/mobile/lib/l10n/intl_sl.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_sl.arb +++ b/mobile/lib/l10n/intl_sl.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_sv.arb b/mobile/lib/l10n/intl_sv.arb index 3bd8b9a60c..ccc0d6f882 100644 --- a/mobile/lib/l10n/intl_sv.arb +++ b/mobile/lib/l10n/intl_sv.arb @@ -531,14 +531,5 @@ "sort": "Sortera", "newPerson": "Ny person", "addName": "Lägg till namn", -<<<<<<< HEAD - "add": "Lägg till", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "add": "Lägg till" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ta.arb b/mobile/lib/l10n/intl_ta.arb index b7a1b30582..1b9d1e8190 100644 --- a/mobile/lib/l10n/intl_ta.arb +++ b/mobile/lib/l10n/intl_ta.arb @@ -19,14 +19,5 @@ "deleteAccountPermanentlyButton": "கணக்கை நிரந்தரமாக நீக்கவும்", "yourAccountHasBeenDeleted": "உங்கள் கணக்கு நீக்கப்பட்டது", "selectReason": "காரணத்தைத் தேர்ந்தெடுக்கவும்", -<<<<<<< HEAD - "deleteReason1": "எனக்கு தேவையான ஒரு முக்கிய அம்சம் இதில் இல்லை", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "deleteReason1": "எனக்கு தேவையான ஒரு முக்கிய அம்சம் இதில் இல்லை" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_te.arb b/mobile/lib/l10n/intl_te.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_te.arb +++ b/mobile/lib/l10n/intl_te.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_th.arb b/mobile/lib/l10n/intl_th.arb index 5ea849c899..a7c4c4ccb2 100644 --- a/mobile/lib/l10n/intl_th.arb +++ b/mobile/lib/l10n/intl_th.arb @@ -287,14 +287,5 @@ "description": "Label for the map view" }, "maps": "แผนที่", -<<<<<<< HEAD - "enableMaps": "เปิดใช้งานแผนที่", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "enableMaps": "เปิดใช้งานแผนที่" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ti.arb b/mobile/lib/l10n/intl_ti.arb index a906c6416e..c8494661c6 100644 --- a/mobile/lib/l10n/intl_ti.arb +++ b/mobile/lib/l10n/intl_ti.arb @@ -1,12 +1,3 @@ { -<<<<<<< HEAD - "@@locale ": "en", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "@@locale ": "en" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_tr.arb b/mobile/lib/l10n/intl_tr.arb index 084fbb0d4e..c3ae396543 100644 --- a/mobile/lib/l10n/intl_tr.arb +++ b/mobile/lib/l10n/intl_tr.arb @@ -1739,14 +1739,5 @@ "cLFamilyPlanDesc": "Artık aile üyelerinizin ne kadar depolama alanı kullanabileceğine dair sınırlar belirleyebilirsiniz.", "cLBulkEdit": "Tarihleri toplu düzenle", "cLBulkEditDesc": "Artık birden fazla fotoğraf seçebilir ve tek bir hızlı işlemle hepsi için tarih/saat düzenleyebilirsiniz. Tarih kaydırma da desteklenmektedir.", -<<<<<<< HEAD - "curatedMemories": "Seçilmiş anılar", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "curatedMemories": "Seçilmiş anılar" ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_uk.arb b/mobile/lib/l10n/intl_uk.arb index f43160beb7..c13e19312c 100644 --- a/mobile/lib/l10n/intl_uk.arb +++ b/mobile/lib/l10n/intl_uk.arb @@ -1510,14 +1510,5 @@ }, "legacyInvite": "{email} запросив вас стати довіреною особою", "authToManageLegacy": "Авторизуйтесь, щоби керувати довіреними контактами", -<<<<<<< HEAD - "useDifferentPlayerInfo": "Виникли проблеми з відтворенням цього відео? Натисніть і утримуйте тут, щоб спробувати інший плеєр.", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "useDifferentPlayerInfo": "Виникли проблеми з відтворенням цього відео? Натисніть і утримуйте тут, щоб спробувати інший плеєр." ->>>>>>> main } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_vi.arb b/mobile/lib/l10n/intl_vi.arb index 8e9a23fa60..9943afc24a 100644 --- a/mobile/lib/l10n/intl_vi.arb +++ b/mobile/lib/l10n/intl_vi.arb @@ -1532,14 +1532,5 @@ "joinAlbum": "Tham gia album", "joinAlbumSubtext": "để xem và thêm ảnh của bạn", "joinAlbumSubtextViewer": "thêm vào album được chia sẻ", -<<<<<<< HEAD - "join": "Tham gia", - "onThisDay": "On this day", - "lookBackOnYourMemories": "Look back on your memories 🌄", - "newPhotosEmoji": " new 📸", - "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", - "clickToInstallOurBestVersionYet": "Click to install our best version yet" -======= "join": "Tham gia" ->>>>>>> main } \ No newline at end of file