ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,795 Commits 6 Branches 42 Tags 64 MiB
b1d98ca33a
Commit Graph

272 Commits

Author SHA1 Message Date
Oskar Hahn
0369edae1e Added translationcontext for posts in assignment 2012-12-09 10:48:45 +01:00
Oskar Hahn
442e5fba60 Added fr translation 2012-12-09 10:40:41 +01:00
Oskar Hahn
fc4c4c3f95 Revert "Updated fr translation" 
This reverts commit 7ff0825dc3.
 2012-12-05 20:07:11 +01:00
Oskar Hahn
7ff0825dc3 Updated fr translation 2012-12-04 00:20:11 +01:00
Emanuel Schuetze
ae35a8c719 Updated translations 2012-11-27 21:30:45 +01:00
René Köcher
ed33b47666 Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides 
Conflicts:
	openslides/locale/de/LC_MESSAGES/django.po

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-22 12:52:11 +01:00
René Köcher
9f51a24311 #419 - aftermath 
- remove accidental print statements left over from debugging
- create missing groups on import

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-22 10:26:44 +01:00
René Köcher
36f83808fd Implement #419: Add group column for motion csv import 
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-21 23:38:25 +01:00
Emanuel Schuetze
4877eed46c Updated translation. 2012-11-21 21:45:27 +01:00
Emanuel Schuetze
7fa86f7de0 Used blocktrans instead of trans 2012-11-20 12:37:16 +01:00
Emanuel Schuetze
0fbb7dced3 Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!) 2012-11-19 23:30:09 +01:00
Emanuel Schuetze
844b2892f1 Updated translation for professional support footer. 2012-11-19 23:05:38 +01:00
Emanuel Schuetze
c5595effef Updated translation. 2012-11-19 22:59:13 +01:00
Emanuel Schuetze
b10cf331ab Updated translation 2012-11-17 22:24:29 +01:00
Emanuel Schuetze
7c75f42d85 Updated translations. 2012-11-08 09:42:35 +01:00
Emanuel Schuetze
71790a345b Fixed some English strings. Updated translations. 2012-11-07 22:37:33 +01:00
Emanuel Schuetze
9d183e9746 Rename user group to group. Updated translations. Clean up new french po file. 2012-11-07 22:16:11 +01:00
Oskar Hahn
0330f74d1b Merge pull request #35 from andkit/master 
Fix missing translations (#415)
 2012-11-07 01:24:54 -08:00
Oskar Hahn
4b2fddc9ce Merge pull request #36 from ostcar/fr 
Added fr translation. The work was done from Moira.
 2012-11-07 01:24:09 -08:00
Oskar Hahn
a691db5d30 updated fr translation 
Thx to Moira
 2012-11-07 10:22:32 +01:00
Andy Kittner
fbd77da788 Fix missing translations (#415) 
- The text "motions" was used with a plural here, but it was also
  present in other places without a plural, therefore the .po file
  contained only a singular translation. Solved by disambiguating the
  uses with a context

- The submitter field of the MotionManagerForm was missing a label
 2012-11-07 00:12:15 +01:00
Oskar Hahn
41c1c5a2c8 Added fr translation 2012-11-05 18:41:53 +01:00
Emanuel Schuetze
a363efe2ef Fixed #390: Added new user field 'about me' 2012-11-03 09:34:42 +01:00
Emanuel Schuetze
005cb2f15e Updated translations. 2012-11-03 08:59:34 +01:00
Emanuel Schuetze
4ee518dd96 Updated translations (for sorting participants). 2012-10-30 22:59:37 +01:00
Emanuel Schuetze
145a52eb24 Updated translations. 2012-10-30 22:16:43 +01:00
Oskar Hahn
87d5f4b6f8 Updated german translation 2012-10-24 12:55:25 +02:00
Emanuel Schuetze
12d8527255 Updated translations. 2012-09-18 22:40:30 +02:00
Oskar Hahn
56e3fe7a37 fix translation 2012-09-13 21:56:50 +02:00
Oskar Hahn
0cf0e58af9 Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides 
Conflicts:
	openslides/assignment/models.py
 2012-09-13 15:28:35 +02:00
Oskar Hahn
ef7deb90c9 translate agenda hidden filter in js 2012-09-13 15:21:43 +02:00
Emanuel Schuetze
7376b7a692 Updated translations. 2012-09-11 20:50:53 +02:00
Emanuel Schuetze
bc25937aa0 Updated translations. 2012-09-11 19:57:22 +02:00
Emanuel Schuetze
7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Oskar Hahn
bd64a6cb5c Merge branch 'stable/1.2.x' 
Conflicts:
	openslides/application/models.py
	openslides/application/views.py
	openslides/participant/forms.py
	openslides/participant/views.py
 2012-08-13 19:16:42 +02:00
Oskar Hahn
c52f8f3ca7 changed application to motion and permitted to authorized in message-strings 2012-08-05 22:31:20 +02:00
Oskar Hahn
e34f90aad1 update german translation 2012-07-28 11:09:00 +02:00
Emanuel Schuetze
feb82bd531 Updated translation. 2012-07-25 23:21:30 +02:00
Emanuel Schuetze
172b90ea1b #328: Translated application status error message. 2012-07-24 07:32:20 +02:00
Emanuel Schuetze
0c0f3d09da #328: Show error message if application status is already set. 2012-07-23 23:17:03 +02:00
Oskar Hahn
9d2a011958 update translation 2012-07-23 09:33:19 +02:00
Oskar Hahn
078125a1a2 update translation 2012-07-20 11:05:04 +02:00
Oskar Hahn
ba783489f2 changle end of line to windows for some files 2012-07-20 10:55:07 +02:00
Oskar Hahn
f928abd006 merge 2012-07-19 11:16:38 +02:00
Oskar Hahn
70b161c539 added name for participant app in __init__ 
removed some files, added though branch merge
 2012-07-19 11:11:07 +02:00
Emanuel Schuetze
c678b557fa #311: Updated first login message and translations. 2012-07-19 08:21:51 +02:00
Emanuel Schuetze
4fe77f89d3 Updated translations. 2012-07-18 21:15:12 +02:00
Emanuel Schuetze
9b3103d4a8 #284: Updated i18n links and added gettext requirement note. 2012-07-18 20:44:02 +02:00
Oskar Hahn
365f844164 update translation 2012-07-18 10:53:19 +02:00
Emanuel Schuetze
2a0e7ef2c4 Updated translation. 2012-07-16 22:37:59 +02:00
Emanuel Schuetze
d428841735 Fixed translation. 2012-07-16 22:26:07 +02:00
Emanuel Schuetze
9c03726bef #295: Change link to button. 2012-07-13 07:44:42 +02:00
Emanuel Schuetze
b4ee5dfff4 #293: Updated translation. 2012-07-13 07:34:15 +02:00
Oskar Hahn
cea2bbbf7d update translation 2012-07-12 14:19:08 +02:00
Oskar Hahn
81fc7ae560 update translation 2012-07-10 02:53:49 +02:00
Oskar Hahn
403f8e7917 update translation 2012-07-10 02:21:27 +02:00
Oskar Hahn
eb3adcd8ca update translation 2012-07-07 11:20:30 +02:00
Oskar Hahn
4e0f8670f1 update translation 2012-07-04 15:48:40 +02:00
Oskar Hahn
198eefbfdd rewrote projector overlay widget 2012-07-04 02:43:26 +02:00
Oskar Hahn
60570ea962 #245 update translation 2012-06-30 15:21:27 +02:00
Oskar Hahn
35e112a7d7 update translation 2012-06-30 12:24:23 +02:00
Oskar Hahn
09e6eec6f2 fix translation error in professional support 2012-06-29 00:38:34 +02:00
Oskar Hahn
587ce4093d update translation 2012-06-29 00:27:27 +02:00
Oskar Hahn
e9c680f5e1 update translation 2012-06-24 21:55:46 +02:00
Oskar Hahn
b963b61385 update german translation 2012-06-23 15:36:02 +02:00
Emanuel Schuetze
f7eab29ed5 Fixed missing translation in poll_view assignment template (table head). 2012-05-23 14:31:12 +02:00
Emanuel Schuetze
0acf6734e9 Updated translations. 2012-05-21 22:02:55 +02:00
Andy Kittner
0007a1dfa8 Add log messages when poll is updated/deleted (#187) 2012-05-20 23:12:50 +02:00
Emanuel Schuetze
c4450bf14e Updated translations. 2012-05-20 20:02:48 +02:00
Andy Kittner
e005863336 Changed/ added logmessages for applications (#184, #187) 
- Added a logmessage when a version is accepted/ rejected

- Made logmessage for trivial changes more explicit and include
  the names of the changed fields

- Updated translations
 2012-05-19 12:46:54 +02:00
Emanuel Schuetze
3f4119f182 #199: Changed login error message. Updated translation. 2012-05-19 08:44:46 +02:00
Emanuel Schuetze
c19025ceb3 #190: Fixed typo in translation. 2012-05-14 23:10:17 +02:00
Emanuel Schuetze
1d6a0bee4e #174: Change form field 'groups' to 'user groups'. 2012-05-14 23:04:00 +02:00
Emanuel Schuetze
31ae7c38c9 #192: i18n-de: Beamer -> Projektor 2012-05-14 22:16:13 +02:00
Emanuel Schuetze
304013649b Changed default event description. Updated tranlsations. 2012-05-14 22:08:40 +02:00
Emanuel Schuetze
114b719cad Added comment column in agenda overview. 2012-05-14 21:55:36 +02:00
Emanuel Schuetze
911b7ebac8 Changed po file header. 2012-05-11 07:38:56 +02:00
Emanuel Schuetze
3faa91f5a4 Updated translation. 2012-04-30 08:23:06 +02:00
Emanuel Schuetze
8c8a3e9fc2 Updated translations. 2012-04-29 20:48:10 +02:00
Emanuel Schuetze
f97529518e Updated translations. 2012-04-27 08:04:16 +02:00
Emanuel Schuetze
3bcf4fd9c3 Added missing 'required' helptext to all forms. 2012-04-26 17:50:46 +02:00
Emanuel Schuetze
7ef298881d Updated license header. 2012-04-25 22:29:19 +02:00
Emanuel Schuetze
20f17d6235 Fixed untranslateable model string. 2012-04-23 22:17:45 +02:00
Emanuel Schuetze
3d0fe9b565 Updated translations. 2012-04-23 22:07:34 +02:00
Emanuel Schuetze
d56dcba7d4 #119: Adjusted icon filenames. 2012-04-23 21:27:22 +02:00
Emanuel Schuetze
1b8c1eda91 Updated translations. 2012-04-22 16:51:22 +02:00
Emanuel Schuetze
ccc1d2b707 #104: Updated second submneu for application. 2012-04-20 22:13:47 +02:00
Emanuel Schuetze
42a2e44390 Updated translations. 2012-04-20 11:15:15 +02:00
Oskar Hahn
189cfa1309 translate poll values 2012-04-17 17:35:50 +02:00
Emanuel Schuetze
95d5929449 Added participant and version config page. Moved system settings to general. Some style work. 2012-04-15 12:39:28 +02:00
Emanuel Schuetze
b1c86d4c19 Import template pages: Link to wiki page. 2012-04-15 10:07:45 +02:00
Emanuel Schuetze
8149686a04 Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes. 2012-04-15 09:48:01 +02:00
Emanuel Schuetze
bd3bf9fb6f Updated translation. 2012-04-15 09:27:57 +02:00
Emanuel Schuetze
6df95a23f6 Updated translations. 2012-04-14 19:33:50 +02:00
René Köcher
7e12e1d5e2 Support for localized permissions on top of the untranslated django model. 2012-04-14 09:28:28 +02:00
René Köcher
113d258b3d #85: New import option: set status of all imported applications to 'permit' 2012-04-13 21:55:13 +02:00
René Köcher
733d78373e #84: Participants CSV import deletes applications 2012-04-12 19:11:07 +02:00
Emanuel Schuetze
c3ada0abdd Updated translation. 2012-04-02 08:44:17 +02:00
Emanuel Schuetze
d4b86574e9 Updated translation. 2012-03-22 17:29:39 +01:00
Emanuel Schuetze
c88ff41805 Reordered config tab subpages. 2011-11-14 23:40:19 +01:00
Emanuel Schuetze
dd85f07d66 Updated translation. 2011-11-14 23:01:43 +01:00
rene
9f50863439 Implement rights for anonymous as requested by #45 2011-11-14 16:37:12 +01:00
Emanuel Schuetze
ecc788f47d Updated translations. 2011-11-09 23:06:39 +01:00
Emanuel Schuetze
de62241dc7 Application: Added import (#55) and trivial changes (#56) function. Thanks to Rene Koecher! 2011-11-09 22:53:10 +01:00
Emanuel Schuetze
e64e91c52d Updated translations. 2011-11-01 08:26:47 +01:00
Emanuel Schuetze
82613c5490 Updated translation (new: gender-sensitive) 2011-10-24 21:05:06 +02:00
Emanuel Schuetze
045c09577a Updated translation. 2011-09-21 21:24:21 +02:00
Emanuel Schuetze
10e8b95b1b Show 'hidden' information in agenda item type column for hidden items (visible for managers only). 2011-09-21 21:13:33 +02:00
Emanuel Schuetze
d85b9e11fa Added new item-done-column for all non-manager. 2011-09-21 21:12:15 +02:00
Emanuel Schuetze
d70219e757 Updated translation. 2011-09-21 21:01:27 +02:00
Emanuel Schuetze
f85ebbfab9 Fixed active submenu class. Added submenu icon for generate passwords. Updated translation. 2011-09-12 09:06:24 +02:00
Emanuel Schuetze
e640241154 Updated translations. Fixed style and display of votes invalid, votes cast. 2011-09-11 22:43:15 +02:00
Emanuel Schuetze
c53e5267c5 Updated translations. 2011-09-07 22:46:47 +02:00
Emanuel Schuetze
f5f220417a Fixed manage permission. Updated message translation. 2011-09-07 22:17:19 +02:00
Emanuel Schuetze
dc782739cc Translation updated. 2011-09-07 19:32:26 +02:00
Emanuel Schuetze
1708c148ad Updated translations. 2011-09-06 23:22:13 +02:00
Emanuel Schuetze
d3adc382b8 Updated translations. 2011-09-04 19:08:38 +02:00
Emanuel Schuetze
6b7697a5b2 Changed translation string: revision -> version. 2011-09-04 12:35:46 +02:00
Emanuel Schuetze
85d74683e8 Updated translations. 2011-09-04 12:21:38 +02:00
Emanuel Schuetze
2ad0754f88 Added and fixed apply buttons. Updated translation. 2011-09-03 19:25:05 +02:00
Emanuel Schuetze
762f09197d Updated translations. 2011-09-03 16:36:49 +02:00
Oskar Hahn
3db6a12024 Add code 2011-07-31 10:46:29 +02:00