diff options
| author | Paul Westbrook <pwestbro@google.com> | 2014-11-02 13:04:25 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2014-11-02 13:04:25 -0800 |
| commit | 92938fb81fecdb0aea0c8d8296232c1a9f5a8fd1 (patch) | |
| tree | e234eedbf10be22fc74c9e0f7c0a2f9c6ecba9e8 | |
| parent | 07d0027f332d515d94e1bdf8b97bcaac16dd207a (diff) | |
| parent | 62c8c8e357550f9fba5acffb91092de04c1bfc52 (diff) | |
| download | Exchange-92938fb81fecdb0aea0c8d8296232c1a9f5a8fd1.tar.gz | |
resolved conflicts for merge of 62c8c8e3 to master
Change-Id: I4658567a6213cbc86586145cc8da7d7688386933
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 16118441..59c340cb 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -27,7 +27,6 @@ <string name="meeting_recurring" msgid="2752008481765880928">"时间：<xliff:g id="EVENTDATE">%s</xliff:g>（重复）"</string> <string name="meeting_allday" msgid="7251209063071628040">"日期：<xliff:g id="EVENTDATE">%s</xliff:g>（全天）"</string> <string name="meeting_allday_recurring" msgid="4545762363537362545">"日期：<xliff:g id="EVENTDATE">%s</xliff:g>（全天，循环）"</string> - <string name="notification_exchange_calendar_added" msgid="8998454267739748113">"已添加Exchange日历"</string> <string name="app_name" msgid="1707639359526090662">"Exchange服务"</string> <string name="exception_cancel" msgid="8972887597771126871">"定于以下日期的活动已取消：<xliff:g id="DATE">%s</xliff:g>"</string> <string name="exception_updated" msgid="329192591551400871">"定于以下日期的活动的详细信息已更改：<xliff:g id="DATE">%s</xliff:g>"</string> |