diff --git a/res/values-ja/config.xml b/res/values-ja/config.xml
deleted file mode 100644
index c5d3aea..0000000
--- a/res/values-ja/config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, 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>
-    <!-- If true, an option is shown in Display Options UI to choose a sort order -->
-    <bool name="config_sort_order_user_changeable">false</bool>
-
-    <!-- If true, the default sort order is primary (i.e. by given name) -->
-    <bool name="config_default_sort_order_primary">true</bool>
-
-    <!-- If true, an option is shown in Display Options UI to choose a name display order -->
-    <bool name="config_display_order_user_changeable">false</bool>
-
-    <!-- If true, the default sort order is primary (i.e. by given name) -->
-    <bool name="config_default_display_order_primary">true</bool>
-    
-    <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
-    <bool name="config_editor_field_order_primary">false</bool>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 44718bc..569f5d6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2006 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.
@@ -12,7 +12,8 @@
      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="contactsList" msgid="8661624236494819731">"連絡先"</string>
@@ -143,6 +144,8 @@
     <string name="recentCalls_removeFromRecentList" msgid="401662244636511330">"通話履歴から消去"</string>
     <string name="recentCalls_deleteAll" msgid="6352364392762163704">"通話履歴を全件消去"</string>
     <string name="recentCalls_empty" msgid="247053222448663107">"通話履歴なし"</string>
+    <string name="clearCallLogConfirmation_title" msgid="718072843006222703">"通話履歴を消去"</string>
+    <string name="clearCallLogConfirmation" msgid="7625927669136267636">"通話履歴を消去してもよろしいですか？"</string>
     <string name="imei" msgid="3045126336951684285">"IMEI（端末識別番号）"</string>
     <string name="meid" msgid="6210568493746275750">"MEID"</string>
     <string name="voicemail" msgid="3851469869202611441">"ボイスメール"</string>
@@ -174,7 +177,7 @@
     <string name="callAgain" msgid="3197312117049874778">"再発信"</string>
     <string name="returnCall" msgid="8171961914203617813">"発信"</string>
     <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g>分<xliff:g id="SECONDS">%s</xliff:g>秒"</string>
-    <string name="favoritesFrquentSeparator" msgid="5007070838253932139">"よく使う連絡先"</string>
+    <string name="favoritesFrquentSeparator" msgid="8107518433381283736">"よく使う連絡先"</string>
     <string name="add_contact_dlg_title" msgid="2896685845822146494">"連絡先を追加"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"<xliff:g id="EMAIL">%s</xliff:g> を連絡先に追加しますか？"</string>
     <string name="all_tab_label" msgid="4003124364397916826">"すべて"</string>
@@ -284,15 +287,13 @@
     <string name="call_fax_work" msgid="7467763592359059243">"勤務先FAXに発信"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"自宅のFAXに発信"</string>
     <string name="call_pager" msgid="9003902812293983281">"ポケベルに発信"</string>
-    <!-- no translation found for call_other (8563753966926932052) -->
-    <skip />
+    <string name="call_other" msgid="8563753966926932052">"発信"</string>
     <string name="call_callback" msgid="1910165691349426858">"コールバック先に発信"</string>
     <string name="call_car" msgid="3280537320306436445">"クルマに発信"</string>
     <string name="call_company_main" msgid="6105120947138711257">"会社代表番号に発信"</string>
     <string name="call_isdn" msgid="1541590690193403411">"ISDNに発信"</string>
     <string name="call_main" msgid="6082900571803441339">"電話番号1に発信"</string>
-    <!-- no translation found for call_other_fax (5745314124619636674) -->
-    <skip />
+    <string name="call_other_fax" msgid="5745314124619636674">"FAXに電話"</string>
     <string name="call_radio" msgid="8296755876398357063">"無線に発信"</string>
     <string name="call_telex" msgid="2223170774548648114">"テレックスに発信"</string>
     <string name="call_tty_tdd" msgid="8951266948204379604">"TTY/TDDに発信"</string>
@@ -307,15 +308,13 @@
     <string name="sms_fax_work" msgid="8028189067816907075">"勤務先FAXにSMS"</string>
     <string name="sms_fax_home" msgid="9204042076306809634">"自宅FAXにSMS"</string>
     <string name="sms_pager" msgid="7730404569637015192">"ポケベルにSMS"</string>
-    <!-- no translation found for sms_other (806127844607642331) -->
-    <skip />
+    <string name="sms_other" msgid="806127844607642331">"電話にSMS"</string>
     <string name="sms_callback" msgid="5004824430094288752">"コールバック先にSMS"</string>
     <string name="sms_car" msgid="7444227058437359641">"クルマにSMS"</string>
     <string name="sms_company_main" msgid="118970873419678087">"会社代表番号にSMS"</string>
     <string name="sms_isdn" msgid="8153785037515047845">"ISDNにSMS"</string>
     <string name="sms_main" msgid="8621625784504541679">"電話番号1にSMS"</string>
-    <!-- no translation found for sms_other_fax (3888842199855843152) -->
-    <skip />
+    <string name="sms_other_fax" msgid="3888842199855843152">"FAXにSMS"</string>
     <string name="sms_radio" msgid="3329166673433967820">"無線にSMS"</string>
     <string name="sms_telex" msgid="9034802430065267848">"テレックスにSMS"</string>
     <string name="sms_tty_tdd" msgid="6782284969132531532">"TTY/TDDにSMS"</string>
@@ -326,14 +325,12 @@
     <string name="email_home" msgid="8573740658148184279">"自宅にメール"</string>
     <string name="email_mobile" msgid="2042889209787989814">"携帯電話にメール"</string>
     <string name="email_work" msgid="2807430017302722689">"勤務先にメール"</string>
-    <!-- no translation found for email_other (3454004077967657109) -->
-    <skip />
+    <string name="email_other" msgid="3454004077967657109">"メール送信"</string>
     <string name="email_custom" msgid="7548003991586214105">"<xliff:g id="CUSTOM">%s</xliff:g>にメール"</string>
     <string name="email" msgid="5668400997660065897">"メール"</string>
     <string name="map_home" msgid="1243547733423343982">"自宅の住所を表示"</string>
     <string name="map_work" msgid="1360474076921878088">"勤務先の住所を表示"</string>
-    <!-- no translation found for map_other (3817820803587012641) -->
-    <skip />
+    <string name="map_other" msgid="3817820803587012641">"住所を表示"</string>
     <string name="map_custom" msgid="6184363799976265281">"<xliff:g id="CUSTOM">%s</xliff:g>の住所を表示"</string>
     <string name="chat_aim" msgid="2588492205291249142">"AIMでチャット"</string>
     <string name="chat_msn" msgid="8041633440091073484">"Windows Liveでチャット"</string>
@@ -371,6 +368,16 @@
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名が先"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓が先"</string>
     <string name="search_bar_hint" msgid="1012756309632856553">"連絡先を検索"</string>
-    <!-- no translation found for search_for_all_contacts (6644963335787294131) -->
+    <string name="search_for_all_contacts" msgid="6644963335787294131">"すべての連絡先を検索"</string>
+    <string name="take_photo" msgid="7496128293167402354">"写真を撮影"</string>
+    <string name="pick_photo" msgid="448886509158039462">"ギャラリーから写真を選ぶ"</string>
+    <string name="locale_change_in_progress" msgid="1124266507671178413">"言語の変更に伴い連絡先リストを更新しています。"\n\n"しばらくお待ちください..."</string>
+    <!-- no translation found for upgrade_in_progress (7530893673211750223) -->
+    <skip />
+    <!-- no translation found for upgrade_out_of_memory (492151063059824962) -->
+    <skip />
+    <!-- no translation found for upgrade_out_of_memory_uninstall (1721798828992091432) -->
+    <skip />
+    <!-- no translation found for upgrade_out_of_memory_retry (8431289830472724609) -->
     <skip />
 </resources>