diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
commit | 680c92febe88260b74f101838a9734b8e10a704c (patch) | |
tree | e3294c3b2b32cd3532fa9b239326b1aaaa79fc40 /WallpaperPicker/res/values-ko/strings.xml | |
parent | 494d2237b8d7b892902604c18098127e77372509 (diff) | |
parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
download | android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.gz android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.bz2 android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.zip |
resolved conflicts for merge of 13ef17a3 to cw-e-dev
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
Diffstat (limited to 'WallpaperPicker/res/values-ko/strings.xml')
-rw-r--r-- | WallpaperPicker/res/values-ko/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WallpaperPicker/res/values-ko/strings.xml b/WallpaperPicker/res/values-ko/strings.xml index a5a85b773..30e7cfa23 100644 --- a/WallpaperPicker/res/values-ko/strings.xml +++ b/WallpaperPicker/res/values-ko/strings.xml @@ -30,7 +30,7 @@ <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"배경화면 %1$d/%2$d"</string> <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> 선택함"</string> <string name="wallpaper_delete" msgid="1459353972739215344">"삭제"</string> - <string name="pick_image" msgid="6704438906027442697">"이미지 선택"</string> + <string name="pick_image" msgid="3189640419551368385">"내 사진"</string> <string name="pick_wallpaper" msgid="4628969645948454559">"배경화면"</string> <string name="crop_wallpaper" msgid="4882870800623585836">"배경화면 잘라내기"</string> </resources> |