diff options
| -rw-r--r-- | res/values-es/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-it/strings.xml | 8 | ||||
| -rw-r--r-- | res/values-my-rMM/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-uz-rUZ/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 8 |
6 files changed, 9 insertions, 16 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 4d8cc9f7..15e3b8af 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Rechazar"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Denegar de todos modos"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"¿Permitir <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> en <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"¿Permitir a <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplicaciones"</string> <string name="app_permissions" msgid="3146758905824597178">"Permisos de aplicaciones"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 9c513e76..78d2a68b 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -42,10 +42,10 @@ <string name="install_failed_msg" product="tv" msgid="3990457938384021566">"Impossibile installare <xliff:g id="APP_NAME">%1$s</xliff:g> sulla tua TV."</string> <string name="install_failed_msg" product="default" msgid="8554909560982962052">"Impossibile installare <xliff:g id="APP_NAME">%1$s</xliff:g> sul telefono."</string> <string name="launch" msgid="4826921505917605463">"Apri"</string> - <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"Il tablet è impostato per bloccare l\'installazione di applicazioni ottenute da fonti sconosciute."</string> - <string name="unknown_apps_dlg_text" product="tv" msgid="7195713985140602351">"Per sicurezza, la TV è impostata per bloccare l\'installazione di app ottenute da fonti sconosciute."</string> - <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"Il telefono è impostato per bloccare l\'installazione di applicazioni ottenute da fonti sconosciute."</string> - <string name="unknown_apps_admin_dlg_text" msgid="1189146324736698462">"L\'amministratore non consente l\'installazione di app ottenute da fonti sconosciute."</string> + <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"Il tablet è impostato per bloccare l\'installazione di applicazioni ottenute da origini sconosciute."</string> + <string name="unknown_apps_dlg_text" product="tv" msgid="7195713985140602351">"La TV è impostata per bloccare l\'installazione di app ottenute da origini sconosciute."</string> + <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"Il telefono è impostato per bloccare l\'installazione di app ottenute da origini sconosciute."</string> + <string name="unknown_apps_admin_dlg_text" msgid="1189146324736698462">"L\'amministratore non consente l\'installazione di app ottenute da origini sconosciute."</string> <string name="ok" msgid="3468756155452870475">"OK"</string> <string name="settings" msgid="6743583734099755409">"Impostazioni"</string> <string name="manage_applications" msgid="4033876279091996596">"Gestisci applicazioni"</string> diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index 4d6048ce..ae53bf8f 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -120,7 +120,7 @@ <string name="permission_review_warning_title_template_update" msgid="2569412700408535872">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ကို အပ်ဒိတ် လုပ်ခဲ့သည်။<xliff:g id="APP_NAME_1">%1$s</xliff:g> အား အောက်ဖေါ်ပြပါကို သုံးခွင့် ပြုရမလား။"</string> <string name="permission_review_title_template_install" msgid="6535540493936469336">"<xliff:g id="APP_NAME">%1$s</xliff:g> အား သုံးခွင့် ပြုမှာကို ရွေးချယ်ပါ"</string> <string name="permission_review_title_template_update" msgid="2548815248828051885">"<xliff:g id="APP_NAME">%1$s</xliff:g> ကို အပ်ဒိတ် လုပ်ခဲ့သည်။ ဤအက်ပ်အား သုံးခွင့် ပြုမှာကို ရွေးချယ်ပါ။"</string> - <string name="review_button_cancel" msgid="957906817733578877">"ဖျက်သိမ်းပါ"</string> + <string name="review_button_cancel" msgid="957906817733578877">"မလုပ်တော့ပါ"</string> <string name="review_button_continue" msgid="4809162078179371370">"ဆက်လုပ်ပါ"</string> <string name="new_permissions_category" msgid="3213523410139204183">"ခွင့်ပြုချက် အသစ်များ"</string> <string name="current_permissions_category" msgid="998210994450606094">"လက်ရှိ ခွင့်ပြုချက်များ"</string> diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index b2df4f43..fb7d5e8a 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="2738748390251381682">"Ilova paketini o‘rnatish vositasi"</string> - <string name="next" msgid="3057143178373252333">"Keyingi"</string> + <string name="next" msgid="3057143178373252333">"Keyingisi"</string> <string name="install" msgid="5896438203900042068">"O‘rnatish"</string> <string name="done" msgid="3889387558374211719">"Tayyor"</string> <string name="security_settings_desc" msgid="2706691034244052604">"Ushbu ilovaga quyidagi amallar uchun ruxsat berish:"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index df471e56..5ec5f6c0 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -86,8 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"拒绝"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"仍然拒绝"</string> <string name="current_permission_template" msgid="6378304249516652817">"第 <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> 项权限（共 <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g> 项）"</string> - <!-- no translation found for permission_warning_template (7332275268559121742) --> - <skip /> + <string name="permission_warning_template" msgid="7332275268559121742">"要允许<b><xliff:g id="APP_NAME">%1$s</xliff:g></b><xliff:g id="ACTION">%2$s</xliff:g>吗？"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"允许"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"应用"</string> <string name="app_permissions" msgid="3146758905824597178">"应用访问授权"</string> diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 3b191458..6692d66a 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -388,13 +388,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mAppInfo = null; } - // If we have a session id, we're invoked to verify the permissions for the given - // package. Otherwise, we start the install process. - if (mSessionId != -1) { - startInstallConfirm(); - } else { - startInstall(); - } + startInstallConfirm(); } void setPmResult(int pmResult) { |