diff --git a/apps/member/templates/member/picture_update.html b/apps/member/templates/member/picture_update.html index 326e3651..51d05f91 100644 --- a/apps/member/templates/member/picture_update.html +++ b/apps/member/templates/member/picture_update.html @@ -32,8 +32,8 @@ SPDX-License-Identifier: GPL-3.0-or-later - - + + diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index e27135fa..b943b130 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-04 07:44+0200\n" +"POT-Creation-Date: 2020-09-06 12:32+0200\n" "PO-Revision-Date: 2020-09-03 23:47+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,42 +18,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.3\n" -#: apps/activity/apps.py:10 apps/activity/models.py:145 -#: apps/activity/models.py:161 +#: apps/activity/apps.py:10 apps/activity/models.py:150 +#: apps/activity/models.py:166 msgid "activity" msgstr "Veranstaltung" -#: apps/activity/forms.py:35 apps/activity/models.py:130 +#: apps/activity/forms.py:35 apps/activity/models.py:131 msgid "The end date must be after the start date." msgstr "Das Abschlussdatum muss nach das Anfangsdatum sein." -#: apps/activity/forms.py:76 apps/activity/models.py:257 +#: apps/activity/forms.py:76 apps/activity/models.py:262 msgid "You can't invite someone once the activity is started." msgstr "" "Sie dürfen nicht jemandem einladen wenn die Veranstaltung angefangen hat." -#: apps/activity/forms.py:79 apps/activity/models.py:260 +#: apps/activity/forms.py:79 apps/activity/models.py:265 msgid "This activity is not validated yet." msgstr "Diese Veranstaltung ist noch nicht bestätigt." -#: apps/activity/forms.py:89 apps/activity/models.py:268 +#: apps/activity/forms.py:89 apps/activity/models.py:273 msgid "This person has been already invited 5 times this year." msgstr "Diese Person wurde schon 5 mal dieses Jahr eingeladen." -#: apps/activity/forms.py:93 apps/activity/models.py:272 +#: apps/activity/forms.py:93 apps/activity/models.py:277 msgid "This person is already invited." msgstr "Diese Person wurde schon eingeladen." -#: apps/activity/forms.py:97 apps/activity/models.py:276 +#: apps/activity/forms.py:97 apps/activity/models.py:281 msgid "You can't invite more than 3 people to this activity." msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen." -#: apps/activity/models.py:27 apps/activity/models.py:62 +#: apps/activity/models.py:28 apps/activity/models.py:63 #: apps/member/models.py:200 #: apps/member/templates/member/includes/club_info.html:4 #: apps/member/templates/member/includes/profile_info.html:4 -#: apps/note/models/notes.py:247 apps/note/models/transactions.py:26 -#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:302 +#: apps/note/models/notes.py:253 apps/note/models/transactions.py:26 +#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:303 #: apps/permission/models.py:329 #: apps/registration/templates/registration/future_profile_detail.html:16 #: apps/wei/models.py:66 apps/wei/models.py:118 @@ -62,161 +62,161 @@ msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen." msgid "name" msgstr "Name" -#: apps/activity/models.py:32 +#: apps/activity/models.py:33 msgid "manage entries" msgstr "Einträge verwalten" -#: apps/activity/models.py:33 +#: apps/activity/models.py:34 msgid "Enable the support of entries for this activity." msgstr "Aktivieren Sie die Eintrittmöglichkeit für diese Aktivität." -#: apps/activity/models.py:38 +#: apps/activity/models.py:39 #: apps/activity/templates/activity/includes/activity_info.html:42 msgid "can invite" msgstr "Darf einladen" -#: apps/activity/models.py:43 +#: apps/activity/models.py:44 #: apps/activity/templates/activity/includes/activity_info.html:46 msgid "guest entry fee" msgstr "Gasteintrittspreis" -#: apps/activity/models.py:48 +#: apps/activity/models.py:49 msgid "activity type" msgstr "Veranstaltungart" -#: apps/activity/models.py:49 +#: apps/activity/models.py:50 msgid "activity types" msgstr "Vearnstaltungarte" -#: apps/activity/models.py:67 +#: apps/activity/models.py:68 #: apps/activity/templates/activity/includes/activity_info.html:19 #: apps/note/models/transactions.py:81 apps/permission/models.py:110 #: apps/permission/models.py:189 apps/wei/models.py:72 apps/wei/models.py:129 msgid "description" msgstr "Beschreibung" -#: apps/activity/models.py:71 +#: apps/activity/models.py:72 msgid "location" msgstr "Ort" -#: apps/activity/models.py:75 +#: apps/activity/models.py:76 msgid "Place where the activity is organized, eg. Kfet." msgstr "Wo findet die Veranstaltung statt ? (z.B Kfet)" -#: apps/activity/models.py:82 +#: apps/activity/models.py:83 #: apps/activity/templates/activity/includes/activity_info.html:22 -#: apps/note/models/notes.py:223 apps/note/models/transactions.py:66 +#: apps/note/models/notes.py:229 apps/note/models/transactions.py:66 #: apps/permission/models.py:164 msgid "type" msgstr "Type" -#: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:305 -#: apps/note/models/notes.py:138 apps/treasury/models.py:267 +#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305 +#: apps/note/models/notes.py:144 apps/treasury/models.py:267 #: apps/treasury/templates/treasury/sogecredit_detail.html:14 #: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15 msgid "user" msgstr "User" -#: apps/activity/models.py:95 +#: apps/activity/models.py:96 #: apps/activity/templates/activity/includes/activity_info.html:36 msgid "organizer" msgstr "Veranstalter" -#: apps/activity/models.py:96 +#: apps/activity/models.py:97 msgid "Club that organizes the activity. The entry fees will go to this club." msgstr "" "Die Veranstaltung wurde von einem Club organisert. Die Eintrittsbeiträge " "gehen an diesen Club." -#: apps/activity/models.py:103 +#: apps/activity/models.py:104 #: apps/activity/templates/activity/includes/activity_info.html:39 msgid "attendees club" msgstr "Teilnehmer" -#: apps/activity/models.py:104 +#: apps/activity/models.py:105 msgid "Club that is authorized to join the activity. Mostly the Kfet club." msgstr "Club die an die Veranstaltung teilnehmen können." -#: apps/activity/models.py:108 +#: apps/activity/models.py:109 #: apps/activity/templates/activity/includes/activity_info.html:25 msgid "start date" msgstr "Anfangsdatum" -#: apps/activity/models.py:112 +#: apps/activity/models.py:113 #: apps/activity/templates/activity/includes/activity_info.html:28 msgid "end date" msgstr "Abschlussdatum" -#: apps/activity/models.py:117 +#: apps/activity/models.py:118 #: apps/activity/templates/activity/includes/activity_info.html:50 #: apps/note/models/transactions.py:146 msgid "valid" msgstr "gültig" -#: apps/activity/models.py:122 +#: apps/activity/models.py:123 #: apps/activity/templates/activity/includes/activity_info.html:65 msgid "open" msgstr "geöffnet" -#: apps/activity/models.py:146 +#: apps/activity/models.py:151 msgid "activities" msgstr "Veranstaltungen" -#: apps/activity/models.py:166 +#: apps/activity/models.py:171 msgid "entry time" msgstr "Eintrittzeit" -#: apps/activity/models.py:172 apps/note/apps.py:14 +#: apps/activity/models.py:177 apps/note/apps.py:14 #: apps/note/models/notes.py:78 msgid "note" msgstr "Note" -#: apps/activity/models.py:183 +#: apps/activity/models.py:188 #: apps/activity/templates/activity/activity_entry.html:46 msgid "entry" msgstr "Eintritt" -#: apps/activity/models.py:184 +#: apps/activity/models.py:189 #: apps/activity/templates/activity/activity_entry.html:46 msgid "entries" msgstr "Eintritte" -#: apps/activity/models.py:190 +#: apps/activity/models.py:195 msgid "Already entered on " msgstr "Schon eingetretten " -#: apps/activity/models.py:190 apps/activity/tables.py:54 +#: apps/activity/models.py:195 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "{:%Y-%m-%d %H:%M:%S}" -#: apps/activity/models.py:198 +#: apps/activity/models.py:203 msgid "The balance is negative." msgstr "Kontostand ist im Rot." -#: apps/activity/models.py:228 +#: apps/activity/models.py:233 msgid "last name" msgstr "Nachname" -#: apps/activity/models.py:233 +#: apps/activity/models.py:238 #: apps/member/templates/member/includes/profile_info.html:4 #: apps/registration/templates/registration/future_profile_detail.html:16 #: apps/wei/templates/wei/weimembership_form.html:14 msgid "first name" msgstr "Vorname" -#: apps/activity/models.py:240 +#: apps/activity/models.py:245 msgid "inviter" msgstr "Einlader" -#: apps/activity/models.py:284 +#: apps/activity/models.py:289 msgid "guest" msgstr "Gast" -#: apps/activity/models.py:285 +#: apps/activity/models.py:290 msgid "guests" msgstr "Gäste" -#: apps/activity/models.py:297 +#: apps/activity/models.py:302 msgid "Invitation" msgstr "Einladung" @@ -244,15 +244,15 @@ msgstr "entfernen" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:82 apps/member/forms.py:131 -#: apps/registration/forms.py:81 apps/treasury/forms.py:135 +#: apps/activity/tables.py:82 apps/member/forms.py:167 +#: apps/registration/forms.py:81 apps/treasury/forms.py:129 #: apps/wei/forms/registration.py:96 msgid "Last name" msgstr "Nachname" -#: apps/activity/tables.py:84 apps/member/forms.py:136 +#: apps/activity/tables.py:84 apps/member/forms.py:172 #: apps/note/templates/note/transaction_form.html:134 -#: apps/registration/forms.py:86 apps/treasury/forms.py:137 +#: apps/registration/forms.py:86 apps/treasury/forms.py:131 #: apps/wei/forms/registration.py:101 msgid "First name" msgstr "Vorname" @@ -270,7 +270,7 @@ msgid "Guests list" msgstr "Gastliste" #: apps/activity/templates/activity/activity_entry.html:14 -#: apps/note/models/transactions.py:259 +#: apps/note/models/transactions.py:260 #: apps/note/templates/note/transaction_form.html:16 #: apps/note/templates/note/transaction_form.html:148 #: note_kfet/templates/base.html:69 @@ -278,13 +278,13 @@ msgid "Transfer" msgstr "Überweisen" #: apps/activity/templates/activity/activity_entry.html:18 -#: apps/note/models/transactions.py:318 +#: apps/note/models/transactions.py:319 #: apps/note/templates/note/transaction_form.html:21 msgid "Credit" msgstr "Kredit" #: apps/activity/templates/activity/activity_entry.html:21 -#: apps/note/models/transactions.py:318 +#: apps/note/models/transactions.py:319 #: apps/note/templates/note/transaction_form.html:25 msgid "Debit" msgstr "Soll" @@ -302,7 +302,7 @@ msgstr "Zurück zur Veranstaltungseite" #: apps/member/templates/member/add_members.html:32 #: apps/member/templates/member/club_form.html:16 #: apps/note/templates/note/transactiontemplate_form.html:18 -#: apps/treasury/forms.py:93 apps/treasury/forms.py:147 +#: apps/treasury/forms.py:87 apps/treasury/forms.py:141 #: apps/treasury/templates/treasury/invoice_form.html:74 #: apps/wei/templates/wei/bus_form.html:17 #: apps/wei/templates/wei/busteam_form.html:17 @@ -356,7 +356,7 @@ msgid "validate" msgstr "validate" #: apps/activity/templates/activity/includes/activity_info.html:71 -#: apps/logs/models.py:62 apps/note/tables.py:194 +#: apps/logs/models.py:62 apps/note/tables.py:195 msgid "edit" msgstr "bearbeiten" @@ -364,39 +364,39 @@ msgstr "bearbeiten" msgid "Invite" msgstr "Einladen" -#: apps/activity/views.py:29 +#: apps/activity/views.py:33 msgid "Create new activity" msgstr "Neue Veranstaltung schaffen" -#: apps/activity/views.py:59 note_kfet/templates/base.html:87 +#: apps/activity/views.py:63 note_kfet/templates/base.html:87 msgid "Activities" msgstr "Veranstaltungen" -#: apps/activity/views.py:87 +#: apps/activity/views.py:91 msgid "Activity detail" msgstr "Veranstaltunginfo" -#: apps/activity/views.py:107 +#: apps/activity/views.py:111 msgid "Update activity" msgstr "Veranstaltung bearbeiten" -#: apps/activity/views.py:134 +#: apps/activity/views.py:138 msgid "Invite guest to the activity \"{}\"" msgstr "Gast zur Veranstaltung \"{}\" einladen" -#: apps/activity/views.py:168 +#: apps/activity/views.py:172 msgid "You are not allowed to display the entry interface for this activity." msgstr "Sie haben nicht das Recht diese Seite zu benuzten." -#: apps/activity/views.py:171 +#: apps/activity/views.py:175 msgid "This activity does not support activity entries." msgstr "Diese Veranstaltung braucht nicht Eintritt." -#: apps/activity/views.py:174 +#: apps/activity/views.py:178 msgid "This activity is closed." msgstr "Diese Veranstaltung ist geschlossen." -#: apps/activity/views.py:272 +#: apps/activity/views.py:274 msgid "Entry for activity \"{}\"" msgstr "Eintritt zur Veranstaltung \"{}\"" @@ -432,7 +432,7 @@ msgstr "neue Daten" msgid "create" msgstr "schaffen" -#: apps/logs/models.py:63 apps/note/tables.py:164 apps/note/tables.py:200 +#: apps/logs/models.py:63 apps/note/tables.py:165 apps/note/tables.py:201 #: apps/permission/models.py:127 apps/treasury/tables.py:38 #: apps/wei/tables.py:75 msgid "delete" @@ -480,69 +480,73 @@ msgstr "Preis" msgid "member" msgstr "Mitglied" -#: apps/member/forms.py:41 +#: apps/member/forms.py:45 msgid "Report frequency" msgstr "Bericht Frequenz" -#: apps/member/forms.py:43 +#: apps/member/forms.py:47 msgid "Last report date" msgstr "Letzen Bericht Datum" -#: apps/member/forms.py:48 +#: apps/member/forms.py:52 msgid "You can't register to the note if you come from the future." msgstr "Sie dürfen nicht einloggen wenn sie aus der Zukunft kommen." -#: apps/member/forms.py:73 +#: apps/member/forms.py:77 msgid "select an image" msgstr "Wählen sie ein Bild aus" -#: apps/member/forms.py:74 +#: apps/member/forms.py:78 msgid "Maximal size: 2MB" msgstr "Maximal Größe: 2MB" -#: apps/member/forms.py:87 apps/member/views.py:100 +#: apps/member/forms.py:97 +msgid "This image cannot be loaded." +msgstr "Dieses Bild kann nicht geladen werden." + +#: apps/member/forms.py:123 apps/member/views.py:98 #: apps/registration/forms.py:33 apps/registration/views.py:237 msgid "An alias with a similar name already exists." msgstr "Ein ähnliches Alias ist schon benutzt." -#: apps/member/forms.py:110 apps/registration/forms.py:61 +#: apps/member/forms.py:146 apps/registration/forms.py:61 msgid "Inscription paid by Société Générale" msgstr "Mitgliedschaft von der Société Générale bezahlt" -#: apps/member/forms.py:112 apps/registration/forms.py:63 +#: apps/member/forms.py:148 apps/registration/forms.py:63 msgid "Check this case is the Société Générale paid the inscription." msgstr "Die Société Générale die Mitgliedschaft bezahlt." -#: apps/member/forms.py:117 apps/registration/forms.py:68 +#: apps/member/forms.py:153 apps/registration/forms.py:68 #: apps/wei/forms/registration.py:83 msgid "Credit type" msgstr "Kredittype" -#: apps/member/forms.py:118 apps/registration/forms.py:69 +#: apps/member/forms.py:154 apps/registration/forms.py:69 #: apps/wei/forms/registration.py:84 msgid "No credit" msgstr "Kein Kredit" -#: apps/member/forms.py:120 +#: apps/member/forms.py:156 msgid "You can credit the note of the user." msgstr "Sie dûrfen diese Note kreditieren." -#: apps/member/forms.py:124 apps/registration/forms.py:74 +#: apps/member/forms.py:160 apps/registration/forms.py:74 #: apps/wei/forms/registration.py:89 msgid "Credit amount" msgstr "Kreditanzahl" -#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140 -#: apps/registration/forms.py:91 apps/treasury/forms.py:139 +#: apps/member/forms.py:177 apps/note/templates/note/transaction_form.html:140 +#: apps/registration/forms.py:91 apps/treasury/forms.py:133 #: apps/wei/forms/registration.py:106 msgid "Bank" msgstr "Bank" -#: apps/member/forms.py:168 +#: apps/member/forms.py:204 msgid "User" msgstr "User" -#: apps/member/forms.py:182 +#: apps/member/forms.py:218 msgid "Roles" msgstr "Rollen" @@ -770,7 +774,7 @@ msgstr "" "Maximales Datum einer Mitgliedschaft, nach dem Mitglieder es erneuern müssen." #: apps/member/models.py:286 apps/member/models.py:311 -#: apps/note/models/notes.py:179 +#: apps/note/models/notes.py:185 msgid "club" msgstr "Club" @@ -791,7 +795,7 @@ msgstr "Mitgliedschaft endet am" msgid "The role {role} does not apply to the club {club}." msgstr "Die Rolle {role} ist nicht erlaubt für das Club {club}." -#: apps/member/models.py:384 apps/member/views.py:669 +#: apps/member/models.py:384 apps/member/views.py:651 msgid "User is already a member of the club" msgstr "User ist schon ein Mitglied dieser club" @@ -804,7 +808,7 @@ msgstr "User ist noch nicht Mitglied des Urclubs" msgid "Membership of {user} for the club {club}" msgstr "Mitgliedschaft von {user} für das Club {club}" -#: apps/member/models.py:483 apps/note/models/transactions.py:359 +#: apps/member/models.py:483 apps/note/models/transactions.py:360 msgid "membership" msgstr "Mitgliedschaft" @@ -842,7 +846,7 @@ msgid "Account #" msgstr "Konto #" #: apps/member/templates/member/base.html:48 -#: apps/member/templates/member/base.html:62 apps/member/views.py:59 +#: apps/member/templates/member/base.html:62 apps/member/views.py:57 #: apps/registration/templates/registration/future_profile_detail.html:48 #: apps/wei/templates/wei/weimembership_form.html:117 msgid "Update Profile" @@ -886,7 +890,7 @@ msgstr "" "zu aufschliessen." #: apps/member/templates/member/base.html:110 -#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95 +#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:89 msgid "Close" msgstr "Schluss" @@ -902,8 +906,8 @@ msgstr "" "erlaubt." #: apps/member/templates/member/club_alias.html:10 -#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:238 -#: apps/member/views.py:443 +#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:236 +#: apps/member/views.py:425 msgid "Note aliases" msgstr "Note Aliases" @@ -967,7 +971,7 @@ msgstr "Kontostand" #: apps/member/templates/member/includes/club_info.html:47 #: apps/member/templates/member/includes/profile_info.html:20 -#: apps/note/models/notes.py:270 apps/wei/templates/wei/base.html:66 +#: apps/note/models/notes.py:276 apps/wei/templates/wei/base.html:66 msgid "aliases" msgstr "Aliases" @@ -1006,6 +1010,14 @@ msgstr "Neue" msgid "Regenerate token" msgstr "Token erneuern" +#: apps/member/templates/member/picture_update.html:35 +msgid "Nevermind" +msgstr "Vergessen" + +#: apps/member/templates/member/picture_update.html:36 +msgid "Crop and upload" +msgstr "Beschneiden und hochladen" + #: apps/member/templates/member/profile_detail.html:11 #: apps/registration/templates/registration/future_profile_detail.html:28 #: apps/wei/templates/wei/weimembership_form.html:26 @@ -1030,47 +1042,47 @@ msgstr "Speichern" msgid "Registrations" msgstr "Anmeldung" -#: apps/member/views.py:72 apps/registration/forms.py:23 +#: apps/member/views.py:70 apps/registration/forms.py:23 msgid "This address must be valid." msgstr "Diese Adresse muss gültig sein." -#: apps/member/views.py:137 +#: apps/member/views.py:135 msgid "Profile detail" msgstr "Profile detail" -#: apps/member/views.py:197 +#: apps/member/views.py:195 msgid "Search user" msgstr "User finden" -#: apps/member/views.py:258 +#: apps/member/views.py:256 msgid "Update note picture" msgstr "Notebild ändern" -#: apps/member/views.py:311 +#: apps/member/views.py:293 msgid "Manage auth token" msgstr "Auth token bearbeiten" -#: apps/member/views.py:338 +#: apps/member/views.py:320 msgid "Create new club" msgstr "Neue Club" -#: apps/member/views.py:357 +#: apps/member/views.py:339 msgid "Search club" msgstr "Club finden" -#: apps/member/views.py:390 +#: apps/member/views.py:372 msgid "Club detail" msgstr "Club Details" -#: apps/member/views.py:466 +#: apps/member/views.py:448 msgid "Update club" msgstr "Club bearbeiten" -#: apps/member/views.py:500 +#: apps/member/views.py:482 msgid "Add new member to the club" msgstr "Neue Mitglieder" -#: apps/member/views.py:660 apps/wei/views.py:922 +#: apps/member/views.py:642 apps/wei/views.py:922 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -1078,25 +1090,25 @@ msgstr "" "Diese User hat nicht genug Geld um Mitglied zu werden, und darf nich im Rot " "sein." -#: apps/member/views.py:673 +#: apps/member/views.py:655 msgid "The membership must start after {:%m-%d-%Y}." msgstr "Die Mitgliedschaft muss nach {:%m-%d-Y} anfängen." -#: apps/member/views.py:678 +#: apps/member/views.py:660 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "Die Mitgliedschaft muss vor {:%m-%d-Y} anfängen." -#: apps/member/views.py:694 apps/member/views.py:696 apps/member/views.py:698 +#: apps/member/views.py:676 apps/member/views.py:678 apps/member/views.py:680 #: apps/registration/views.py:287 apps/registration/views.py:289 #: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931 msgid "This field is required." msgstr "Dies ist ein Pflichtfeld." -#: apps/member/views.py:771 +#: apps/member/views.py:753 msgid "Manage roles of an user in the club" msgstr "Rollen in diesen Club bearbeiten" -#: apps/member/views.py:796 +#: apps/member/views.py:778 msgid "Members of the club" msgstr "Mitlglieder dieses Club" @@ -1114,7 +1126,7 @@ msgstr "Empfänger" msgid "amount" msgstr "Anzahl" -#: apps/note/api/serializers.py:178 apps/note/api/serializers.py:184 +#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189 #: apps/note/models/transactions.py:224 msgid "" "The transaction can't be saved since the source note or the destination note " @@ -1207,68 +1219,68 @@ msgstr "The note is blocked by the the BDE and can't be manually reactivated." msgid "notes" msgstr "Notes" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:128 msgid "This alias is already taken." msgstr "Dieses Alias ist schon benutzt." -#: apps/note/models/notes.py:142 +#: apps/note/models/notes.py:148 msgid "one's note" msgstr "Jemand Note" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:149 msgid "users note" msgstr "User Note" -#: apps/note/models/notes.py:149 +#: apps/note/models/notes.py:155 #, python-format msgid "%(user)s's note" msgstr "%(user)s's note" -#: apps/note/models/notes.py:183 +#: apps/note/models/notes.py:189 msgid "club note" msgstr "Club Note" -#: apps/note/models/notes.py:184 +#: apps/note/models/notes.py:190 msgid "clubs notes" msgstr "Club Notes" -#: apps/note/models/notes.py:190 +#: apps/note/models/notes.py:196 #, python-format msgid "Note of %(club)s club" msgstr "%(club)s Note" -#: apps/note/models/notes.py:229 +#: apps/note/models/notes.py:235 msgid "special note" msgstr "Sondernote" -#: apps/note/models/notes.py:230 +#: apps/note/models/notes.py:236 msgid "special notes" msgstr "Sondernoten" -#: apps/note/models/notes.py:253 +#: apps/note/models/notes.py:259 msgid "Invalid alias" msgstr "Unerlaublt Alias" -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:275 msgid "alias" msgstr "Alias" -#: apps/note/models/notes.py:293 +#: apps/note/models/notes.py:299 msgid "Alias is too long." msgstr "Alias ist zu lang." -#: apps/note/models/notes.py:296 +#: apps/note/models/notes.py:302 msgid "" "This alias contains only complex character. Please use a more simple alias." msgstr "" "Dieser Alias enthält nur komplexe Zeichen. Bitte verwenden Sie einen " "einfacheren Alias." -#: apps/note/models/notes.py:300 +#: apps/note/models/notes.py:306 msgid "An alias with a similar name already exists: {} " msgstr "Ein Alias mit einem ähnlichen Namen existiert bereits: {} " -#: apps/note/models/notes.py:313 +#: apps/note/models/notes.py:319 msgid "You can't delete your main alias." msgstr "Sie können Ihren Hauptalias nicht löschen." @@ -1313,7 +1325,7 @@ msgstr "Anzahl" msgid "reason" msgstr "Grund" -#: apps/note/models/transactions.py:151 apps/note/tables.py:139 +#: apps/note/models/transactions.py:151 apps/note/tables.py:140 msgid "invalidity reason" msgstr "Ungültigkeit Grund" @@ -1343,34 +1355,34 @@ msgstr "" "Die Notenguthaben müssen zwischen - 92 233 720 368 547 758,08 € und 92 233 " "720 368 547 758,07 € liegen." -#: apps/note/models/transactions.py:279 +#: apps/note/models/transactions.py:280 msgid "" "The destination of this transaction must equal to the destination of the " "template." msgstr "" "Der Empfänger dieser Transaktion muss dem Empfänger der Vorlage entsprechen." -#: apps/note/models/transactions.py:288 +#: apps/note/models/transactions.py:289 msgid "Template" msgstr "Vorlage" -#: apps/note/models/transactions.py:291 +#: apps/note/models/transactions.py:292 msgid "recurrent transaction" msgstr "wiederkehrende Transaktion" -#: apps/note/models/transactions.py:292 +#: apps/note/models/transactions.py:293 msgid "recurrent transactions" msgstr "wiederkehrende Transaktionen" -#: apps/note/models/transactions.py:307 +#: apps/note/models/transactions.py:308 msgid "first_name" msgstr "Vorname" -#: apps/note/models/transactions.py:312 +#: apps/note/models/transactions.py:313 msgid "bank" msgstr "Bank" -#: apps/note/models/transactions.py:329 +#: apps/note/models/transactions.py:330 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -1378,35 +1390,35 @@ msgstr "" "Eine Sondertransaktion ist nur zwischen einer Note, die einer " "Zahlungsmethode zugeordnet ist, und einem User oder einem Club möglich" -#: apps/note/models/transactions.py:337 +#: apps/note/models/transactions.py:338 msgid "Special transaction" msgstr "Sondertransaktion" -#: apps/note/models/transactions.py:338 +#: apps/note/models/transactions.py:339 msgid "Special transactions" msgstr "Sondertranskationen" -#: apps/note/models/transactions.py:354 +#: apps/note/models/transactions.py:355 msgid "membership transaction" msgstr "Mitgliedschafttransaktion" -#: apps/note/models/transactions.py:355 apps/treasury/models.py:273 +#: apps/note/models/transactions.py:356 apps/treasury/models.py:273 msgid "membership transactions" msgstr "Mitgliedschaftttransaktionen" -#: apps/note/tables.py:93 +#: apps/note/tables.py:94 msgid "Click to invalidate" msgstr "Klicken Sie zum Ungültigmachen" -#: apps/note/tables.py:93 +#: apps/note/tables.py:94 msgid "Click to validate" msgstr "Klicken Sie zum gültigmachen" -#: apps/note/tables.py:137 +#: apps/note/tables.py:138 msgid "No reason specified" msgstr "Kein Grund gegeben" -#: apps/note/tables.py:168 apps/note/tables.py:202 apps/treasury/tables.py:39 +#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39 #: apps/treasury/templates/treasury/invoice_confirm_delete.html:30 #: apps/treasury/templates/treasury/sogecredit_detail.html:59 #: apps/wei/tables.py:76 apps/wei/tables.py:103 @@ -1414,7 +1426,7 @@ msgstr "Kein Grund gegeben" msgid "Delete" msgstr "Löschen" -#: apps/note/tables.py:196 apps/note/templates/note/conso_form.html:132 +#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132 #: apps/wei/tables.py:47 apps/wei/tables.py:48 #: apps/wei/templates/wei/base.html:89 #: apps/wei/templates/wei/bus_detail.html:20 @@ -1487,7 +1499,7 @@ msgid "Action" msgstr "Aktion" #: apps/note/templates/note/transaction_form.html:112 -#: apps/treasury/forms.py:141 apps/treasury/tables.py:67 +#: apps/treasury/forms.py:135 apps/treasury/tables.py:67 #: apps/treasury/tables.py:135 #: apps/treasury/templates/treasury/remittance_form.html:23 msgid "Amount" @@ -1938,15 +1950,20 @@ msgstr "Ungültige Vorregistrierung" msgid "Treasury" msgstr "Quaestor" -#: apps/treasury/forms.py:104 +#: apps/treasury/forms.py:24 apps/treasury/models.py:89 +#: apps/treasury/templates/treasury/invoice_form.html:22 +msgid "This invoice is locked and can no longer be edited." +msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden." + +#: apps/treasury/forms.py:98 msgid "Remittance is already closed." msgstr "Überweisung ist bereits geschlossen." -#: apps/treasury/forms.py:109 +#: apps/treasury/forms.py:103 msgid "You can't change the type of the remittance." msgstr "Sie können die Art der Überweisung nicht ändern." -#: apps/treasury/forms.py:129 apps/treasury/models.py:252 +#: apps/treasury/forms.py:123 apps/treasury/models.py:252 #: apps/treasury/tables.py:97 apps/treasury/tables.py:105 #: apps/treasury/templates/treasury/invoice_list.html:16 #: apps/treasury/templates/treasury/remittance_list.html:16 @@ -1954,7 +1971,7 @@ msgstr "Sie können die Art der Überweisung nicht ändern." msgid "Remittance" msgstr "Überweisung" -#: apps/treasury/forms.py:130 +#: apps/treasury/forms.py:124 msgid "No attached remittance" msgstr "Keine beigefügte Überweisung" @@ -1998,11 +2015,6 @@ msgstr "Eine Rechnung kann nicht bearbeitet werden, wenn sie gesperrt ist." msgid "tex source" msgstr "Tex Quelle" -#: apps/treasury/models.py:89 -#: apps/treasury/templates/treasury/invoice_form.html:22 -msgid "This invoice is locked and can no longer be edited." -msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden." - #: apps/treasury/models.py:109 apps/treasury/models.py:122 msgid "invoice" msgstr "Rechnung" @@ -2112,11 +2124,12 @@ msgid "Yes" msgstr "Ja" #: apps/treasury/templates/treasury/invoice_confirm_delete.html:10 -#: apps/treasury/views.py:166 +#: apps/treasury/views.py:176 msgid "Delete invoice" msgstr "Rechnung löschen" #: apps/treasury/templates/treasury/invoice_confirm_delete.html:15 +#: apps/treasury/views.py:180 msgid "This invoice is locked and can't be deleted." msgstr "Eine Rechnung kann nicht gelöscht werden, wenn sie gesperrt ist." @@ -2286,40 +2299,40 @@ msgstr "" msgid "Create new invoice" msgstr "Neue Rechnung" -#: apps/treasury/views.py:89 +#: apps/treasury/views.py:94 msgid "Invoices list" msgstr "Rechnunglist" -#: apps/treasury/views.py:104 apps/treasury/views.py:265 -#: apps/treasury/views.py:391 +#: apps/treasury/views.py:109 apps/treasury/views.py:282 +#: apps/treasury/views.py:408 msgid "You are not able to see the treasury interface." msgstr "Sie können die Quaestor-App nicht sehen." -#: apps/treasury/views.py:114 +#: apps/treasury/views.py:119 msgid "Update an invoice" msgstr "Rechnung bearbeiten" -#: apps/treasury/views.py:226 +#: apps/treasury/views.py:243 msgid "Create a new remittance" msgstr "Neue Überweisung" -#: apps/treasury/views.py:253 +#: apps/treasury/views.py:270 msgid "Remittances list" msgstr "Überweisungliste" -#: apps/treasury/views.py:316 +#: apps/treasury/views.py:333 msgid "Update a remittance" msgstr "Überweisung bearbeiten" -#: apps/treasury/views.py:339 +#: apps/treasury/views.py:356 msgid "Attach a transaction to a remittance" msgstr "Fügen Sie einer Überweisung eine Transaktion hinzu" -#: apps/treasury/views.py:383 +#: apps/treasury/views.py:400 msgid "List of credits from the Société générale" msgstr "Kreditliste von Société générale" -#: apps/treasury/views.py:426 +#: apps/treasury/views.py:443 msgid "Manage credits from the Société générale" msgstr "Krediten von der Société générale handeln" @@ -2939,7 +2952,7 @@ msgstr "Users" #: note_kfet/templates/base.html:81 msgid "Clubs" -msgstr "CLubs" +msgstr "Clubs" #: note_kfet/templates/base.html:110 msgid "Admin" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 53b84ef2..1b715643 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-04 07:44+0200\n" +"POT-Creation-Date: 2020-09-06 12:32+0200\n" "PO-Revision-Date: 2020-09-02 23:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,42 +18,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.3\n" -#: apps/activity/apps.py:10 apps/activity/models.py:145 -#: apps/activity/models.py:161 +#: apps/activity/apps.py:10 apps/activity/models.py:150 +#: apps/activity/models.py:166 msgid "activity" msgstr "activité" -#: apps/activity/forms.py:35 apps/activity/models.py:130 +#: apps/activity/forms.py:35 apps/activity/models.py:131 msgid "The end date must be after the start date." msgstr "La date de fin doit être après celle de début." -#: apps/activity/forms.py:76 apps/activity/models.py:257 +#: apps/activity/forms.py:76 apps/activity/models.py:262 msgid "You can't invite someone once the activity is started." msgstr "" "Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré." -#: apps/activity/forms.py:79 apps/activity/models.py:260 +#: apps/activity/forms.py:79 apps/activity/models.py:265 msgid "This activity is not validated yet." msgstr "Cette activité n'est pas encore validée." -#: apps/activity/forms.py:89 apps/activity/models.py:268 +#: apps/activity/forms.py:89 apps/activity/models.py:273 msgid "This person has been already invited 5 times this year." msgstr "Cette personne a déjà été invitée 5 fois cette année." -#: apps/activity/forms.py:93 apps/activity/models.py:272 +#: apps/activity/forms.py:93 apps/activity/models.py:277 msgid "This person is already invited." msgstr "Cette personne est déjà invitée." -#: apps/activity/forms.py:97 apps/activity/models.py:276 +#: apps/activity/forms.py:97 apps/activity/models.py:281 msgid "You can't invite more than 3 people to this activity." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." -#: apps/activity/models.py:27 apps/activity/models.py:62 +#: apps/activity/models.py:28 apps/activity/models.py:63 #: apps/member/models.py:200 #: apps/member/templates/member/includes/club_info.html:4 #: apps/member/templates/member/includes/profile_info.html:4 -#: apps/note/models/notes.py:247 apps/note/models/transactions.py:26 -#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:302 +#: apps/note/models/notes.py:253 apps/note/models/transactions.py:26 +#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:303 #: apps/permission/models.py:329 #: apps/registration/templates/registration/future_profile_detail.html:16 #: apps/wei/models.py:66 apps/wei/models.py:118 @@ -62,161 +62,161 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." msgid "name" msgstr "nom" -#: apps/activity/models.py:32 +#: apps/activity/models.py:33 msgid "manage entries" msgstr "gérer les entrées" -#: apps/activity/models.py:33 +#: apps/activity/models.py:34 msgid "Enable the support of entries for this activity." msgstr "Activer le support des entrées pour cette activité." -#: apps/activity/models.py:38 +#: apps/activity/models.py:39 #: apps/activity/templates/activity/includes/activity_info.html:42 msgid "can invite" msgstr "peut inviter" -#: apps/activity/models.py:43 +#: apps/activity/models.py:44 #: apps/activity/templates/activity/includes/activity_info.html:46 msgid "guest entry fee" msgstr "cotisation de l'entrée invité" -#: apps/activity/models.py:48 +#: apps/activity/models.py:49 msgid "activity type" msgstr "type d'activité" -#: apps/activity/models.py:49 +#: apps/activity/models.py:50 msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:67 +#: apps/activity/models.py:68 #: apps/activity/templates/activity/includes/activity_info.html:19 #: apps/note/models/transactions.py:81 apps/permission/models.py:110 #: apps/permission/models.py:189 apps/wei/models.py:72 apps/wei/models.py:129 msgid "description" msgstr "description" -#: apps/activity/models.py:71 +#: apps/activity/models.py:72 msgid "location" msgstr "lieu" -#: apps/activity/models.py:75 +#: apps/activity/models.py:76 msgid "Place where the activity is organized, eg. Kfet." msgstr "Lieu où l'activité est organisée, par exemple la Kfet." -#: apps/activity/models.py:82 +#: apps/activity/models.py:83 #: apps/activity/templates/activity/includes/activity_info.html:22 -#: apps/note/models/notes.py:223 apps/note/models/transactions.py:66 +#: apps/note/models/notes.py:229 apps/note/models/transactions.py:66 #: apps/permission/models.py:164 msgid "type" msgstr "type" -#: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:305 -#: apps/note/models/notes.py:138 apps/treasury/models.py:267 +#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305 +#: apps/note/models/notes.py:144 apps/treasury/models.py:267 #: apps/treasury/templates/treasury/sogecredit_detail.html:14 #: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15 msgid "user" msgstr "utilisateur" -#: apps/activity/models.py:95 +#: apps/activity/models.py:96 #: apps/activity/templates/activity/includes/activity_info.html:36 msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:96 +#: apps/activity/models.py:97 msgid "Club that organizes the activity. The entry fees will go to this club." msgstr "" "Le club qui organise l'activité. Les coûts d'invitation iront pour ce club." -#: apps/activity/models.py:103 +#: apps/activity/models.py:104 #: apps/activity/templates/activity/includes/activity_info.html:39 msgid "attendees club" msgstr "club attendu" -#: apps/activity/models.py:104 +#: apps/activity/models.py:105 msgid "Club that is authorized to join the activity. Mostly the Kfet club." msgstr "" "Club qui est autorisé à rejoindre l'activité. Très souvent le club Kfet." -#: apps/activity/models.py:108 +#: apps/activity/models.py:109 #: apps/activity/templates/activity/includes/activity_info.html:25 msgid "start date" msgstr "date de début" -#: apps/activity/models.py:112 +#: apps/activity/models.py:113 #: apps/activity/templates/activity/includes/activity_info.html:28 msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:117 +#: apps/activity/models.py:118 #: apps/activity/templates/activity/includes/activity_info.html:50 #: apps/note/models/transactions.py:146 msgid "valid" msgstr "valide" -#: apps/activity/models.py:122 +#: apps/activity/models.py:123 #: apps/activity/templates/activity/includes/activity_info.html:65 msgid "open" msgstr "ouvrir" -#: apps/activity/models.py:146 +#: apps/activity/models.py:151 msgid "activities" msgstr "activités" -#: apps/activity/models.py:166 +#: apps/activity/models.py:171 msgid "entry time" msgstr "heure d'entrée" -#: apps/activity/models.py:172 apps/note/apps.py:14 +#: apps/activity/models.py:177 apps/note/apps.py:14 #: apps/note/models/notes.py:78 msgid "note" msgstr "note" -#: apps/activity/models.py:183 +#: apps/activity/models.py:188 #: apps/activity/templates/activity/activity_entry.html:46 msgid "entry" msgstr "entrée" -#: apps/activity/models.py:184 +#: apps/activity/models.py:189 #: apps/activity/templates/activity/activity_entry.html:46 msgid "entries" msgstr "entrées" -#: apps/activity/models.py:190 +#: apps/activity/models.py:195 msgid "Already entered on " msgstr "Déjà rentré le " -#: apps/activity/models.py:190 apps/activity/tables.py:54 +#: apps/activity/models.py:195 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "{:%d/%m/%Y %H:%M:%S}" -#: apps/activity/models.py:198 +#: apps/activity/models.py:203 msgid "The balance is negative." msgstr "La note est en négatif." -#: apps/activity/models.py:228 +#: apps/activity/models.py:233 msgid "last name" msgstr "nom de famille" -#: apps/activity/models.py:233 +#: apps/activity/models.py:238 #: apps/member/templates/member/includes/profile_info.html:4 #: apps/registration/templates/registration/future_profile_detail.html:16 #: apps/wei/templates/wei/weimembership_form.html:14 msgid "first name" msgstr "prénom" -#: apps/activity/models.py:240 +#: apps/activity/models.py:245 msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:284 +#: apps/activity/models.py:289 msgid "guest" msgstr "invité" -#: apps/activity/models.py:285 +#: apps/activity/models.py:290 msgid "guests" msgstr "invités" -#: apps/activity/models.py:297 +#: apps/activity/models.py:302 msgid "Invitation" msgstr "Invitation" @@ -244,15 +244,15 @@ msgstr "supprimer" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:82 apps/member/forms.py:131 -#: apps/registration/forms.py:81 apps/treasury/forms.py:135 +#: apps/activity/tables.py:82 apps/member/forms.py:167 +#: apps/registration/forms.py:81 apps/treasury/forms.py:129 #: apps/wei/forms/registration.py:96 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:84 apps/member/forms.py:136 +#: apps/activity/tables.py:84 apps/member/forms.py:172 #: apps/note/templates/note/transaction_form.html:134 -#: apps/registration/forms.py:86 apps/treasury/forms.py:137 +#: apps/registration/forms.py:86 apps/treasury/forms.py:131 #: apps/wei/forms/registration.py:101 msgid "First name" msgstr "Prénom" @@ -270,7 +270,7 @@ msgid "Guests list" msgstr "Liste des invités" #: apps/activity/templates/activity/activity_entry.html:14 -#: apps/note/models/transactions.py:259 +#: apps/note/models/transactions.py:260 #: apps/note/templates/note/transaction_form.html:16 #: apps/note/templates/note/transaction_form.html:148 #: note_kfet/templates/base.html:69 @@ -278,13 +278,13 @@ msgid "Transfer" msgstr "Virement" #: apps/activity/templates/activity/activity_entry.html:18 -#: apps/note/models/transactions.py:318 +#: apps/note/models/transactions.py:319 #: apps/note/templates/note/transaction_form.html:21 msgid "Credit" msgstr "Crédit" #: apps/activity/templates/activity/activity_entry.html:21 -#: apps/note/models/transactions.py:318 +#: apps/note/models/transactions.py:319 #: apps/note/templates/note/transaction_form.html:25 msgid "Debit" msgstr "Débit" @@ -302,7 +302,7 @@ msgstr "Retour à la page de l'activité" #: apps/member/templates/member/add_members.html:32 #: apps/member/templates/member/club_form.html:16 #: apps/note/templates/note/transactiontemplate_form.html:18 -#: apps/treasury/forms.py:93 apps/treasury/forms.py:147 +#: apps/treasury/forms.py:87 apps/treasury/forms.py:141 #: apps/treasury/templates/treasury/invoice_form.html:74 #: apps/wei/templates/wei/bus_form.html:17 #: apps/wei/templates/wei/busteam_form.html:17 @@ -356,7 +356,7 @@ msgid "validate" msgstr "valider" #: apps/activity/templates/activity/includes/activity_info.html:71 -#: apps/logs/models.py:62 apps/note/tables.py:194 +#: apps/logs/models.py:62 apps/note/tables.py:195 msgid "edit" msgstr "modifier" @@ -364,41 +364,41 @@ msgstr "modifier" msgid "Invite" msgstr "Inviter" -#: apps/activity/views.py:29 +#: apps/activity/views.py:33 msgid "Create new activity" msgstr "Créer une nouvelle activité" -#: apps/activity/views.py:59 note_kfet/templates/base.html:87 +#: apps/activity/views.py:63 note_kfet/templates/base.html:87 msgid "Activities" msgstr "Activités" -#: apps/activity/views.py:87 +#: apps/activity/views.py:91 msgid "Activity detail" msgstr "Détails de l'activité" -#: apps/activity/views.py:107 +#: apps/activity/views.py:111 msgid "Update activity" msgstr "Modifier l'activité" -#: apps/activity/views.py:134 +#: apps/activity/views.py:138 msgid "Invite guest to the activity \"{}\"" msgstr "Invitation pour l'activité « {} »" -#: apps/activity/views.py:168 +#: apps/activity/views.py:172 msgid "You are not allowed to display the entry interface for this activity." msgstr "" "Vous n'êtes pas autorisé à afficher l'interface des entrées pour cette " "activité." -#: apps/activity/views.py:171 +#: apps/activity/views.py:175 msgid "This activity does not support activity entries." msgstr "Cette activité ne requiert pas d'entrées." -#: apps/activity/views.py:174 +#: apps/activity/views.py:178 msgid "This activity is closed." msgstr "Cette activité est fermée." -#: apps/activity/views.py:272 +#: apps/activity/views.py:274 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -434,7 +434,7 @@ msgstr "ouvelles données" msgid "create" msgstr "créer" -#: apps/logs/models.py:63 apps/note/tables.py:164 apps/note/tables.py:200 +#: apps/logs/models.py:63 apps/note/tables.py:165 apps/note/tables.py:201 #: apps/permission/models.py:127 apps/treasury/tables.py:38 #: apps/wei/tables.py:75 msgid "delete" @@ -482,69 +482,73 @@ msgstr "cotisation" msgid "member" msgstr "adhérent" -#: apps/member/forms.py:41 +#: apps/member/forms.py:45 msgid "Report frequency" msgstr "Fréquence des rapports (en jours)" -#: apps/member/forms.py:43 +#: apps/member/forms.py:47 msgid "Last report date" msgstr "Date de dernier rapport" -#: apps/member/forms.py:48 +#: apps/member/forms.py:52 msgid "You can't register to the note if you come from the future." msgstr "Vous ne pouvez pas vous inscrire à la note si vous venez du futur." -#: apps/member/forms.py:73 +#: apps/member/forms.py:77 msgid "select an image" msgstr "choisissez une image" -#: apps/member/forms.py:74 +#: apps/member/forms.py:78 msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" -#: apps/member/forms.py:87 apps/member/views.py:100 +#: apps/member/forms.py:97 +msgid "This image cannot be loaded." +msgstr "Cette image ne peut pas être chargée." + +#: apps/member/forms.py:123 apps/member/views.py:98 #: apps/registration/forms.py:33 apps/registration/views.py:237 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/forms.py:110 apps/registration/forms.py:61 +#: apps/member/forms.py:146 apps/registration/forms.py:61 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:112 apps/registration/forms.py:63 +#: apps/member/forms.py:148 apps/registration/forms.py:63 msgid "Check this case is the Société Générale paid the inscription." msgstr "Cochez cette case si la Société Générale a payé l'inscription." -#: apps/member/forms.py:117 apps/registration/forms.py:68 +#: apps/member/forms.py:153 apps/registration/forms.py:68 #: apps/wei/forms/registration.py:83 msgid "Credit type" msgstr "Type de rechargement" -#: apps/member/forms.py:118 apps/registration/forms.py:69 +#: apps/member/forms.py:154 apps/registration/forms.py:69 #: apps/wei/forms/registration.py:84 msgid "No credit" msgstr "Pas de rechargement" -#: apps/member/forms.py:120 +#: apps/member/forms.py:156 msgid "You can credit the note of the user." msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion." -#: apps/member/forms.py:124 apps/registration/forms.py:74 +#: apps/member/forms.py:160 apps/registration/forms.py:74 #: apps/wei/forms/registration.py:89 msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140 -#: apps/registration/forms.py:91 apps/treasury/forms.py:139 +#: apps/member/forms.py:177 apps/note/templates/note/transaction_form.html:140 +#: apps/registration/forms.py:91 apps/treasury/forms.py:133 #: apps/wei/forms/registration.py:106 msgid "Bank" msgstr "Banque" -#: apps/member/forms.py:168 +#: apps/member/forms.py:204 msgid "User" msgstr "Utilisateur" -#: apps/member/forms.py:182 +#: apps/member/forms.py:218 msgid "Roles" msgstr "Rôles" @@ -772,7 +776,7 @@ msgstr "" "renouveler." #: apps/member/models.py:286 apps/member/models.py:311 -#: apps/note/models/notes.py:179 +#: apps/note/models/notes.py:185 msgid "club" msgstr "club" @@ -793,7 +797,7 @@ msgstr "l'adhésion finit le" msgid "The role {role} does not apply to the club {club}." msgstr "Le rôle {role} ne s'applique pas au club {club}." -#: apps/member/models.py:384 apps/member/views.py:669 +#: apps/member/models.py:384 apps/member/views.py:651 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" @@ -806,7 +810,7 @@ msgstr "L'utilisateur n'est pas membre du club parent" msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:483 apps/note/models/transactions.py:359 +#: apps/member/models.py:483 apps/note/models/transactions.py:360 msgid "membership" msgstr "adhésion" @@ -844,7 +848,7 @@ msgid "Account #" msgstr "Compte n°" #: apps/member/templates/member/base.html:48 -#: apps/member/templates/member/base.html:62 apps/member/views.py:59 +#: apps/member/templates/member/base.html:62 apps/member/views.py:57 #: apps/registration/templates/registration/future_profile_detail.html:48 #: apps/wei/templates/wei/weimembership_form.html:117 msgid "Update Profile" @@ -888,7 +892,7 @@ msgstr "" "déverrouiller lui-même." #: apps/member/templates/member/base.html:110 -#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95 +#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:89 msgid "Close" msgstr "Fermer" @@ -904,8 +908,8 @@ msgstr "" "à nouveau possible." #: apps/member/templates/member/club_alias.html:10 -#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:238 -#: apps/member/views.py:443 +#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:236 +#: apps/member/views.py:425 msgid "Note aliases" msgstr "Alias de la note" @@ -969,7 +973,7 @@ msgstr "solde du compte" #: apps/member/templates/member/includes/club_info.html:47 #: apps/member/templates/member/includes/profile_info.html:20 -#: apps/note/models/notes.py:270 apps/wei/templates/wei/base.html:66 +#: apps/note/models/notes.py:276 apps/wei/templates/wei/base.html:66 msgid "aliases" msgstr "alias" @@ -1008,6 +1012,14 @@ msgstr "Créé le" msgid "Regenerate token" msgstr "Regénérer le jeton" +#: apps/member/templates/member/picture_update.html:35 +msgid "Nevermind" +msgstr "Annuler" + +#: apps/member/templates/member/picture_update.html:36 +msgid "Crop and upload" +msgstr "Recadrer et envoyer" + #: apps/member/templates/member/profile_detail.html:11 #: apps/registration/templates/registration/future_profile_detail.html:28 #: apps/wei/templates/wei/weimembership_form.html:26 @@ -1032,47 +1044,47 @@ msgstr "Sauvegarder les changements" msgid "Registrations" msgstr "Inscriptions" -#: apps/member/views.py:72 apps/registration/forms.py:23 +#: apps/member/views.py:70 apps/registration/forms.py:23 msgid "This address must be valid." msgstr "Cette adresse doit être valide." -#: apps/member/views.py:137 +#: apps/member/views.py:135 msgid "Profile detail" msgstr "Détails de l'utilisateur" -#: apps/member/views.py:197 +#: apps/member/views.py:195 msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:258 +#: apps/member/views.py:256 msgid "Update note picture" msgstr "Modifier la photo de la note" -#: apps/member/views.py:311 +#: apps/member/views.py:293 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: apps/member/views.py:338 +#: apps/member/views.py:320 msgid "Create new club" msgstr "Créer un nouveau club" -#: apps/member/views.py:357 +#: apps/member/views.py:339 msgid "Search club" msgstr "Chercher un club" -#: apps/member/views.py:390 +#: apps/member/views.py:372 msgid "Club detail" msgstr "Détails du club" -#: apps/member/views.py:466 +#: apps/member/views.py:448 msgid "Update club" msgstr "Modifier le club" -#: apps/member/views.py:500 +#: apps/member/views.py:482 msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:660 apps/wei/views.py:922 +#: apps/member/views.py:642 apps/wei/views.py:922 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -1080,25 +1092,25 @@ msgstr "" "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas " "avoir un solde négatif." -#: apps/member/views.py:673 +#: apps/member/views.py:655 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:678 +#: apps/member/views.py:660 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:694 apps/member/views.py:696 apps/member/views.py:698 +#: apps/member/views.py:676 apps/member/views.py:678 apps/member/views.py:680 #: apps/registration/views.py:287 apps/registration/views.py:289 #: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931 msgid "This field is required." msgstr "Ce champ est requis." -#: apps/member/views.py:771 +#: apps/member/views.py:753 msgid "Manage roles of an user in the club" msgstr "Gérer les rôles d'un utilisateur dans le club" -#: apps/member/views.py:796 +#: apps/member/views.py:778 msgid "Members of the club" msgstr "Membres du club" @@ -1116,7 +1128,7 @@ msgstr "destination" msgid "amount" msgstr "montant" -#: apps/note/api/serializers.py:178 apps/note/api/serializers.py:184 +#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189 #: apps/note/models/transactions.py:224 msgid "" "The transaction can't be saved since the source note or the destination note " @@ -1210,68 +1222,68 @@ msgstr "" msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:128 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." -#: apps/note/models/notes.py:142 +#: apps/note/models/notes.py:148 msgid "one's note" msgstr "note d'un utilisateur" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:149 msgid "users note" msgstr "notes des utilisateurs" -#: apps/note/models/notes.py:149 +#: apps/note/models/notes.py:155 #, python-format msgid "%(user)s's note" msgstr "Note de %(user)s" -#: apps/note/models/notes.py:183 +#: apps/note/models/notes.py:189 msgid "club note" msgstr "note d'un club" -#: apps/note/models/notes.py:184 +#: apps/note/models/notes.py:190 msgid "clubs notes" msgstr "notes des clubs" -#: apps/note/models/notes.py:190 +#: apps/note/models/notes.py:196 #, python-format msgid "Note of %(club)s club" msgstr "Note du club %(club)s" -#: apps/note/models/notes.py:229 +#: apps/note/models/notes.py:235 msgid "special note" msgstr "note spéciale" -#: apps/note/models/notes.py:230 +#: apps/note/models/notes.py:236 msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:253 +#: apps/note/models/notes.py:259 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:275 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:293 +#: apps/note/models/notes.py:299 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:296 +#: apps/note/models/notes.py:302 msgid "" "This alias contains only complex character. Please use a more simple alias." msgstr "" "Cet alias ne contient que des caractères complexes. Merci d'utiliser un " "alias plus simple." -#: apps/note/models/notes.py:300 +#: apps/note/models/notes.py:306 msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {} " -#: apps/note/models/notes.py:313 +#: apps/note/models/notes.py:319 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -1316,7 +1328,7 @@ msgstr "quantité" msgid "reason" msgstr "raison" -#: apps/note/models/transactions.py:151 apps/note/tables.py:139 +#: apps/note/models/transactions.py:151 apps/note/tables.py:140 msgid "invalidity reason" msgstr "motif d'invalidité" @@ -1347,7 +1359,7 @@ msgstr "" "€ et 92 233 720 368 547 758.07 €. Ne cherchez pas à capitaliser l'argent du " "BDE." -#: apps/note/models/transactions.py:279 +#: apps/note/models/transactions.py:280 msgid "" "The destination of this transaction must equal to the destination of the " "template." @@ -1355,27 +1367,27 @@ msgstr "" "Le destinataire de cette transaction doit être identique à celui du bouton " "utilisé." -#: apps/note/models/transactions.py:288 +#: apps/note/models/transactions.py:289 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:291 +#: apps/note/models/transactions.py:292 msgid "recurrent transaction" msgstr "transaction issue de bouton" -#: apps/note/models/transactions.py:292 +#: apps/note/models/transactions.py:293 msgid "recurrent transactions" msgstr "transactions issues de boutons" -#: apps/note/models/transactions.py:307 +#: apps/note/models/transactions.py:308 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:312 +#: apps/note/models/transactions.py:313 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:329 +#: apps/note/models/transactions.py:330 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -1383,35 +1395,35 @@ msgstr "" "Une transaction spéciale n'est possible que entre une note associée à un " "mode de paiement et un utilisateur ou un club" -#: apps/note/models/transactions.py:337 +#: apps/note/models/transactions.py:338 msgid "Special transaction" msgstr "Transaction de crédit/retrait" -#: apps/note/models/transactions.py:338 +#: apps/note/models/transactions.py:339 msgid "Special transactions" msgstr "Transactions de crédit/retrait" -#: apps/note/models/transactions.py:354 +#: apps/note/models/transactions.py:355 msgid "membership transaction" msgstr "transaction d'adhésion" -#: apps/note/models/transactions.py:355 apps/treasury/models.py:273 +#: apps/note/models/transactions.py:356 apps/treasury/models.py:273 msgid "membership transactions" msgstr "transactions d'adhésion" -#: apps/note/tables.py:93 +#: apps/note/tables.py:94 msgid "Click to invalidate" msgstr "Cliquez pour dévalider" -#: apps/note/tables.py:93 +#: apps/note/tables.py:94 msgid "Click to validate" msgstr "Cliquez pour valider" -#: apps/note/tables.py:137 +#: apps/note/tables.py:138 msgid "No reason specified" msgstr "Pas de motif spécifié" -#: apps/note/tables.py:168 apps/note/tables.py:202 apps/treasury/tables.py:39 +#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39 #: apps/treasury/templates/treasury/invoice_confirm_delete.html:30 #: apps/treasury/templates/treasury/sogecredit_detail.html:59 #: apps/wei/tables.py:76 apps/wei/tables.py:103 @@ -1419,7 +1431,7 @@ msgstr "Pas de motif spécifié" msgid "Delete" msgstr "Supprimer" -#: apps/note/tables.py:196 apps/note/templates/note/conso_form.html:132 +#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132 #: apps/wei/tables.py:47 apps/wei/tables.py:48 #: apps/wei/templates/wei/base.html:89 #: apps/wei/templates/wei/bus_detail.html:20 @@ -1492,7 +1504,7 @@ msgid "Action" msgstr "Action" #: apps/note/templates/note/transaction_form.html:112 -#: apps/treasury/forms.py:141 apps/treasury/tables.py:67 +#: apps/treasury/forms.py:135 apps/treasury/tables.py:67 #: apps/treasury/tables.py:135 #: apps/treasury/templates/treasury/remittance_form.html:23 msgid "Amount" @@ -1942,15 +1954,20 @@ msgstr "Invalider l'inscription" msgid "Treasury" msgstr "Trésorerie" -#: apps/treasury/forms.py:104 +#: apps/treasury/forms.py:24 apps/treasury/models.py:89 +#: apps/treasury/templates/treasury/invoice_form.html:22 +msgid "This invoice is locked and can no longer be edited." +msgstr "Cette facture est verrouillée et ne peut plus être éditée." + +#: apps/treasury/forms.py:98 msgid "Remittance is already closed." msgstr "La remise est déjà fermée." -#: apps/treasury/forms.py:109 +#: apps/treasury/forms.py:103 msgid "You can't change the type of the remittance." msgstr "Vous ne pouvez pas changer le type de la remise." -#: apps/treasury/forms.py:129 apps/treasury/models.py:252 +#: apps/treasury/forms.py:123 apps/treasury/models.py:252 #: apps/treasury/tables.py:97 apps/treasury/tables.py:105 #: apps/treasury/templates/treasury/invoice_list.html:16 #: apps/treasury/templates/treasury/remittance_list.html:16 @@ -1958,7 +1975,7 @@ msgstr "Vous ne pouvez pas changer le type de la remise." msgid "Remittance" msgstr "Remise" -#: apps/treasury/forms.py:130 +#: apps/treasury/forms.py:124 msgid "No attached remittance" msgstr "Pas de remise associée" @@ -2002,11 +2019,6 @@ msgstr "Une facture ne peut plus être modifiée si elle est verrouillée." msgid "tex source" msgstr "fichier TeX source" -#: apps/treasury/models.py:89 -#: apps/treasury/templates/treasury/invoice_form.html:22 -msgid "This invoice is locked and can no longer be edited." -msgstr "Cette facture est verrouillée et ne peut plus être éditée." - #: apps/treasury/models.py:109 apps/treasury/models.py:122 msgid "invoice" msgstr "facture" @@ -2116,11 +2128,12 @@ msgid "Yes" msgstr "Oui" #: apps/treasury/templates/treasury/invoice_confirm_delete.html:10 -#: apps/treasury/views.py:166 +#: apps/treasury/views.py:176 msgid "Delete invoice" msgstr "Supprimer la facture" #: apps/treasury/templates/treasury/invoice_confirm_delete.html:15 +#: apps/treasury/views.py:180 msgid "This invoice is locked and can't be deleted." msgstr "Cette facture est verrouillée et ne peut pas être supprimée." @@ -2288,40 +2301,40 @@ msgstr "" msgid "Create new invoice" msgstr "Créer une nouvelle facture" -#: apps/treasury/views.py:89 +#: apps/treasury/views.py:94 msgid "Invoices list" msgstr "Liste des factures" -#: apps/treasury/views.py:104 apps/treasury/views.py:265 -#: apps/treasury/views.py:391 +#: apps/treasury/views.py:109 apps/treasury/views.py:282 +#: apps/treasury/views.py:408 msgid "You are not able to see the treasury interface." msgstr "Vous n'êtes pas autorisé à voir l'interface de trésorerie." -#: apps/treasury/views.py:114 +#: apps/treasury/views.py:119 msgid "Update an invoice" msgstr "Modifier la facture" -#: apps/treasury/views.py:226 +#: apps/treasury/views.py:243 msgid "Create a new remittance" msgstr "Créer une nouvelle remise" -#: apps/treasury/views.py:253 +#: apps/treasury/views.py:270 msgid "Remittances list" msgstr "Liste des remises" -#: apps/treasury/views.py:316 +#: apps/treasury/views.py:333 msgid "Update a remittance" msgstr "Modifier la remise" -#: apps/treasury/views.py:339 +#: apps/treasury/views.py:356 msgid "Attach a transaction to a remittance" msgstr "Joindre une transaction à une remise" -#: apps/treasury/views.py:383 +#: apps/treasury/views.py:400 msgid "List of credits from the Société générale" msgstr "Liste des crédits de la Société générale" -#: apps/treasury/views.py:426 +#: apps/treasury/views.py:443 msgid "Manage credits from the Société générale" msgstr "Gérer les crédits de la Société générale"