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

Merge pull request #2206 from emanuelschuetze/translation-updates

Browse Source 
Fixed and update English translation strings.
This commit is contained in:
Emanuel Schütze 2016-06-28 14:05:25 +02:00 committed by GitHub
commit 9c1e8a86a4
4 changed files with 59 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openslides/core/static/js/core/site.js
View File

@ -1125,22 +1125,24 @@ angular.module('OpenSlidesApp.core.site', [
'assembly.'); 'assembly.');
gettext('General'); gettext('General');
gettext('Event'); gettext('Event');
gettext('Short description of Event'); gettext('Short description of event');
gettext('Event date'); gettext('Event date');
gettext('Event location'); gettext('Event location');
gettext('Event organizer'); gettext('Event organizer');
gettext('Legal notice'); gettext('Legal notice');
gettext('Front page title'); gettext('Front page title');
gettext('Welcome to OpenSlides');
gettext('Front page text'); gettext('Front page text');
gettext('[Space for your welcome text.]');
gettext('Allow access for anonymous guest users'); gettext('Allow access for anonymous guest users');
gettext('Show this text on the login page.'); gettext('Show this text on the login page.');
gettext('Show logo on projector'); gettext('Show logo on projector');
gettext('You can replace the logo. Just copy a file to '); gettext('You can replace the logo. Just copy a file to ' +
gettext('"static/img/logo-projector.png" in your OpenSlides data ' + '"static/img/logo-projector.png" in your OpenSlides data ' +
'path.'); 'path.');
gettext('Projector'); gettext('Projector');
gettext('Show title and description of event on projector'); gettext('Show title and description of event on projector');
gettext('Backgroundcolor of projector header and footer'); gettext('Background color of projector header and footer');
gettext('Font color of projector header and footer'); gettext('Font color of projector header and footer');
gettext('Font color of projector headline'); gettext('Font color of projector headline');
gettext('Default countdown'); gettext('Default countdown');

88
openslides/locale/angular-gettext/template-en.pot
View File

@ -25,18 +25,18 @@ msgstr ""
msgid "--- Set phase ---" msgid "--- Set phase ---"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1139
msgid "\"static/img/logo-projector.png\" in your OpenSlides data path."
msgstr ""
#: agenda/static/js/agenda/site.js:547 #: agenda/static/js/agenda/site.js:547
msgid "[Begin speech] starts the countdown, [End speech] stops the countdown." msgid "[Begin speech] starts the countdown, [End speech] stops the countdown."
msgstr "" msgstr ""
#: users/static/js/users/site.js:1004 #: users/static/js/users/site.js:1003
msgid "[Place for your welcome and help text.]" msgid "[Place for your welcome and help text.]"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1136
msgid "[Space for your welcome text.]"
msgstr ""
#: core/static/js/core/site.js:1122 #: core/static/js/core/site.js:1122
msgid "<a href=\"http://www.openslides.org\">OpenSlides</a> is a free web based presentation and assembly system for visualizing and controlling agenda, motions and elections of an assembly." msgid "<a href=\"http://www.openslides.org\">OpenSlides</a> is a free web based presentation and assembly system for visualizing and controlling agenda, motions and elections of an assembly."
msgstr "" msgstr ""
@ -147,7 +147,7 @@ msgstr ""
msgid "All motions" msgid "All motions"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1135 #: core/static/js/core/site.js:1137
msgid "Allow access for anonymous guest users" msgid "Allow access for anonymous guest users"
msgstr "" msgstr ""
@ -256,8 +256,8 @@ msgstr ""
msgid "Back to users overview" msgid "Back to users overview"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1143 #: core/static/js/core/site.js:1145
msgid "Backgroundcolor of projector header and footer" msgid "Background color of projector header and footer"
msgstr "" msgstr ""
#: assignments/static/templates/assignments/assignment-detail.html:123 #: assignments/static/templates/assignments/assignment-detail.html:123
@ -515,7 +515,7 @@ msgstr ""
msgid "Default comment on the ballot paper" msgid "Default comment on the ballot paper"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1146 #: core/static/js/core/site.js:1148
msgid "Default countdown" msgid "Default countdown"
msgstr "" msgstr ""
@ -581,7 +581,7 @@ msgstr ""
msgid "Designates whether this user should be treated as active. Unselect this instead of deleting the account." msgid "Designates whether this user should be treated as active. Unselect this instead of deleting the account."
msgstr "" msgstr ""
#: users/static/js/users/site.js:1006 #: users/static/js/users/site.js:1005
msgid "Disable for sorting by last name" msgid "Disable for sorting by last name"
msgstr "" msgstr ""
@ -817,11 +817,11 @@ msgstr ""
msgid "First name" msgid "First name"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1144 #: core/static/js/core/site.js:1146
msgid "Font color of projector header and footer" msgid "Font color of projector header and footer"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1145 #: core/static/js/core/site.js:1147
msgid "Font color of projector headline" msgid "Font color of projector headline"
msgstr "" msgstr ""
@ -829,7 +829,7 @@ msgstr ""
msgid "French" msgid "French"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1134 #: core/static/js/core/site.js:1135
msgid "Front page text" msgid "Front page text"
msgstr "" msgstr ""
@ -867,7 +867,7 @@ msgstr ""
msgid "h" msgid "h"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1012 #: users/static/js/users/site.js:1011
msgid "Help text for access data and welcome PDF" msgid "Help text for access data and welcome PDF"
msgstr "" msgstr ""
@ -1231,7 +1231,7 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1023 #: users/static/js/users/site.js:1022
msgid "No encryption" msgid "No encryption"
msgstr "" msgstr ""
@ -1342,6 +1342,7 @@ msgstr ""
msgid "participants" msgid "participants"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1006
#: users/static/js/users/site.js:14 #: users/static/js/users/site.js:14
#: users/static/templates/users/user-list.html:35 #: users/static/templates/users/user-list.html:35
msgid "Participants" msgid "Participants"
@ -1376,7 +1377,7 @@ msgstr ""
#: assignments/static/templates/assignments/assignment-list.html:14 #: assignments/static/templates/assignments/assignment-list.html:14
#: motions/static/templates/motions/motion-detail.html:10 #: motions/static/templates/motions/motion-detail.html:10
#: motions/static/templates/motions/motion-list.html:22 #: motions/static/templates/motions/motion-list.html:22
#: users/static/js/users/site.js:1011 #: users/static/js/users/site.js:1010
#: users/static/templates/users/user-list.html:19 #: users/static/templates/users/user-list.html:19
msgid "PDF" msgid "PDF"
msgstr "" msgstr ""
@ -1530,7 +1531,7 @@ msgstr ""
msgid "Project user" msgid "Project user"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1141 #: core/static/js/core/site.js:1143
#: index.html:179 #: index.html:179
msgid "Projector" msgid "Projector"
msgstr "" msgstr ""
@ -1770,7 +1771,7 @@ msgid "Settings"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1128 #: core/static/js/core/site.js:1128
msgid "Short description of Event" msgid "Short description of event"
msgstr "" msgstr ""
#: agenda/static/templates/agenda/item-detail.html:72 #: agenda/static/templates/agenda/item-detail.html:72
@ -1800,7 +1801,7 @@ msgstr ""
msgid "Show internal items" msgid "Show internal items"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1137 #: core/static/js/core/site.js:1139
msgid "Show logo on projector" msgid "Show logo on projector"
msgstr "" msgstr ""
@ -1816,11 +1817,11 @@ msgstr ""
msgid "Show PDF files only" msgid "Show PDF files only"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1136 #: core/static/js/core/site.js:1138
msgid "Show this text on the login page." msgid "Show this text on the login page."
msgstr "" msgstr ""
#: core/static/js/core/site.js:1142 #: core/static/js/core/site.js:1144
msgid "Show title and description of event on projector" msgid "Show title and description of event on projector"
msgstr "" msgstr ""
@ -1837,18 +1838,14 @@ msgstr ""
msgid "Sort agenda" msgid "Sort agenda"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1005 #: users/static/js/users/site.js:1004
msgid "Sort users by first name" msgid "Sort users by first name"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1008 #: users/static/js/users/site.js:1007
msgid "Sorting" msgid "Sorting"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1003
msgid "Space for your welcome text.]"
msgstr ""
#: core/static/js/core/base.js:96 #: core/static/js/core/base.js:96
msgid "Spanish" msgid "Spanish"
msgstr "" msgstr ""
@ -1928,7 +1925,7 @@ msgstr ""
msgid "Supporters" msgid "Supporters"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1013 #: users/static/js/users/site.js:1012
msgid "System URL" msgid "System URL"
msgstr "" msgstr ""
@ -1991,7 +1988,7 @@ msgstr ""
msgid "Title" msgid "Title"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1010 #: users/static/js/users/site.js:1009
msgid "Title for access data and welcome PDF" msgid "Title for access data and welcome PDF"
msgstr "" msgstr ""
@ -2042,13 +2039,13 @@ msgstr ""
msgid "Use the following custom number" msgid "Use the following custom number"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1014 #: users/static/js/users/site.js:1013
msgid "Used for QRCode in PDF of access data." msgid "Used for QRCode in PDF of access data."
msgstr "" msgstr ""
#: users/static/js/users/site.js:1016 #: users/static/js/users/site.js:1015
#: users/static/js/users/site.js:1018 #: users/static/js/users/site.js:1017
#: users/static/js/users/site.js:1020 #: users/static/js/users/site.js:1019
msgid "Used for WLAN QRCode in PDF of access data." msgid "Used for WLAN QRCode in PDF of access data."
msgstr "" msgstr ""
@ -2059,10 +2056,6 @@ msgstr ""
msgid "Username" msgid "Username"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1007
msgid "Users"
msgstr ""
#: assignments/static/templates/assignments/assignment-detail.html:202 #: assignments/static/templates/assignments/assignment-detail.html:202
#: assignments/static/templates/assignments/slide_assignment.html:87 #: assignments/static/templates/assignments/slide_assignment.html:87
#: motions/static/js/motions/site.js:376 #: motions/static/js/motions/site.js:376
@ -2112,15 +2105,12 @@ msgstr ""
msgid "Voting result" msgid "Voting result"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1002 #: core/static/js/core/site.js:1134
#: users/static/js/users/site.js:1008
msgid "Welcome to OpenSlides" msgid "Welcome to OpenSlides"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1009 #: users/static/js/users/site.js:1020
msgid "Welcome to OpenSlides!"
msgstr ""
#: users/static/js/users/site.js:1021
msgid "WEP" msgid "WEP"
msgstr "" msgstr ""
@ -2140,15 +2130,15 @@ msgstr ""
msgid "withdrawed" msgid "withdrawed"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1019 #: users/static/js/users/site.js:1018
msgid "WLAN encryption" msgid "WLAN encryption"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1015 #: users/static/js/users/site.js:1014
msgid "WLAN name (SSID)" msgid "WLAN name (SSID)"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1017 #: users/static/js/users/site.js:1016
msgid "WLAN password" msgid "WLAN password"
msgstr "" msgstr ""
@ -2160,7 +2150,7 @@ msgstr ""
msgid "Workflow of new motions" msgid "Workflow of new motions"
msgstr "" msgstr ""
#: users/static/js/users/site.js:1022 #: users/static/js/users/site.js:1021
msgid "WPA/WPA2" msgid "WPA/WPA2"
msgstr "" msgstr ""
@ -2172,8 +2162,8 @@ msgstr ""
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: core/static/js/core/site.js:1138 #: core/static/js/core/site.js:1140
msgid "You can replace the logo. Just copy a file to" msgid "You can replace the logo. Just copy a file to \"static/img/logo-projector.png\" in your OpenSlides data path."
msgstr "" msgstr ""
#: mediafiles/static/templates/mediafiles/mediafile-list.html:61 #: mediafiles/static/templates/mediafiles/mediafile-list.html:61

16
openslides/users/config_variables.py
View File

@ -16,17 +16,17 @@ def get_config_variables():
label='Sort users by first name', label='Sort users by first name',
help_text='Disable for sorting by last name', help_text='Disable for sorting by last name',
weight=510, weight=510,
group='Users', group='Participants',
subgroup='Sorting') subgroup='Sorting')
# PDF # PDF
yield ConfigVariable( yield ConfigVariable(
name='users_pdf_welcometitle', name='users_pdf_welcometitle',
default_value='Welcome to OpenSlides!', default_value='Welcome to OpenSlides',
label='Title for access data and welcome PDF', label='Title for access data and welcome PDF',
weight=520, weight=520,
group='Users', group='Participants',
subgroup='PDF', subgroup='PDF',
translatable=True) translatable=True)
@ -35,7 +35,7 @@ def get_config_variables():
default_value='[Place for your welcome and help text.]', default_value='[Place for your welcome and help text.]',
label='Help text for access data and welcome PDF', label='Help text for access data and welcome PDF',
weight=530, weight=530,
group='Users', group='Participants',
subgroup='PDF', subgroup='PDF',
translatable=True) translatable=True)
@ -46,7 +46,7 @@ def get_config_variables():
label='System URL', label='System URL',
help_text='Used for QRCode in PDF of access data.', help_text='Used for QRCode in PDF of access data.',
weight=540, weight=540,
group='Users', group='Participants',
subgroup='PDF') subgroup='PDF')
yield ConfigVariable( yield ConfigVariable(
@ -55,7 +55,7 @@ def get_config_variables():
label='WLAN name (SSID)', label='WLAN name (SSID)',
help_text='Used for WLAN QRCode in PDF of access data.', help_text='Used for WLAN QRCode in PDF of access data.',
weight=550, weight=550,
group='Users', group='Participants',
subgroup='PDF') subgroup='PDF')
yield ConfigVariable( yield ConfigVariable(
@ -64,7 +64,7 @@ def get_config_variables():
label='WLAN password', label='WLAN password',
help_text='Used for WLAN QRCode in PDF of access data.', help_text='Used for WLAN QRCode in PDF of access data.',
weight=560, weight=560,
group='Users', group='Participants',
subgroup='PDF') subgroup='PDF')
yield ConfigVariable( yield ConfigVariable(
@ -79,5 +79,5 @@ def get_config_variables():
{'value': 'WPA', 'display_name': 'WPA/WPA2'}, {'value': 'WPA', 'display_name': 'WPA/WPA2'},
{'value': 'nopass', 'display_name': 'No encryption'}), {'value': 'nopass', 'display_name': 'No encryption'}),
weight=570, weight=570,
group='Users', group='Participants',
subgroup='PDF') subgroup='PDF')

13
openslides/users/static/js/users/site.js
View File

@ -963,11 +963,11 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
} }
]) ])
// Mark all permission strings for translation in JavaScript. // Mark all users strings for translation in JavaScript.
// (see models.py of each Django app)
.config([ .config([
'gettext', 'gettext',
function (gettext) { function (gettext) {
// permission strings (see models.py of each Django app)
// agenda // agenda
gettext('Can see agenda'); gettext('Can see agenda');
gettext('Can manage agenda'); gettext('Can manage agenda');
@ -998,15 +998,14 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
gettext('Can see names of users'); gettext('Can see names of users');
gettext('Can see extra data of users (e.g. present and comment)'); gettext('Can see extra data of users (e.g. present and comment)');
gettext('Can manage users'); gettext('Can manage users');
//mark all config strings in users/config_variables.py for translation
gettext('Welcome to OpenSlides'); // config strings in users/config_variables.py
gettext('Space for your welcome text.]');
gettext('[Place for your welcome and help text.]'); gettext('[Place for your welcome and help text.]');
gettext('Sort users by first name'); gettext('Sort users by first name');
gettext('Disable for sorting by last name'); gettext('Disable for sorting by last name');
gettext('Users'); gettext('Participants');
gettext('Sorting'); gettext('Sorting');
gettext('Welcome to OpenSlides!'); gettext('Welcome to OpenSlides');
gettext('Title for access data and welcome PDF'); gettext('Title for access data and welcome PDF');
gettext('PDF'); gettext('PDF');
gettext('Help text for access data and welcome PDF'); gettext('Help text for access data and welcome PDF');