diff options
author | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:56:49 +0530 |
---|---|---|
committer | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:56:49 +0530 |
commit | 14ee72e6db5d7e33d061176e7e6d06e1d0475882 (patch) | |
tree | 933f97c4bddd3e5408c35a28a24f990095fedefe /res/values-ka-rGE/strings.xml | |
parent | 7f3bc87a69368ecdc9a27d8c6a21ee4b2d7fd32f (diff) | |
parent | b26b9425d700359d6ee68d45ac334fd1f2ab82d4 (diff) | |
download | android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.tar.gz android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.tar.bz2 android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.zip |
Merge commit 'b26b9425d700359d6ee68d45ac334fd1f2ab82d4' into remote
Conflicts:
src/com/android/packageinstaller/permission/ui/handheld/GrantPermissionsViewHandlerImpl.java
Change-Id: Ia57d17750406754f1e19266f51f0115e3cf774ba
Diffstat (limited to 'res/values-ka-rGE/strings.xml')
-rw-r--r-- | res/values-ka-rGE/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index d8f9f0a7..a0610773 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -87,7 +87,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> - <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="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> |