From 341186bb54597b9923b70550e0af90d1189d8394 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Thu, 24 Apr 2014 09:15:24 +0200
Subject: [PATCH] Editor update - tweaking action descriptions, translation,
 behavior

> editor: minor usability tweak
> editor: tweaking some action descriptions
---
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 5573 -> 5569 bytes
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.po |  11 +++++++----
 apps/wiki/static/wiki/editor                |   2 +-
 apps/wiki/templates/wiki/bootstrap.html     |   4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index 9377d89f8476ee8de030270f4eed18ab3a8dfa5e..9f48fd9714eca55428b11b4b764c8bb34a0a2d0b 100644
GIT binary patch
delta 1878
zcmXxlZD^Hc7{Kvs)0XE<bDPalS3BigFI#O+=X}{rEp53imxH1{xk6J+Q&K8eorqAQ
zzL|-YNQANvrP&b+QbA;f1ii5jMYbq|Knfv?z6kpNpL2V&>-pW!+x>Fg_j5MVbh;@&
zRx^H2PzH!P;#hgaR_wij1EuQ5h#IWMDr`V+wPOV?!rO2eHsTt*1$W{sJb+Vi1SjEn
zyd5uMWkfzQ6C$Q_p%y1%E6%_!yc3_qn{WtuA>P6a?nMXiAv&O89FK?7{Q}ZQoJ0pS
zg0}MuI?=yyI{in6)|_Dj+CT?7(@xA`A3DR$>H6E~^ZU^meVVSH!kan&7R|&TXnU2}
z(!i^53g>m{yjAHxI;l9)Zk&w$Xa{T123|lrdMVxCfz_P9i}Vr0$<NS?oIq!KCY}F~
z?*D|ha{WT`3g+9nP)lB2f*!Qvb!f*g<3@ZHo!Ld4hF8(&rm<cQq#2#rVzh(R=)g82
zeZ+S3{nyX|?m@C2A50|wUO31FJNy{=i=!OO#3{6)Z_pQhL_7Qq50*t-M%Q*9)77JB
zhv(3CM{zd(jBPlHMjLSnw&1gq$-ldEFBeSlVRYA?K-!Mq(M@;>?YM@GaThk=OzcIk
zZ$Ss}I+C1t4;{dv<R{5vNK^48I-#%gRNP#n>Bc{3ipyzL>(CD7aWF&OXh(gR!?jqC
zJCMIP#K9%_BAtJaG#MAriT;asV<qe70P=IGIMXh);gx76o<?V~1x@J?y2d+`@1rw3
zg3jnT*5X-oFP%rS9{(pRc-f__MW3%n_g}P>DzOkv^>WPNdhEhC(Sd!1cJM3O@qg&o
zb0ys$Vu$(uJ7@+zM`!#U`g`&x-htz2#P?@m))tzn_(Dgz(T|SwiQ)qhgJ|lXLmS+R
zv=zJ3{rzZz!$@}H2(mYe`(znjFTQJWG95%W(c=s(e*Y_p24WmBn{b`n18oFZjCR5@
zhiEC*N^5WRUSfW_mP@+67AI$MITjJ~JfS>7<X3ZW{hg6z3E|J_T*C4w;m@UIaf#yk
zTD^z3kLV>HBTT=Ux}R{3`v{BaUs|k1Jb<l)U)cgz&{SJil_(xf<MpzfN>e&{DA|vV
z#DfIOU)-Qj+_=r?r|FV(60W&rA>oGhpU=Yts}$u9Z3PvJpNXI10O7`q!rv8RWxK~F
z^c31MAC+YWUfi(lnf1AC&lg6s^%c9b)hh~*S6?p6J~g;$!`hKIa+?PW-BVsEzXms@
Bn5qB(

delta 1884
zcmZA1YfQ~?9LMqBsdT!LN+RSRii9Ya+)}!ba%(nB9=IGvBJDI|wu8+u^gs(ea9i@g
zVzx7zDYvb%)p#NgY(^Fjtj(~o*=)Q&|MPobemmd)>;L=x|L1r4{(k2?%kIt&yi1H|
zHk2x2JkcIzOf4=M#)a}V(wId2h9fb;Ym6QxBTZ%;PQXc+iG`SgyD<X;I2zk<ICf$h
z_F^oL&1Y^>Y50M0I5LV(aRN@lg*XDMkuR7UjK)K#2^>dF=rl%PqkZ0lbZM@jCe()M
z_z1Po_n6A~<~KJQFoj;#K^|(Q`RHIdYK41k`)O20T2L!$x9tyc6!kt-CI(Rbd1FEo
zkHaMDV{CnfWPFp)jb>Vc@mPr(pc>V|0n|W#`}_nZP``kTVQyOQqB8OTm9Zzb{u0Mf
ze{KDO^Qe23f2DpYHyUsgYQP$-!8+86-r`vNhI%iSebNNdP%D~^8lVI<p{>XmW;g2l
z^{9!RLXvG7ZT(Ul`PYC~Y2ag8xhMnoP#rx*eW4dM;45tN81o6Wr)OEFY()*&ff}d>
z=im#>#XqPm$))og+>APuXX44fQhS{Soz}ZZ-=-gR_&%Tpj^IE{#nCt!3sCLbQ4{bZ
z$uZ|p6S!=>X1#@UW$vIB^aypPdIH>NW*<>0j-^+bf$De}DnlD>y&4_rew>KS$j990
zqAhrC>jOxa<~wSo;q2QqOhrwg7`4zqB{v#qGb$4YQ7Z|cQhFA(#}}=)Q7e3mT2VJ9
z<7?De8bY#dBKeX`Ms4L3)cdng{T3h@4w!Oo92)lFQaq2EP#>z}LDYc1P`?(PC_O)h
z+M>&-m3N?4+K>7<4`Dib=|tbpLJd3{_5NbFogO!EqZw|oFZfU?uS0d%fb?a~+2=P<
z9kwIcH9_P|x}}7x-kn3}PbQO4A9{a1p$w^Liwg)xD=H-Nh}DGlESH!`xciUUgjS^e
zD<zah6|G_cv6fgtWD)<Dxio0Mb-3pfQ-~#mGQF5^Gm36e7Fdj1^p`q=C?aMNRfNha
zBA-~K%0ES^*8jT7bV6sTn9#4LoR~<cEGO7WckB4m3yrUnm_z8`RS+sGi8bzB=&}yn
z{X_k9v_<m>9Ws?lg0trqZHr16vCzE>{cOwZy$IK(D46Jd<4JP1?ehETogEGJ^}hXn
zXa9knzNVq5ipWrVFfaO+CpZ|B7MbE4+2(BD<LmD1I=SO;t#hcW<w*AlUu}~op)8zd
O!IFfZo?vOx(XhXQo}y|1

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index e58b72c9..e7a166bd 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
@@ -232,8 +232,8 @@ msgid "unknown operation"
 msgstr "Nieznana operacja"
 
 #: static/wiki/editor/src/editor/plugins/core/core.js:126
-msgid "Insert comment after current node"
-msgstr "Wstaw komentarz za bieżącym węzłem"
+msgid "Insert comment"
+msgstr "Wstaw komentarz"
 
 #: static/wiki/editor/src/editor/plugins/core/core.js:148
 msgid "Hide grid"
@@ -358,5 +358,8 @@ msgstr "Wybrany niepoprawny węzeł"
 
 #: static/wiki/editor/src/editor/plugins/core/templates.js:37
 #, c-format
-msgid "Insert template %s after %s"
-msgstr "Wstaw template %s za %s"
+msgid "Insert template %s"
+msgstr "Wstaw template %s"
+
+msgid "Switch to"
+msgstr "Zamień na"
diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index f098ff98..bb204203 160000
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit f098ff9873de73d1fd6d71ce64b83ae318e8bd7e
+Subproject commit bb204203f5f64dd13b256263fd398e1463d4eaf9
diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index 098df286..d0fe48a1 100644
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -268,8 +268,8 @@
                     ['core.undo', 'core.redo'],
                     
                     [
-                    {actionName: 'core.switchToHeader', actionConfig: {label: 'nagłówek'}},
-                    {actionName: 'core.switchToParagraph', actionConfig: {label: 'paragraf'}},
+                    {actionName: 'core.switchToHeader'},
+                    {actionName: 'core.switchToParagraph'},
                     'core.toggleBulletList', 'core.toggleEnumList'
                     ],
 
-- 
2.20.1