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

Commit 7244dcc7 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts... 

Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts when merging upstream changes
parent de8cff8d

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

+311 −321

File changed.

Preview size limit exceeded, changes collapsed.

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

+202 −197

File changed.

Preview size limit exceeded, changes collapsed.

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

+145 −144
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="UTF-8"?>

<!-- 

/* //device/apps/common/assets/res/any/strings.xml

**
@@ -16,7 +16,10 @@ 
** See the License for the specific language governing permissions and

** limitations under the License.

*/

 --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

 -->



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

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

    <string name="byteShort" msgid="202579285008794431">"octet(s)"</string>

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

    <string name="megabyteShort" msgid="6649361267635823443">"Mo"</string>
@@ -1176,7 +1179,7 @@ 
    <string name="app_running_notification_title" msgid="8985999749231486569">"<xliff:g id="APP_NAME">%1$s</xliff:g> en cours d\'exécution"</string>

    <string name="app_running_notification_text" msgid="5120815883400228566">"Appuyez ici pour en savoir plus ou pour arrêter l\'application."</string>

    <string name="ok" msgid="2646370155170753815">"OK"</string>

    <string name="cancel" msgid="6908697720451760115">Annuler</string>

    <string name="cancel" msgid="6908697720451760115">"Annuler"</string>

    <string name="yes" msgid="9069828999585032361">"OK"</string>

    <string name="no" msgid="5122037903299899715">"Annuler"</string>

    <string name="dialog_alert_title" msgid="651856561974090712">"Attention"</string>
@@ -1229,6 +1232,7 @@ 
    <string name="aerr_mute" msgid="2304972923480211376">"Ignorer jusqu\'au redémarrage de l\'appareil"</string>

    <string name="aerr_wait" msgid="3198677780474548217">"Attendre"</string>

    <string name="aerr_close_app" msgid="8318883106083050970">"Fermer l\'application"</string>

    <string name="anr_title" msgid="7290329487067300120"></string>

    <string name="anr_activity_application" msgid="8121716632960340680">"<xliff:g id="APPLICATION">%2$s</xliff:g> ne répond pas."</string>

    <string name="anr_activity_process" msgid="3477362583767128667">"L\'activité \"<xliff:g id="ACTIVITY">%1$s</xliff:g>\" ne répond pas."</string>

    <string name="anr_application_process" msgid="4978772139461676184">"<xliff:g id="APPLICATION">%1$s</xliff:g> ne répond pas."</string>
@@ -1524,7 +1528,7 @@ 
    </plurals>

    <string name="action_mode_done" msgid="2536182504764803222">"OK"</string>

    <string name="progress_erasing" msgid="6891435992721028004">"Suppression de l\'espace de stockage partagé…"</string>

    <string name="share" msgid="4157615043345227321">Partager</string>

    <string name="share" msgid="4157615043345227321">"Partager"</string>

    <string name="find" msgid="5015737188624767706">"Rechercher"</string>

    <string name="websearch" msgid="5624340204512793290">"Recherche Web"</string>

    <string name="find_next" msgid="5341217051549648153">"Rechercher suivant"</string>
@@ -2059,6 +2063,7 @@ 
    <string name="etws_primary_default_message_earthquake_and_tsunami" msgid="4888224011071875068">"Restez calme et cherchez un abri à proximité."</string>

    <string name="etws_primary_default_message_test" msgid="4583367373909549421">"Test de messages d\'urgence"</string>

    <string name="notification_reply_button_accessibility" msgid="5235776156579456126">"Répondre"</string>

    <string name="etws_primary_default_message_others" msgid="7958161706019130739"></string>

    <string name="mmcc_authentication_reject" msgid="4891965994643876369">"Carte SIM non autorisée pour les commandes vocales"</string>

    <string name="mmcc_imsi_unknown_in_hlr" msgid="227760698553988751">"Carte SIM non provisionnée pour les commandes vocales"</string>

    <string name="mmcc_illegal_ms" msgid="7509650265233909445">"Carte SIM non autorisée pour les commandes vocales"</string>
@@ -2282,6 +2287,10 @@ 
    <string name="PERSOSUBSTATE_SIM_ICCID_SUCCESS" msgid="8058678548991999545">"Déblocage ICCID effectué."</string>

    <string name="PERSOSUBSTATE_SIM_IMPI_SUCCESS" msgid="2545608067978550571">"Déblocage IMPI effectué."</string>

    <string name="PERSOSUBSTATE_SIM_NS_SP_SUCCESS" msgid="4352382949744625007">"Déblocage du sous-réseau du fournisseur de services effectué."</string>

    <string name="config_pdp_reject_dialog_title" msgid="4072057179246785727"></string>

    <string name="config_pdp_reject_user_authentication_failed" msgid="4531693033885744689"></string>

    <string name="config_pdp_reject_service_not_subscribed" msgid="8190338397128671588"></string>

    <string name="config_pdp_reject_multi_conn_to_same_pdn_not_allowed" msgid="6024904218067254186"></string>

    <string name="window_magnification_prompt_title" msgid="2876703640772778215">"Nouveaux paramètres d\'agrandissement"</string>

    <string name="window_magnification_prompt_content" msgid="8159173903032344891">"Vous pouvez désormais agrandir une partie de l\'écran"</string>

    <string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Activer dans les paramètres"</string>
@@ -2297,12 +2306,4 @@ 
    <string name="view_and_control_notification_content" msgid="8003766498562604034">"<xliff:g id="SERVICE_NAME">%s</xliff:g> peut afficher et contrôler votre écran. Appuyez ici pour en savoir plus."</string>

    <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> traduit."</string>

    <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Message en <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> traduit en <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string>

    <string name="permlab_fakePackageSignature">Usurper la signature de paquets</string>

    <string name="permgrouplab_fake_package_signature">Usurper la signature de paquets</string>

    <string name="permgrouprequest_fake_package_signature">Autoriser &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; à usurper la signature de paquets \?</string>

    <string name="permgroupdesc_fake_package_signature">Autoriser l\'usurpation de la signature de paquets</string>

    <string name="permdesc_fakePackageSignature">Autoriser l\'application à prétendre qu\'elle est une autre application. Des applications frauduleuses pourraient utiliser cette autorisation pour accéder à des données d\'application privées. Les usages légitimes incluent un émulateur prétendant être ce qu\'il émule. N\'accordez cette autorisation qu\'avec parcimonie !</string>

    <string name="crossSimFormat_spn"><xliff:g id="spn" example="Operator">%s</xliff:g></string>

    <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string>

    <string name="wfcSpnFormat_spn"><xliff:g id="spn" example="Operator">%s</xliff:g></string>

</resources>

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

+146 −137
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="UTF-8"?>

<!-- 

/* //device/apps/common/assets/res/any/strings.xml

**
@@ -16,7 +16,10 @@ 
** See the License for the specific language governing permissions and

** limitations under the License.

*/

 --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

 -->



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

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

    <string name="byteShort" msgid="202579285008794431">"B"</string>

    <string name="kilobyteShort" msgid="2214285521564195803">"kB"</string>

    <string name="megabyteShort" msgid="6649361267635823443">"MB"</string>
@@ -1176,11 +1179,11 @@ 
    <string name="app_running_notification_title" msgid="8985999749231486569">"<xliff:g id="APP_NAME">%1$s</xliff:g> è in esecuzione"</string>

    <string name="app_running_notification_text" msgid="5120815883400228566">"Tocca per ulteriori informazioni o per interrompere l\'app."</string>

    <string name="ok" msgid="2646370155170753815">"OK"</string>

    <string name="cancel" msgid="6908697720451760115">Annulla</string>

    <string name="cancel" msgid="6908697720451760115">"Annulla"</string>

    <string name="yes" msgid="9069828999585032361">"OK"</string>

    <string name="no" msgid="5122037903299899715">"Annulla"</string>

    <string name="dialog_alert_title" msgid="651856561974090712">"Attenzione"</string>

    <string name="loading" msgid="3138021523725055037">Caricamento…</string>

    <string name="loading" msgid="3138021523725055037">"Caricamento…"</string>

    <string name="capital_on" msgid="2770685323900821829">"ON"</string>

    <string name="capital_off" msgid="7443704171014626777">"OFF"</string>

    <string name="checked" msgid="9179896827054513119">"selezionato"</string>
@@ -1229,6 +1232,7 @@ 
    <string name="aerr_mute" msgid="2304972923480211376">"Disattiva fino al riavvio del dispositivo"</string>

    <string name="aerr_wait" msgid="3198677780474548217">"Attendi"</string>

    <string name="aerr_close_app" msgid="8318883106083050970">"Chiudi app"</string>

    <string name="anr_title" msgid="7290329487067300120"></string>

    <string name="anr_activity_application" msgid="8121716632960340680">"L\'app <xliff:g id="APPLICATION">%2$s</xliff:g> non risponde"</string>

    <string name="anr_activity_process" msgid="3477362583767128667">"L\'app <xliff:g id="ACTIVITY">%1$s</xliff:g> non risponde"</string>

    <string name="anr_application_process" msgid="4978772139461676184">"L\'app <xliff:g id="APPLICATION">%1$s</xliff:g> non risponde"</string>
@@ -1524,7 +1528,7 @@ 
    </plurals>

    <string name="action_mode_done" msgid="2536182504764803222">"Fine"</string>

    <string name="progress_erasing" msgid="6891435992721028004">"Cancellazione archivio condiviso…"</string>

    <string name="share" msgid="4157615043345227321">Condividi</string>

    <string name="share" msgid="4157615043345227321">"Condividi"</string>

    <string name="find" msgid="5015737188624767706">"Trova"</string>

    <string name="websearch" msgid="5624340204512793290">"Ricerca Web"</string>

    <string name="find_next" msgid="5341217051549648153">"Trova successivo"</string>
@@ -2059,6 +2063,7 @@ 
    <string name="etws_primary_default_message_earthquake_and_tsunami" msgid="4888224011071875068">"Mantieni la calma e cerca riparo nelle vicinanze."</string>

    <string name="etws_primary_default_message_test" msgid="4583367373909549421">"Testo messaggi di emergenza"</string>

    <string name="notification_reply_button_accessibility" msgid="5235776156579456126">"Rispondi"</string>

    <string name="etws_primary_default_message_others" msgid="7958161706019130739"></string>

    <string name="mmcc_authentication_reject" msgid="4891965994643876369">"SIM non consentita per la voce"</string>

    <string name="mmcc_imsi_unknown_in_hlr" msgid="227760698553988751">"SIM non predisposta per la voce"</string>

    <string name="mmcc_illegal_ms" msgid="7509650265233909445">"SIM non consentita per la voce"</string>
@@ -2282,6 +2287,10 @@ 
    <string name="PERSOSUBSTATE_SIM_ICCID_SUCCESS" msgid="8058678548991999545">"Sblocco ICCID riuscito."</string>

    <string name="PERSOSUBSTATE_SIM_IMPI_SUCCESS" msgid="2545608067978550571">"Sblocco IMPI riuscito."</string>

    <string name="PERSOSUBSTATE_SIM_NS_SP_SUCCESS" msgid="4352382949744625007">"Sblocco fornitore di servizi sottoinsieme rete riuscito."</string>

    <string name="config_pdp_reject_dialog_title" msgid="4072057179246785727"></string>

    <string name="config_pdp_reject_user_authentication_failed" msgid="4531693033885744689"></string>

    <string name="config_pdp_reject_service_not_subscribed" msgid="8190338397128671588"></string>

    <string name="config_pdp_reject_multi_conn_to_same_pdn_not_allowed" msgid="6024904218067254186"></string>

    <string name="window_magnification_prompt_title" msgid="2876703640772778215">"Nuove impostazioni per l\'ingrandimento"</string>

    <string name="window_magnification_prompt_content" msgid="8159173903032344891">"Ora puoi ingrandire parte dello schermo"</string>

    <string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Attiva in Impostazioni"</string>

core/res/res/values/strings.xml

+0 −12
Original line number Diff line number Diff line
@@ -880,18 +880,6 @@ 


    <!--  Permissions -->



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_fakePackageSignature">Spoof package signature</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_fakePackageSignature">Allows the app to pretend to be a different app. Malicious applications might be able to use this to access private application data. Legitimate uses include an emulator pretending to be what it emulates. Grant this permission with caution only!</string>

    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgrouplab_fake_package_signature">Spoof package signature</string>

    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgroupdesc_fake_package_signature">allow to spoof package signature</string>

    <!-- Message shown to the user when the apps requests permission from this group. If ever possible this should stay below 80 characters (assuming the parameters takes 20 characters). Don't abbreviate until the message reaches 120 characters though. [CHAR LIMIT=120] -->

    <string name="permgrouprequest_fake_package_signature">Allow

        &lt;b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b> to spoof package signature?</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_statusBar">disable or modify status bar</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->