From 9c03726bef3e467d545712bbf399d2396a59f104 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Fri, 13 Jul 2012 07:44:42 +0200 Subject: [PATCH] #295: Change link to button. --- .../templates/application/view.html | 6 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 34964 -> 34943 bytes openslides/locale/de/LC_MESSAGES/django.po | 94 +++++++++--------- 3 files changed, 51 insertions(+), 49 deletions(-) diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index 8cc86c4f4..5181e9789 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -92,8 +92,10 @@ {% endif %} {% else %} {% if perms.application.can_manage_application %} - {% trans "Enter vote results!" %} - {% endif %} + + {%trans 'Enter result' %} + + {% endif %} {% endif %} {% endif %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index a41875c09aca4343286a2392eb4b7b854c72ff80..428e90e6e07c64e1c783037d82288a3faf6c7af4 100644 GIT binary patch delta 6257 zcmXZgdsLT29>?*AyMiJY5s|wf%3YBZMT8V2&;TW{$ScVbreNOPlqV~NI@xBTwRz0i zboH367hGG@HMO+$wyk!vEh#1% zC?B_r<2a{t9483B#6;}_X_ zD@IaZHN@sxTCv$5h;aBk&)#J#?7aabMIz`=cV1 zgIdr%sP|XnKztD6@prB*?7-eMe24*f12fSx&vDW)3l+-AsK`vW&c*K3n=uksp%-pL zMW7wEkv*sd9KaAfjEb~-#yw25S78Fa zjmm)z)O)`{jsFqVKR*A?MqDR@f|4T#HJ}(3i3;?@IoJ#5V+5|mFnj}*I|orm^G{U2 z%ht{Xrhg*#pnW*%D5_BXAG%X_9cKXrg<=`%1uvpPv=bG&!$|%)Comj+?>7BnPzxG@ z+Hoc7C>EeL^ek#aYcU!(pdxVyN8xDjhe>z}b)9dbBGq}M33)8uIYQKitI>_2@UZRBf?7x$Y6ojk$+pEl--Q}@5H<0K zsHD1XpWn9n6`F;1N4-A|wV-?)fEAd5PZVpO!R0J;-5r3^LYLuBc9UH0F;Ggg)`ryK1 za|F$(P(O#th1XFF+lz|K2dLX|4!!Xb>gcYb=JB}4EGPuEka(AZb}$rmHuqVZQ3E!k zuFD?Oi;tj^@f2#pfD&^JqfyB_0ySrjz#k5bSM&!AS?fxdXz z)~}+VLO{h=vQ`T2ek=}>F%`Wn-9mu!HiK=j%zBn2A z_&F^V#9srB(vX4Iu|Fn`H6My9)XrNlAD>0-VxW^GmiLcr};GKg{7#oszl{P6YA_2pUEeafSzTyOkyx7Tm`#8xLAA2P3K+hd$0YBq+{Ctic-?hGVPEZK%h=)Sp2` z=n(3NJja^_1*48M2K6J9gZd;_V=TJ!D8x}%js0*pCgPWgfVNAf5t%U7Tx zuoiVRJ5Uq+6}9tI_W4(~{RV1d{)A5v7>IpvEJo@6FQBl5hBj1Eggj_|JR(p#E=El} z4mH6P)C-$17+*pyXbUQd51=A<1ye9|g4xh;RQqUDgqu`ney5FsLiZQcjt-)-{v>Ka zr*S%dhI6rSB4cn5p2V_A=6Td){<@*wf@OFX^}e(z=B#s2k-8sKaR$2S6kejBdwB$v z&6hD8Z=#YVXsW4aqIO!0aX1n6Np8ko_!_3+KGaUX#YpU0YbH)cMJx~X-tt=F-;+Wk z4eHo}TEOc#2;aov_%BqygojL04MQEpy{H#Wz=8M}M&UO5`~)f)KSv$mWz_rshkBpy zG~(|?A$FSSkbvE&4?tbNyKTJ`i?uCgTUzTbM;X;Wy^KS7QP7=P+0OY(1dfEMyEO(O!j0;>D<= zYe5~sI@AK)Z4|VlcTk}^W9t{K-Vd8(j7B9*Z`6XzP&>=hhH+Hv``ks{supyWBu6Op#qY5nhBcZj9gah(mtz4wgI(}AD&%LZ=TJNT z4i(AUs9P1%Wcu~6#-bM14|NN&nux#d??@WFu@??q3dn^ZPZ4-z*xME8sBTSSx`2r{|J|YCY*@M{+X!ccoLQMn^0N3A4lL} zRPuG2V8-B2M+LM<={Gq42Je2omj%4L;P4cZrCDmKjPcee}kEriJ@M9*D8K?PnCDDk*=7m+(T2#L#R0Q5cCEtEjlATA5^I2k^_e9N;jFFg!x%j{m z;;)dcra>XwhzivX)LFlan&22l3nw>#j3%9*kJ4HP~*3v`t3r!=NKx~9k%^8 zDiT3Yn2lthBI}N&ptGt)g?1k5NLo-y_ads}MpVdlqb4|rn)qYX__Nj@Pz&{Xl0VNd z1T}7o^%2zj<|FgCP78%zG`xtKa3{v%0o04WLWTSaDzxEGnOw=k1nMQ|i8C<@XW<}R zfob?2X5m#V#l&UiFQXI1YH)$uec5*?@)eveAdtEhzp zwer6u7>zoLSX6r!>YnGLB0C=aunslfOl-dtmFDU3hxUlr1W(T#kM`m5FMD~s*8W*y zu?InI@13+e#CLYxoOv_mt~!+y+I}-CoqxMM+gJS;=W!D-4 delta 6259 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\n" "Language-Team: German\n" @@ -29,13 +29,13 @@ msgid "Parent item" msgstr "Elternelement" #: agenda/models.py:42 application/forms.py:40 application/models.py:517 -#: application/templates/application/view.html:238 config/forms.py:61 +#: application/templates/application/view.html:240 config/forms.py:61 #: projector/models.py:32 msgid "Title" msgstr "Titel" #: agenda/models.py:43 application/forms.py:41 application/models.py:518 -#: application/templates/application/view.html:239 projector/models.py:33 +#: application/templates/application/view.html:241 projector/models.py:33 msgid "Text" msgstr "Text" @@ -318,8 +318,8 @@ msgid "Edit" msgstr "Bearbeiten" #: application/forms.py:43 application/models.py:519 application/views.py:827 -#: application/templates/application/view.html:221 -#: application/templates/application/view.html:241 +#: application/templates/application/view.html:223 +#: application/templates/application/view.html:243 #: application/templates/projector/Application.html:77 msgid "Reason" msgstr "Begründung" @@ -414,12 +414,12 @@ msgid "Permitted" msgstr "Zugelassen" #: application/models.py:42 application/templates/application/overview.html:24 -#: application/templates/application/view.html:162 +#: application/templates/application/view.html:164 msgid "Accepted" msgstr "Angenommen" #: application/models.py:43 application/templates/application/overview.html:25 -#: application/templates/application/view.html:167 +#: application/templates/application/view.html:169 msgid "Rejected" msgstr "Abgelehnt" @@ -427,17 +427,17 @@ msgstr "Abgelehnt" msgid "Withdrawed" msgstr "Zurückgezogen" -#: application/models.py:45 application/templates/application/view.html:175 +#: application/models.py:45 application/templates/application/view.html:177 msgid "Adjourned" msgstr "Vertagt" # please check! -#: application/models.py:46 application/templates/application/view.html:178 +#: application/models.py:46 application/templates/application/view.html:180 msgid "Not Concerned" msgstr "Nicht befasst" # please check! -#: application/models.py:47 application/templates/application/view.html:181 +#: application/models.py:47 application/templates/application/view.html:183 msgid "Commited a bill" msgstr "Verwiesen (in Ausschuss)" @@ -765,7 +765,7 @@ msgstr "" #: application/views.py:702 application/views.py:841 #: application/templates/application/view.html:7 -#: application/templates/application/view.html:203 +#: application/templates/application/view.html:205 #: application/templates/application/widget.html:22 #: application/templates/projector/Application.html:7 #: application/templates/projector/Application.html:65 @@ -782,7 +782,7 @@ msgstr "Keine Anträge vorhanden." #: application/templates/application/base_application.html:24 #: application/templates/application/poll_view.html:6 #: application/templates/application/poll_view.html:9 -#: application/templates/application/view.html:201 +#: application/templates/application/view.html:203 #: application/templates/projector/Application.html:63 msgid "Application No." msgstr "Antrag Nr." @@ -799,8 +799,8 @@ msgstr "Antrag Nr." msgid "Status" msgstr "Status" -#: application/views.py:791 application/templates/application/view.html:206 -#: application/templates/application/view.html:236 config/models.py:131 +#: application/views.py:791 application/templates/application/view.html:208 +#: application/templates/application/view.html:238 config/models.py:131 #: config/templates/config/version.html:5 #: config/templates/config/version.html:8 #: config/templates/config/version.html:11 @@ -987,7 +987,7 @@ msgid "Number of supporters" msgstr "Anzahl der Unterstützer/innen" #: application/templates/application/overview.html:42 -#: application/templates/application/view.html:104 +#: application/templates/application/view.html:106 msgid "Creation Time" msgstr "Erstellungszeit" @@ -1052,119 +1052,119 @@ msgstr "Abstimmung bearbeiten" msgid "Delete Vote" msgstr "Abstimmung löschen" -#: application/templates/application/view.html:95 -msgid "Enter vote results!" -msgstr "Abstimmungsergebnisse eingeben!" +#: application/templates/application/view.html:96 +msgid "Enter result" +msgstr "Ergebnis eingeben" -#: application/templates/application/view.html:111 +#: application/templates/application/view.html:113 msgid "Withdraw" msgstr "Zurückziehen" -#: application/templates/application/view.html:119 +#: application/templates/application/view.html:121 msgid "Unsupport" msgstr "Nicht unterstützen" -#: application/templates/application/view.html:125 +#: application/templates/application/view.html:127 msgid "Support" msgstr "Unterstützen" -#: application/templates/application/view.html:131 +#: application/templates/application/view.html:133 msgid "minimum required supporters" msgstr "minimal erforderliche Unterstützer/innen" -#: application/templates/application/view.html:138 +#: application/templates/application/view.html:140 msgid "Manage application" msgstr "Antrag verwalten" -#: application/templates/application/view.html:141 +#: application/templates/application/view.html:143 msgid "Formal validation" msgstr "Formale Gültigkeitsprüfung" -#: application/templates/application/view.html:143 +#: application/templates/application/view.html:145 msgid "Publish" msgstr "Veröffentlichen" -#: application/templates/application/view.html:146 +#: application/templates/application/view.html:148 msgid "Permit" msgstr "Zulassen" -#: application/templates/application/view.html:149 +#: application/templates/application/view.html:151 msgid "Not permit (reject)" msgstr "Nicht zulassen (verwerfen)" -#: application/templates/application/view.html:152 +#: application/templates/application/view.html:154 msgid "Set Number" msgstr "Setze Nummer" -#: application/templates/application/view.html:159 +#: application/templates/application/view.html:161 msgid "Result after vote" msgstr "Ergebnis nach der Abstimmung" -#: application/templates/application/view.html:173 +#: application/templates/application/view.html:175 msgid "Result after debate" msgstr "Ergebnis nach der Debatte" -#: application/templates/application/view.html:184 +#: application/templates/application/view.html:186 msgid "Withdrawed by Submitter" msgstr "Zurückgezogen durch Antragsteller/in" -#: application/templates/application/view.html:189 +#: application/templates/application/view.html:191 msgid "For Administration only:" msgstr "Nur zur Administration:" -#: application/templates/application/view.html:191 +#: application/templates/application/view.html:193 msgid "Reset" msgstr "Zurücksetzen" -#: application/templates/application/view.html:203 +#: application/templates/application/view.html:205 #: application/templates/projector/Application.html:65 msgid "no number" msgstr "ohne Nummer" -#: application/templates/application/view.html:211 +#: application/templates/application/view.html:213 msgid "This is not the newest version." msgstr "Dies ist nicht die neuste Version." -#: application/templates/application/view.html:211 #: application/templates/application/view.html:213 +#: application/templates/application/view.html:215 msgid "Go to version" msgstr "Gehe zu Version" -#: application/templates/application/view.html:213 +#: application/templates/application/view.html:215 msgid "This is not the permitted version." msgstr "Dies ist nicht die zugelassene Version." -#: application/templates/application/view.html:231 +#: application/templates/application/view.html:233 msgid "Version History" msgstr "Versionshistorie" -#: application/templates/application/view.html:237 +#: application/templates/application/view.html:239 msgid "Time" msgstr "Zeit" -#: application/templates/application/view.html:248 +#: application/templates/application/view.html:250 msgid "Version permitted" msgstr "Version zugelassen" -#: application/templates/application/view.html:251 +#: application/templates/application/view.html:253 msgid "Permit Version" msgstr "Version zulassen" -#: application/templates/application/view.html:254 +#: application/templates/application/view.html:256 msgid "Reject Version" msgstr "Version verwerfen" -#: application/templates/application/view.html:258 +#: application/templates/application/view.html:260 msgid "Version rejected" msgstr "Version verworfen" -#: application/templates/application/view.html:268 -#: application/templates/application/view.html:275 -#: application/templates/application/view.html:282 +#: application/templates/application/view.html:270 +#: application/templates/application/view.html:277 +#: application/templates/application/view.html:284 msgid "unchanged" msgstr "unverändert" -#: application/templates/application/view.html:291 +#: application/templates/application/view.html:293 msgid "Log" msgstr "Log"