diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-19 11:26:01 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-19 11:30:45 -0700 |
| commit | 2f1c7586bcce334ca69022eb8dc6d8965ceb6a05 (patch) | |
| tree | bf00ada449ee3de31ec983a14e84159200aa18c2 /java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml | |
| parent | 3d0ca68e466482971a4cf46576c50cb2bd42bcb5 (diff) | |
Update AOSP Dialer source from internal google3 repository at
cl/159428781.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/152373142 (4/06/2017) to cl/159428781 (6/19/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030
Diffstat (limited to 'java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml')
| -rw-r--r-- | java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml index bfa58ed61..5e5fb601e 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml @@ -1,11 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2016 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="camera_switch_full_screen" msgid="8940026902611470063">"Bytt til fullskjermkamera"</string> - <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nå er knappen frontkameraet"</string> - <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nå er knappen det bakre kameraet"</string> - <string name="camera_cancel_recording" msgid="1957458244979306869">"Slutt å filme"</string> - <string name="using_front_camera" msgid="6734227994972108992">"Bruker frontkameraet"</string> - <string name="using_back_camera" msgid="2143070243242164971">"Bruker det bakre kameraet"</string> - <string name="camera_take_picture" msgid="2366908858042883376">"Ta et bilde"</string> + <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string> + <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string> + <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string> + <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string> + <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string> + <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string> </resources> |