From 8a2da2583650c08344a57a661ea56cca1c22c649 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 21 Mar 2014 16:16:21 +0100
Subject: [PATCH 1/1] Editor update: Saving and restoring local draft of a
 document

---
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 1312 -> 2232 bytes
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.po |  47 ++++++++++++++++++--
 apps/wiki/static/wiki/editor                |   2 +-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index b0a221abeca4f29cdb556d6c6d238d64e56e99cd..4d92aa11495c0a02e2c981a36fb92cc41fe467b0 100644
GIT binary patch
literal 2232
zcmZvcO>7%Q6vqcBA2lC^@?AK*g4(8P*Vv(zf*Ut=6Ss|OCsE=QwOl&!PMo#ZJJ#%O
z-Cb2hiimoo9C`>h5J+&TKyV4_t@Z^W!HrwbT#=9vH~w#T?X-xI$G@33Z{EC*nSHQ-
z&mDpG7W&)hf1w{j|K&0Kp<R7kh^IgaJ_l}qtQ&&wfS-XcfIot)cOTpX{tP}1{tCVb
z{tgoO2Y49V`$W240QX@&1?~qgfV}@B@OkiRw(fy1VSW?b3*H9#yw5X!0iMMC8}I=5
z0PKMOfNy{bMp^$R_%&kN%I3!)WV@5#5pWKC7j!fEZ4f{4WyWv8XE6T`d=1<I3H%M5
z0RIGY-~j~xGI%KC2OyS29prc$;H#hwvcECNdAtL1d|!cV=Pp<Vcfi-dzrl~eeQ@F+
z_$kPCzXuUk(%Am9=ue_^4v~VSA@xb)d_X;^5AS8Wub^}OxwfOm{&DTtA8uS1_I1?W
z#DHUDzd48OFW-?-<NSzO={1!rW<z6?7m%lICFV3mIwYf{>qgX<kO!L7btjm?S~Kjj
zW>b5CbUdFz&zIMfP0bDIwUmEwS0#~)s_g{Yh$^;=3yzO*Bx<@TU6|-alq#hH+sO5R
z^g2nhN9W*JKk&tZK2D*p=$bOVqdju9v~lRV(On8Q6#2?vNh~WqK#fS3QuS=^c&)Jk
zu>!A?KN`ivGgcX$J({~?Z!<|gpBF1SG)))?*SZL-vElgReY?3)#%SY{^pGCu9SLYn
zWuE7$G?DJYM(L62_JU|^Aum?5tfps=6BF<`qZ}Yn9Qw#zt`Jg1j>qLQv}SZ4X~`qL
zq@JTfa_Yzlpyvll+B4#^@{gn1N#@`lmnJz-sI+uTMz>Wnu;y(m%V&v}Dzg_W=c{z7
zy1X*KxR6^`J#7N3?zbG<IvciptD#GjTUu;bv$#kBYG%#JK$U2+P&{E3CauXSDxNGA
zP8=%~3k4`z%j%lLwaxS{S1Zd_ebJh$(1pcPeg4>$#f56FCjG!_80q=0M5Rk~ZnajU
zg-X3j)75%qzILWEH@93}Svd_=uNBIcvKmTuOH`{YoL^;^r)#w{u9MfMwW|YH>+|*M
zZhXajAvcRFj;n4pq8|JX)b-%Ko{KwwitoDdRZw1SoU^8O_1LX-Wvr^#)HZHXiKf<^
zAh+a(M!MEHZMuGmyk0W(%kQ6}bXcD7%H<->P=T;~s8~2%o}|Nvli_sv1P>=zT$nBv
z=*Epi&N_vo*i*!w$)l%oqT+>a*cN9UHM}?2YU1GzwqrHi6ti(eo}`}Ydm5fMl^;_q
zJ9_v@GmZwgsAptzu+2}qlRoWO_8ny;d5(%@&+(<FDDFDaiyqcV79u?Fh@ba|QQIE=
zls#}qii^7ENL;3lba8fOMv8eqfYr95&Lit~c62Bf9Ce(X9BgCLa8ug4FX3Y!@3_q}
ze(0D;v1H<?Z|?svxRnhhUYMg&P3M1QS2&nhq`<RD!%gQAUI%uMgyADncGk&)QSFD9
z_)9R{fgAR4Q)40E%yA+b${QO)Bxyp|hMR+JJ0gcuOI<y@r)Z5!Fb>s=(hq~CHr^xk
zLO=N`q@LzQqp#bjq={9_9c<asbTHGtBkhN)HQ3_aaWht2_cUP`r^Ub`hl5-Os-0zP
m>}i-MzAf1$X+t4Eu44*^_u%G?Xvof}I;rTtM)Ao=uEW37hiowb

delta 498
zcmYMvJx>Bb5P;!@J2^$bhy{KX7cDFl44{QZJ4h%jj22iKiI8}ac*zMd*GOVwVZGW|
z*%*zD1%*&q5NiK{g%<t-YkdcZPBQmoZ+B*ATjO`(#(UhnQN$QIOJ0)+G7{iJ9N`Q)
zIER-Q!bi05dEg65k5`Q28=ClmQT)OY{6?w&!BwRiDil;|njae|8%4Zla~~I2n{=7S
zC6xVb9F}t!#si$d<ADv7a~fr!Ta4io$^dQL#11C7Uj>Hx1yjhqy)XvK3+1v=QkqDE
z2q_mxFk|nPy#*gy{DllBA+MJ~RL-@1w{CltQnl*aXQh*xUDH>=#aO=V)Lc&$oKx`i
zvXKv`QYp3T*1f}uelT|Qxw#k3CexW@Hf^Uf>nm%`PqPrvxzHBH{(rHfC#_;sio0#E
Q(=2x{T-~yYR;7RF7r$FWSpWb4

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index 6659c6e6..3f60ea0a 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-31 12:49+0100\n"
+"POT-Creation-Date: 2014-02-28 15:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,10 +91,49 @@ msgstr "edytor"
 #: static/wiki/editor/src/editor/modules/rng/rng.js:255
 msgid "Do you really want to exit?"
 msgstr "Czy na pewno chcesz zakończyć pracę?"
-#: static/wiki/editor/src/editor/modules/data/dialog.html:10
-msgid "Cancel"
-msgstr "Anuluj"
 
 #: static/wiki/editor/src/editor/modules/rng/rng.js:257
 msgid "Document contains unsaved changes!"
 msgstr "Dokument zawiera niezapisane zmiany"
+
+#: static/wiki/editor/src/editor/modules/data/data.js:116
+msgid "Local draft of a document exists"
+msgstr "Istnieje kopia lokalna dokumentu"
+
+#: static/wiki/editor/src/editor/modules/data/data.js:117
+msgid ""
+"Unsaved local draft of this version of the document exists in your browser. "
+"Do you want to load it instead?"
+msgstr "Twoja przeglądarka posiada niezapisaną jeszcze na serwerze lokalną kopię tej wersji dokumentu. Czy chcesz jej teraz użyć?"
+
+#: static/wiki/editor/src/editor/modules/data/data.js:118
+msgid "Yes, restore local draft"
+msgstr "Tak, chcę użyć lokalną kopię"
+
+#: static/wiki/editor/src/editor/modules/data/data.js:119
+msgid "No, use version loaded from the server"
+msgstr "Nie, chcę załadować wersję z serwera"
+
+#: static/wiki/editor/src/editor/modules/data/dialog.js:30
+msgid "Submit"
+msgstr "Zatwierdź"
+
+#: static/wiki/editor/src/editor/modules/data/dialog.js:31
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: static/wiki/editor/src/editor/modules/rng/rng.js:104
+msgid "Saving document"
+msgstr "Zapisywanie dokumentu"
+
+#: static/wiki/editor/src/editor/modules/rng/rng.js:105
+msgid "Saving local copy"
+msgstr "Zapisywanie kopii lokalnej"
+
+#: static/wiki/editor/src/editor/modules/rng/rng.js:113
+msgid "Document saved"
+msgstr "Dokument zapisany"
+
+#: static/wiki/editor/src/editor/modules/rng/rng.js:114
+msgid "Local copy saved"
+msgstr "Kopia lokalna zapisana"
diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index 432da106..49752f40 160000
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit 432da106a4167b35113341fcb7d275ed53671480
+Subproject commit 49752f4017dbd3a15b36634541010a029a73a744
-- 
2.20.1