Hopefully improve the _overwrite wording a bit

cabinet/base.py

@@ -137,9 +137,9 @@ class OverwriteMixin(models.Model):
         _('Keep filename when uploading new file?'),
         default=False,
         help_text=_(
-            'By default, Django always generates filenames that'
-            ' do not clash with existing files.'
-        )
+            'By default, a new and unique filename is generated for each file,'
+            ' which also helps with caching.'
+        ),
     )
 
     class Meta:

cabinet/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-13 14:51+0100\n"
+"POT-Creation-Date: 2018-03-18 16:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,129 +17,133 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53 base.py:88
+#: admin.py:22 admin.py:33
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
+#: admin.py:44 base.py:86
 msgid "Image"
 msgstr "Bild"
 
-#: admin.py:57
+#: admin.py:47
 msgid "Download"
 msgstr "Download"
 
-#: admin.py:86 base.py:204
+#: admin.py:76 base.py:200
 msgid "file name"
 msgstr "Dateiname"
 
-#: admin.py:94
+#: admin.py:91
 msgid "details"
 msgstr "Details"
 
 #: apps.py:7
 msgid "Cabinet media library"
 msgstr "Cabinet Medienbibliothek"
 
-#: base.py:50
+#: base.py:48
 msgid "image"
 msgstr "Bild"
 
-#: base.py:58
+#: base.py:56
 msgid "image width"
 msgstr "Bildbreite"
 
-#: base.py:64
+#: base.py:62
 msgid "image height"
 msgstr "Bildhöhe"
 
-#: base.py:69
+#: base.py:67
 msgid "primary point of interest"
 msgstr "Fokuspunkt"
 
-#: base.py:71
+#: base.py:69
 msgid "alternative text"
 msgstr "Alternativer Text"
 
-#: base.py:90
+#: base.py:88
 msgid "Video"
 msgstr "Video"
 
-#: base.py:93
+#: base.py:91
 msgid "Audio"
 msgstr "Ton"
 
-#: base.py:95
+#: base.py:93
 msgid "PDF document"
 msgstr "PDF-Dokument"
 
-#: base.py:96
+#: base.py:94
 msgid "Flash"
 msgstr "Flash"
 
-#: base.py:97
+#: base.py:95
 msgid "Text"
 msgstr "Text"
 
-#: base.py:98
+#: base.py:96
 msgid "Rich Text"
 msgstr "Rich Text"
 
-#: base.py:99
+#: base.py:97
 msgid "Zip archive"
 msgstr "ZIP-Archiv"
 
-#: base.py:100
+#: base.py:98
 msgid "Microsoft Word"
 msgstr "Microsoft Word"
 
-#: base.py:102
+#: base.py:100
 msgid "Microsoft Excel"
 msgstr "Microsoft Excel"
 
-#: base.py:104
+#: base.py:102
 msgid "Microsoft PowerPoint"
 msgstr "Microsoft PowerPoint"
 
-#: base.py:106
+#: base.py:104
 msgid "Binary"
 msgstr "Binär"
 
-#: base.py:110
+#: base.py:108
 msgid "download"
 msgstr "Download"
 
-#: base.py:115
+#: base.py:113
 msgid "download type"
 msgstr "Downloadtyp"
 
-#: base.py:138
+#: base.py:137
 msgid "Keep filename when uploading new file?"
 msgstr "Dateiname beim Hochladen einer neuen Datei beibehalten?"
 
-#: base.py:141
+#: base.py:140
 msgid ""
-"By default, Django always generates filenames that do not clash with "
-"existing files."
+"By default, a new and unique filename is generated for each file, which also "
+"helps with caching."
 msgstr ""
-"Standardmässig generiert Django immer neue Dateinamen, um Konflikte mit "
-"existierenden Dateien zu vermeiden."
+"Standardmässig wird jeweils ein neuer Dateiname generiert, was auch beim "
+"Caching hilft."
 
-#: base.py:199 base_admin.py:86 models.py:48
+#: base.py:195 base_admin.py:86 models.py:50
 #: templates/admin/cabinet/file/change_list.html:24
 #: templates/admin/cabinet/folder/change_form.html:15
 msgid "folder"
 msgstr "Ordner"
 
-#: base.py:208
+#: base.py:204
 msgid "file size"
 msgstr "Dateigrösse"
 
-#: base.py:214
+#: base.py:210
 msgid "file"
 msgstr "Datei"
 
-#: base.py:215 base_admin.py:97
+#: base.py:211 base_admin.py:97
 msgid "files"
 msgstr "Dateien"
 
-#: base.py:240
+#: base.py:232
 msgid "Please fill in exactly one file field!"
 msgstr "Bitte genau ein Dateifeld ausfüllen!"
 
@@ -197,27 +201,27 @@ msgstr "Die Dateien wurden erfolgreich verschoben."
 msgid "Root folder"
 msgstr "Oberster Ordner"
 
-#: models.py:37
+#: models.py:39
 msgid "parent"
 msgstr "übergeordnet"
 
-#: models.py:41
+#: models.py:43
 msgid "name"
 msgstr "Name"
 
-#: models.py:49
+#: models.py:51
 msgid "folders"
 msgstr "Ordner"
 
-#: models.py:68
+#: models.py:70
 msgid "Loop detected."
 msgstr "Ring entdeckt."
 
-#: models.py:74
+#: models.py:83
 msgid "caption"
 msgstr "Legende"
 
-#: models.py:79
+#: models.py:88
 msgid "copyright"
 msgstr "Copyright"
 

cabinet/migrations/0003_file__overwrite.py

@@ -15,6 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='file',
             name='_overwrite',
-            field=models.BooleanField(default=False, help_text='By default, Django always generates filenames that do not clash with existing files.', verbose_name='Overwrite the original file?'),
+            field=models.BooleanField(default=False, help_text='By default, a new and unique filename is generated for each file, which also helps with caching.', verbose_name='Keep filename when uploading new file?'),
         ),
     ]
+