diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Roland Levillain <rpl@google.com> | 2017-09-04 18:05:19 +0100 |
commit | fc0eb8ccebcc7846db5e8b5c5430070055679bfa (patch) | |
tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 /java/com/android/incallui/video/impl/res/values-bs | |
parent | ea7b4dc89590ffa3332766a531e0eab6ffb9aebd (diff) |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)
This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):
git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef
Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/incallui/video/impl/res/values-bs')
-rw-r--r-- | java/com/android/incallui/video/impl/res/values-bs/strings.xml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/java/com/android/incallui/video/impl/res/values-bs/strings.xml b/java/com/android/incallui/video/impl/res/values-bs/strings.xml index b27137f3f..47d1d0263 100644 --- a/java/com/android/incallui/video/impl/res/values-bs/strings.xml +++ b/java/com/android/incallui/video/impl/res/values-bs/strings.xml @@ -1,12 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2017 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ 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"> <string name="videocall_remote_video_off" msgid="2959680546745902547">"Kamera je isključena"</string> <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kamera je uključena"</string> <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv na čekanju"</string> <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string> - <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Dozvoliti pristup kameri?"</string> - <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija za telefon želi koristiti kameru za videopozive?"</string> - <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Dozvoli"</string> - <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odbij"</string> </resources> |