diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:29:09 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:29:09 +0000 |
| commit | 383c7bfd171faaca388ac6c4ff8551824b2c3cfc (patch) | |
| tree | 064cda87d36a236d63d9951388b85826c4bf364f | |
| parent | 6ab1bdd7e458a340bc286c984eec3e9a5bf097f0 (diff) | |
| parent | a5f877f0b6644036c875613b4799b79d64b73efd (diff) | |
| download | photoviewer-android12-mainline-conscrypt-release.tar.gz | |
Snap for 7550844 from a5f877f0b6644036c875613b4799b79d64b73efd to mainline-conscrypt-releaseandroid-mainline-12.0.0_r8android-mainline-12.0.0_r25android12-mainline-conscrypt-release
Change-Id: I9e481783d5655195d879873aa6e498bde29dec29
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | res/values-iw/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-mn/strings.xml | 2 | ||||
| -rw-r--r-- | sample/Android.bp | 4 | ||||
| -rw-r--r-- | sample/res/values-as/strings.xml | 2 | ||||
| -rw-r--r-- | sample/res/values-iw/strings.xml | 2 |
6 files changed, 12 insertions, 4 deletions
@@ -15,6 +15,10 @@ //################################################# // Build appcompat library +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + android_library { name: "libphotoviewer_appcompat", diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 0597ee1..6ef9973 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="photo_view_count" msgid="3972196711827497300">"<xliff:g id="CURRENT_POS">%1$d</xliff:g> מתוך <xliff:g id="COUNT">%2$d</xliff:g>"</string> - <string name="retry" msgid="3791698559547529232">"נסה שנית"</string> + <string name="retry" msgid="3791698559547529232">"ניסיון נוסף"</string> <string name="failed" msgid="8338915262229269954">"לא ניתן היה לטעון את התמונה"</string> <string name="titles" msgid="3827868765772315200">"<xliff:g id="TITLE_0">%1$s</xliff:g>, <xliff:g id="SUBTITLE">%2$s</xliff:g>"</string> </resources> diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 462f616..a3c08a2 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="photo_view_count" msgid="3972196711827497300">"<xliff:g id="COUNT">%2$d</xliff:g>-н <xliff:g id="CURRENT_POS">%1$d</xliff:g>"</string> - <string name="retry" msgid="3791698559547529232">"Дахих"</string> + <string name="retry" msgid="3791698559547529232">"Дахин оролдох"</string> <string name="failed" msgid="8338915262229269954">"Зургийг ачаалж чадсангүй"</string> <string name="titles" msgid="3827868765772315200">"<xliff:g id="TITLE_0">%1$s</xliff:g>, <xliff:g id="SUBTITLE">%2$s</xliff:g>"</string> </resources> diff --git a/sample/Android.bp b/sample/Android.bp index 389032e..e2afc1e 100644 --- a/sample/Android.bp +++ b/sample/Android.bp @@ -15,6 +15,10 @@ //################################################# // Build APK +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + android_app { name: "PhotoViewerSample", diff --git a/sample/res/values-as/strings.xml b/sample/res/values-as/strings.xml index d6906b9..e5d28d9 100644 --- a/sample/res/values-as/strings.xml +++ b/sample/res/values-as/strings.xml @@ -2,7 +2,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="6534472978887454478">"PhotoViewerSample"</string> - <string name="menu_settings" msgid="4422995668159108064">"ছেটিংসমূহ"</string> + <string name="menu_settings" msgid="4422995668159108064">"ছেটিং"</string> <string name="title_activity_main" msgid="7854395873771803232">"MainActivity"</string> <string name="launch" msgid="6848049715183303298">"ফট\' ভিউয়াৰ আৰম্ভ কৰক"</string> </resources> diff --git a/sample/res/values-iw/strings.xml b/sample/res/values-iw/strings.xml index 8567a5f..ebf92ee 100644 --- a/sample/res/values-iw/strings.xml +++ b/sample/res/values-iw/strings.xml @@ -4,5 +4,5 @@ <string name="app_name" msgid="6534472978887454478">"PhotoViewerSample"</string> <string name="menu_settings" msgid="4422995668159108064">"הגדרות"</string> <string name="title_activity_main" msgid="7854395873771803232">"MainActivity"</string> - <string name="launch" msgid="6848049715183303298">"הפעל את מציג התמונות"</string> + <string name="launch" msgid="6848049715183303298">"הפעלה של מציג התמונות"</string> </resources> |