ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated merge with ssh://openslides.org/openslides

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-07-26 08:10:17 +02:00
commit 3ad0a42989
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
extras/website/website/locale/en/LC_MESSAGES/django.mo
View File

Binary file not shown.

54
extras/website/website/locale/en/LC_MESSAGES/django.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version:OpenSlides Website\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-25 22:51+0200\n"
"POT-Creation-Date: 2012-07-26 01:21+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
"Language-Team: English \n"
@ -344,7 +344,7 @@ msgid "Tickets"
msgstr "Tickets"
#: templates/base.html:115 templates/development.html:59
#: templates/download.html:45
#: templates/download.html:47
msgid "Quellcode"
msgstr "Source code"
@ -711,34 +711,46 @@ msgid "Bisheriger Spendeneingang"
msgstr "Previous donations"
#: templates/download.html:10
msgid "Aktuelle Version: OpenSlides 1.2-rc1 (veröffentlicht am 16.7.2012)"
msgstr "Current version: OpenSlides 1.2-rc1 (released on Jul. 16th 2012)"
msgid "Aktuelle Version: OpenSlides 1.2 (veröffentlicht am 25.7.2012)"
msgstr "Current version: OpenSlides 1.2 (released on Jul. 25th 2012)"
#: templates/download.html:17
msgid "Für Windows"
msgstr "For Windows"
#: templates/download.html:21 templates/download.html.py:32
#: templates/download.html:21 templates/download.html.py:33
msgid "Download OpenSlides"
msgstr "Download OpenSlides?"
#: templates/download.html:24
msgid "Portable Version mit openslides.exe"
msgstr "Portable version with openslides.exe"
msgid ""
"Dies ist eine <strong>portable Version</strong>. \n"
" OpenSlides muss nicht installiert werden. Einfach herunterladen, "
"entpacken und openslides.exe starten!\n"
" "
msgstr ""
"This is a <strong>portable version</strong>. "
"OpenSlides doesn't have to be installed. Just download, unpack and "
"run openslides.exe!"
#: templates/download.html:25 templates/download.html.py:34
msgid "Installationsanleitung"
msgstr "Installation instructions"
#: templates/download.html:28
#: templates/download.html:29
msgid "Für Linux/MacOS"
msgstr "For Linux/MacOS"
#: templates/download.html:41
#: templates/download.html:35
msgid ""
"Folgen Sie der <a href=\"http://openslides.org/download/INSTALL-1.2.txt"
"\">Installationsanleitung</a> \n"
" nach dem Download. Die Anleitung liegt auch im Archiv bei."
msgstr ""
"After the download follow the <a href=\"http://openslides.org/download/INSTALL-1.2.txt\">"
"installation instructions</a>. The instructions are also included in the archive."
#: templates/download.html:43
msgid "Ältere Versionen und Prüfsummen"
msgstr "Older versions and checksums"
#: templates/download.html:46
#: templates/download.html:48
msgid ""
"Der aktuelle Entwicklungstand von OpenSlides kann im öffentlichen \n"
" Quellcode-Repository eingesehen werden."
@ -746,7 +758,7 @@ msgstr ""
"The current development version of OpenSlides can be seen in the public "
"source code repository"
#: templates/download.html:49
#: templates/download.html:51
msgid "Zum Auschecken des Quellcodes von OpenSlides nutzen Sie:"
msgstr "To check out the source code of OpenSlides use:"
@ -767,9 +779,9 @@ msgstr ""
"\"support@openslides.org\">support@openslides.org</a>! Then we can compile a "
"helpful selection of FAQs here soon."
#: templates/features.html:49 templates/features.html.py:164
#: templates/features.html:235 templates/features.html.py:271
#: templates/features.html:306 templates/features.html.py:342
#: templates/features.html:48 templates/features.html.py:160
#: templates/features.html:225 templates/features.html.py:269
#: templates/features.html:300 templates/features.html.py:335
msgid "Nach oben"
msgstr "Top"
@ -1336,5 +1348,11 @@ msgstr ""
msgid "Sollten Sie noch Fragen haben, melden Sie sich gerne!"
msgstr "If you have further questions don't hesitate to contact us!"
#~ msgid "Portable Version mit openslides.exe"
#~ msgstr "Portable version with openslides.exe"
#~ msgid "Installationsanleitung"
#~ msgstr "Installation instructions"
#~ msgid "IRC Chat starten"
#~ msgstr "start IRC chat"

4
extras/website/website/templates/download.html
View File

@ -32,8 +32,8 @@
href="http://openslides.org/download/openslides-1.2.tar.gz">
{% trans 'Download OpenSlides' %} <br><small>v1.2 | .tar.gz | 1 MB</small></a>
</p>
<p>Folgen Sie der <a href="http://openslides.org/download/INSTALL-1.2.txt">{% trans 'Installationsanleitung' %}</a>
nach dem Download. Die Anleitung liegt auch im Archiv bei.<br><br></p>
<p>{% blocktrans %}Folgen Sie der <a href="http://openslides.org/download/INSTALL-1.2.txt">Installationsanleitung</a>
nach dem Download. Die Anleitung liegt auch im Archiv bei.{% endblocktrans %}<br><br></p>
</div>
</div>
<br>