Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11b1a2d1 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch 'fix-conflicts' into 'v1-pie' 

Fix merge conflicts

See merge request !58
parents 7a36141f 0a83f5e5

res/values-ast-rES/strings.xml

+21 −54
Original line number Diff line number Diff line
@@ -17,56 +17,37 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Anovador</string>

    <string name="display_name">Anovador</string>

    <string name="verification_failed_notification">Falló la verificación</string>

    <string name="verifying_download_notification">Verificando l\'anovamientu</string>

    <string name="downloading_notification">Baxando</string>

    <string name="download_paused_notification">Descarga posada</string>

    <string name="download_paused_error_notification">Fallu de descarga</string>

    <string name="download_completed_notification">Completóse la descarga</string>

    <string name="download_starting_notification">Aniciando descarga</string>

    <string name="update_failed_notification">Falló l\'anovamientu</string>

    <string name="new_updates_found_title">Anovamientos nuevos</string>

    <string name="installation_suspended_notification">Suspendióse la instalación</string>

    <string name="new_updates_found_title">Hai anovamientos</string>

    <string name="text_download_speed">%1$s, %2$s/s</string>

    <string name="pause_button">Posar</string>

    <string name="resume_button">Siguir</string>

    <string name="installing_update">Instalando\'l paquete d\'anovamientu</string>

    <string name="installing_update_error">Fallu d\'instalación</string>

    <string name="installing_update_finished">Instalóse l\'anovamientu</string>

    <string name="suspend_button">Suspender</string>

    <string name="finalizing_package">Finando la instalación del paquete</string>

    <string name="preparing_ota_first_boot">Tresnando\'l primer arranque</string>

    <string name="dialog_prepare_zip_message">Tresnáu preliminar del anovamientu</string>

    <string name="dialog_battery_low_title">Batería baxa</string>

    <string name="dialog_battery_low_message_pct">El nivel de batería ta perbaxu, precises polo menos<xliff:g id="percent_discharging">%1$d</xliff:g>%% de batería pa siguir, <xliff:g id="percent_charging">%2$d</xliff:g>%% si ta en carga.</string>

    <string name="reboot">Reaniciar</string>

    <string name="menu_refresh">Refrescar</string>

    <string name="preparing_ota_first_boot">Tresnando\'l primer arrinque</string>

    <string name="dialog_battery_low_title">Queda poca batería</string>

    <string name="dialog_battery_low_message_pct">El nivel de batería ye perbaxu, tien d\'haber polo menos un <xliff:g id="percent_discharging">%1$d</xliff:g>%% de batería pa siguir, <xliff:g id="percent_charging">%2$d</xliff:g>%% si ta en carga.</string>

    <string name="menu_preferences">Preferencies</string>

    <string name="menu_auto_updates_check">Comprobación automática d\'anovamientos</string>

    <string name="menu_auto_updates_check_interval_daily">Una vegada al día</string>

    <string name="menu_auto_updates_check_interval_weekly">Una vegada por selmana</string>

    <string name="menu_auto_updates_check_interval_monthly">Una vegada al mes</string>

    <string name="menu_auto_updates_check_interval_daily">Caldía</string>

    <string name="menu_auto_updates_check_interval_weekly">Una vegada per selmana</string>

    <string name="menu_auto_updates_check_interval_monthly">Una vegada per mes</string>

    <string name="menu_auto_updates_check_interval_never">Enxamás</string>

    <string name="menu_auto_delete_updates">Desaniciar anovamientos al instalalos</string>

    <string name="menu_delete_update">Desaniciar</string>

    <string name="menu_copy_url">Copiar URL</string>

    <string name="menu_export_update">Esportar anovamientu</string>

    <string name="menu_show_changelog">Amosar rexistru de cambeos</string>

    <string name="menu_show_changelog">Amosar el rexistru de cambeos</string>

    <string name="menu_ab_perf_mode">Priorizar el procesu d\'anovamientu</string>

    <string name="snack_updates_found">Alcontráronse anovamientos nuevos</string>

    <string name="snack_no_updates_found">Nun s\'alcontraron anovamientos</string>

    <string name="snack_updates_check_failed">Falló la comprobación d\'anovamientos. Comprueba la to conexón a Internet y volvi tentalo, por favor.</string>

    <string name="snack_download_failed">Falló la descarga. Comprueba la to conexón a Internet y volvi tentalo, por favor.</string>

    <string name="snack_download_verification_failed">Falló la verificación del anovamientu.</string>

    <string name="snack_download_verified">Descarga completada.</string>

    <string name="snack_update_not_installable">Esti anovamientu nun pue instalase enriba de la compilación actual.</string>

    <string name="header_title_text">/e/OS\n%1$s</string>

    <string name="header_android_version">Android <xliff:g id="version" example="7.1.2">%1$s</xliff:g></string>

    <string name="header_last_updates_check">Anovamientu caberu\'l <xliff:g id="date" example="1 January 1970">%1$s</xliff:g> (<xliff:g id="time" example="01:23">%2$s</xliff:g>)</string>

    <string name="snack_updates_found">Atopáronse anovamientos</string>

    <string name="snack_no_updates_found">Nun s\'atopó nengún anovamientu</string>

    <string name="snack_update_not_installable">Esti anovamientu nun se pue instalar sobre la versión actual.</string>

    <string name="header_title_text">/e/\n%1$s</string>

    <string name="header_android_version">Android <xliff:g id="version" example="7.1.2">%1$s</xliff:g></string>

    <string name="list_build_version">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>

    <string name="list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>

    <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> de <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>

    <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> de <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>

    <string name="list_verifying_update">Verificando anovamientu</string>

    <string name="list_no_updates">Nun s\'alcontraron anovamientos. Pa comprobalos a mano, usa\'l botón Refrescar.</string>

    <string name="action_download">Baxar</string>

    <string name="action_pause">Posar</string>

    <string name="action_resume">Siguir</string>
@@ -74,18 +55,8 @@ 
    <string name="action_info">Información</string>

    <string name="action_delete">Desaniciar</string>

    <string name="action_cancel">Encaboxar</string>

    <string name="confirm_delete_dialog_title">Desaniciar ficheru</string>

    <string name="confirm_delete_dialog_message">¿Desaniciar l\'anovamientu esbilláu?</string>

    <string name="apply_update_dialog_title">Aplicar anovamientu</string>

    <string name="apply_update_dialog_message">Tas a piques d\'anovar a <xliff:g id="update_name">%1$s</xliff:g>.\n\nSi primes <xliff:g id="ok">%2$s</xliff:g>, el preséu va reaniciase solu al recovery pa instalar l\'anovamientu.\n\nNota: Esta carauterística rique un recovery compatible o los anovamientos van precisar instalase a mano.</string>

    <string name="apply_update_dialog_message_ab">Tas a piques d\'anovar a <xliff:g id="update_name">%1$s</xliff:g>.\n\nSi primes <xliff:g id="ok">%2$s</xliff:g>, el preséu va entamar la instalación de fondu.\n\nNamái acabar, va suxerísete reaniciar.</string>

    <string name="cancel_installation_dialog_message">¿Encaboxar la instalación?</string>

    <string name="label_download_url">URL de descarga</string>

    <string name="toast_download_url_copied">Copióse la URL</string>

    <string name="dialog_export_title">Esportando anovamientu</string>

    <string name="notification_export_success">Esportóse l\'anovamientu</string>

    <string name="notification_export_fail">Fallu d\'esportación</string>

    <string name="toast_already_exporting">Yá ta esportándose un anovamientu</string>

    <string name="confirm_delete_dialog_message">¿Quies desaniciar l\'anovamientu esbilláu?</string>

    <string name="cancel_installation_dialog_message">¿Quies encaboxar la instalación?</string>

    <plurals name="eta_seconds">

        <item quantity="one">Queda 1 segundu</item>

        <item quantity="other">Queden <xliff:g id="count">%d</xliff:g> segundos</item>
@@ -99,13 +70,9 @@ 
        <item quantity="other">Queden <xliff:g id="count">%d</xliff:g> hores</item>

    </plurals>

    <string name="update_on_mobile_data_title">Alvertencia</string>

    <string name="update_on_mobile_data_message">Tas a piques de baxar un paquete d\'anovamientu usando los datos móviles que pue causar un usu altu de datos. ¿Prestaríate siguir?</string>

    <string name="checkbox_mobile_data_warning">Nun amosar más</string>

    <string name="menu_mobile_data_warning">Alvertencia de datos de móviles</string>

    <string name="blocked_update_dialog_title">Bloquióse l\'anovamientu</string>

    <string name="blocked_update_dialog_message">Esti anovamientu nun pue instalase usando l\'aplicación anovadora. Llei <xliff:g id="info_url">%1$s</xliff:g> pa más información, por favor.</string>

    <string name="export_channel_title">Completáu de la esportación</string>

    <string name="new_updates_channel_title">Anovamientos nuevos</string>

    <string name="checkbox_mobile_data_warning">Nun volver amosar</string>

    <string name="blocked_update_dialog_message">Esti anovamientu nun se pue instalar con «Anovador».  Llei <xliff:g id="info_url">%1$s</xliff:g> pa consiguir más información.</string>

    <string name="export_channel_title">Esportación completada</string>

    <string name="new_updates_channel_title">Hai anovamientos</string>

    <string name="ongoing_channel_title">Descargues en cursu</string>

    <string name="update_failed_channel_title">Falló l\'anovamientu</string>

</resources>

res/values-az/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <string name="verification_failed_notification">Təsdiqləmə uğursuz oldu</string>

    <string name="verifying_download_notification">Yeniləmə təsdiqlənir</string>

    <string name="downloading_notification">Endirilir</string>

    <string name="download_paused_notification">Endirilməyə fasilə verildi</string>

    <string name="download_paused_notification">Endirməyə fasilə verildi</string>

    <string name="download_paused_error_notification">Endirmə xətası</string>

    <string name="download_completed_notification">Endirmə tamamlandı</string>

    <string name="download_starting_notification">Endirmə başladılır</string>

res/values-bn/strings.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2017 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     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.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="verification_failed_notification">যাচাইকরণ ব্যর্থ হয়েছে</string>

    <string name="text_download_speed">%1$s, %2$s/s</string>

    <string name="pause_button">বিরাম</string>

    <plurals name="eta_seconds">

        <item quantity="one">১ সেকেন্ড বাকি</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> সেকেন্ড বাকি</item>

    </plurals>

    <plurals name="eta_minutes">

        <item quantity="one">১ মিনিট বাকি</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> মিনিট বাকি</item>

    </plurals>

    <plurals name="eta_hours">

        <item quantity="one">১ ঘণ্টা বাকি</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> ঘণ্টা বাকি</item>

    </plurals>

</resources>

res/values-da/strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="display_name">Opdatering</string>

    <string name="verification_failed_notification">Verifikation mislykkedes</string>

    <string name="verifying_download_notification">Verificerer opdatering</string>

    <string name="downloading_notification">Henter</string>

    <string name="download_paused_notification">Overførsel på pause</string>

    <string name="download_paused_error_notification">Overførselsfejl</string>
@@ -32,14 +34,18 @@ 
    <string name="finalizing_package">Fuldfører pakkeinstallering</string>

    <string name="preparing_ota_first_boot">Forbereder på første opstart</string>

    <string name="dialog_prepare_zip_message">Indledende opdateringsforberedelse</string>

    <string name="dialog_battery_low_title">Lavt batteriniveau</string>

    <string name="dialog_battery_low_message_pct">Du har for lidt strøm på dit batteri. Du skal mindst bruge <xliff:g id="percent_discharging">%1$d</xliff:g>%% for at installere opdateringen, <xliff:g id="percent_charging">%2$d</xliff:g>%% hvis din enhed oplader.</string>

    <string name="reboot">Genstart</string>

    <string name="menu_refresh">Genopfrisk</string>

    <string name="menu_preferences">Præferencer</string>

    <string name="menu_auto_updates_check">Auto-opdateringskontrol</string>

    <string name="menu_auto_updates_check_interval_never">Aldrig</string>

    <string name="menu_auto_delete_updates">Slet opdateringer, når installeret</string>

    <string name="menu_delete_update">Slet</string>

    <string name="menu_copy_url">Kopiér URL</string>

    <string name="menu_export_update">Eksportér opdatering</string>

    <string name="menu_ab_perf_mode">Prioritér opdateringsproces</string>

    <string name="snack_updates_found">Nye opdateringer fundet</string>

    <string name="snack_no_updates_found">Ingen nye opdateringer fundet</string>

    <string name="snack_updates_check_failed">Opdateringskontrollen fejlede. Kontrollér venligst din internetforbindelse og prøv igen senere.</string>
@@ -49,8 +55,11 @@ 
    <string name="snack_update_not_installable">Denne opdatering kan ikke installeres ovenpå det nuværende build.</string>

    <string name="header_title_text">LineageOS\n%1$s</string>

    <string name="header_android_version">Android <xliff:g id="version" example="7.1.2">%1$s</xliff:g></string>

    <string name="header_last_updates_check">Sidst tjekket: <xliff:g id="date" example="1 January 1970">%1$s</xliff:g> (<xliff:g id="time" example="01:23">%2$s</xliff:g>)</string>

    <string name="list_build_version">LineageOS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>

    <string name="list_build_version_date">LineageOS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>

    <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> af <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>

    <string name="list_verifying_update">Verificerer opdatering</string>

    <string name="list_no_updates">Ingen nye opdateringer fundet. Brug Genopfrisk-knappen, for manuel kontrol af nye opdateringer.</string>

    <string name="action_download">Hent</string>

    <string name="action_pause">Pause</string>
@@ -77,6 +86,8 @@ 
    <string name="menu_mobile_data_warning">Mobildata-advarsel</string>

    <string name="blocked_update_dialog_title">Opdatering blokeret</string>

    <string name="blocked_update_dialog_message">Denne opdatering kan ikke installeres over opdatering-app\'en. Læs venligst <xliff:g id="info_url">%1$s</xliff:g> for mere information.</string>

    <string name="export_channel_title">Eksport fuldførelse</string>

    <string name="new_updates_channel_title">Nye opdateringer</string>

    <string name="ongoing_channel_title">Igangværende Downloads</string>

    <string name="update_failed_channel_title">Opdatering fejlede</string>

</resources>

res/values-de/strings.xml

+16 −22
Original line number Diff line number Diff line
@@ -51,12 +51,12 @@ 
    <string name="menu_copy_url">URL in Zwischenablage kopieren</string>

    <string name="menu_export_update">Aktualisierung exportieren</string>

    <string name="menu_show_changelog">Changelog anzeigen</string>

    <string name="menu_ab_perf_mode">Aktualisierungsprozess priorisieren</string>

    <string name="snack_updates_found">Neue Aktualisierungen gefunden</string>

    <string name="snack_no_updates_found">Keine neuen Aktualisierungen gefunden</string>

    <string name="snack_updates_check_failed">Die Suche nach Aktualisierungen ist fehlgeschlagen. Bitte überprüfe die Internetverbindung und versuche es später erneut.</string>

    <string name="snack_download_failed">Das Herunterladen ist fehlgeschlagen. Bitte überprüfe die Internetverbindung und versuche es später erneut.</string>

    <string name="snack_download_verification_failed">Die Aktualisierungs-Überprüfung ist fehlgeschlagen.</string>

    <string name="menu_ab_perf_mode">Updateprozess priorisieren</string>

    <string name="snack_updates_found">Neue Updates gefunden</string>

    <string name="snack_no_updates_found">Keine neuen Updates gefunden</string>

    <string name="snack_updates_check_failed">Die Suche nach Updates ist fehlgeschlagen. Bitte überprüfe die Internetverbindung und versuche es später erneut.</string>

    <string name="snack_download_failed">Das Herunterladen ist fehlgeschlagen. Bitte überpüfe die Internetverbindung und versuche es später erneut.</string>

    <string name="snack_download_verification_failed">Die Update-Überprüfung ist fehlgeschlagen.</string>

    <string name="snack_download_verified">Herunterladen abgeschlossen.</string>

    <string name="snack_update_not_installable">Diese Aktualisierung kann nicht auf die bestehende Installation angewendet werden.</string>

    <string name="header_title_text">/e/OS\n%1$s</string>
@@ -66,8 +66,8 @@ 
    <string name="list_build_version_date">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>

    <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> von <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>

    <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> von <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>

    <string name="list_verifying_update">Aktualisierung wird geprüft</string>

    <string name="list_no_updates">Keine neuen Aktualisierungen gefunden. Um manuell nach neuen Aktualisierungen zu suchen, verwende die Schaltfläche „Aktualisieren“.</string>

    <string name="list_verifying_update">Update wird geprüft</string>

    <string name="list_no_updates">Keine neuen Updates gefunden. Um manuell nach neuen Updates zu suchen, verwende die Schaltfläche \"Aktualisieren\".</string>

    <string name="action_download">Herunterladen</string>

    <string name="action_pause">Anhalten</string>

    <string name="action_resume">Fortsetzen</string>
@@ -76,16 +76,10 @@ 
    <string name="action_delete">Löschen</string>

    <string name="action_cancel">Abbrechen</string>

    <string name="confirm_delete_dialog_title">Datei löschen</string>

    <string name="confirm_delete_dialog_message">Soll die ausgewählte Aktualisierung-Datei gelöscht werden\?</string>

    <string name="apply_update_dialog_title">Aktualisierung installieren</string>

    <string name="apply_update_dialog_message">Bereit zum Aktualisieren auf <xliff:g id="update_name">%1$s</xliff:g>.

\n

\nWenn du <xliff:g id="ok">%2$s</xliff:g> drückst, wird das Gerät in den Wiederherstellungs-Modus gestartet, um die Aktualisierung durchzuführen.</string>

    <string name="apply_update_dialog_message_ab">Bereit zum Aktualisieren auf <xliff:g id="update_name">%1$s</xliff:g>.

\n

\nWenn du <xliff:g id="ok">%2$s</xliff:g> drückst, beginnt das Gerät mit der Installation im Hintergrund.

\n

\nSobald diese abgeschlossen ist, wirst du zum Neustart aufgefordert.</string>

    <string name="confirm_delete_dialog_message">Soll die ausgewählte Update-Datei gelöscht werden?</string>

    <string name="apply_update_dialog_title">Update installieren</string>

    <string name="apply_update_dialog_message">Bereit zum Update auf <xliff:g id="update_name">%1$s</xliff:g>\n\nWenn du <xliff:g id="ok">%2$s</xliff:g> drückst, wird das Gerät im Recovery-Modus gestartet, um das Update durchzuführen.\n\nHinweis: Diese Funktion erfordert ein kompatibles Recovery-System, anderenfalls muss das Update manuell installiert werden.</string>

    <string name="apply_update_dialog_message_ab">Bereit zum Update auf <xliff:g id="update_name">%1$s</xliff:g>\n\nWenn du <xliff:g id="ok">%2$s drückst</xliff:g>, beginnt das Gerät im Hintergrund mit der Installation\n\nSobald diese abgeschlossen ist, wirst du zum Neustart aufgefordert.</string>

    <string name="cancel_installation_dialog_message">Installation abbrechen?</string>

    <string name="label_download_url">Download URL</string>

    <string name="toast_download_url_copied">URL wurde kopiert</string>
@@ -106,11 +100,11 @@ 
        <item quantity="other">noch <xliff:g id="count">%d</xliff:g> Stunden</item>

    </plurals>

    <string name="update_on_mobile_data_title">Achtung</string>

    <string name="update_on_mobile_data_message">Du bist dabei, eine Software-Aktualisierung über das Mobilfunknetz herunterzuladen, was zu einem hohen Datenverbrauch führen kann. Möchtest du wirklich fortfahren\?</string>

    <string name="update_on_mobile_data_message">Du bist dabei ein Software-Update über das Mobilfunknetz herunterzuladen, was zu einem hohen Datenverbrauch führen kann. Möchtest du fortfahren?</string>

    <string name="checkbox_mobile_data_warning">Nicht wieder anzeigen</string>

    <string name="menu_mobile_data_warning">Mobildaten-Warnung</string>

    <string name="blocked_update_dialog_title">Aktualisierungen blockiert</string>

    <string name="blocked_update_dialog_message">Diese Aktualisierung kann mit der Aktualisierungen-App nicht installiert werden. Für weitere Informationen bitte <xliff:g id="info_url">%1$s</xliff:g> lesen.</string>

    <string name="blocked_update_dialog_title">Update blockiert</string>

    <string name="blocked_update_dialog_message">Dieses Update kann mit der Updater-App nicht installiert werden. Für weitere Informationen lies bitte <xliff:g id="info_url">%1$s </xliff:g>.</string>

    <string name="export_channel_title">Export abgeschlossen</string>

    <string name="new_updates_channel_title">Neue Aktualisierungen</string>

    <string name="ongoing_channel_title">Laufende Downloads</string>