Commit 7c632baf authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch 'fix-merge-conflicts' into 'v1-q'

Fix merge conflicts with upstream

See merge request !57
parents 83777af0 7e8046ab
......@@ -17,40 +17,21 @@
<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="installation_suspended_notification">Suspendióse la instalación</string>
<string name="new_updates_found_title">Anovamientos nuevos</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="suspend_button">Suspender</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="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 ye 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_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 al mes</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 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>
......@@ -67,8 +48,6 @@
<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>
......@@ -76,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>
......@@ -101,12 +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="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>
......@@ -34,6 +34,7 @@
<string name="finalizing_package">Finalizando instalación del paquete</string>
<string name="preparing_ota_first_boot">Preparando para el primer arranque</string>
<string name="dialog_prepare_zip_message">Preparación preliminar de la actualización</string>
<string name="dialog_battery_low_title">Batería baja</string>
<string name="reboot">Reiniciar</string>
<string name="menu_refresh">Actualizar</string>
<string name="menu_preferences">Preferencias</string>
......@@ -77,6 +78,14 @@
<string name="notification_export_success">Actualización exportada</string>
<string name="notification_export_fail">Error de exportación</string>
<string name="toast_already_exporting">Ya se está exportando una actualización</string>
<plurals name="eta_seconds">
<item quantity="one">Falta 1 segundo</item>
<item quantity="other">Faltan <xliff:g id="count">%d</xliff:g> segundos</item>
</plurals>
<plurals name="eta_minutes">
<item quantity="one">Falta 1 minuto</item>
<item quantity="other">Faltan <xliff:g id="count">%d</xliff:g> minutos</item>
</plurals>
<string name="update_on_mobile_data_title">Advertencia</string>
<string name="update_on_mobile_data_message">Se descargará un paquete de actualización usando los datos móviles, que probablemente ocasione un alto consumo de datos. ¿Quieres continuar?</string>
<string name="checkbox_mobile_data_warning">No mostrar de nuevo</string>
......
......@@ -66,7 +66,7 @@
<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> 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_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> à <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">A’ dearbhadh an ùrachaidh</string>
<string name="list_no_updates">Cha deach ùrachadh a lorg. Airson sùil a thoirt airson ùrachaidhean a làimh, cleachd am putan “Ath-nuadhaich”.</string>
<string name="action_download">Luchdaich a-nuas</string>
......@@ -95,10 +95,10 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> diog air fhàgail</item>
</plurals>
<plurals name="eta_minutes">
<item quantity="one"><xliff:g id="count">%d</xliff:g> mhionaid air fhàgail</item>
<item quantity="two"><xliff:g id="count">%d</xliff:g> mhionaid air fhàgail</item>
<item quantity="few"><xliff:g id="count">%d</xliff:g> mionaidean air fhàgail</item>
<item quantity="other"><xliff:g id="count">%d</xliff:g> mionaid air fhàgail</item>
<item quantity="one"><xliff:g id="count">%d</xliff:g> mhion. air fhàgail</item>
<item quantity="two"><xliff:g id="count">%d</xliff:g> mhion. air fhàgail</item>
<item quantity="few"><xliff:g id="count">%d</xliff:g> mion. air fhàgail</item>
<item quantity="other"><xliff:g id="count">%d</xliff:g> mion. air fhàgail</item>
</plurals>
<plurals name="eta_hours">
<item quantity="one"><xliff:g id="count">%d</xliff:g> uair a thìde air fhàgail</item>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment