From c2a82bf782bf88609fcdf83ed966e60684d24c7d Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 28 Sep 2023 17:56:33 +0530 Subject: [PATCH 1/2] Move our string modifications to e_strings.xml --- .../lineageos/updater/UpdaterReceiver.java | 2 +- .../lineageos/updater/UpdatesActivity.java | 2 +- .../lineageos/updater/UpdatesListAdapter.java | 24 +++++----- .../updater/controller/UpdaterService.java | 8 ++-- .../layout-television/activity_updates.xml | 2 +- app/src/main/res/layout/activity_updates.xml | 6 +-- app/src/main/res/layout/update_item_view.xml | 4 +- app/src/main/res/menu/menu_toolbar.xml | 2 +- app/src/main/res/values-de/e_strings.xml | 34 ++++++++++++++ app/src/main/res/values-es/e_strings.xml | 22 +++++++++ app/src/main/res/values-fr/e_strings.xml | 44 ++++++++++++++++++ app/src/main/res/values-is/e_strings.xml | 45 +++++++++++++++++++ app/src/main/res/values-it/e_strings.xml | 34 ++++++++++++++ app/src/main/res/values-nl/e_strings.xml | 34 ++++++++++++++ app/src/main/res/values-ru/e_strings.xml | 34 ++++++++++++++ app/src/main/res/values/arrays.xml | 6 +-- app/src/main/res/values/e_strings.xml | 39 ++++++++++++++++ 17 files changed, 314 insertions(+), 28 deletions(-) create mode 100644 app/src/main/res/values-de/e_strings.xml create mode 100644 app/src/main/res/values-es/e_strings.xml create mode 100644 app/src/main/res/values-fr/e_strings.xml create mode 100644 app/src/main/res/values-is/e_strings.xml create mode 100644 app/src/main/res/values-it/e_strings.xml create mode 100644 app/src/main/res/values-nl/e_strings.xml create mode 100644 app/src/main/res/values-ru/e_strings.xml create mode 100644 app/src/main/res/values/e_strings.xml diff --git a/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java b/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java index 081b8d97..f295f05c 100644 --- a/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java +++ b/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java @@ -60,7 +60,7 @@ public class UpdaterReceiver extends BroadcastReceiver { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); String buildDate = StringGenerator.getDateLocalizedUTC(context, DateFormat.MEDIUM, preferences.getLong(Constants.PREF_INSTALL_NEW_TIMESTAMP, 0)); - String buildInfo = context.getString(R.string.list_build_version_date_e, + String buildInfo = context.getString(R.string.e_list_build_version_date, BuildInfoUtils.getBuildVersion(), buildDate); Intent notificationIntent = new Intent(context, UpdatesActivity.class); diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java index 32b3b167..8eb8cd1d 100644 --- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java +++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java @@ -183,7 +183,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport } TextView headerTitle = findViewById(R.id.header_title); - headerTitle.setText(getString(R.string.header_title_text_e, + headerTitle.setText(getString(R.string.e_header_title_text, BuildInfoUtils.getDisplayVersion())); updateLastCheckedString(); diff --git a/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java b/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java index ceeabcef..745e0639 100644 --- a/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java +++ b/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java @@ -247,7 +247,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter= 1) { - String message = resources.getString(R.string.dialog_free_space_low_message_pct, + String message = resources.getString(R.string.e_dialog_free_space_low_message_pct, new DecimalFormat("# MB").format(spaceNeeded)); return new AlertDialog.Builder(mActivity) - .setTitle(R.string.dialog_free_space_low_title) + .setTitle(R.string.e_dialog_free_space_low_title) .setMessage(message) .setPositiveButton(android.R.string.ok, null); } @@ -370,7 +370,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter { if (checkbox.isChecked()) { @@ -390,7 +390,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter { @@ -541,29 +541,29 @@ public class UpdatesListAdapter extends RecyclerView.Adapter preferences.edit() .putBoolean(Constants.HAS_SEEN_INFO_DIALOG, true) .apply()) diff --git a/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java b/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java index 5e163830..6b69d282 100644 --- a/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java +++ b/app/src/main/java/org/lineageos/updater/controller/UpdaterService.java @@ -377,7 +377,7 @@ public class UpdaterService extends Service { mNotificationBuilder.setStyle(null); mNotificationBuilder.setSmallIcon(R.drawable.ic_system_update); mNotificationBuilder.setProgress(0, 0, false); - String text = getString(R.string.download_completed_notification); + String text = getString(R.string.e_download_completed_notification); boolean hasRequiredSpace = Utils.availableFreeSpace() > (update.getFileSize() * 2); if (!Utils.canInstall(update) || !Utils.isBatteryLevelOk(this) @@ -387,7 +387,7 @@ public class UpdaterService extends Service { if (!Utils.isBatteryLevelOk(this)) { text = text + getString(R.string.dialog_battery_low_title); } else if (!hasRequiredSpace) { - text = text + getString(R.string.dialog_free_space_low_title); + text = text + getString(R.string.e_dialog_free_space_low_title); } else if (!Utils.canInstall(update)) { text = text + getString(R.string.verification_failed_notification); } @@ -395,7 +395,7 @@ public class UpdaterService extends Service { /* Add action to reboot and install for Non-A/B devices. */ mNotificationBuilder.mActions.clear(); mNotificationBuilder.addAction(R.drawable.ic_system_update, - getString(R.string.reboot_install), + getString(R.string.e_reboot_install), getInstallationPendingIntent(update.getDownloadId())); } @@ -568,7 +568,7 @@ public class UpdaterService extends Service { private void setNotificationTitle(UpdateInfo update) { String buildDate = StringGenerator.getDateLocalizedUTC(this, DateFormat.MEDIUM, update.getTimestamp()); - String buildInfo = getString(R.string.list_build_version_date_e, + String buildInfo = getString(R.string.e_list_build_version_date, update.getVersion(), buildDate); mNotificationStyle.setBigContentTitle(buildInfo); mNotificationBuilder.setContentTitle(buildInfo); diff --git a/app/src/main/res/layout-television/activity_updates.xml b/app/src/main/res/layout-television/activity_updates.xml index efabfea4..df63d6c8 100644 --- a/app/src/main/res/layout-television/activity_updates.xml +++ b/app/src/main/res/layout-television/activity_updates.xml @@ -105,7 +105,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:text="@string/list_no_updates" + android:text="@string/e_list_no_updates" android:textColor="?android:textColorSecondary" /> diff --git a/app/src/main/res/layout/activity_updates.xml b/app/src/main/res/layout/activity_updates.xml index fa839141..594cfbac 100644 --- a/app/src/main/res/layout/activity_updates.xml +++ b/app/src/main/res/layout/activity_updates.xml @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingBottom="24dp" - android:text="@string/current_version" + android:text="@string/e_current_version" android:textColor="?android:attr/textColorPrimary" android:textSize="16sp" /> @@ -117,7 +117,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:text="@string/list_no_updates" + android:text="@string/e_list_no_updates" android:textColor="?android:textColorSecondary" /> @@ -141,7 +141,7 @@ android:paddingStart="16dp" android:textSize="16sp" android:background="?attr/colorPrimary" - android:text="@string/available_updates" + android:text="@string/e_available_updates" android:textColor="?android:textColorPrimary" /> diff --git a/app/src/main/res/values-de/e_strings.xml b/app/src/main/res/values-de/e_strings.xml new file mode 100644 index 00000000..159d08cc --- /dev/null +++ b/app/src/main/res/values-de/e_strings.xml @@ -0,0 +1,34 @@ + + + + Auf deinem Telefon läuft die neueste /e/OS-Version. Um manuell nach neuen Aktualisierungen zu suchen, verwende die Schaltfläche „Aktualisieren“. + /e/OS +\n%1$s + /e/OS-Aktualisierungen sind immer vollständige Installationspakete. Das bedeutet, dass du nur die neueste Aktualisierung aufspielen musst, selbst wenn du eine vorherige Aktualisierung vergessen hast. + Versionshinweise anzeigen + /e/OS %1$s - %2$s + /e/OS %1$s + Verfügbare Aktualisierungen: + Aktuelle Version: + Alle 30 Minuten + Alle 10 Minuten + Alle 5 Minuten + Die Aktualisierung kann nicht abgeschlossen werden, weil nicht genug Speicher frei ist. Mindestens %1$s freier interner Speicher ist nötig, bevor du weitermachst. + Platz schaffen + Aktualisierung installieren + Neustarten und Installieren + \ No newline at end of file diff --git a/app/src/main/res/values-es/e_strings.xml b/app/src/main/res/values-es/e_strings.xml new file mode 100644 index 00000000..9adf7197 --- /dev/null +++ b/app/src/main/res/values-es/e_strings.xml @@ -0,0 +1,22 @@ + + + + Versión actual: + Actualizaciones disponibles: + La actualización no puede completarse porque no hay suficiente espacio libre; al menos %1$s de espacio libre. Por favor, borra tu almacenamiento interno antes de proceder. + Liberar espacio + \ No newline at end of file diff --git a/app/src/main/res/values-fr/e_strings.xml b/app/src/main/res/values-fr/e_strings.xml new file mode 100644 index 00000000..9d53699f --- /dev/null +++ b/app/src/main/res/values-fr/e_strings.xml @@ -0,0 +1,44 @@ + + + + Vous utilisez actuellement la dernière version de /e/OS. Pour vérifier manuellement la présence de mises à jour, utilisez le bouton Actualiser. + Vous êtes sur le point de passer à la version %1$s. +\n +\nLorsque vous appuierez sur %2$s, votre appareil redémarrera automatiquement en mode récupération pour installer la mise à jour. +\n +\nRemarque : Cette opération nécessite une partition de récupération compatible, sans quoi les mises à jour devront être installées manuellement. + Vous êtes sur le point de passer à la version %1$s. +\n +\nLorsque vous appuierez sur %2$s, l’appareil commencera l\'installation en arrière plan. +\n +\nUne fois celle-ci terminée, il vous sera demandé de redémarrer. + + + Version actuelle : + /e/OS +\n%1$s + /e/OS %1$s - %2$s + /e/OS %1$s + Toutes les 30 minutes + Toutes les 10 minutes + Toutes les 5 minutes + L\'espace disponible n\'est pas suffisant pour installer la mise à jour : merci de libérer au moins %1$s de mémoire interne pour pouvoir continuer. + Libérez de l\'espace + Les mises à jour de /e/OS sont des paquets d\'installation complets. Cela signifie que vous pouvez vous contenter d\'installer la dernière mise à jour proposée, même si vous en avez raté quelques unes entre temps ! + Afficher les notes de version + Mises à jour disponibles : + \ No newline at end of file diff --git a/app/src/main/res/values-is/e_strings.xml b/app/src/main/res/values-is/e_strings.xml new file mode 100644 index 00000000..2d62dc0a --- /dev/null +++ b/app/src/main/res/values-is/e_strings.xml @@ -0,0 +1,45 @@ + + + + Uppfærsla er tilbúin til uppsetningar + Endurræsa og setja upp + Losa geymslupláss + Það er ekki nægilegt pláss eftir til að halda áfram með uppfærsluna: þú þarft fyrst að losa um %1$s í innri gagnageymslunni. + Á 5 mínútna fresti + Á 10 mínútna fresti + Á 30 mínútna fresti + Þú ert þegar að keyra nýjustu útgáfu /e/OS stýrikerfisins. Til að athuga handvirkt með nýjar uppfærslur, notaðu Endurlesa-hnappinn. + Setja inn uppfærslu + Þú ert í þann mund að setja upp %1$s. +\n +\nEf þú ýtir á %2$s, mun tækið endurræsa sig í endurheimtuham til að setja inn uppfærsluna. +\n +\nAthugaðu: Þessi eiginleiki krefst þess að til staðar séu samhæfð endurheimtugögn því annars þarf að setja uppfærslurnar inn handvirkt. + Þú ert í þann mund að setja upp %1$s. +\n +\nEf þú ýtir á %2$s, mun tækið hefja uppsetninguna í bakgrunnsferli. +\n +\nÞegar henni er lokið færðu beiðni um að endurræsa. + /e/OS %1$s + /e/OS %1$s - %2$s + Birta útgáfuupplýsingar + /e/OS +\n%1$s + Tiltækar uppfærslur: + Núverandi útgáfa: + Uppfærslur á /e/OS eru alltaf heilir uppsetningapakkar. Það þýðir að þú getur alltaf sett einungis upp nýjustu uppfærsluna, jafnvel þótt þú hafir sleppt einhverjum uppfærslum í millitíðinni! + \ No newline at end of file diff --git a/app/src/main/res/values-it/e_strings.xml b/app/src/main/res/values-it/e_strings.xml new file mode 100644 index 00000000..76327009 --- /dev/null +++ b/app/src/main/res/values-it/e_strings.xml @@ -0,0 +1,34 @@ + + + + Stai usando l\'ultima versione di /e/OS. Per verificare manualmente la presenza di aggiornamenti, utilizza il pulsante Aggiorna. + /e/OS +\n%1$s + Gli aggiornamenti di /e/OS sono pacchetti completi. Ciò significa che puoi sempre installare solo l\'ultimo aggiornamento, anche se ne hai saltati alcuni in mezzo! + Mostra note di rilascio + /e/OS %1$s - %2$s + /e/OS %1$s + Ogni 30 minuti + Ogni 10 minuti + Ogni 5 minuti + Versione attuale: + Agiornamenti disponibili: + Non c\'è spazio sufficiente per procedere con l\'aggiornamento; devi liberare almeno altri %1$s dalla memoria interna. + Libera spazio + Riavvia e installa + Applica aggiornamento + \ No newline at end of file diff --git a/app/src/main/res/values-nl/e_strings.xml b/app/src/main/res/values-nl/e_strings.xml new file mode 100644 index 00000000..908d7ff6 --- /dev/null +++ b/app/src/main/res/values-nl/e_strings.xml @@ -0,0 +1,34 @@ + + + + Je gebruikt de laatste versie van /e/OS. Gebruik de knop Vernieuwen om handmatig te controleren op nieuwe updates. + Beschikbare updates: + /e/OS +\n%1$s + /e/OS updates zijn volledige installatie pakketten.Dat betekend dat je altijd de laatste update kan installeren, zelfs als je hiermee sommige updates overslaat! + Toon release notes + /e/OS %1$s - %2$s + /e/OS %1$s + Huidige versie: + Elke 30 minuten + Elke 10 minuten + Elke 5 minuten + Er is niet genoeg geheugen vrij om deze update uit te voeren: je moet eerst nog %1$s intern geheugen vrijmaken. + Geheugen vrij maken + Update uitvoeren + Herstarten en installeren + \ No newline at end of file diff --git a/app/src/main/res/values-ru/e_strings.xml b/app/src/main/res/values-ru/e_strings.xml new file mode 100644 index 00000000..4471baeb --- /dev/null +++ b/app/src/main/res/values-ru/e_strings.xml @@ -0,0 +1,34 @@ + + + + Вы используете последнюю версию /e/OS. Чтобы проверить наличие обновлений вручную, используйте кнопку Обновить. + /e/OS +\n%1$s + Обновления /e/OS представляют собой полные установочные пакеты. Это означает, что вы всегда можете установить только последнее обновление, даже если вы пропустили несколько обновлений между ними! + Показать примечания к выпуску + /e/OS %1$s - %2$s + /e/OS %1$s + Каждые 30 минут + Каждые 10 минут + Каждые 5 минут + Текущая версия: + Доступные обновления: + Для продолжения обновления недостаточно места: сначала необходимо освободить еще %1$s во внутреннем хранилище. + Освободить место + Применить обновление + Перезагрузиться и установить + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 0448bf25..3374dccf 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -23,8 +23,8 @@ - @string/menu_auto_updates_check_interval_5_minutes - @string/menu_auto_updates_check_interval_10_minutes - @string/menu_auto_updates_check_interval_30_minutes + @string/e_menu_auto_updates_check_interval_5_minutes + @string/e_menu_auto_updates_check_interval_10_minutes + @string/e_menu_auto_updates_check_interval_30_minutes diff --git a/app/src/main/res/values/e_strings.xml b/app/src/main/res/values/e_strings.xml new file mode 100644 index 00000000..8082859c --- /dev/null +++ b/app/src/main/res/values/e_strings.xml @@ -0,0 +1,39 @@ + + + + Update is ready to be installed + Reboot and install + Free up space + There is not enough space left to proceed with the update: you must free up another %1$s in the internal storage first. + Every 5 minutes + Every 10 minutes + Every 30 minutes + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. + Apply update + You are about to update to %1$s.\n\nIf you press %2$s, the device will restart itself in recovery mode to install the update. + You are about to update to %1$s.\n\nIf you press %2$s, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot. + Version Upgrade! + You are about to upgrade to %1$s, based on Android %2$s\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press %3$s, the device will restart itself into recovery mode to install the update. + You are about to upgrade to %1$s, based on Android %2$s.\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press %3$s, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot. + /e/OS %1$s + /e/OS %1$s - %2$s + Show release notes + /e/OS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between! + /e/OS\n%1$s + Available updates: + Current version: + \ No newline at end of file -- GitLab From 7923f59c569e7d83a150a656e374dc30b690de4f Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 28 Sep 2023 18:02:54 +0530 Subject: [PATCH 2/2] Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts when merging upstream changes --- app/src/main/res/values-de/strings.xml | 24 +++------ app/src/main/res/values-en-rAU/strings.xml | 2 +- app/src/main/res/values-en-rCA/strings.xml | 2 +- app/src/main/res/values-en-rGB/strings.xml | 2 +- app/src/main/res/values-en-rIN/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 28 ++-------- app/src/main/res/values-fr/strings.xml | 42 ++++----------- app/src/main/res/values-it/strings.xml | 62 ++++++++-------------- app/src/main/res/values-nl/strings.xml | 18 ++----- app/src/main/res/values-ru/strings.xml | 27 +++------- app/src/main/res/values/strings.xml | 39 ++------------ 11 files changed, 61 insertions(+), 187 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1729529f..8de9af9c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -13,9 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> - Aktualisierungsprogramm - Aktualisierungsprogramm +--> + + Updater + Updater Überprüfung fehlgeschlagen Update wird geprüft Wird heruntergeladen @@ -69,7 +70,7 @@ %1$s von %2$s %1$s von %2$s (%3$s) Update wird geprüft - Auf deinem Telefon läuft die neueste /e/OS-Version. Um manuell nach neuen Aktualisierungen zu suchen, verwende die Schaltfläche „Aktualisieren“. + Keine neuen Updates gefunden. Um manuell nach neuen Updates zu suchen, verwende die Schaltfläche \"Aktualisieren\". Herunterladen Anhalten Fortsetzen @@ -115,17 +116,4 @@ Schon gewusst? LineageOS-Updates sind vollständige Installationspakete. Das bedeutet, dass du immer nur das neueste Update installieren zu brauchst, auch wenn du zwischendurch welche übersprungen hast! Danke für die Information! - /e/OS -\n%1$s - /e/OS-Aktualisierungen sind immer vollständige Installationspakete. Das bedeutet, dass du nur die neueste Aktualisierung aufspielen musst, selbst wenn du eine vorherige Aktualisierung vergessen hast. - Versionshinweise anzeigen - /e/OS %1$s - %2$s - /e/OS %1$s - Verfügbare Aktualisierungen: - Aktuelle Version: - Alle 30 Minuten - Alle 10 Minuten - Alle 5 Minuten - Die Aktualisierung kann nicht abgeschlossen werden, weil nicht genug Speicher frei ist. Mindestens %1$s freier interner Speicher ist nötig, bevor du weitermachst. - Platz schaffen - \ No newline at end of file + diff --git a/app/src/main/res/values-en-rAU/strings.xml b/app/src/main/res/values-en-rAU/strings.xml index 0c558249..85f48ac7 100644 --- a/app/src/main/res/values-en-rAU/strings.xml +++ b/app/src/main/res/values-en-rAU/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - You are running the latest /e/OS version. To manually check for updates, use the Refresh button. + No new updates found. To manually check for new updates, use the Refresh button. Download Pause Resume diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml index a48e29df..6596afc3 100644 --- a/app/src/main/res/values-en-rCA/strings.xml +++ b/app/src/main/res/values-en-rCA/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - You are running the latest /e/OS version. To manually check for updates, use the Refresh button. + No new updates found. To manually check for new updates, use the Refresh button. Download Pause Resume diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index 9a3b59ff..f56d4550 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - You are running the latest /e/OS version. To manually check for updates, use the Refresh button. + No new updates found. To manually check for new updates, use the Refresh button. Download Pause Resume diff --git a/app/src/main/res/values-en-rIN/strings.xml b/app/src/main/res/values-en-rIN/strings.xml index 9a3b59ff..f56d4550 100644 --- a/app/src/main/res/values-en-rIN/strings.xml +++ b/app/src/main/res/values-en-rIN/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - You are running the latest /e/OS version. To manually check for updates, use the Refresh button. + No new updates found. To manually check for new updates, use the Refresh button. Download Pause Resume diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 70fb361d..7fb076c8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -13,7 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--> + Actualizador Actualizador Verificación fallida @@ -90,27 +91,4 @@ Exportación finalizada Nuevas actualizaciones Descargas en curso - Versión actual: - Actualizaciones disponibles: - ¡Gracias por la información! - ¿Lo sabías\? - Actualización fallida - - Queda una hora - %dHoras restantes - %dHoras restantes - - Exportación iniciada - Actualizar recovery - Priorizar el proceso de actualización - Nunca - Una vez al mes - Una vez a la semana - Una vez al día - La actualización no puede completarse porque no hay suficiente espacio libre; al menos %1$s de espacio libre. Por favor, borra tu almacenamiento interno antes de proceder. - Liberar espacio - El nivel de la batería es demasiado bajo, necesita al menos %1$d%% de batería para continuar, %2$d%% si se está cargando. - Suspender - Instalación suspendida - Actualización fallida - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b003ddcb..97393a03 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -13,7 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--> + Gestionnaire de mise à jour Gestionnaire de mise à jour Échec de la vérification @@ -66,10 +67,10 @@ Dernière vérification : %1$s (%2$s) LineageOS %1$s LineageOS %1$s - %2$s - %1$s de %2$s - %1$s de %2$s (%3$s) + %1$s sur %2$s + %1$s sur %2$s (%3$s) Vérification de la mise à jour en cours - Vous utilisez actuellement la dernière version de /e/OS. Pour vérifier manuellement la présence de mises à jour, utilisez le bouton Actualiser. + Aucune nouvelle mise à jour trouvée. Pour vérifier manuellement la présence de mises à jour, utiliser le bouton Actualiser. Télécharger Mettre en pause Reprendre @@ -80,16 +81,8 @@ Supprimer le fichier Supprimer le fichier de mise à jour sélectionné ? Appliquer la mise à jour - Vous êtes sur le point de passer à la version %1$s. -\n -\nLorsque vous appuierez sur %2$s, votre appareil redémarrera automatiquement en mode récupération pour installer la mise à jour. -\n -\nRemarque : Cette opération nécessite une partition de récupération compatible, sans quoi les mises à jour devront être installées manuellement. - Vous êtes sur le point de passer à la version %1$s. -\n -\nLorsque vous appuierez sur %2$s, l’appareil commencera l\'installation en arrière plan. -\n -\nUne fois celle-ci terminée, il vous sera demandé de redémarrer. + Vous êtes sur le point d\'installer %1$s.\n\nSi vous appuyez sur %2$s, votre appareil redémarrera automatiquement en mode récupération pour installer la mise à jour.\n\nRemarque : Cette opération nécessite un système de récupération compatible, sans quoi les mises à jour devront être installées manuellement. + Vous êtes sur le point d\'installer %1$s.\n\nSi vous appuyez sur %2$s, l’appareil commencera l\'installation en arrière-plan.\n\nUne fois celle-ci terminée, il vous sera demandé de redémarrer. Annuler l\'installation ? URL de téléchargement URL copiée @@ -97,7 +90,7 @@ Mise à jour exportée Erreur lors de l\'exportation Une mise à jour est déjà en cours d\'export - L\'export a démarré + Export démarré temps restant : 1 seconde temps restant : %d secondes @@ -120,22 +113,9 @@ Nouvelles mises à jour Téléchargements en cours Échec de la mise à jour - Version actuelle : - /e/OS -\n%1$s - /e/OS %1$s - %2$s - /e/OS %1$s - Merci pour l\'info ! - Le saviez-vous \? - Toutes les 30 minutes - Toutes les 10 minutes - Toutes les 5 minutes - L\'espace disponible n\'est pas suffisant pour installer la mise à jour : merci de libérer au moins %1$s de mémoire interne pour pouvoir continuer. - Libérez de l\'espace - Les mises à jour de LineageOS sont des paquets d\'installation complets. Cela signifie que vous pouvez toujours installer uniquement la dernière mise à jour, même si vous en avez raté quelques unes entre temps ! - Les mises à jour de /e/OS sont des paquets d\'installation complets. Cela signifie que vous pouvez vous contenter d\'installer la dernière mise à jour proposée, même si vous en avez raté quelques unes entre temps ! - Afficher les notes de version - Mises à jour disponibles : + Le saviez-vous ? + Les mises à jour de LineageOS sont des paquets d\'installation complets. Cela signifie que vous ne pouvez installer que la dernière mise à jour, même si vous en avez ignorées entre temps ! + Merci pour l\'information ! Mise à jour locale Importation de la mise à jour locale\u2026 %1$s a été importée. Voulez-vous l\'installer ? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 4eafd44e..268951ff 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -13,7 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--> + Aggiornamenti Aggiornamenti Verifica fallita @@ -30,18 +31,18 @@ Pausa Riprendi Sospendi - Installo il pacchetto aggiornato + Installazione del pacchetto aggiornamento Errore d\'installazione Aggiornamento installato - Sto completando l\'installazione del pacchetto + Finalizzazione dell\'installazione del pacchetto Preparazione per il primo avvio Preparazione preliminare dell\'aggiornamento Batteria scarica Il livello della batteria è troppo basso, è necessario almeno il %1$d%% di batteria per continuare, oppure il %2$d%% se il dispositivo è in carica. - Riavvio + Riavvia Ricarica Preferenze - Verifico aggiornamenti automatici + Ricerca aggiornamenti automaticamente Quotidianamente Settimanalmente Mensilmente @@ -51,26 +52,25 @@ Copia indirizzo URL Esporta aggiornamento Mostra il changelog - Aggiorna con priorità - Aggiorna recovery - Impossibile disabilitare gli aggiornamenti di Lineage Recovery su questo dispositivo. - Trovati nuovi aggiornamenti + Agg. con priorità + Aggiornamento recovery + Impossibile disabilitare l\'aggiornamento di Lineage Recovery su questo dispositivo + Nessun aggiornamento trovato Nessun nuovo aggiornamento trovato - Controllo degli aggiornamenti non riuscito. Verifica la connessione a Internet e riprova. - Download non riuscito. Verifica la connessione a Internet e riprova. - Verifica dell\'aggiornamento non riuscita. - Download completato. - Questo aggiornamento non può essere installato sulla build attuale. - LineageOS -\n%1$s + La verifica di aggiornamenti è fallita. Controlla la connessione ad internet e riprova più tardi. + Il download dell\'aggiornamento è fallito. Controlla la connessione ad internet e riprova più tardi. + Verifica dell\'aggiornamento fallita. + Download aggiornamento completato. + Questo aggiornamento non può essere installato sopra la versione corrente. + LineageOS\n%1$s Android %1$s - Ultima verifica: %1$s (%2$s) + Ultima verifica: %1$s (%2$s) LineageOS %1$s LineageOS %1$s - %2$s %1$s di %2$s %1$s di %2$s (%3$s) Verifica aggiornamento - Stai usando l\'ultima versione di /e/OS. Per verificare manualmente la presenza di aggiornamenti, utilizza il pulsante Aggiorna. + Nessun nuovo aggiornamento trovato. Per controllare manualmente nuovi aggiornamenti, tocca il pulsante Aggiorna. Download Pausa Riprendi @@ -79,31 +79,28 @@ Elimina Annulla Elimina file - Elimino il file di aggiornamento selezionato\? + Eliminare il file di aggiornamento selezionato? Applica aggiornamento Stai per installare %1$s.\n\nSe premi %2$s, il dispositivo verrà riavviato in modalità recovery per installare l\'aggiornamento automaticamente.\n\nNota: questa funzione richiede una recovery compatibile, in caso contrario si dovrà procedere all\'installazione manualmente. Stai per installare %1$s.\n\nSe premi %2$s, il dispositivo inizierà l\'installazione in background.\n\nUna volta completato, ti verrà richiesto di riavviare il dispositivo. - Annullo l\'installazione\? + Annullare l\'installazione? Download URL URL copiato - Esporto aggiornamento + Esportazione aggiornamento Aggiornamento esportato Errore esportazione Esportazione aggiornamento già in corso Esportazione avviata 1 secondo rimanente - %d secondi rimanenti %d secondi rimanenti 1 minuto rimanente - %d minuti rimanenti %d minuti rimanenti 1 ora rimanente - %d ore rimanenti %d ore rimanenti Attenzione @@ -111,27 +108,14 @@ Non mostrare di nuovo Avviso di rete a consumo Aggiornamento bloccato - Questo aggiornamento non può essere installato usando l\'app updater. Leggi su %1$s per ulteriori informazioni. + Questo aggiornamento non può essere installato usando l\'app updater. Si prega di leggere %1$s per ulteriori informazioni. Completamento esportazione Nuovi aggiornamenti - Download in essere + Download in corso Aggiornamento fallito Lo sapevi? Gli aggiornamenti di LineageOS sono pacchetti d\'installazione completi. Questo significa che puoi sempre installare solo l\'ultimo aggiornamento, anche se ne hai saltati alcuni in precedenza! Grazie per l\'informazione! - /e/OS -\n%1$s - Gli aggiornamenti di /e/OS sono pacchetti completi. Ciò significa che puoi sempre installare solo l\'ultimo aggiornamento, anche se ne hai saltati alcuni in mezzo! - Mostra note di rilascio - /e/OS %1$s - %2$s - /e/OS %1$s - Ogni 30 minuti - Ogni 10 minuti - Ogni 5 minuti - Versione attuale: - Agiornamenti disponibili: - Non c\'è spazio sufficiente per procedere con l\'aggiornamento; devi liberare almeno altri %1$s dalla memoria interna. - Libera spazio Aggiornamento locale Importazione aggiornamento locale\u2026 %1$s è stato importato. Vuoi installarlo? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ccede242..61292644 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -13,7 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--> + Updater Updater Verificatie mislukt @@ -69,7 +70,7 @@ %1$s van %2$s %1$s van %2$s (%3$s) Update verifiëren - Je gebruikt de laatste versie van /e/OS. Gebruik de knop Vernieuwen om handmatig te controleren op nieuwe updates. + Geen nieuwe updates gevonden. Gebruik de knop Vernieuwen om handmatig te controleren op nieuwe updates. Downloaden Pauzeren Hervatten @@ -115,19 +116,6 @@ Wist u dat? LineageOS updates zijn volledige installatiepakketten. Dat betekent dat u altijd alleen de nieuwste update hoeft te installeren, zelfs als u een paar updates overslaat! Bedankt voor de informatie! - Beschikbare updates: - /e/OS -\n%1$s - /e/OS updates zijn volledige installatie pakketten.Dat betekend dat je altijd de laatste update kan installeren, zelfs als je hiermee sommige updates overslaat! - Toon release notes - /e/OS %1$s - %2$s - /e/OS %1$s - Huidige versie: - Elke 30 minuten - Elke 10 minuten - Elke 5 minuten - Er is niet genoeg geheugen vrij om deze update uit te voeren: je moet eerst nog %1$s intern geheugen vrijmaken. - Geheugen vrij maken Lokale update Importeer lokale update\u2026 %1$s is geïmporteerd. Wilt u het installeren? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3267938a..14913be5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -13,7 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--> + Обновления системы Обновления системы Проверка не удалась @@ -61,8 +62,7 @@ Ошибка проверки обновления. Загрузка завершена. Это обновление не может быть установлено поверх текущей сборки. - LineageOS -\n%1$s + LineageOS\n%1$s Android %1$s Поиск обновлений выполнялся %1$s в %2$s LineageOS %1$s @@ -70,7 +70,7 @@ %1$s из %2$s %1$s из %2$s (%3$s) Проверка обновлений - Вы используете последнюю версию /e/OS. Чтобы проверить наличие обновлений вручную, используйте кнопку Обновить. + Обновлений не найдено. Чтобы проверить наличие обновлений вручную, используйте кнопку Обновить. Скачать Приостановить Возобновить @@ -92,19 +92,19 @@ Экспорт уже выполняется Экспорт начат - осталась %d секунда + осталась %d секунда осталось %d секунды осталось %d секунд осталось %d секунд - осталась %d минута + осталась %d минута осталось %d минуты осталось %d минут осталось %d минут - остался %d час + остался %d час осталось %d часа осталось %d часов осталось %d часов @@ -122,19 +122,6 @@ Знаете ли вы? Обновления LineageOS представляют собой полные установочные пакеты. Это означает, что вы всегда можете установить только последнее обновление, даже если вы пропустили некоторые из них! Спасибо за информацию! - /e/OS -\n%1$s - Обновления /e/OS представляют собой полные установочные пакеты. Это означает, что вы всегда можете установить только последнее обновление, даже если вы пропустили несколько обновлений между ними! - Показать примечания к выпуску - /e/OS %1$s - %2$s - /e/OS %1$s - Каждые 30 минут - Каждые 10 минут - Каждые 5 минут - Текущая версия: - Доступные обновления: - Для продолжения обновления недостаточно места: сначала необходимо освободить еще %1$s во внутреннем хранилище. - Освободить место Локальное обновление Импорт локального обновления\u2026 Обновление %1$s было импортировано. Установить его? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e093b673..e55606f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,7 +40,7 @@ Downloading Download paused Download error - Update is ready to be installed + Download completed Starting download Update failed Installation suspended @@ -52,7 +52,6 @@ Pause Resume Suspend - Reboot and install Installing update package Install error @@ -62,17 +61,12 @@ Preliminary update preparation Low battery The battery level is too low, you need at least %1$d%% of the battery to continue, %2$d%% if charging. - Free up space - There is not enough space left to proceed with the update: you must free up another %1$s in the internal storage first. Reboot Refresh Preferences Auto updates check - Every 5 minutes - Every 10 minutes - Every 30 minutes Once a day Once a week Once a month @@ -106,10 +100,9 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - You are running the latest /e/OS version. To manually check for updates, use the Refresh button. + No new updates found. To manually check for new updates, use the Refresh button. Download - Apply update Pause Resume Install @@ -121,12 +114,8 @@ Delete the selected update file? Apply update - You are about to update to %1$s.\n\nIf you press %2$s, the device will restart itself in recovery mode to install the update. - You are about to update to %1$s.\n\nIf you press %2$s, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot. - - Version Upgrade! - You are about to upgrade to %1$s, based on Android %2$s\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press %3$s, the device will restart itself into recovery mode to install the update. - You are about to upgrade to %1$s, based on Android %2$s.\n\nRemember: it is always recommended to backup your data before upgrades.\n\nIf you press %3$s, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot. + You are about to install %1$s.\n\nIf you press %2$s, the device will restart itself in recovery mode to install the update.\n\nNote: This feature requires a compatible Recovery or updates will need to be installed manually. + You are about to install %1$s.\n\nIf you press %2$s, the device will begin installing in the background.\n\nOnce completed, you will be prompted to reboot. Cancel the installation? @@ -176,24 +165,4 @@ Failed to import local update Install Local update - - - - - /e/OS %1$s - /e/OS %1$s - %2$s - - - Show release notes - - - /e/OS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between! - - - /e/OS\n%1$s - - Available updates: - Current version: - - -- GitLab