From 304013649bc4d4003161b574f1015a7958e1b3f4 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 14 May 2012 22:08:40 +0200 Subject: [PATCH] Changed default event description. Updated tranlsations. --- openslides/config/models.py | 2 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 31750 -> 31775 bytes openslides/locale/de/LC_MESSAGES/django.po | 80 +++++++++------------ 3 files changed, 34 insertions(+), 48 deletions(-) diff --git a/openslides/config/models.py b/openslides/config/models.py index 2b5fe71b2..f4425a54c 100644 --- a/openslides/config/models.py +++ b/openslides/config/models.py @@ -85,7 +85,7 @@ config = Config() def default_config(sender, key, **kwargs): return { 'event_name': 'OpenSlides', - 'event_description': _('Presentation system for agenda, applications, elections and participants'), + 'event_description': _('Presentation system for agenda, applications and elections'), 'event_date': '', 'event_location': '', 'event_organizer': '', diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 1d6b8a8281a317ef8f96b98c344b4114453b4858..57d32dca3c635484549d6d8fc96bec4638dd7bf8 100644 GIT binary patch delta 7188 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 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 62b6b8db2..072847049 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-14 10:10+0200\n" +"POT-Creation-Date: 2012-05-14 22:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: German\n" @@ -39,8 +39,9 @@ msgstr "Titel" msgid "Text" msgstr "Text" -#: agenda/models.py:40 agenda/templates/agenda/view.html:12 -#: participant/models.py:37 participant/templates/participant/overview.html:70 +#: agenda/models.py:40 agenda/templates/agenda/overview.html:65 +#: agenda/templates/agenda/view.html:13 participant/models.py:37 +#: participant/templates/participant/overview.html:70 msgid "Comment" msgstr "Kommentar" @@ -48,7 +49,7 @@ msgstr "Kommentar" msgid "Closed" msgstr "Abgeschlossen" -#: agenda/models.py:42 agenda/templates/agenda/overview.html:66 +#: agenda/models.py:42 agenda/templates/agenda/overview.html:67 msgid "Weight" msgstr "Gewichtung" @@ -65,7 +66,7 @@ msgstr "Darf die Tagesordung verwalten" #: agenda/templates/agenda/base_agenda.html:10 #: agenda/templates/agenda/overview.html:8 #: agenda/templates/agenda/overview.html:52 -#: agenda/templates/agenda/overview.html:73 +#: agenda/templates/agenda/overview.html:74 #: agenda/templates/projector/AgendaSummary.html:6 #: agenda/templates/projector/AgendaSummary.html:10 msgid "Agenda" @@ -189,7 +190,7 @@ msgid "Item" msgstr "Eintrag" #: agenda/templates/agenda/edit.html:9 -#: agenda/templates/agenda/item_row.html:31 +#: agenda/templates/agenda/item_row.html:40 msgid "Edit item" msgstr "Eintrag bearbeiten" @@ -220,11 +221,11 @@ msgstr "erforderlich" msgid "Item closed" msgstr "Eintrag erledigt" -#: agenda/templates/agenda/item_row.html:26 +#: agenda/templates/agenda/item_row.html:35 msgid "Activate item" msgstr "Eintrag projizieren" -#: agenda/templates/agenda/item_row.html:32 +#: agenda/templates/agenda/item_row.html:41 msgid "Delete item" msgstr "Eintrag löschen" @@ -253,7 +254,7 @@ msgstr[1] "Einträge" msgid "Done" msgstr "Erledigt" -#: agenda/templates/agenda/overview.html:65 +#: agenda/templates/agenda/overview.html:66 #: application/templates/application/overview.html:43 #: assignment/templates/assignment/overview.html:28 #: participant/templates/participant/group_overview.html:13 @@ -261,11 +262,11 @@ msgstr "Erledigt" msgid "Actions" msgstr "Aktionen" -#: agenda/templates/agenda/overview.html:88 +#: agenda/templates/agenda/overview.html:90 msgid "No items available." msgstr "Keine Einträge vorhanden." -#: agenda/templates/agenda/view.html:19 +#: agenda/templates/agenda/view.html:20 msgid "Edit agenda item" msgstr "Tagesordnungseintrag bearbeiten" @@ -1148,7 +1149,7 @@ msgstr "Darf selbst für Wahlen kandidieren" msgid "Can manage assignment" msgstr "Darf Wahlen verwalten" -#: assignment/models.py:205 assignment/views.py:305 assignment/views.py:591 +#: assignment/models.py:205 assignment/views.py:305 assignment/views.py:588 #: assignment/templates/assignment/base_assignment.html:14 #: assignment/templates/assignment/overview.html:6 #: assignment/templates/assignment/overview.html:9 @@ -1264,7 +1265,24 @@ msgstr "N" msgid "A" msgstr "E" -#: assignment/views.py:584 +#: assignment/views.py:482 assignment/templates/assignment/poll_view.html:9 +#: assignment/templates/assignment/view.html:106 +#: assignment/templates/assignment/view.html:114 +#: assignment/templates/projector/Assignment.html:58 +msgid "ballot" +msgstr "Wahlgang" + +#: assignment/views.py:482 assignment/templates/assignment/poll_view.html:10 +msgid "candidate" +msgid_plural "candidates" +msgstr[0] "Kandidat/in" +msgstr[1] "Kandidaten/innen" + +#: assignment/views.py:482 +msgid "available posts" +msgstr "verfügbare Posten" + +#: assignment/views.py:581 msgid "Election settings successfully saved." msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert." @@ -1324,19 +1342,6 @@ msgstr "Wahl projizieren" msgid "No assignments available." msgstr "Keine Wahlen vorhanden." -#: assignment/templates/assignment/poll_view.html:9 -#: assignment/templates/assignment/view.html:106 -#: assignment/templates/assignment/view.html:114 -#: assignment/templates/projector/Assignment.html:58 -msgid "ballot" -msgstr "Wahlgang" - -#: assignment/templates/assignment/poll_view.html:10 -msgid "candidate" -msgid_plural "candidates" -msgstr[0] "Kandidat/in" -msgstr[1] "Kandidaten/innen" - #: assignment/templates/assignment/poll_view.html:13 msgid "Short description" msgstr "Kurzbeschreibung" @@ -1435,9 +1440,8 @@ msgid "Can manage configuration" msgstr "Darf die Konfiguration verwalten" #: config/models.py:88 -msgid "" -"Presentation system for agenda, applications, elections and participants" -msgstr "Präsentationssystem für Tagesordnung, Anträge, Wahlen und Teilnehmer" +msgid "Presentation system for agenda, applications and elections" +msgstr "Präsentationssystem für Tagesordnung, Anträge und Wahlen" #: config/models.py:93 templates/base.html:29 msgid "Welcome" @@ -2050,21 +2054,3 @@ msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen." #: utils/views.py:231 msgid "undefined-filename" msgstr "undefinierter-dateiname" - -#~ msgid "Countdown (in seconds)" -#~ msgstr "Countdown (in Sekunden)" - -#~ msgid "Agenda settings successfully saved." -#~ msgstr "Tagesordnungs-Einstellungen erfolgreich gespeichert." - -#~ msgid "Print ballot" -#~ msgstr "Stimmzettel drucken" - -#~ msgid "Manage election" -#~ msgstr "Wahl verwalten" - -#~ msgid "Edit" -#~ msgstr "Bearbeiten" - -#~ msgid "Beam election" -#~ msgstr "Wahl projizieren"