=== ændret fil gui/main.py
--- gui/main.py	2010-09-05 10:55:10 +0000
+++ gui/main.py	2010-10-12 21:24:31 +0000
@@ -994,6 +994,8 @@
            subFileName = without_extension(video.getFileName()) +"." + sub_extension
         elif optionSubtitleName == QVariant("SAME_VIDEOPLUSLANG"):
            subFileName = without_extension(video.getFileName()) +"." +subtitle.getLanguageXXX() +"." + sub_extension
+        elif optionSubtitleName == QVariant("SAME_VIDEOPLUSLANGANDUPLOADER"):
+           subFileName = without_extension(video.getFileName()) +"." +subtitle.getLanguageXXX() +"." +subtitle.getUploader()+"." + sub_extension
         elif optionSubtitleName == QVariant("SAME_ONLINE"):
            subFileName = subtitle.getFileName()
 

=== ændret fil gui/preferences.py
--- gui/preferences.py	2010-09-03 22:50:13 +0000
+++ gui/preferences.py	2010-10-12 21:24:31 +0000
@@ -107,6 +107,8 @@
             self.ui.optionDownloadSameFilename.setChecked(True)
         elif optionSubtitleName == QVariant("SAME_VIDEOPLUSLANG"):
             self.ui.optionDownloadSameFilenamePlusLang.setChecked(True)
+        elif optionSubtitleName == QVariant("SAME_VIDEOPLUSLANGANDUPLOADER"):
+            self.ui.optionDownloadSameFilenamePlusLangAndUploader.setChecked(True)
         elif optionSubtitleName == QVariant("SAME_ONLINE"):
             self.ui.optionDownloadOnlineSubName.setChecked(True)
             
@@ -171,6 +173,8 @@
             settings.setValue("options/subtitleName", QVariant("SAME_VIDEO"))
         elif self.ui.optionDownloadSameFilenamePlusLang.isChecked():
             settings.setValue("options/subtitleName", QVariant("SAME_VIDEOPLUSLANG"))
+        elif self.ui.optionDownloadSameFilenamePlusLangAndUploader.isChecked():
+            settings.setValue("options/subtitleName", QVariant("SAME_VIDEOPLUSLANGANDUPLOADER"))
         elif self.ui.optionDownloadOnlineSubName.isChecked():
             settings.setValue("options/subtitleName", QVariant("SAME_ONLINE"))
         

=== ændret fil gui/preferences.ui
--- gui/preferences.ui	2010-09-05 10:55:10 +0000
+++ gui/preferences.ui	2010-10-12 21:24:31 +0000
@@ -214,6 +214,16 @@
             </property>
            </widget>
           </item>
+		   <item>
+           <widget class="QRadioButton" name="optionDownloadSameFilenamePlusLangAndUploader">
+            <property name="text">
+             <string>Same name as video file + language code + Uploader name (ex: StarWarsCD1.eng.JohnDoe.srt)</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QRadioButton" name="optionDownloadOnlineSubName">
             <property name="text">

=== ændret fil gui/preferences_ui.py
--- gui/preferences_ui.py	2010-03-21 10:46:50 +0000
+++ gui/preferences_ui.py	2010-09-02 19:22:16 +0000
@@ -122,6 +122,10 @@
         self.optionDownloadSameFilenamePlusLang.setChecked(False)
         self.optionDownloadSameFilenamePlusLang.setObjectName("optionDownloadSameFilenamePlusLang")
         self.verticalLayout_2.addWidget(self.optionDownloadSameFilenamePlusLang)
+        self.optionDownloadSameFilenamePlusLangAndUploader = QtGui.QRadioButton(self.groupBox_2)
+        self.optionDownloadSameFilenamePlusLangAndUploader.setChecked(False)
+        self.optionDownloadSameFilenamePlusLangAndUploader.setObjectName("optionDownloadSameFilenamePlusLangAndUploader")
+        self.verticalLayout_2.addWidget(self.optionDownloadSameFilenamePlusLangAndUploader)
         self.optionDownloadOnlineSubName = QtGui.QRadioButton(self.groupBox_2)
         self.optionDownloadOnlineSubName.setObjectName("optionDownloadOnlineSubName")
         self.verticalLayout_2.addWidget(self.optionDownloadOnlineSubName)
@@ -276,6 +280,7 @@
         self.groupBox_2.setTitle(_("Filename of the Subtitle:"))
         self.optionDownloadSameFilename.setText(_("Same name as video file"))
         self.optionDownloadSameFilenamePlusLang.setText(_("Same name as video file + language code (ex: StarWarsCD1.eng.srt)"))
+        self.optionDownloadSameFilenamePlusLangAndUploader.setText(_("Same name as video file + language code + Uploader (ex: StarWarsCD1.eng.JohnDoe.srt)"))
         self.optionDownloadOnlineSubName.setText(_("Same name as the online subtitle"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_6), _("Download"))
         self.label_55.setText(_("Default language of uploaded subtitles"))