From c53e5267c53cf00dbc07370ed972d1e662658ed0 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 7 Sep 2011 22:46:47 +0200 Subject: [PATCH] Updated translations. --- .../templates/application/overview.html | 3 +- .../templates/assignment/overview.html | 2 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 22995 -> 23038 bytes openslides/locale/de/LC_MESSAGES/django.po | 72 ++++++++++-------- openslides/participant/models.py | 2 +- .../templates/participant/overview.html | 15 ++-- 6 files changed, 51 insertions(+), 43 deletions(-) diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html index e973cbf30..6f1716b30 100644 --- a/openslides/application/templates/application/overview.html +++ b/openslides/application/templates/application/overview.html @@ -23,8 +23,7 @@

- {{ applications|length }} - {% blocktrans count counter=applications|length %}Application{% plural %}Applications{% endblocktrans %} + {{ applications|length }} {% trans "Applications" %} diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html index 592a67531..390eac4bb 100644 --- a/openslides/assignment/templates/assignment/overview.html +++ b/openslides/assignment/templates/assignment/overview.html @@ -15,7 +15,7 @@

{{ assignments|length }} - {% blocktrans count counter=assignments|length %}Election{% plural %}Elections{% endblocktrans %} + {% blocktrans count counter=assignments|length %}election{% plural %}elections{% endblocktrans %}
{%trans "Number" %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index e286bb1e5d38cdb108d995b665d43c0063904116..4f3d408a04839928f2aa83b22ba04c9da6cfd5a5 100644 GIT binary patch delta 3068 zcmYM$c~DkW7{~E*aYfk#l~qN-6ct7m1x1uaKv7I_Lmd}zKv6_Sw5YM(X`7)1Ev`#7 zR$5v*MpkG|TEs+-f0SEJo8!`q=D3t;lhqVz-=FtX{Nd+p_nhZE=iK{xs>Qj};=J48 z?~5?T6sH>#jFs3GAHd%D2zJ9J48@mie=~NWz8|~eL5#+B?1|^mAFtW|TNp(B4hCRg zhSwjJVSHwVV@x~^3Si?HW0LVTT!1H0fh3MKrXS|wVqAi8*oHmuB5LAaFbq3vdq}1i zV6-(JW9UyrZLBEMXG}PS5*kL~3e-f~Q42O>fBXUi@hWPEf1-BOd7Kw`7%I>>R0cCJ z5htJmT!lli9(&;q)CO976oygw7PYWnme&!C@zhgoy%d$|^{4=z!p`^tF2XIi0dL_E zd~&>(;;9on=U^)BOOP(J3HzY$6a__i1+}B!Fa|qiduJYt+IcGKuH;}RoR4Z>ggUxv zRAB3Ey#aL;FIwM5jc-F`{1}F?zPUs}1OGr}pl6OT2^fJXn2X#SvktSd8Ogr6ZtKHx zjk%BdO4LT0P$_-|71%!Orx;27IO;NA!9J{SI&4R1o|n=QIGh2=sEjN`on18!#LcKP z{?OWrI-0{c0FR+|dL8>>2P&YjiQdA4Q5(&`?yPU}DQLoJwqrJGf^yU?twrsm-qssX zDSRGvRJ&0-Ka6_qPGB;g#%K)4_vRUjT4y9CVLJNaC{)@3&tPZjO~@N$wxTBf%6b;H zqsyp;?xIrZU*IhegEX0V)B-C|0lb9D18EPZ7s7$THC~QQnvm14!2MWo*9ymvX0{Iy=Vdx}d24f5k z!CcgltUzU~9<|^$9D&WKOMDs?@O9MlcTj=EPxihi38+h0hzhLCM?ooi$hsL7>3gWx z?MvJKBle^26nRH50QJEdjS8$9_1wd#05+rE?_H>X5223kJa)z3kx!2C-KLRaB1+UeJ*2d<$qa~E|qq4#@dI2_fUhdpr)YQb_0!YT~LdQ^V{YW_{= zulIis1>J!b+i@HNsb55;>Q~gI@t^L!?{TO=v(X=mQ31|HU8^cQN!T}!-q0#TQ>KWhGQ)*=k0 zUTR%gLjE=2Q5v++bEt`SqRx0Pj=&F4uh9ie#LLJJo#{K%`+1&)3#r$k#+^i6)^AYX zjWgCCup9M@7=}O1wC}%}<(*M5rqVG0b#^mRfs~^jT!ngY9qP!Q#(S?BYR89Anfo3? zumeLeaJIL>Sk!zOsCn{y6g2T%)Y&Y?Sgb}p*ob;yyRGj<1=ecYk6ORO1llj4G8#C? z`!R|}jn72A=0&IgSEG*3*F?dO!mFq=-hoPaE2iKzEW-YCjp3M06(->!>s8c$C?ZR} z4^k=W2sWTTNG@up@8C5241=-Pyn7q;nSm7aUZTIoo~{9qRfEGw!9{Z#olO8v7h^oNRY?_)>D=9t_Om;ttc+e?ylOu;XliYccTb+FOW@MpG;=jKM zZhq7PC&%3p^@dZ>k{|6K6JA?eUA44qZPn@;Q}%zk&YhY*Dzc)wV(Gn}e+zY{a`l?n z!F6t9`V{wE`s03SDJ|t08)JiWYSykPTV_Q2&Se$ujnc7UbIX=j8~syJV=CJ}zW3bd Lc}v{a=OzCG#2ksF delta 3026 zcmXxmc~DkW7{~GR3Mj9DqM)oQi%OC(0V=4;rtF}kQjlhuf@rD5qB*0zSvuhuI(1Y3 za3s_0pUNesMFy)G_a(L6Db%dS8B21TDNWP9KkvzL=5x-u=brOC&pG$iyX~HD+C97P zczu11F%_A{^u#AH9Oq&$TxQ2tVgUUX>pBdi|0c%Z77W6@=*5Hf`6<+UXRr^R!(i-2 z&HE?Q_{;*2G5%S`D3HZtjY&fv&cHpWfI`L@GYAv#NzBDW+={*N0BYe=7=~ST{3CPOK_!?x-e*h%jdTV^V<~E(mrxtF;$VCaL+}_X(=(`yenSO*0~M&>!)_%b zF@^pRRDc!u09Io^T!~7+@zF@8@d;|nI;^7zIGal@F*&yZ!s2s#r|k=-OR%_P=}1GRC$BsbAW3}k;ZjD{9WwGT$47RX24(n?e&)wW-c zD&cdeqiR8Az614H?Z!0hz!@T27`KR@7ROY70 zy>y|d=i$~ts6d7zm&rVY+9(f|NF}OLRTzy6QTw!@j&ws2_16oZF`z)cL@jt7hv6Me z!h~Y?NJ>!^t43|O97kd+>JoRL0zQd){~Rh1{}T82#EZIwNvOc`d^A*|8f!Bu($`U+ z+xvF>AP%B`0d)lTP(N4$OWnZAQSUvD3ZNPFeXm9ZyczZ0=hzd!M}A_A?<@^v9$n^c zn1edgYV3{ApfX*80r)Cv;a1co-Hw{K2lWHfiMo7OtqJAs_;l2G3o4Kfq_RHq6%9pv z3$>89!hIp!T8zPrFULS!gPQjSrsEddKaC3XC)80~Mtyc>vYT;#Or;xzdR~l4`u=Cq z=)=G&)J6{Kw|pxq(~nRu97k2=JnCq!qs}mBiaVZ&LG;Iib_qLwCTj4|ZV){R5~{eT}*_mr&okU!@yp9D3=epaRT91yqJPI0yCKc2wZ|Pzj#4 zo<*NF`kh87-b7s%?<3rJOhGMJiQ2dxmHBEMk8P-oene$_5w%V?>ayNNtsgtpH5nC1 zmbGju_1A=13}~ZgQ46g?o$*>6i5pR$(SA(9Bgj8=<}VzKqo(nn7o3Kgw+D4uKSn?7 zw0?oT=pVo^JTc9F|35R(mw_vof%i~nmoeQ9Bp>x+1%_c2>d5Bf{m%@Q@n%%z_M$4$ zh5fM`m7u9|*Na50ljx(Ng)>oSlY?!&z^@%^ZZcH
g9gkxv-bIenlsx8sMw_k2Q2(L0g`+X6 z+C73rs2`+8RHo~2GHyd9b`ANQea64Woe+ZhzT;69Nk*MzI_j2Z+UI$wOInJ`Y!NDx z6{rfXvHgvxBiM%8u-!gCgdY0(6K0%?;qQ7Twzm#A?D6C{RS|P~b{ZSqWVu0<7vl>EOFZ)7_K z(K9@`&fC%3Jq7IrG2U2bUS>vc-QtG0VU1>9b8Taj)1Fxt(AYG)uFm;4^OYWHquO82 pS|8`c*NhFW+uwPAUeRo(Ev$JesA7K8?1ran=Qq_hI45e-{{!NXc+da< diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index d06b2bf94..aa64d644e 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-07 22:14+0200\n" +"POT-Creation-Date: 2011-09-07 22:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -93,7 +93,6 @@ msgstr "Text" #: agenda/models.py:199 agenda/templates/agenda/overview.html:113 #: agenda/templates/beamer/ItemApplication.html:5 #: application/templates/application/edit.html:2 -#: application/templates/application/overview.html:27 #: application/templates/application/view.html:2 #: application/templates/application/view.html:213 poll/models.py:23 #: poll/models.py:110 system/templates/system/general.html:13 utils/pdf.py:451 @@ -103,8 +102,7 @@ msgstr "Antrag" #: agenda/models.py:206 agenda/templates/agenda/overview.html:126 #: agenda/templates/beamer/ItemAssignment.html:8 -#: assignment/templates/assignment/edit.html:2 -#: assignment/templates/assignment/overview.html:18 poll/models.py:24 +#: assignment/templates/assignment/edit.html:2 poll/models.py:24 #: utils/pdf.py:509 utils/pdf.py:596 utils/pdf.py:605 msgid "Election" msgstr "Wahl" @@ -298,7 +296,7 @@ msgstr "Keine Einträge vorhanden." #: agenda/templates/beamer/ItemApplication.html:11 #: agenda/templates/beamer/ItemAssignment.html:14 #: application/templates/application/overview.html:16 -#: application/templates/application/overview.html:35 +#: application/templates/application/overview.html:34 #: application/templates/application/view.html:35 #: assignment/templates/assignment/overview.html:10 #: assignment/templates/assignment/overview.html:23 @@ -412,7 +410,7 @@ msgstr "Verwiesen (in Ausschuss)" msgid "Rejected (not permitted)" msgstr "Verworfen (nicht zulässig)" -#: application/models.py:45 application/templates/application/overview.html:36 +#: application/models.py:45 application/templates/application/overview.html:35 #: application/templates/application/view.html:9 utils/pdf.py:347 msgid "Submitter" msgstr "Antragsteller" @@ -600,7 +598,8 @@ msgstr "Soll Version %s wirklich zurückgewiesen werden?" #: application/templates/application/base_application.html:6 #: application/templates/application/overview.html:2 -#: application/templates/application/overview.html:6 templates/base.html:41 +#: application/templates/application/overview.html:6 +#: application/templates/application/overview.html:26 templates/base.html:41 #: utils/pdf.py:426 utils/pdf.py:433 msgid "Applications" msgstr "Anträge" @@ -648,24 +647,24 @@ msgstr "Noch nicht zugelassen" msgid "Withdrawed (by submitter)" msgstr "Zurückgezogen (durch Antragsteller)" -#: application/templates/application/overview.html:30 +#: application/templates/application/overview.html:29 msgid "Number" msgstr "Nummer" -#: application/templates/application/overview.html:31 +#: application/templates/application/overview.html:30 msgid "Application title" msgstr "Antragstitel" -#: application/templates/application/overview.html:33 +#: application/templates/application/overview.html:32 msgid "Number of supporters" msgstr "Anzahl der Unterstützer" -#: application/templates/application/overview.html:37 +#: application/templates/application/overview.html:36 #: application/templates/application/view.html:102 msgid "Creation Time" msgstr "Erstellungszeit" -#: application/templates/application/overview.html:59 +#: application/templates/application/overview.html:58 msgid "No applications available." msgstr "Keine Anträge vorhanden." @@ -1011,6 +1010,12 @@ msgstr "Alle Wahlen drucken" msgid "Edit election" msgstr "Wahl bearbeiten" +#: assignment/templates/assignment/overview.html:18 +msgid "election" +msgid_plural "elections" +msgstr[0] "Wahl" +msgstr[1] "Wahlen" + #: assignment/templates/assignment/overview.html:34 msgid "Edit assignment" msgstr "Wahl bearbeiten" @@ -1107,21 +1112,25 @@ msgid "Female" msgstr "Weiblich" #: participant/models.py:27 participant/templates/participant/overview.html:24 +#: participant/templates/participant/overview.html:59 msgid "Delegate" msgstr "Delegierter" -#: participant/models.py:28 -msgid "Guest" -msgstr "Gast" - -#: participant/models.py:29 participant/templates/participant/overview.html:25 +#: participant/models.py:28 participant/templates/participant/overview.html:25 +#: participant/templates/participant/overview.html:60 msgid "Observer" msgstr "Beobachter" -#: participant/models.py:30 +#: participant/models.py:29 participant/templates/participant/overview.html:26 +#: participant/templates/participant/overview.html:61 msgid "Staff" msgstr "Mitarbeiter" +#: participant/models.py:30 participant/templates/participant/overview.html:27 +#: participant/templates/participant/overview.html:62 +msgid "Guest" +msgstr "Gast" + #: participant/models.py:34 participant/templates/participant/overview.html:10 msgid "Gender" msgstr "Geschlecht" @@ -1278,7 +1287,7 @@ msgid "Participant" msgstr "Teilnehmer" #: participant/templates/participant/edit.html:6 -#: participant/templates/participant/overview.html:67 +#: participant/templates/participant/overview.html:71 msgid "Edit participant" msgstr "Teilnehmer bearbeiten" @@ -1316,7 +1325,7 @@ msgid "Delete group" msgstr "Benutzergruppe löschen" #: participant/templates/participant/group_overview.html:20 -#: participant/templates/participant/overview.html:84 +#: participant/templates/participant/overview.html:88 msgid "No participants available." msgstr "Keine Teilnehmer vorhanden." @@ -1355,14 +1364,6 @@ msgid "Your username and password didn't match. Please try again." msgstr "" "Benutzername und Passwort stimmen nicht überein. Bitte noch einmal versuchen." -#: participant/templates/participant/overview.html:26 -msgid "staff" -msgstr "Mitarbeiter" - -#: participant/templates/participant/overview.html:27 -msgid "guest" -msgstr "Gast" - #: participant/templates/participant/overview.html:42 utils/pdf.py:260 msgid "First Name" msgstr "Vorname" @@ -1383,23 +1384,23 @@ msgstr "E-Mail" msgid "Last Login" msgstr "Letzer Login" -#: participant/templates/participant/overview.html:68 +#: participant/templates/participant/overview.html:72 msgid "Delete participant" msgstr "Teilnehmer löschen" -#: participant/templates/participant/overview.html:70 +#: participant/templates/participant/overview.html:74 msgid "Participiant is activated. Click to deactivate!" msgstr "Teilnehmer ist aktiviert. Zum Deaktivieren klicken!" -#: participant/templates/participant/overview.html:72 +#: participant/templates/participant/overview.html:76 msgid "Participiant is deactivated. Click to activate!" msgstr "Teilnehmer ist deaktiviert, Zum Aktivieren klicken!" -#: participant/templates/participant/overview.html:75 +#: participant/templates/participant/overview.html:79 msgid "Administrator. Click to get normal user!" msgstr "Administrator. Klicken, um normaler Nutzer zu werden!" -#: participant/templates/participant/overview.html:77 +#: participant/templates/participant/overview.html:81 msgid "Normal user. Click to get administrator!" msgstr "Normaler Nutzer. Klicken, um Administrator zu werden!" @@ -1574,3 +1575,8 @@ msgstr "verfügbare Posten" #: utils/utils.py:72 msgid "Sorry, you have no rights to see this page." msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen." + +#~ msgid "application" +#~ msgid_plural "applications" +#~ msgstr[0] "Antrag" +#~ msgstr[1] "Anträge" diff --git a/openslides/participant/models.py b/openslides/participant/models.py index 28f21824b..b8e4000a4 100644 --- a/openslides/participant/models.py +++ b/openslides/participant/models.py @@ -25,9 +25,9 @@ class Profile(models.Model): ) TYPE_CHOICE = ( ('delegate', _('Delegate')), - ('guest', _('Guest')), ('observer', _('Observer')), ('staff', _('Staff')), + ('guest', _('Guest')), ) user = models.OneToOneField(User, unique=True, editable=False) diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index 7b5fc01a7..6a4eedc8f 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -2,7 +2,7 @@ {% block title %}{{ block.super }} - {%trans "Participants" %}{% endblock %} {% block content %} -

{%trans "Participants" %}

+

{% trans "Participants" %}

{%trans "Filter" %}: @@ -23,8 +23,8 @@ - - + +

- {{ users|length }} - {% blocktrans count counter=users|length %}Participant{% plural %}Participants{% endblocktrans %} + {{ users|length }} {% trans "Participant" %}
{%trans "Elections" %}
@@ -56,7 +55,11 @@ - + {% if perms.participant.can_manage_participant %}
{%trans "First Name" %}{{ user.first_name }} {{ user.last_name }} {{ user.profile.group }}{{ user.profile.type }}{% if user.profile.type == "delegate" %}{% trans "Delegate" %}{% endif %} + {% if user.profile.type == "observer" %}{% trans "Observer" %}{% endif %} + {% if user.profile.type == "staff" %}{% trans "Staff" %}{% endif %} + {% if user.profile.type == "guest" %}{% trans "Guest" %}{% endif %} + {{ user.profile.committee }}{{ user.username }}