From 9495989265306b773fdc7f6ac8d6739c7e294444 Mon Sep 17 00:00:00 2001
From: JuneHyeon Bae <devunt@gmail.com>
Date: Sun, 14 Dec 2014 16:43:27 +0100
Subject: [PATCH] Fixed timesince translations for Korean

Refs #23989.
Forward port of eb632bfba from stable/1.7.x.
---
 django/conf/locale/ko/LC_MESSAGES/django.mo | Bin 21044 -> 21056 bytes
 django/conf/locale/ko/LC_MESSAGES/django.po |  19 ++++++++++---------
 docs/releases/1.7.2.txt                     |   2 ++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo
index 6a43bd08ae5c038f2e58fc4a5b754c7040c28c24..68239e5df079b447806cdd33bd46e641723d72ab 100644
GIT binary patch
delta 2483
zcmXZd4NMed9LMqJ08defq<GO#Axv-w3{I3p417aH#ZXsiw7dXc2qE!sLNBKc*PO<1
z7P$qj(zTXbVyI(_vMgO~w3f6|W^+TTsg!dSbGBvQpZ90uKF|Mof4w_-)bqtrPj^;y
zsNLh-9lvukopby1otulN@J+mln{n@K=PK|IEWzSA&Mm~<7>{4!82kyx;bn_|wfKg`
zf17tqSKvbT8hQ)D9mJUNW-?aN;Z)p&FJco8VHH00sB=594>#Z}X0HXb@j(^$4N~M>
zp>t2bTwIIon2y7RA?MftH*TJDQ8*qI$5}iPy~K&Al}^Dp%(e0oj3!=!DY)A5>+n9}
z?U;bOF$OzO?T?`P>j{x~fW&#6jDwhl|DY-+6*)HvGf?pYvjWv&0M$`FF2X$)pF>Uj
zqIm_AiGQ>5yOtk{pC4YqBvgm#s2S&)rKq#5M4jz(sE(h<Vr)cB>=V2n&!Q$WfU1}D
zm~$&|s#%K*h)*L&5puUlRFkoi-sA}kU}A}L+&8z&{1~+}!#D-K^r9V`j#*fYy2N#;
zb{!V?V;b=&PRC?!t`Fy94&%G6Bvf$N{0!A#2sJ<y%gMoMsI4wH0~kdd#1w2st+)eY
zu?w}M$1o9lQFrBg^y4L!Gro&iY)4?GqXx>xAeNxE_!O$cbEu9kSbW*MX8EJ2XX}=P
z>u*8TZ^8)}LiN8NLn?TOgl71m6`Vn><O1q0T*6g&6Yp(ZX?Q|g&1Q_Ed>^X6Hj59N
zU8sq_Zyq=MO4)xk_?8T<Z~!&4s}_%1>|GkppM-kXS*XiajT*SgY(Xs~gzC4$eAoQQ
zJc)W$pD$(qRq-MjI+G#P013;uxwr~5um+indmSIdAI)p1djH`=n7BNAcl<bpc%8Wc
zHQ|jo7Pq4o+#Dj|C9x0JV7nDuMSWxag?tOUvNF9D{!y3lE<S@fye%Ec0kapi)x)R(
zZlNxtXJvTeaj5d?I1xj6Bvf&c6|BW*;*Dl4K1m$J_1KTv@)=wRwey+tP%B)4u~>;Z
z%3AYfOeJo|SUiC-TGJWJ=*Jlp45H4^Qy!j3viUG-z$~PpE3$aGm9ICetbCirEoLh|
zPP;br;T4>tJ)N*x34YN~XW5LJ$U)Rj^qOZ;N7av7>44=An}3?OF_Q8KMvFr)Y9|s=
zuW2T>Vlm!(|6h~fhsync`XZUYZ>?6CiQ4MfsEHJsi><sIHPF+ji9L%R++=P+UBX(6
zUoacZAcoXnr)BIiTTl&O!U%lT^7o=9^qP49Rqvq1Z<(Fud*%n`F|!-h?o<W)uf(TT
z@Fi*`=Pmxuynw3rv&FxdL+0=1h<VE#MfLZu8Nm}%Khb8~nrYz*31p~Z3TlPvsJoEa
zGdF%#+JZcPc3ysJZhoQP@5|+H{K~+NVD`GkK>d!oK(L{)Ftx0yzGhi-O+$U^!az-G
zQFYDErutyX=52wkbvacH+j@@A@<nEhboIGMsz>&BUhi%tapSZ;uXlHjy#0pqkEry<
c-qu5VCi@P(QZTkBvtTeXl3G0x^ZZHw1M3Go!~g&Q

delta 2470
zcmX}t3ry8z7{~FK4qzNW6jKOs9tv%S5^|A?H!dk=D5$9EfTV!H!La~ct+}HN=7zTA
zt+sNx6;?J{)G1517OjbGsjImmX>P7^EyiL+YGZTs{c)ah!_WJ?_v`=k_k?}g6V|sd
zDsUvsx$#Wr7C7f#$#yOuKgZ+vCq9P<a-7?MqgaSVOPnjl4vfe1=)ocLC-WwH$^X^j
zQF9C<$iKV91tt^sEW?u<Du^=Uu!@Q^u>o6gH~xsvVtJl(doYOG@lj^41$6NrRoqud
zk-LjqFr&b^O?Utw#_I(E=hy%@L52)l8q$N|#1R;YUerpbV;rVhc{WB7=VLOKSpE*2
zN?eaKu^nTu8`b`GRDbUUNX#H{4wLXQrr__WiqXrQdk|-%;v91os>98wj-J61+->n$
z)Wk2ES1^(Inw5`PejsvrXa%vT4iiu_PBjZqXH|js;}%rMPvc5#KuzpjoQ7vm6S;t@
z7rnx{Co$fv!6M=hkfR8=5fXJ|6w;eKg|+A{WVP6AzKz<MA)JHbs2xkBw}qI6y2LwB
z?Yb@Q#}wjWOvM;(ZW=DebjEkpBvf$7{20|>5H-L*n2s}8mbSXs+>GJGjhKurs1<i(
zEFMPf=t-P~y{NnL4QApcl{3C`kJ}NL38;ZmupP5eTYMVT;aOBi0~UX8-mv^()U*BD
z@~c*b>NjCD`E98F0~k<8M@VRfC#)cdTFC(FE?mNO_zO;M-RjVUs?8P*r+hD}zYdEJ
znTJsmf6aWy>|4$LtHGCKXoVM0GrMZ>u*KtMY-#9S`%stdDb&DCrXRJCHdMde<}vdv
z^L^B-`lOWoSH+8D=u8GtAC9OsyaX)5M{pZ52e%&|z;DePsCs|lZ1g@6x;yhRf_RO&
z9yQ@goPzbJ1-Ar9M3UHx8?n<0uA;tJzad{?w_>f{3M)fh#xbnMhj?2$l6__`YO9A(
z1KdJg#@ncgd&)xPi8!4&Fpq>P=2}51MiEz<HMo_y5w~GKYRi+j5NbEqd<?b1l^BZ^
zsH3bgUqBymC&uC_jM18cmeG&%DY%R}!`rBd#H<fF3pJn*Y3MR6UT)><%&k^lYq8&a
z5i4ldfoXUJ_50%{CKCkZp|fm3O{5DofnM_r>ZtlrE4^U(L*~!s2zn^LgK;>H+6gbC
z>ov{6PRzo|_x}Y6exTfW)Q4n31(?iluC{ssY9i@o9;&<;HBdQfVw*4wx0_X{OITxZ
zo!MYEVn7XcT1K<!M>TvN@54Qo{}O6KFPr;N^|~xRXufJ5H{UQ%nmwp?r#G<wN_=Dm
zpP^QA&f>4l0aU&3EdIe9G_RXC&0FR$s=rb54yvDfrf1{aP=zSoo+?g5tuO)gu9JiL
z@mVP)8F`B`vwazP1v!~%8T|8>)wZ=Ss%)+Gw>8(c?`kdZt*!O@o7#M3^-Xp4&Aw$j
zC&R+#$uPai->@tAVOE+a+2`if{r{Ia+;?K+&13&%9o?UlcJz<jDZ$0L*F3?gOEVMx
E1=L0}LI3~&

diff --git a/django/conf/locale/ko/LC_MESSAGES/django.po b/django/conf/locale/ko/LC_MESSAGES/django.po
index 3781fc332e..9b52248b4a 100644
--- a/django/conf/locale/ko/LC_MESSAGES/django.po
+++ b/django/conf/locale/ko/LC_MESSAGES/django.po
@@ -5,13 +5,14 @@
 # Jaehong Kim <mixe@korea.com>, 2011
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Jeong Seongtae <magno79@gmail.com>, 2014
+# JuneHyeon Bae <devunt@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-23 14:10+0200\n"
-"PO-Revision-Date: 2014-08-24 08:52+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"PO-Revision-Date: 2014-12-14 04:22+0000\n"
+"Last-Translator: JuneHyeon Bae <devunt@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
 "MIME-Version: 1.0\n"
@@ -1242,41 +1243,41 @@ msgstr ","
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] "%d "
+msgstr[0] "%d년"
 
 #: utils/timesince.py:26
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] "%d 2개월"
+msgstr[0] "%d개월"
 
 #: utils/timesince.py:27
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] "%d "
+msgstr[0] "%d주"
 
 #: utils/timesince.py:28
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d "
+msgstr[0] "%d일"
 
 #: utils/timesince.py:29
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d "
+msgstr[0] "%d시간"
 
 #: utils/timesince.py:30
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d "
+msgstr[0] "%d분"
 
 #: utils/timesince.py:46
 msgid "0 minutes"
-msgstr "0"
+msgstr "0분"
 
 #: views/csrf.py:105
 msgid "Forbidden"
diff --git a/docs/releases/1.7.2.txt b/docs/releases/1.7.2.txt
index df0167351a..60e4c15e50 100644
--- a/docs/releases/1.7.2.txt
+++ b/docs/releases/1.7.2.txt
@@ -133,3 +133,5 @@ Bugfixes
   on Oracle (the main tablespace was increased from 200M to 300M and the
   temporary tablespace from 100M to 150M). This was required to accomodate
   growth in Django's own test suite (:ticket:`23969`).
+
+* Fixed timesince filter translations in Korean (:ticket:`23989`).