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
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
