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

Commit f23edc6a authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge remote-tracking branch 'origin/lineage-19.1' into v1-s

parents 2450f9c7 6af703b4
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -44,9 +44,10 @@ it with the right key to update the one in the system partition. To do this:

 - Place this directory anywhere in the Android source tree
 - Generate a keystore and keystore.properties using `gen-keystore.sh`
 - Build the dependencies running `make UpdaterStudio` from the root of the
   Android source tree. This command will add the needed libraries in
   `system_libraries/`.
 - Build the dependencies by running `m framework` from the root of the
   Android source tree.
 - Create `system_libs/` directory in Updater repo and copy `classes.jar` file
   from `out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/` into it.

You need to do the above once, unless Android Studio can't find some symbol.
In this case, rebuild the system libraries with `make UpdaterStudio`.
In this case, rebuild the system libraries with `m framework`.
+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@
    <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="reboot">Reaniciar</string>
    <string name="menu_refresh">Refrescar</string>
    <string name="menu_refresh">Anovar</string>
    <string name="menu_preferences">Preferencies</string>
    <string name="menu_auto_updates_check">Comprobación d\'anovamientos</string>
    <string name="menu_auto_updates_check_interval_daily">Caldía</string>
@@ -70,7 +70,7 @@
    <string name="list_download_progress_newer"><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></string>
    <string name="list_download_progress_eta_newer"><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>)</string>
    <string name="list_verifying_update">Verificando l\'anovamientu</string>
    <string name="list_no_updates">Nun s\'atopó nengún anovamientu. Pa comprobar manualmente si los hai, usa\'l botón «Refrescar».</string>
    <string name="list_no_updates">Nun s\'atopó nengún anovamientu. Pa comprobar manualmente si los hai, usa\'l botón «Anovar».</string>
    <string name="action_download">Baxar</string>
    <string name="action_pause">Posar</string>
    <string name="action_resume">Siguir</string>
+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@
    <string name="preparing_ota_first_boot">Przygotowanie do pierwszego uruchomienia</string>
    <string name="dialog_prepare_zip_message">Przygotowanie wstępne aktualizacji</string>
    <string name="dialog_battery_low_title">Niskim poziom baterii</string>
    <string name="dialog_battery_low_message_pct">Poziom naładowania baterii jest zbyt niski, musisz mieć co najmniej <xliff:g id="percent_discharging">%1$d</xliff:g>% baterii lub <xliff:g id="percent_charging">%2$d</xliff:g>% w trakcie ładowania.</string>
    <string name="dialog_battery_low_message_pct">Poziom naładowania baterii jest zbyt niski, musisz mieć co najmniej <xliff:g id="percent_discharging">%1$d</xliff:g>%% baterii lub <xliff:g id="percent_charging">%2$d</xliff:g>%% w trakcie ładowania.</string>
    <string name="reboot">Uruchom ponownie</string>
    <string name="menu_refresh">Odśwież</string>
    <string name="menu_preferences">Ustawienia</string>