diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-31 16:13:53 +0000 |
| commit | 2ca4318cc1ee57dda907ba2069bd61d162b1baef (patch) | |
| tree | e282668a9587cf6c1ec7b604dea860400c75c6c7 /java/com/android/incallui/incall/impl/res/values-ja | |
| parent | 68038172793ee0e2ab3e2e56ddfbeb82879d1f58 (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.
Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/incallui/incall/impl/res/values-ja')
| -rw-r--r-- | java/com/android/incallui/incall/impl/res/values-ja/strings.xml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml index 9e313a072..b78ee202e 100644 --- a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml @@ -1,18 +1,33 @@ <?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="incall_label_videocall" msgid="2208755440134676113">"ビデオ通話"</string> <string name="incall_label_hold" msgid="4223472584896867896">"保留"</string> <string name="incall_label_add_call" msgid="5641663436373994915">"通話を追加"</string> <string name="incall_label_mute" msgid="2180667027331706737">"ミュート"</string> + <string name="incall_label_end_call" msgid="5434079261446614887">"通話を終了"</string> <string name="incall_label_dialpad" msgid="8609779533654156550">"キーパッド"</string> - <string name="incall_label_speaker" msgid="8100402799687856933">"スピーカー"</string> <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"がオンです"</string> <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"がオフです"</string> <string name="incall_label_merge" msgid="720076442985913175">"統合"</string> <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string> <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"発信者を管理"</string> <string name="incall_label_swap" msgid="10458642864243507">"切り替え"</string> - <string name="incall_label_audio" msgid="8616473242030174797">"音声"</string> <string name="incall_note_sent" msgid="4524130323127388367">"メモを送信しました"</string> </resources> |