summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rTW
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-09-25 12:11:58 -0700
committerBrian Attwell <brianattwell@google.com>2014-09-25 12:11:58 -0700
commitd30c3c2d7526f011abf28e752b45e8aee0a23dd3 (patch)
tree689449cb83879f06cef387e0410e98295cea372d /res/values-zh-rTW
parente2f23e3110b09f6ac4c113ff9811cf0e2d2f8a5d (diff)
parentbccfd553e64b9e497a463dcaeb2d69704660fd82 (diff)
downloadpackages_apps_Contacts-d30c3c2d7526f011abf28e752b45e8aee0a23dd3.tar.gz
packages_apps_Contacts-d30c3c2d7526f011abf28e752b45e8aee0a23dd3.tar.bz2
packages_apps_Contacts-d30c3c2d7526f011abf28e752b45e8aee0a23dd3.zip
resolved conflicts for merge of bccfd553 to lmp-mr1-dev-plus-aosp
Change-Id: I618ba902bf82d6ef4fef606addea45cb169313cd
Diffstat (limited to 'res/values-zh-rTW')
-rw-r--r--res/values-zh-rTW/strings.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ef6ab5092..975e10226 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -242,4 +242,18 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g><xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(未命名活動)"</string>
<string name="date_time_set" msgid="4761419824439606690">"設定"</string>
+ <string name="header_im_entry" msgid="3581720979640225615">"即時訊息"</string>
+ <string name="header_organization_entry" msgid="8515394955666265406">"機構"</string>
+ <string name="header_nickname_entry" msgid="6743561883967451485">"暱稱"</string>
+ <string name="header_note_entry" msgid="4320190426480612344">"記事"</string>
+ <string name="header_website_entry" msgid="1411467850000824745">"網站"</string>
+ <string name="header_event_entry" msgid="6738250422744401460">"活動"</string>
+ <string name="header_relation_entry" msgid="1520292958088146460">"關係"</string>
+ <string name="content_description_directions" msgid="2686791825798189335">"規劃前往特定地點的路線"</string>
+ <string name="content_description_recent_sms" msgid="6268563442222149676">"近期簡訊。<xliff:g id="MESSAGE_DETAILS">%s</xliff:g>。點選即可回覆"</string>
+ <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"來電"</string>
+ <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"撥出通話"</string>
+ <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接來電"</string>
+ <string name="content_description_recent_call" msgid="6204048362763219585">"近期通話。<xliff:g id="CALL_DETAILS">%s</xliff:g>。點選即可回電"</string>
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"您:<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>