From 9a090c89e7a0c43a668bd6e2ac5e5e680f323aed Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 16 Mar 2017 19:22:24 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/150392808

Test: Treehugger

Notable this release:
* Reintroduce localization.

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 3/15/2017 to cl/150392808 (3/16/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: Ia16d68469c2ca1ff42c7fa31d922bdb78c4e244a
---
 .../dialer/calllogutils/res/values-ja/strings.xml  | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 java/com/android/dialer/calllogutils/res/values-ja/strings.xml

(limited to 'java/com/android/dialer/calllogutils/res/values-ja/strings.xml')

diff --git a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
new file mode 100644
index 000000000..75eda0ca2
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
@@ -0,0 +1,42 @@
+<?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="type_incoming" msgid="5727636795656199810">"通話着信"</string>
+    <string name="type_incoming_pulled" msgid="8434723359163965796">"別の端末に転送された通話着信"</string>
+    <string name="type_outgoing" msgid="764896746073942963">"通話発信"</string>
+    <string name="type_outgoing_pulled" msgid="1648517538371704193">"別の端末に転送された通話発信"</string>
+    <string name="type_missed" msgid="2997043831022028176">"不在着信"</string>
+    <string name="type_incoming_video" msgid="7507180294202642554">"ビデオ通話の着信"</string>
+    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"別の端末に転送されたビデオ通話の着信"</string>
+    <string name="type_outgoing_video" msgid="309370072333983910">"ビデオ通話の発信"</string>
+    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"別の端末に転送されたビデオ通話の発信"</string>
+    <string name="type_missed_video" msgid="4350107016317603785">"ビデオ通話の不在着信"</string>
+    <string name="type_voicemail" msgid="1877524395253846684">"ボイスメール"</string>
+    <string name="type_rejected" msgid="5632107438472996198">"拒否された通話"</string>
+    <string name="type_blocked" msgid="9177237294052244929">"ブロックされた通話"</string>
+    <string name="type_answered_elsewhere" msgid="411958582555881640">"別の端末で応答した通話"</string>
+    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
+    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> で受信"</string>
+    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>（<xliff:g id="NUMBER">%2$s</xliff:g>）で受信"</string>
+    <string name="voicemail_string" msgid="6029775151483803006">"ボイスメール"</string>
+    <!-- no translation found for call_details_duration_format (296780245582838089) -->
+    <skip />
+    <!-- no translation found for call_details_short_duration_format (8079910850626312453) -->
+    <skip />
+</resources>
-- 
cgit v1.2.3