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

Commit 19c597ff authored by Giulio Cervera's avatar Giulio Cervera
Browse files

Merge remote-tracking branch 'github/ics' into ics_chocolate_M8260AAABQNLZA30150

parents 129c3bf1 75b2e6d7

core/jni/android_view_GLES20Canvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ static void android_view_GLES20Canvas_resetDisplayListRenderer(JNIEnv* env, 


static void android_view_GLES20Canvas_destroyDisplayList(JNIEnv* env,

        jobject clazz, DisplayList* displayList) {

    delete displayList;

    DisplayList::destroyDisplayListDeferred(displayList);

}



static bool android_view_GLES20Canvas_drawDisplayList(JNIEnv* env,

core/res/res/values-es/strings.xml

100644 → 100755
+27 −0
Original line number Diff line number Diff line
@@ -36,6 +36,17 @@ 
    <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string>

    <string name="mmiError" msgid="5154499457739052907">"Se ha producido un problema de conexión o el código MMI no es válido."</string>

    <string name="mmiFdnError" msgid="5224398216385316471">"La operación solo es válida para números de marcación fija."</string>

    <string name="profileNameDefault">"Predeterminado"</string>

    <string name="profileNameWork">"Trabajo"</string>

    <string name="profileNameHome">"Casa"</string>

    <string name="profileNameSilent">"Silencio"</string>

    <string name="profileNameNight">"Noche"</string>

    <string name="profileGroupPhone">"Teléfono"</string>

    <string name="profileGroupCalendar">"Calendario"</string>

    <string name="profileGroupGmail">"Gmail"</string>

    <string name="profileGroupEmail">"Email"</string>

    <string name="profileGroupSMS">SMS</string>

    <string name="wildcardProfile">Otro</string>

    <string name="serviceEnabled" msgid="8147278346414714315">"El servicio se ha habilitado."</string>

    <string name="serviceEnabledFor" msgid="6856228140453471041">"Se ha habilitado el servicio para:"</string>

    <string name="serviceDisabled" msgid="1937553226592516411">"El servicio se ha inhabilitado."</string>
@@ -137,6 +148,17 @@ 
    <string name="turn_off_radio" msgid="8198784949987062346">"Desactivar función inalámbrica"</string>

    <string name="screen_lock" msgid="799094655496098153">"Bloqueo de pantalla"</string>

    <string name="power_off" msgid="4266614107412865048">"Apagar"</string>

    <string name="reboot_system" product="tablet">"Reiniciar tablet"</string>

    <string name="reboot_system" product="default">"Reiniciar teléfono"</string>

    <string name="global_action_screenshot">"Captura de pantalla"</string>

    <string name="reboot_reboot">"Reiniciar"</string>

    <string name="reboot_recovery">"Modo Recovery"</string>

    <string name="reboot_bootloader">"Modo Bootloader"</string>

    <string name="reboot_bootmenu">"Modo Bootmenu"</string>

    <string name="reboot_fastboot">"Modo Fastboot"</string>

    <string name="reboot_download">"Modo Download"</string>

    <string name="reboot_progress">"Reiniciando\u2026"</string>

    <string name="reboot_confirm">"El teléfono se reiniciará."</string>

    <string name="silent_mode_silent" msgid="319298163018473078">"Timbre desactivado"</string>

    <string name="silent_mode_vibrate" msgid="7072043388581551395">"Modo vibración"</string>

    <string name="silent_mode_ring" msgid="8592241816194074353">"Timbre activado"</string>
@@ -150,6 +172,8 @@ 
    <string name="global_actions" product="default" msgid="2406416831541615258">"Opciones del teléfono"</string>

    <string name="global_action_lock" msgid="2844945191792119712">"Bloqueo de pantalla"</string>

    <string name="global_action_power_off" msgid="4471879440839879722">"Apagar"</string>

    <string name="global_action_reboot">"Reiniciar"</string>

    <string name="global_action_choose_profile">"Perfil"</string>

    <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Modo silencio"</string>

    <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"El sonido está desactivado. Activar"</string>

    <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"El sonido está activado. Desactivar"</string>
@@ -301,6 +325,8 @@ 
    <string name="permdesc_clearAppCache" product="default" msgid="7740465694193671402">"Permite que una aplicación libere espacio de almacenamiento en el teléfono mediante la eliminación de archivos en el directorio de caché de la aplicación. El acceso al proceso del sistema suele estar muy restringido."</string>

    <string name="permlab_movePackage" msgid="728454979946503926">"Mover recursos de aplicaciones"</string>

    <string name="permdesc_movePackage" msgid="6323049291923925277">"Permite que una aplicación mueva los recursos de aplicaciones de un medio interno a otro externo y viceversa."</string>

    <string name="permlab_preventpower">"anular tecla encendido"</string>

    <string name="permdesc_preventpower">"Permite que una aplicación anule la tecla de encendido"</string>

    <string name="permlab_readLogs" msgid="6615778543198967614">"leer datos de registro personales"</string>

    <string name="permdesc_readLogs" product="tablet" msgid="4077356893924755294">"Permite que una aplicación lea diversos archivos de registro del sistema. Con este permiso, la aplicación puede ver información general sobre las acciones que se realizan con el tablet (que puede incluir datos personales o privados)."</string>

    <string name="permdesc_readLogs" product="default" msgid="8896449437464867766">"Permite que una aplicación lea distintos archivos de registro del sistema. Con este permiso, la aplicación puede ver información general sobre las acciones que realizas con el teléfono, que puede incluir datos personales o privados."</string>
@@ -1227,4 +1253,5 @@ 
    <string name="sending" msgid="8715108995741758718">"Enviando..."</string>

    <string name="launchBrowserDefault" msgid="2057951947297614725">"¿Iniciar el navegador?"</string>

    <string name="SetupCallDefault" msgid="6870275517518479651">"¿Aceptar la llamada?"</string>

    <string name="app_killed_message">"Aplicación finalizada"</string>

</resources>

core/res/res/values-fi/strings.xml

+16 −0
Original line number Diff line number Diff line
@@ -1228,4 +1228,20 @@ 
    <string name="launchBrowserDefault" msgid="2057951947297614725">"Käynnistetäänkö selain?"</string>

    <string name="SetupCallDefault" msgid="6870275517518479651">"Vastataanko puheluun?"</string>

    <string name="global_action_screenshot">Kuvakaappaus</string>

    <string name="reboot_reboot">Käynnistä uudelleen</string>

    <string name="reboot_system" product="tablet">Käynnistä tablet uudelleen</string>

    <string name="reboot_system" product="default">Käynnistä puhelin uudelleen</string>

    <string name="reboot_progress">_Uudelleenkäynnistetään\u2026</string>

    <string name="reboot_confirm">Laitteesi käynnistyy uudelleen</string>

    <string name="profileNameDefault">Oletus</string>

    <string name="profileNameWork">Työ</string>

    <string name="profileNameHome">Koti</string>

    <string name="profileNameSilent">Äänetön</string>

    <string name="profileNameNight">Yö</string>

    <string name="profileGroupPhone">Puhelin</string>

    <string name="profileGroupCalendar">Kalenteri</string>

    <string name="profileGroupEmail">Sähköposti</string>

    <string name="profileGroupSMS">Tekstiviesti</string>

    <string name="wildcardProfile">Muu</string>

    <string name="global_action_choose_profile">Profiili</string>

</resources>

core/res/res/values-fr/strings.xml

+19 −0
Original line number Diff line number Diff line
@@ -20,6 +20,24 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

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



    <!-- Names of default profiles. -->

    <string name="profileNameDefault">Défaut</string>

    <string name="profileNameWork">Bureau</string>

    <string name="profileNameHome">Maison</string>

    <string name="profileNameSilent">Silence</string>

    <string name="profileNameNight">Nuit</string>



    <!-- Names of application groups. -->

    <string name="profileGroupPhone">Téléphone</string>

    <string name="profileGroupCalendar">Agenda</string>

    <string name="profileGroupGmail">Gmail</string>

    <string name="profileGroupEmail">Email</string>

    <string name="profileGroupSMS">SMS</string>



    <!-- Name of wildcard profile. -->

    <string name="wildcardProfile">Autres</string>



    <string name="byteShort" msgid="8340973892742019101">"o"</string>

    <string name="kilobyteShort" msgid="5973789783504771878">"Ko"</string>

    <string name="megabyteShort" msgid="6355851576770428922">"Mo"</string>
@@ -157,6 +175,7 @@ 
    <string name="reboot_progress">Redémarrage en cours...</string>

    <string name="global_action_reboot">Redémarrer</string>

    <string name="global_action_screenshot">Capture d\'écran</string>

    <string name="global_action_choose_profile">Profils</string>

    <string name="global_actions" product="tablet" msgid="408477140088053665">"Options de la tablette"</string>

    <string name="global_actions" product="default" msgid="2406416831541615258">"Options du téléphone"</string>

    <string name="global_action_lock" msgid="2844945191792119712">"Verrouillage de l\'écran"</string>

core/res/res/values-it/strings.xml

+27 −0
Original line number Diff line number Diff line
@@ -36,6 +36,17 @@ 
    <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string>

    <string name="mmiError" msgid="5154499457739052907">"Problema di connessione o codice MMI non valido."</string>

    <string name="mmiFdnError" msgid="5224398216385316471">"Operazione limitata solo ai numeri di selezione fissa."</string>

    <string name="profileNameDefault">Predefinito</string>

    <string name="profileNameWork">Lavoro</string>

    <string name="profileNameHome">Casa</string>

    <string name="profileNameSilent">Silenzioso</string>

    <string name="profileNameNight">Notte</string>

    <string name="profileGroupPhone">Telefono</string>

    <string name="profileGroupCalendar">Calendario</string>

    <string name="profileGroupGmail">Gmail</string>

    <string name="profileGroupEmail">Email</string>

    <string name="profileGroupSMS">SMS</string>

    <string name="wildcardProfile">Altro</string>

    <string name="serviceEnabled" msgid="8147278346414714315">"Il servizio è stato attivato."</string>

    <string name="serviceEnabledFor" msgid="6856228140453471041">"Il servizio è stato attivato per:"</string>

    <string name="serviceDisabled" msgid="1937553226592516411">"Il servizio è stato disattivato."</string>
@@ -137,6 +148,17 @@ 
    <string name="turn_off_radio" msgid="8198784949987062346">"Disattiva wireless"</string>

    <string name="screen_lock" msgid="799094655496098153">"Blocco schermo"</string>

    <string name="power_off" msgid="4266614107412865048">"Spegni"</string>

    <string name="reboot_system" product="tablet">Riavvia tablet</string>

    <string name="reboot_system" product="default">Riavvia telefono</string>

    <string name="global_action_screenshot">Cattura schermata</string>

    <string name="reboot_reboot">Riavvia</string>

    <string name="reboot_recovery">Recovery</string>

    <string name="reboot_bootloader">Bootloader</string>

    <string name="reboot_bootmenu">Bootmenu</string>

    <string name="reboot_fastboot">Fastboot</string>

    <string name="reboot_download">Download</string>

    <string name="reboot_progress">Riavvio\u2026</string>

    <string name="reboot_confirm">Il telefono verrà riavviato.</string>

    <string name="silent_mode_silent" msgid="319298163018473078">"Suoneria disattivata"</string>

    <string name="silent_mode_vibrate" msgid="7072043388581551395">"Suoneria vibrazione"</string>

    <string name="silent_mode_ring" msgid="8592241816194074353">"Suoneria attiva"</string>
@@ -150,6 +172,8 @@ 
    <string name="global_actions" product="default" msgid="2406416831541615258">"Opzioni telefono"</string>

    <string name="global_action_lock" msgid="2844945191792119712">"Blocco schermo"</string>

    <string name="global_action_power_off" msgid="4471879440839879722">"Spegni"</string>

    <string name="global_action_reboot">Riavvia</string>

    <string name="global_action_choose_profile">Profilo</string>

    <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Modalità silenziosa"</string>

    <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Audio non attivo"</string>

    <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Audio attivo"</string>
@@ -301,6 +325,8 @@ 
    <string name="permdesc_clearAppCache" product="default" msgid="7740465694193671402">"Consente a un\'applicazione di liberare spazio sul telefono eliminando file nella directory della cache dell\'applicazione. L\'accesso è generalmente limitato a processi di sistema."</string>

    <string name="permlab_movePackage" msgid="728454979946503926">"Spostare risorse dell\'applicazione"</string>

    <string name="permdesc_movePackage" msgid="6323049291923925277">"Consente a un\'applicazione di spostare risorse applicative da supporti interni a esterni e viceversa."</string>

    <string name="permlab_preventpower">modifica azione tasto spegnimento</string>

    <string name="permdesc_preventpower">Consente a un\'applicazione di cambiare il comportamento del tasto di spegnimento</string>

    <string name="permlab_readLogs" msgid="6615778543198967614">"Lettura dati di registro sensibili"</string>

    <string name="permdesc_readLogs" product="tablet" msgid="4077356893924755294">"Consente a un\'applicazione di leggere vari file di registro del sistema per trovare informazioni generali sulle operazioni effettuate con il tablet. Tali file potrebbero contenere informazioni personali o riservate."</string>

    <string name="permdesc_readLogs" product="default" msgid="8896449437464867766">"Consente a un\'applicazione di leggere vari file di registro del sistema per trovare informazioni generali sulle operazioni effettuate con il telefono. Tali file potrebbero contenere informazioni personali o riservate."</string>
@@ -1227,4 +1253,5 @@ 
    <string name="sending" msgid="8715108995741758718">"Invio..."</string>

    <string name="launchBrowserDefault" msgid="2057951947297614725">"Avviare l\'applicazione Browser?"</string>

    <string name="SetupCallDefault" msgid="6870275517518479651">"Accettare la chiamata?"</string>

    <string name="app_killed_message">Applicazione terminata</string>

</resources>