diff options
| author | Paul Westbrook <pwestbro@google.com> | 2014-11-02 11:00:40 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2014-11-02 11:00:40 -0800 |
| commit | a54d0838b74550d30803f65638483b7fa79e46e0 (patch) | |
| tree | c29cb0637a478a9238e02325964a5b97cc3285c7 /res/values-ko | |
| parent | c1ad14a93ec1d05272f03618bac920bfcadc2a25 (diff) | |
| parent | 6666fbf0908dcfdd626e84625b2305e7e2475488 (diff) | |
| download | android_packages_apps_Email-a54d0838b74550d30803f65638483b7fa79e46e0.tar.gz android_packages_apps_Email-a54d0838b74550d30803f65638483b7fa79e46e0.tar.bz2 android_packages_apps_Email-a54d0838b74550d30803f65638483b7fa79e46e0.zip | |
resolved conflicts for merge of 6666fbf0 to master
Change-Id: I92e53c11119cda4efa3816b5ae030c278bda1290
Diffstat (limited to 'res/values-ko')
| -rw-r--r-- | res/values-ko/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 31a55a92f..a145a38b6 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"이 계정의 캘린더 일정을 동기화합니다."</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"이메일 동기화"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"이 계정의 이메일을 동기화합니다."</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"진동"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"진동"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"벨소리 선택"</string> <string name="account_settings_servers" msgid="3386185135392642067">"서버 설정"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"동기화 옵션"</string> |