summaryrefslogtreecommitdiffstats
path: root/res/values-ko/strings.xml
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-08-27 17:57:13 +0900
committerKen Wakasa <kwakasa@google.com>2014-08-27 17:57:13 +0900
commit59901028dfb89c6852e6100346d6b16f0c703ce5 (patch)
treee2bc03827fb038577a534405a5b6c12528e52bba /res/values-ko/strings.xml
parent7b8b9bff7868e9e1dae0c261714152d21a76863f (diff)
parent59cdbf00103f3255399216ddbe49fb50fbdcaa53 (diff)
downloadandroid_packages_wallpapers_Basic-59901028dfb89c6852e6100346d6b16f0c703ce5.tar.gz
android_packages_wallpapers_Basic-59901028dfb89c6852e6100346d6b16f0c703ce5.tar.bz2
android_packages_wallpapers_Basic-59901028dfb89c6852e6100346d6b16f0c703ce5.zip
resolved conflicts for merge of 59cdbf00 to master
Change-Id: I991ff097b7d1e82b1e833d9cf03e0910a8398306
Diffstat (limited to 'res/values-ko/strings.xml')
-rw-r--r--res/values-ko/strings.xml12
1 files changed, 0 insertions, 12 deletions
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2d76e97..dbd56e6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -23,21 +23,9 @@
<string name="wallpaper_walkaround" msgid="5548084303782181478">"투명"</string>
<string name="wallpaper_walkaround_author" msgid="7292960549371044078">"Google"</string>
<string name="wallpaper_walkaround_desc" msgid="1714824320382778730">"전화가 항상 시야에 들어오게 하여 사고를 당할 위험 없이 안전하게 돌아다니세요."</string>
- <string name="wallpaper_grass" msgid="4753389782988032116">"풀밭"</string>
- <string name="wallpaper_grass_author" msgid="9197652780831360471">"Google"</string>
- <string name="wallpaper_grass_desc" msgid="7808225799564607409">"풀잎들이 낮이나 밤하늘을 배경으로 하여 부드럽게 흔들립니다."</string>
- <string name="wallpaper_galaxy" msgid="4698294375306738428">"은하수"</string>
- <string name="wallpaper_galaxy_author" msgid="5455561260819111338">"Google"</string>
- <string name="wallpaper_galaxy_desc" msgid="6816969378845338629">"부드럽게 소용돌이치는 별들로 이루어진 은하수입니다."</string>
- <string name="wallpaper_fall" msgid="1500920940722360941">"물"</string>
- <string name="wallpaper_fall_author" msgid="8860429843949521342">"Google"</string>
- <string name="wallpaper_fall_desc" msgid="595888373487204297">"찰랑거리는 연못으로&lt;br&gt; 떨어지는 가을 낙엽:&lt;br&gt; 투명한 배경"</string>
<string name="wallpaper_clock" msgid="6555051461698958610">"중심축 시계"</string>
<string name="wallpaper_clock_author" msgid="8779094427834551330">"Google"</string>
<string name="wallpaper_clock_desc" msgid="6767980298898740026">"날짜와 시간을 시계방향 원호(월, 일, 시, 분, 초)로 표시합니다."</string>
- <string name="wallpaper_nexus" msgid="3789061608411260304">"넥서스"</string>
- <string name="wallpaper_nexus_author" msgid="8492858637541249441">"Google"</string>
- <string name="wallpaper_nexus_desc" msgid="5562598238151885905">"신경망 들여다보기"</string>
<string name="clock_settings" msgid="7837858747417927288">"중심축 시계 설정"</string>
<string name="show_seconds" msgid="8525899907567218168">"초 표시"</string>
<string name="variable_line_width" msgid="8487094734462263605">"다양한 고리 너비"</string>