From mhammond at users.sourceforge.net Fri Mar 9 00:21:34 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Thu, 08 Mar 2007 15:21:34 -0800 Subject: [Spambayes-checkins] spambayes/spambayes i18n.py,1.6,1.7 Message-ID: <20070308232138.1B4B21E4021@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3342 Modified Files: i18n.py Log Message: Patch [ 1676576 ] gettext localization broken at all from Marko von Oppen Index: i18n.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/i18n.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** i18n.py 13 Apr 2005 05:56:44 -0000 1.6 --- i18n.py 8 Mar 2007 23:21:30 -0000 1.7 *************** *** 88,92 **** this_filename = __file__ LC_DIR = os.path.dirname(os.path.dirname(this_filename)) ! DIALOGS_DIR = os.path.join(os.path.dirname(__file__), "languages") else: try: --- 88,93 ---- this_filename = __file__ LC_DIR = os.path.dirname(os.path.dirname(this_filename)) ! LANG_DIR = os.path.join(os.path.dirname(__file__), "languages") ! else: try: *************** *** 94,100 **** except NameError: # no __file__ - means Py2.2 and __name__=='__main__' this_filename = os.path.abspath(sys.argv[0]) ! LC_DIR = os.path.dirname(this_filename) ! DIALOGS_DIR = os.path.join(LC_DIR, "languages") ! class LanguageManager: --- 95,101 ---- except NameError: # no __file__ - means Py2.2 and __name__=='__main__' this_filename = os.path.abspath(sys.argv[0]) ! LANG_DIR = os.path.join(os.path.dirname(this_filename), "languages") ! LC_DIR = LANG_DIR ! class LanguageManager: *************** *** 168,173 **** self._clear_syspath() for lcode in self.current_langs_codes: ! code_and_country = os.path.join(DIALOGS_DIR, lcode, 'DIALOGS') ! code_only = os.path.join(DIALOGS_DIR, lcode.split("_")[0], 'DIALOGS') if code_and_country not in sys.path: sys.path.append(code_and_country) --- 169,174 ---- self._clear_syspath() for lcode in self.current_langs_codes: ! code_and_country = os.path.join(LANG_DIR, lcode, 'DIALOGS') ! code_only = os.path.join(LANG_DIR, lcode.split("_")[0], 'DIALOGS') if code_and_country not in sys.path: sys.path.append(code_and_country) From mhammond at users.sourceforge.net Fri Mar 9 00:25:10 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Thu, 08 Mar 2007 15:25:10 -0800 Subject: [Spambayes-checkins] spambayes/Outlook2000 filter.py,1.47,1.48 Message-ID: <20070308232511.F05A01E4002@bag.python.org> Update of /cvsroot/spambayes/spambayes/Outlook2000 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5049 Modified Files: filter.py Log Message: Patch [ 1676324 ] Action texts should be localized >From Marko von Oppen. Index: filter.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/Outlook2000/filter.py,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** filter.py 29 Dec 2004 06:22:31 -0000 1.47 --- filter.py 8 Mar 2007 23:25:07 -0000 1.48 *************** *** 10,14 **** --- 10,21 ---- True, False = 1, 0 + # Action texts could be localized. + # So comparing the action texts should be done using the same localized text. + # These variables store the actions texts in the same localized form how the + # user sees them in the Action dropdowns from configuration dialogs + ACTION_MOVE, ACTION_COPY, ACTION_NONE = None, None, None + def filter_message(msg, mgr, all_actions=True): + config = mgr.config.filter prob = mgr.score(msg) *************** *** 32,35 **** --- 39,47 ---- ms = mgr.message_store try: + global ACTION_NONE, ACTION_COPY, ACTION_MOVE + if ACTION_NONE is None: ACTION_NONE = _("Untouched").lower() + if ACTION_COPY is None: ACTION_COPY = _("Copied").lower() + if ACTION_MOVE is None: ACTION_MOVE = _("Moved").lower() + try: # Save the score *************** *** 84,90 **** if mark_as_read: msg.SetReadState(True) ! if action.startswith("un"): # untouched mgr.LogDebug(1, "Not touching message '%s'" % msg.subject) ! elif action.startswith("co"): # copied try: dest_folder = ms.GetFolder(folder_id) --- 96,102 ---- if mark_as_read: msg.SetReadState(True) ! if action == ACTION_NONE: mgr.LogDebug(1, "Not touching message '%s'" % msg.subject) ! elif action == ACTION_COPY: try: dest_folder = ms.GetFolder(folder_id) *************** *** 96,100 **** mgr.LogDebug(1, "Copied message '%s' to folder '%s'" \ % (msg.subject, dest_folder.GetFQName())) ! elif action.startswith("mo"): # Moved try: dest_folder = ms.GetFolder(folder_id) --- 108,112 ---- mgr.LogDebug(1, "Copied message '%s' to folder '%s'" \ % (msg.subject, dest_folder.GetFQName())) ! elif action == ACTION_MOVE: try: dest_folder = ms.GetFolder(folder_id) From mhammond at users.sourceforge.net Fri Mar 9 00:27:16 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Thu, 08 Mar 2007 15:27:16 -0800 Subject: [Spambayes-checkins] spambayes README-DEVEL.txt,1.23,1.24 Message-ID: <20070308232717.78FF41E4002@bag.python.org> Update of /cvsroot/spambayes/spambayes In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5888 Modified Files: README-DEVEL.txt Log Message: Patch [ 1676437 ] Localization documentation >From Marko von Oppen Index: README-DEVEL.txt =================================================================== RCS file: /cvsroot/spambayes/spambayes/README-DEVEL.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** README-DEVEL.txt 20 Apr 2006 03:12:17 -0000 1.23 --- README-DEVEL.txt 8 Mar 2007 23:27:13 -0000 1.24 *************** *** 687,691 **** ..\testtools\*.py ..\utilities\*.py ..\windows\*.py ! You may wish to use a GUI system to create the required *.po file, such as poEdit, but you can also do this manually with a text editor. If your utility does not do it for you, you will also need to --- 687,691 ---- ..\testtools\*.py ..\utilities\*.py ..\windows\*.py ! You may wish to use a GUI system to create the required messages.po file, such as poEdit, but you can also do this manually with a text editor. If your utility does not do it for you, you will also need to From mhammond at users.sourceforge.net Wed Mar 14 01:46:44 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Tue, 13 Mar 2007 16:46:44 -0800 Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs processors.py, 1.15, 1.16 Message-ID: <20070314004647.0A13E1E4008@bag.python.org> Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7623/Outlook2000/dialogs Modified Files: processors.py Log Message: Patch [ 1679610 ] Non localized error message Index: processors.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/processors.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** processors.py 8 Feb 2004 02:14:48 -0000 1.15 --- processors.py 14 Mar 2007 00:46:41 -0000 1.16 *************** *** 80,92 **** problem = self.window.manager.GetDisabledReason() if problem: ! q = "There appears to be a problem with SpamBayes' configuration" \ "\r\nIf you do not fix this problem, SpamBayes will be" \ ! " disabled.\r\n\r\n" + problem + \ ! "\r\n\r\nDo you wish to re-configure?" if self.window.manager.AskQuestion(q): return win32gui.EndDialog(self.window.hwnd, id) def GetPopupHelpText(self, ctrlid): ! return "Closes this dialog" class CommandButtonProcessor(ButtonProcessor): --- 80,92 ---- problem = self.window.manager.GetDisabledReason() if problem: ! q = _("There appears to be a problem with SpamBayes' configuration" \ "\r\nIf you do not fix this problem, SpamBayes will be" \ ! " disabled.\r\n\r\n%s" \ ! "\r\n\r\nDo you wish to re-configure?") % (problem,) if self.window.manager.AskQuestion(q): return win32gui.EndDialog(self.window.hwnd, id) def GetPopupHelpText(self, ctrlid): ! return _("Closes this dialog") class CommandButtonProcessor(ButtonProcessor): From mhammond at users.sourceforge.net Wed Mar 14 02:06:10 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Tue, 13 Mar 2007 17:06:10 -0800 Subject: [Spambayes-checkins] spambayes/spambayes/languages/de/DIALOGS - New directory Message-ID: <20070314010611.C54981E400E@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/languages/de/DIALOGS In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16136/DIALOGS Log Message: Directory /cvsroot/spambayes/spambayes/spambayes/languages/de/DIALOGS added to the repository From mhammond at users.sourceforge.net Wed Mar 14 02:06:10 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Tue, 13 Mar 2007 17:06:10 -0800 Subject: [Spambayes-checkins] spambayes/spambayes/languages/de/LC_MESSAGES - New directory Message-ID: <20070314010611.C10E51E4011@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/languages/de/LC_MESSAGES In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16136/LC_MESSAGES Log Message: Directory /cvsroot/spambayes/spambayes/spambayes/languages/de/LC_MESSAGES added to the repository From mhammond at users.sourceforge.net Wed Mar 14 02:09:38 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Tue, 13 Mar 2007 17:09:38 -0800 Subject: [Spambayes-checkins] spambayes/spambayes/languages/de .cvsignore, NONE, 1.1 __init__.py, NONE, 1.1 Message-ID: <20070314010940.9DC0F1E4008@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/languages/de In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17616/de Added Files: .cvsignore __init__.py Log Message: [ 1679626 ] Localization files German from Marko von Oppen --- NEW FILE: .cvsignore --- *.pyc *.pyo --- NEW FILE: __init__.py --- """Design-time __init__.py for resourcepackage This is the scanning version of __init__.py for your resource modules. You replace it with a blank or doc-only init when ready to release. """ try: __file__ except NameError: pass else: import os if os.path.splitext(os.path.basename( __file__ ))[0] == "__init__": try: from resourcepackage import package, defaultgenerators generators = defaultgenerators.generators.copy() ### CUSTOMISATION POINT ## import specialised generators here, such as for wxPython #from resourcepackage import wxgenerators #generators.update( wxgenerators.generators ) except ImportError: pass else: package = package.Package( packageName = __name__, directory = os.path.dirname( os.path.abspath(__file__) ), generators = generators, ) package.scan( ### CUSTOMISATION POINT ## force true -> always re-loads from external files, otherwise ## only reloads if the file is newer than the generated .py file. # force = 1, ) From mhammond at users.sourceforge.net Wed Mar 14 02:09:39 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Tue, 13 Mar 2007 17:09:39 -0800 Subject: [Spambayes-checkins] spambayes/spambayes/languages/de/LC_MESSAGES __init__.py, NONE, 1.1 messages.mo, NONE, 1.1 messages.po, NONE, 1.1 Message-ID: <20070314010940.E9EE01E4008@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/languages/de/LC_MESSAGES In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17616/de/LC_MESSAGES Added Files: __init__.py messages.mo messages.po Log Message: [ 1679626 ] Localization files German from Marko von Oppen --- NEW FILE: __init__.py --- --- NEW FILE: messages.mo --- (This appears to be a binary file; contents omitted.) --- NEW FILE: messages.po --- msgid "" msgstr "" "Project-Id-Version: SpamBayes 1.1\n" "POT-Creation-Date: \n" "PO-Revision-Date: 2007-03-13 09:09+0100\n" "Last-Translator: Marko von Oppen \n" "Language-Team: Marko von Oppen \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" #: ..\Outlook2000\addin.py:602 msgid "Are you sure you want to permanently delete all items in the \"%s\" folder?" msgstr "Sind Sie sicher, dass Sie alle Nachrichten im Ordner \"%s\" l?schen wollen?" #: ..\Outlook2000\addin.py:613 msgid "The \"%s\" folder is already empty." [...3253 lines suppressed...] #: UserInterface.py:1199 msgid "[YOUR EMAIL ADDRESS]" msgstr "" #: UserInterface.py:1201 msgid "[DESCRIBE YOUR PROBLEM HERE]" msgstr "" #: UserInterface.py:1203 msgid "[PROBLEM SUMMARY]" msgstr "" #: Version.py:224 msgid "%s Version %s (%s)" msgstr "%s Version %s (%s)" #: __init__.py:9 msgid "August 2006" msgstr "August 2006" From mhammond at users.sourceforge.net Wed Mar 14 02:09:39 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Tue, 13 Mar 2007 17:09:39 -0800 Subject: [Spambayes-checkins] spambayes/spambayes/languages/de/DIALOGS .cvsignore, NONE, 1.1 __init__.py, NONE, 1.1 dialogs.rc, NONE, 1.1 i18n_dialogs.py, NONE, 1.1 Message-ID: <20070314013343.CB77E1E4008@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/languages/de/DIALOGS In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17616/de/DIALOGS Added Files: .cvsignore __init__.py dialogs.rc i18n_dialogs.py Log Message: [ 1679626 ] Localization files German from Marko von Oppen --- NEW FILE: .cvsignore --- *.pyc *.pyo *.bmp *.h *.aps --- NEW FILE: __init__.py --- --- NEW FILE: dialogs.rc --- //Microsoft Developer Studio generated resource script. // #include "dialogs.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // #include "winres.h" // spambayes dialog definitions ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // Deutsch (Deutschland) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) #ifdef _WIN32 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // Dialog // IDD_ADVANCED DIALOGEX 0, 0, 248, 257 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Erweitert" FONT 8, "Tahoma" BEGIN GROUPBOX "Zeitliches Verhalten",IDC_STATIC,7,3,234,117 CONTROL "",IDC_DELAY1_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,16,36,148,22 LTEXT "Wartezeit vor dem start",IDC_STATIC,16,26,101,8 EDITTEXT IDC_DELAY1_TEXT,165,39,40,14,ES_AUTOHSCROLL LTEXT "seconds",IDC_STATIC,208,41,28,8 CONTROL "",IDC_DELAY2_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,16,73,148,22 LTEXT "Wartezeit zwischen zwei Elementen",IDC_STATIC,16,62,142, 8 EDITTEXT IDC_DELAY2_TEXT,165,79,40,14,ES_AUTOHSCROLL LTEXT "seconds",IDC_STATIC,207,82,28,8 CONTROL "Nur f?r Ordner, die neue Nachrichten erhalten", IDC_INBOX_TIMER_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,100,217,10 PUSHBUTTON "Datenordner zeigen",IDC_SHOW_DATA_FOLDER,7,238,70,14 CONTROL "Filtern im Hintergrund aktivieren", IDC_BUT_TIMER_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,12,162,10 PUSHBUTTON "Diagnose...",IDC_BUT_SHOW_DIAGNOSTICS,171,238,70,14 END IDD_STATISTICS DIALOG DISCARDABLE 0, 0, 248, 257 STYLE WS_CHILD | WS_CAPTION CAPTION "Statistik" FONT 8, "Tahoma" BEGIN GROUPBOX "Statistik",IDC_STATIC,7,3,241,229 LTEXT "some stats\nand some more\nline 3\nline 4\nline 5", IDC_STATISTICS,12,12,230,204 PUSHBUTTON "Statistik zur?cksetzen",IDC_BUT_RESET_STATS,165,238,83, 14 LTEXT "Zuletzt zur?ckgesetzt:",IDC_STATIC,7,241,72,8 LTEXT "<<>>",IDC_LAST_RESET_DATE,84,241,70,8 END IDD_MANAGER DIALOGEX 0, 0, 275, 308 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "SpamBayes Manager" FONT 8, "Tahoma" BEGIN DEFPUSHBUTTON "Schlie?en",IDOK,216,287,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,155,287,50,14,NOT WS_VISIBLE CONTROL "",IDC_TAB,"SysTabControl32",0x0,8,7,258,276 PUSHBUTTON "?ber...",IDC_ABOUT_BTN,8,287,50,14 END IDD_DIAGNOSTIC DIALOGEX 0, 0, 183, 98 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Diagnose" FONT 8, "Tahoma" BEGIN LTEXT "Diese erweiterten Optionen sind nur f?r die Fehlersuche gedacht. Sie sollten hier nur Werte ?ndern, wenn Sie dazu aufgefordert wurden oder wenn Sie genau wissen, was sie bedeuten.", IDC_STATIC,5,3,174,36 LTEXT "Ausf?hrlichkeit Logdatei",IDC_STATIC,5,44,77,8 EDITTEXT IDC_VERBOSE_LOG,84,42,31,14,ES_AUTOHSCROLL PUSHBUTTON "Log ansehen...",IDC_BUT_VIEW_LOG,117,41,62,14 CONTROL "Spamwert sichern",IDC_SAVE_SPAM_SCORE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,5,63,72,10 PUSHBUTTON "Abbrechen",IDCANCEL,69,79,50,14,NOT WS_VISIBLE DEFPUSHBUTTON "Schlie?en",IDOK,129,79,50,14 END IDD_FILTER DIALOGEX 0, 0, 249, 257 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Filtern" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN LTEXT "Die folgenden Ordner filtern beim Eintreffen neuer Nachrichten", IDC_STATIC,8,4,207,11 CONTROL "Folder names...\nLine 2",IDC_FOLDER_WATCH,"Static", SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,7,16,177,12 PUSHBUTTON "Durchsuchen",IDC_BROWSE_WATCH,192,14,50,14 GROUPBOX "Zweifelsfrei Spam",IDC_STATIC,7,31,235,82 LTEXT "Um sicher Spam zu sein, muss der Spamwert mindestens betragen:", IDC_STATIC,12,40,225,10 CONTROL "Slider1",IDC_SLIDER_CERTAIN,"msctls_trackbar32", TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,13,50,165,22 EDITTEXT IDC_EDIT_CERTAIN,184,53,51,14,ES_AUTOHSCROLL LTEXT "und folgende Aktion soll mit dieser Nachricht durchgef?hrt werden:", IDC_STATIC,13,72,223,10 COMBOBOX IDC_ACTION_CERTAIN,12,83,55,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "in Ordner",IDC_STATIC,71,85,31,10 CONTROL "Ordner Namen",IDC_FOLDER_CERTAIN,"Static", SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,103,83,77,14 PUSHBUTTON "Durchsuchen",IDC_BROWSE_CERTAIN,184,83,50,14 GROUPBOX "M?glicherweise Spam",IDC_STATIC,6,117,235,84 LTEXT "Um als unsicher gelten, muss der Spamwert mindestens betragen:", IDC_STATIC,12,128,212,10 CONTROL "Slider1",IDC_SLIDER_UNSURE,"msctls_trackbar32", TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,12,137,165,20 EDITTEXT IDC_EDIT_UNSURE,183,141,54,14,ES_AUTOHSCROLL LTEXT "und folgende Aktion soll mit dieser Nachricht durchgef?hrt werden:", IDC_STATIC,12,158,217,10 COMBOBOX IDC_ACTION_UNSURE,12,169,55,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "in Ordner",IDC_STATIC,71,172,31,10 CONTROL "(folder name)",IDC_FOLDER_UNSURE,"Static", SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,103,169,77,14 PUSHBUTTON "Durchsuchen",IDC_BROWSE_UNSURE,184,169,50,14 CONTROL "Spam als gelesen markieren",IDC_MARK_SPAM_AS_READ, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,100,154,10 CONTROL "M?glichen Spam als gelesen markieren", IDC_MARK_UNSURE_AS_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,189,190,10 GROUPBOX "Sicher gut",IDC_STATIC,6,206,235,48 LTEXT "Aktion f?r gute Nachrichten:",IDC_STATIC,12,218,107,10 COMBOBOX IDC_ACTION_HAM,12,231,55,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "in Ordner",IDC_STATIC,71,233,31,10 CONTROL "(folder name)",IDC_FOLDER_HAM,"Static", SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,103,231,77,14 PUSHBUTTON "Durchsuchen",IDC_BROWSE_HAM,184,231,50,14 END IDD_GENERAL DIALOGEX 0, 0, 253, 257 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Allgemein" FONT 8, "Tahoma" BEGIN LTEXT "SpamBayes Version Here",IDC_VERSION,6,54,242,8 LTEXT "SpamBayes ben?tigt Training, bevor es effektiv arbeiten kann. Klicken Sie auf die Registerkarte Training, um das Training durchzuf?hren.", IDC_STATIC,6,67,242,17 LTEXT "Status der Training Datenbank",IDC_STATIC,6,90,222,8 LTEXT "123 spam messages; 456 good messages\r\nLine2\r\nLine3", IDC_TRAINING_STATUS,6,101,242,27,SS_SUNKEN CONTROL "SpamBayes aktivieren",IDC_BUT_FILTER_ENABLE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,6,221,97,11 LTEXT "Certain spam is moved to Folder1\nPossible spam is moved too", IDC_FILTER_STATUS,6,146,242,67,SS_SUNKEN PUSHBUTTON "Konfiguration zur?cksetzen...",IDC_BUT_RESET,6,238,108, 15 PUSHBUTTON "Konfigurationsassistent...",IDC_BUT_WIZARD,155,238,93, 15 LTEXT "Filter Status:",IDC_STATIC,6,135,222,8 CONTROL 1062,IDC_LOGO_GRAPHIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,0,2,275,52 END IDD_TRAINING DIALOGEX 0, 0, 252, 257 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Training" FONT 8, "Tahoma" BEGIN GROUPBOX "",IDC_STATIC,5,1,243,113 CONTROL "Ordner mit bekannterma?en guten Nachrichten",IDC_STATIC, "Static",SS_LEFTNOWORDWRAP | WS_GROUP,11,11,170,11 CONTROL "",IDC_STATIC_HAM,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN,11,21,175,12 PUSHBUTTON "Durchsuchen",IDC_BROWSE_HAM,192,20,50,14 LTEXT "Ordner mit Spam oder anderen M?llnachrichten", IDC_STATIC,11,36,171,9 CONTROL "Static",IDC_STATIC_SPAM,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,11,46,174,12 PUSHBUTTON "Durchsuchen",IDC_BROWSE_SPAM,192,46,50,14 CONTROL "Nachrichten nach Training bewerten",IDC_BUT_RESCORE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,64,131,10 CONTROL "Datenbank komplett neu",IDC_BUT_REBUILD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,147,64,94,10 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER, 11,76,231,11 PUSHBUTTON "Training &starten",IDC_START,11,91,54,14,BS_NOTIFY LTEXT "training status training status training status training status training status training status training status ", IDC_PROGRESS_TEXT,75,89,149,17 GROUPBOX "InkrementellesTraining",IDC_STATIC,4,117,244,87 CONTROL "Trainieren, dass eine Nachricht 'gut' ist, wenn sie aus einem Spam-Ordner in den Posteingang verschoben wird", IDC_BUT_TRAIN_FROM_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,127,204,18 LTEXT "Klicken auf 'Kein Spam' soll die Nachricht...", IDC_STATIC,10,148,141,10 COMBOBOX IDC_RECOVER_RS,153,145,88,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Trainieren, dass eine Nachricht Spam ist, wenn sie in den Spam-Ordner verschoben wird.", IDC_BUT_TRAIN_TO_SPAM_FOLDER,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,163,204,16 LTEXT "Klicken auf 'Spam' soll die Nachricht...",IDC_STATIC,10, 183,140,10 COMBOBOX IDC_DEL_SPAM_RS,153,180,88,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_FILTER_NOW DIALOGEX 0, 0, 244, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Jetzt filtern" FONT 8, "Tahoma" BEGIN LTEXT "Die folgenden Ordner filtern",IDC_STATIC,8,9,168,11 CONTROL "Folder names...\nLine 2",IDC_FOLDER_NAMES,"Static", SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN,7,20,172, 12 PUSHBUTTON "Durchsuchen",IDC_BROWSE,187,19,50,14 GROUPBOX "Filteraktionen",IDC_STATIC,7,38,230,40,WS_GROUP CONTROL "Alle Aktionen ausf?hren",IDC_BUT_ACT_ALL,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,49,126,10 CONTROL "Nachrichten bewerten, aber keine Aktionen ausf?hren", IDC_BUT_ACT_SCORE,"Button",BS_AUTORADIOBUTTON,15,62,203, 10 GROUPBOX "Filter beschr?nken",IDC_STATIC,7,84,230,35,WS_GROUP CONTROL "Nur ungelesene Nachrichten bearbeiten",IDC_BUT_UNREAD, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,149,9 CONTROL "Nur ungefilterte Nachrichten verarbeiten", IDC_BUT_UNSEEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15, 106,149,9 CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER,7, 129,230,11 LTEXT "Static",IDC_PROGRESS_TEXT,7,144,227,10 DEFPUSHBUTTON "Start filtern",IDC_START,7,161,52,14 PUSHBUTTON "Schlie?en",IDCANCEL,187,162,50,14 END IDD_FOLDER_SELECTOR DIALOG DISCARDABLE 0, 0, 247, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ordner ausw?hlen" FONT 8, "Tahoma" BEGIN LTEXT "&Folders:",IDC_STATIC,7,7,47,9 CONTROL "",IDC_LIST_FOLDERS,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_CHECKBOXES | WS_BORDER | WS_TABSTOP,7,21,172,140 CONTROL "(sub)",IDC_BUT_SEARCHSUB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,126,9 LTEXT "(status1)",IDC_STATUS1,7,180,220,9 LTEXT "(status2)",IDC_STATUS2,7,194,220,9 DEFPUSHBUTTON "OK",IDOK,190,21,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,190,39,50,14 PUSHBUTTON "Alle l?schen",IDC_BUT_CLEARALL,190,58,50,14 PUSHBUTTON "Neuer Ordner",IDC_BUT_NEW,190,77,50,14 END IDD_WIZARD DIALOGEX 0, 0, 384, 190 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "SpamBayes Konfigurationsassistent" FONT 8, "Tahoma" BEGIN PUSHBUTTON "Abbrechen",IDCANCEL,328,173,50,14 PUSHBUTTON "<< Zur?ck",IDC_BACK_BTN,216,173,50,14 DEFPUSHBUTTON "Weiter >>,Beenden",IDC_FORWARD_BTN,269,173,50,14 CONTROL "",IDC_PAGE_PLACEHOLDER,"Static",SS_ETCHEDFRAME,75,4,303, 167 CONTROL 125,IDC_WIZ_GRAPHIC,"Static",SS_BITMAP,0,0,69,190 END IDD_WIZARD_WELCOME DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN LTEXT "Willkommen zum SpamBayes Konfigurationsassistenten", IDC_STATIC,20,4,191,14 LTEXT "Dieser Assistent hilft Ihnen, SpamBayes einzurichten. Bitte geben Sie an, wie Sie sich auf den Umgang mit dem Programm vorbereitet haben.", IDC_STATIC,20,20,255,18 CONTROL "Ich habe gar nichts vorbereitet.",IDC_BUT_PREPARATION, "Button",BS_AUTORADIOBUTTON | BS_TOP | WS_GROUP,20,42, 190,11 CONTROL "Ich habe bereits Spam und 'gute' Nachrichten (Ham) in f?r das Training geeignete Ordner sortiert.", IDC_STATIC,"Button",BS_AUTORADIOBUTTON | BS_TOP | BS_MULTILINE,20,59,255,18 CONTROL "Ich bevorzuge, SpamBayes manuell zu konfigurieren (Expertenmodus)", IDC_STATIC,"Button",BS_AUTORADIOBUTTON | BS_TOP,20,82, 255,12 LTEXT "Wenn Sie mehr ?ber die Konfiguration und das Training von SpamBayes erfahren m?chten, dr?cken Sie den Knopf '?ber...'", IDC_STATIC,20,103,206,22 PUSHBUTTON "?ber...",IDC_BUT_ABOUT,233,104,42,15 LTEXT "Wenn Sie den SpamBayes Konfigurationsassistenten abbrechen, k?nnen Sie ihn jederzeit ?ber den SpamBayes Manager von der Outlook Symbolleiste neu starten.", IDC_STATIC,20,129,247,26 END IDD_WIZARD_FINISHED_UNTRAINED DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN LTEXT "Gratulation",IDC_STATIC,20,4,247,14 LTEXT "SpamBayes ist jetzt konfiguriert und bereit, ?ber ihre Nachrichten zu lernen.", IDC_STATIC,20,22,247,16 LTEXT "Weil SpamBayes nicht trainiert ist, landen alle Nachrichten im Ordner 'unsicher'. Bitte benutzen Sie die Schaltfl?chen 'Spam' und 'Kein Spam', um SpamBayes zu trainieren.", IDC_STATIC,20,42,247,27 LTEXT "Wenn Sie die Lernzeit verk?rzen wollen, verschieben Sie allen vorhandenen Spam in einen Ordner und trainieren danach SpamBayes mit Hilfe des SpamBayes Managers.", IDC_STATIC,20,94,247,31 LTEXT "Wenn Sie SpamBayes auf diese Weise trainieren, werden Sie feststellen, dass die Genauigkeit von SpamBayes zunimmt.", IDC_STATIC,20,69,247,18 LTEXT "Klicken Sie 'Beenden', um den Assistenten zu schlie?en.", IDC_STATIC,20,132,263,9 END IDD_WIZARD_FOLDERS_REST DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN PUSHBUTTON "Durchsuchen",IDC_BROWSE_SPAM,208,100,60,15 LTEXT "Ordner f?r Spam und 'unsichere' Nachrichten",IDC_STATIC, 20,4,247,14 LTEXT "SpamBayes benutzt zwei Ordner, um Spam zu verwalten. Einen Ordner, der Nachrichten enth?lt, bei denen sich SpamBayes sicher ist und einen, wo es unsicher ist.", IDC_STATIC,20,20,247,29 LTEXT "Wenn Sie einen Ordnernamen eingeben, der nicht existiert, wird ein Ordner mit diesem Namen erstellt. Sollten Sie einen bereits existierenden Ordner bevorzugen, klicken Sie auf 'Durchsuchen', um den Ordner auszuw?hlen.", IDC_STATIC,20,53,243,24 EDITTEXT IDC_FOLDER_CERTAIN,20,100,179,14,ES_AUTOHSCROLL LTEXT "Unsichere Nachrichten kommen in folgenden Ordner:", IDC_STATIC,20,121,227,12 EDITTEXT IDC_FOLDER_UNSURE,20,132,177,14,ES_AUTOHSCROLL LTEXT "Spam soll in folgenden Ordner zugestellt werden:", IDC_STATIC,20,89,189,8 PUSHBUTTON "Durchsuchen",IDC_BROWSE_UNSURE,208,132,60,15 END IDD_WIZARD_FOLDERS_WATCH DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN PUSHBUTTON "Durchsuchen",IDC_BROWSE_WATCH,225,134,50,14 LTEXT "Ordner, in denen neue Nachrichten eintreffen", IDC_STATIC,20,4,247,14 LTEXT "SpamBayes muss wissen, in welchen Ordnern neue Nachrichten eintreffen. In den meisen F?llen ist dies der Posteingang. Sie k?nnen aber weitere Ordner angeben, die von SpamBayes ?berwacht werden sollen.", IDC_STATIC,20,21,247,25 LTEXT "Die folgende Liste enth?lt die zu beobachtenden Ordner. Dr?cken Sie auf 'Durchsuchen', um die Liste zu ?ndern, bzw. auf 'Weiter', um fortzufahren.", IDC_STATIC,20,79,247,20 LTEXT "Wenn Sie den Outlook Regelassistenten benutzen, um Nachrichten zu verschieben, k?nnen Sie solche Ordner zus?tzlich angeben.", IDC_STATIC,20,51,241,20 EDITTEXT IDC_FOLDER_WATCH,20,100,195,48,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY END IDD_WIZARD_FINISHED_UNCONFIGURED DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN LTEXT "Konfiguration abgebrochen",IDC_STATIC,20,4,247,14 LTEXT "Die SpamBayes Optionen werden jetzt angezeigt. Sie m?ssen Ihre Ordner ausw?hlen, bevor SpamBayes beginnt, Nachrichten zu filtern.", IDC_STATIC,20,29,247,16 LTEXT "Klicken Sie auf 'Beenden', um den Assistenten zu beenden.", IDC_STATIC,20,139,240,16 END IDD_WIZARD_FOLDERS_TRAIN DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN PUSHBUTTON "Druchsuchen",IDC_BROWSE_HAM,208,49,60,15 LTEXT "Training",IDC_STATIC,20,4,247,10 LTEXT "Bitte w?hlen Sie die Nachrichten mit dem vorsortierten Spam und den vorsortierten 'guten' Nachrichten.", IDC_STATIC,20,16,243,16 EDITTEXT IDC_FOLDER_HAM,20,49,179,14,ES_AUTOHSCROLL | ES_READONLY LTEXT "Beispiele von Spam und anderer unerw?nschter Nachrichten finden sich hier:", IDC_STATIC,20,71,248,8 EDITTEXT IDC_FOLDER_CERTAIN,20,81,177,14,ES_AUTOHSCROLL | ES_READONLY LTEXT "Beispiele 'guter' Nachrichten finden sich unter", IDC_STATIC,20,38,153,8 PUSHBUTTON "Durchsuchen",IDC_BROWSE_SPAM,208,81,60,15 LTEXT "Wenn Sie keine vorsortierten Nachrichten haben oder bereits vorhandene SpamBayes-Daten weiter benutzen m?chten, gehen Sie bitte zur?ck und geben an, dass Sie sich nicht vorbereitet haben.", IDC_STATIC,20,128,243,26 CONTROL "Nachrichten nach dem Training bewerten",IDC_BUT_RESCORE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,108,163,16 END IDD_WIZARD_TRAIN DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN LTEXT "Training",-1,20,4,247,14 LTEXT "SpamBayes wird trainiert anhand Ihrer guten Nachrichten und Ihres Spams", -1,20,22,247,16 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,20,45,255, 11 LTEXT "(progress text)",IDC_PROGRESS_TEXT,20,61,257,10 END IDD_WIZARD_FINISHED_TRAINED DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN LTEXT "Gratulation",IDC_STATIC,20,4,247,14 LTEXT "SpamBayes wurde erfolgreich trainiert und konfiguriert. SpamBayes sollte jetzt bereit sein, die Nachrichten effektiv zu filtern.", IDC_TRAINING_STATUS,20,35,247,26 LTEXT "Obwohl SpamBayes jetzt erfolgreich trainiert wurde, lernt SpamBayes weiter. Bitte schauen Sie regelm??ig in den Ordner mit den 'unsicheren' Nachrichten und benutzen die Schaltfl?chen 'Spam' und 'Kein Spam'.", IDC_STATIC,20,68,249,30 LTEXT "Klicken Sie auf Beenden, um den Assistenten zu schlie?en.", IDC_STATIC,20,104,257,23 END IDD_WIZARD_TRAINING_IS_IMPORTANT DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN LTEXT "SpamBayes kann nicht effektiv arbeiten, wenn es untrainiert ist.", IDC_STATIC,11,8,263,11 PUSHBUTTON "Training...",IDC_BUT_ABOUT,225,140,49,15 LTEXT "SpamBayes besitzt keine vordefinierten Regeln sondern lernt von Ihnen, Spam von 'guten' Nachrichten (Ham) zu unterscheiden. Sie m?ssen SpamBayes deshalb Ordner mit guten und schlechten Nachrichten zum Training zur Verf?gung stellen.", IDC_STATIC,11,21,263,30 LTEXT "In diesem Fall stellt SpamBayes anfangs alle Nachrichten in den Ordner 'unsicher'. W?hrend Sie dann mit den Kn?pfen 'Spam' und 'Kein Spam' die Nachrichten zuordnen, lernt SpamBayes den Umgang mit Ihren Nachrichten.", IDC_STATIC,22,61,252,29 LTEXT "Diese Option wird den Assistenten beenden und erkl?ren, wie Sie Ihre Nachrichten vorsortieren k?nnen. Danach k?nnen Sie SpamBayes trainieren und SpamBayes wird sofort beginnen, effektiv zu arbeiten.", IDC_STATIC,22,106,252,27 LTEXT "F?r mehr Informationen bet?tigen Sie bitte den Knopf 'Training...'", IDC_STATIC,11,143,211,12 CONTROL "Ich m?chte ohne Training fortfahren",IDC_BUT_UNTRAINED, "Button",BS_AUTORADIOBUTTON | WS_GROUP,11,50,263,11 CONTROL "Ich werde die Nachrichten vorsortieren und SpamBayes danach konfigurieren.", IDC_BUT_TRAIN,"Button",BS_AUTORADIOBUTTON,11,92,263,11 END IDD_WIZARD_FINISHED_TRAIN_LATER DIALOGEX 0, 0, 284, 162 STYLE WS_CHILD | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP FONT 8, "Tahoma" BEGIN LTEXT "Konfiguration angehalten",IDC_STATIC,20,4,247,14 LTEXT "Um mit dem Training zu beginnen, sollten Sie einen Ordner erstellen, der nur Beispiele von 'guten' Nachrichten enth?lt und einen, der nur Beispiele von Spam enth?lt.", IDC_STATIC,20,17,257,27 LTEXT "Klicken Sie auf 'Beenden', um den Assistenten zu schlie?en.", IDC_STATIC,20,145,228,9 LTEXT "F?r Beispiele von 'guten' Nachrichten k?nnen Sie z.B. den Posteingang benutzen. Es ist aber wichtig, aus diesem erst den gesamten Spam zu entfernen, bevor Sie fortfahren. Wenn Sie zuviel in Ihrem Posteingang haben, k?nnen Sie auch einen Teil davon in einen tempor?ren Ordner kopieren.", IDC_STATIC,20,44,256,36 LTEXT "F?r Beispiele von Spam k?nnen Sie z.B. im Posteingang oder in 'Gel?schte Objekte' suchen. SpamBayes erlaubt jedoch nicht, den Ordner 'Gel?schte Objekte' selbst anzugeben. Sie k?nnen jedoch die Elemente aus 'Gel?schte Objekte' in einen selbst angelegten Ordner kopieren.", IDC_STATIC,20,80,247,35 LTEXT "Wenn Sie fertig damit sind, starten Sie den SpamBayes Installationsassistenten erneut und konfigurieren Sie SpamBayes.", IDC_STATIC,20,121,257,17 END IDD_NOTIFICATIONS DIALOG DISCARDABLE 0, 0, 248, 257 STYLE WS_CHILD | WS_CAPTION CAPTION "Notifizierung" FONT 8, "Tahoma" BEGIN GROUPBOX "Kl?nge f?r neue Nachrichten",IDC_STATIC,7,3,241,229 CONTROL "Kl?nge f?r neue Nachrichten aktivieren", IDC_ENABLE_SOUNDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 14,17,140,10 LTEXT "Gute Nachricht:",IDC_STATIC,14,31,51,8 EDITTEXT IDC_HAM_SOUND,14,40,174,14,ES_AUTOHSCROLL PUSHBUTTON "Durchsuchen",IDC_BROWSE_HAM_SOUND,192,40,50,14 LTEXT "Unsichere Nachricht:",IDC_STATIC,14,58,67,8 EDITTEXT IDC_UNSURE_SOUND,14,67,174,14,ES_AUTOHSCROLL PUSHBUTTON "Durchsuchen",IDC_BROWSE_UNSURE_SOUND,192,67,50,14 LTEXT "Spam:",IDC_STATIC,14,85,21,8 EDITTEXT IDC_SPAM_SOUND,14,94,174,14,ES_AUTOHSCROLL PUSHBUTTON "Durchsuchen",IDC_BROWSE_SPAM_SOUND,192,94,50,14 LTEXT "Zeit, um auf weitere Nachrichten zu warten",IDC_STATIC, 14,116,142,8 CONTROL "",IDC_ACCUMULATE_DELAY_SLIDER,"msctls_trackbar32", TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,127,148,22 EDITTEXT IDC_ACCUMULATE_DELAY_TEXT,163,133,40,14,ES_AUTOHSCROLL LTEXT "Sekunden",IDC_STATIC,205,136,35,8 END ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO // #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ADVANCED, DIALOG BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 241 VERTGUIDE, 16 BOTTOMMARGIN, 204 END IDD_MANAGER, DIALOG BEGIN BOTTOMMARGIN, 253 END IDD_DIAGNOSTIC, DIALOG BEGIN LEFTMARGIN, 5 RIGHTMARGIN, 179 BOTTOMMARGIN, 93 END IDD_FILTER, DIALOG BEGIN TOPMARGIN, 4 BOTTOMMARGIN, 254 HORZGUIDE, 127 END IDD_GENERAL, DIALOG BEGIN RIGHTMARGIN, 248 VERTGUIDE, 6 BOTTOMMARGIN, 205 END IDD_TRAINING, DIALOG BEGIN RIGHTMARGIN, 241 VERTGUIDE, 11 VERTGUIDE, 242 BOTTOMMARGIN, 207 END IDD_FILTER_NOW, DIALOG BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 237 TOPMARGIN, 9 BOTTOMMARGIN, 176 END IDD_WIZARD, DIALOG BEGIN RIGHTMARGIN, 378 END IDD_WIZARD_WELCOME, DIALOG BEGIN VERTGUIDE, 20 VERTGUIDE, 275 BOTTOMMARGIN, 161 END IDD_WIZARD_FINISHED_UNTRAINED, DIALOG BEGIN VERTGUIDE, 20 BOTTOMMARGIN, 161 END IDD_WIZARD_FOLDERS_REST, DIALOG BEGIN VERTGUIDE, 20 VERTGUIDE, 268 BOTTOMMARGIN, 161 HORZGUIDE, 85 HORZGUIDE, 117 END IDD_WIZARD_FOLDERS_WATCH, DIALOG BEGIN VERTGUIDE, 20 BOTTOMMARGIN, 161 END IDD_WIZARD_FINISHED_UNCONFIGURED, DIALOG BEGIN VERTGUIDE, 20 BOTTOMMARGIN, 161 END IDD_WIZARD_FOLDERS_TRAIN, DIALOG BEGIN VERTGUIDE, 20 VERTGUIDE, 268 BOTTOMMARGIN, 161 HORZGUIDE, 49 HORZGUIDE, 81 END IDD_WIZARD_TRAIN, DIALOG BEGIN VERTGUIDE, 20 BOTTOMMARGIN, 161 END IDD_WIZARD_FINISHED_TRAINED, DIALOG BEGIN VERTGUIDE, 20 BOTTOMMARGIN, 161 END IDD_WIZARD_TRAINING_IS_IMPORTANT, DIALOG BEGIN VERTGUIDE, 11 VERTGUIDE, 22 VERTGUIDE, 274 BOTTOMMARGIN, 161 END IDD_WIZARD_FINISHED_TRAIN_LATER, DIALOG BEGIN VERTGUIDE, 20 BOTTOMMARGIN, 161 END IDD_NOTIFICATIONS, DIALOG BEGIN LEFTMARGIN, 7 TOPMARGIN, 7 BOTTOMMARGIN, 232 END END #endif // APSTUDIO_INVOKED #endif // Deutsch (Deutschland) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// // Englisch (USA) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // Bitmap // IDB_SBLOGO BITMAP MOVEABLE PURE "sblogo.bmp" IDB_SBWIZLOGO BITMAP MOVEABLE PURE "sbwizlogo.bmp" IDB_FOLDERS BITMAP MOVEABLE PURE "folders.bmp" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // 1 TEXTINCLUDE MOVEABLE PURE BEGIN "dialogs.h\0" END 2 TEXTINCLUDE MOVEABLE PURE BEGIN "#include ""winres.h""\r\n" "// spambayes dialog definitions\r\n" "\0" END 3 TEXTINCLUDE MOVEABLE PURE BEGIN "\0" END #endif // APSTUDIO_INVOKED #endif // Englisch (USA) resources ///////////////////////////////////////////////////////////////////////////// --- NEW FILE: i18n_dialogs.py --- #i18n_dialogs.py #This is a generated file. Please edit dialogs.rc instead. _rc_size_=30899 _rc_mtime_=1173774820 try: _ except NameError: def _(s): return s class FakeParser: dialogs = {'IDD_WIZARD_FINISHED_TRAIN_LATER': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [130, _('Konfiguration angehalten'), -1, (20, 4, 247, 14), 1342177280], [130, _("Um mit dem Training zu beginnen, sollten Sie einen Ordner erstellen, der nur Beispiele von 'guten' Nachrichten enth\xe4lt und einen, der nur Beispiele von Spam enth\xe4lt."), -1, (20, 17, 257, 27), 1342177280], [130, _("Klicken Sie auf 'Beenden', um den Assistenten zu schlie\xdfen."), -1, (20, 145, 228, 9), 1342177280], [130, _("F\xfcr Beispiele von 'guten' Nachrichten k\xf6nnen Sie z.B. den Posteingang benutzen. Es ist aber wichtig, aus diesem erst den gesamten Spam zu entfernen, bevor Sie fortfahren. Wenn Sie zuviel in Ihrem Posteingang haben, k\xf6nnen Sie auch einen Teil davon in einen tempor\xe4ren Ordner kopieren."), -1, (20, 44, 256, 36), 1342177280], [130, _("F\xfcr Beispiele von Spam k\xf6nnen Sie z.B. im Posteingang oder in 'Gel\xf6schte Objekte' suchen. SpamBayes erlaubt jedoch nicht, den Ordner 'Gel\xf6schte Objekte' selbst anzugeben. Sie k\xf6nnen jedoch die Elemente aus 'Gel\xf6schte Objekte' in einen selbst angelegten Ordner kopieren."), -1, (20, 80, 247, 35), 1342177280], [130, _('Wenn Sie fertig damit sind, starten Sie den SpamBayes Installationsassistenten erneut und konfigurieren Sie SpamBayes.'), -1, (20, 121, 257, 17), 1342177280]], 'IDD_WIZARD_WELCOME': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [130, _('Willkommen zum SpamBayes Konfigurationsassistenten'), -1, (20, 4, 191, 14), 1342177280], [130, _('Dieser Assistent hilft Ihnen, SpamBayes einzurichten. Bitte geben Sie an, wie Sie sich auf den Umgang mit dem Programm vorbereitet haben.'), -1, (20, 20, 255, 18), 1342177280], [128, _('Ich habe gar nichts vorbereitet.'), 1081, (20, 42, 190, 11), 1342309385], [128, _("Ich habe bereits Spam und 'gute' Nachrichten (Ham) in f\xfcr das Training geeignete Ordner sortiert."), -1, (20, 59, 255, 18), 1342186505], [128, _('Ich bevorzuge, SpamBayes manuell zu konfigurieren (Expertenmodus)'), -1, (20, 82, 255, 12), 1342178313], [130, _("Wenn Sie mehr \xfcber die Konfiguration und das Training von SpamBayes erfahren m\xf6chten, dr\xfccken Sie den Knopf '\xdcber...'"), -1, (20, 103, 206, 22), 1342177280], [128, _('\xdcber...'), 1017, (233, 104, 42, 15), 1342177280], [130, _('Wenn Sie den SpamBayes Konfigurationsassistenten abbrechen, k\xf6nnen Sie ihn jederzeit \xfcber den SpamBayes Manager von der Outlook Symbolleiste neu starten.'), -1, (20, 129, 247, 26), 1342177280]], 'IDD_WIZARD': [[_('SpamBayes Konfigurationsassistent'), (0, 0, 384, 190), -1865940800, 1024, (8, 'Tahoma')], [128, _('Abbrechen'), 2, (328, 173, 50, 14), 1342177280], [128, _('<< Zur\xfcck'), 1069, (216, 173, 50, 14), 1342177280], [128, _('Weiter >>,Beenden'), 1077, (269, 173, 50, 14), 1342177281], [130, '', 1078, (75, 4, 303, 167), 1342177298], [130, '125', 1092, (0, 0, 69, 190), 1342177294]], 'IDD_WIZARD_FINISHED_UNTRAINED': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [130, _('Gratulation'), -1, (20, 4, 247, 14), 1342177280], [130, _('SpamBayes ist jetzt konfiguriert und bereit, \xfcber ihre Nachrichten zu lernen.'), -1, (20, 22, 247, 16), 1342177280], [130, _("Weil SpamBayes nicht trainiert ist, landen alle Nachrichten im Ordner 'unsicher'. Bitte benutzen Sie die Schaltfl\xe4chen 'Spam' und 'Kein Spam', um SpamBayes zu trainieren."), -1, (20, 42, 247, 27), 1342177280], [130, _('Wenn Sie die Lernzeit verk\xfcrzen wollen, verschieben Sie allen vorhandenen Spam in einen Ordner und trainieren danach SpamBayes mit Hilfe des SpamBayes Managers.'), -1, (20, 94, 247, 31), 1342177280], [130, _('Wenn Sie SpamBayes auf diese Weise trainieren, werden Sie feststellen, dass die Genauigkeit von SpamBayes zunimmt.'), -1, (20, 69, 247, 18), 1342177280], [130, _("Klicken Sie 'Beenden', um den Assistenten zu schlie\xdfen."), -1, (20, 132, 263, 9), 1342177280]], 'IDD_GENERAL': [[_('Allgemein'), (0, 0, 253, 257), 1354760256, 1024, (8, 'Tahoma')], [130, _('SpamBayes Version Here'), 1009, (6, 54, 242, 8), 1342177280], [130, _('SpamBayes ben\xf6tigt Training, bevor es effektiv arbeiten kann. Klicken Sie auf die Registerkarte Training, um das Training durchzuf\xfchren.'), -1, (6, 67, 242, 17), 1342177280], [130, _('Status der Training Datenbank'), -1, (6, 90, 222, 8), 1342177280], [130, _('123 spam messages; 456 good messages\\r\\nLine2\\r\\nLine3'), 1035, (6, 101, 242, 27), 1342181376], [128, _('SpamBayes aktivieren'), 1013, (6, 221, 97, 11), 1342242819], [130, _('Certain spam is moved to Folder1\\nPossible spam is moved too'), 1014, (6, 146, 242, 67), 1342181376], [128, _('Konfiguration zur\xfccksetzen...'), 1073, (6, 238, 108, 15), 1342177280], [128, _('Konfigurationsassistent...'), 1070, (155, 238, 93, 15), 1342177280], [130, _('Filter Status:'), -1, (6, 135, 222, 8), 1342177280], [130, '1062', 1063, (0, 2, 275, 52), 1342179342]], 'IDD_WIZARD_FINISHED_UNCONFIGURED': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [130, _('Konfiguration abgebrochen'), -1, (20, 4, 247, 14), 1342177280], [130, _('Die SpamBayes Optionen werden jetzt angezeigt. Sie m\xfcssen Ihre Ordner ausw\xe4hlen, bevor SpamBayes beginnt, Nachrichten zu filtern.'), -1, (20, 29, 247, 16), 1342177280], [130, _("Klicken Sie auf 'Beenden', um den Assistenten zu beenden."), -1, (20, 139, 240, 16), 1342177280]], 'IDD_MANAGER': [[_('SpamBayes Manager'), (0, 0, 275, 308), -1865940800, 1024, (8, 'Tahoma')], [128, _('Schlie\xdfen'), 1, (216, 287, 50, 14), 1342177281], [128, _('Abbrechen'), 2, (155, 287, 50, 14), 1073741824], ['SysTabControl32', '', 1068, (8, 7, 258, 276), 1342177280], [128, _('\xdcber...'), 1072, (8, 287, 50, 14), 1342177280]], 'IDD_WIZARD_FOLDERS_REST': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [128, _('Durchsuchen'), 1005, (208, 100, 60, 15), 1342177280], [130, _("Ordner f\xfcr Spam und 'unsichere' Nachrichten"), -1, (20, 4, 247, 14), 1342177280], [130, _('SpamBayes benutzt zwei Ordner, um Spam zu verwalten. Einen Ordner, der Nachrichten enth\xe4lt, bei denen sich SpamBayes sicher ist und einen, wo es unsicher ist.'), -1, (20, 20, 247, 29), 1342177280], [130, _("Wenn Sie einen Ordnernamen eingeben, der nicht existiert, wird ein Ordner mit diesem Namen erstellt. Sollten Sie einen bereits existierenden Ordner bevorzugen, klicken Sie auf 'Durchsuchen', um den Ordner auszuw\xe4hlen."), -1, (20, 53, 243, 24), 1342177280], [129, '', 1027, (20, 100, 179, 14), 1350566016], [130, _('Unsichere Nachrichten kommen in folgenden Ordner:'), -1, (20, 121, 227, 12), 1342177280], [129, '', 1033, (20, 132, 177, 14), 1350566016], [130, _('Spam soll in folgenden Ordner zugestellt werden:'), -1, (20, 89, 189, 8), 1342177280], [128, _('Durchsuchen'), 1034, (208, 132, 60, 15), 1342177280]], 'IDD_WIZARD_TRAIN': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [130, _('Training'), -1, (20, 4, 247, 14), 1342177280], [130, _('SpamBayes wird trainiert anhand Ihrer guten Nachrichten und Ihres Spams'), -1, (20, 22, 247, 16), 1342177280], ['msctls_progress32', '', 1000, (20, 45, 255, 11), 1350565888], [130, _('(progress text)'), 1001, (20, 61, 257, 10), 1342177280]], 'IDD_DIAGNOSTIC': [[_('Diagnose'), (0, 0, 183, 98), -1865940800, 1024, (8, 'Tahoma')], [130, _('Diese erweiterten Optionen sind nur f\xfcr die Fehlersuche gedacht. Sie sollten hier nur Werte \xe4ndern, wenn Sie dazu aufgefordert wurden oder wenn Sie genau wissen, was sie bedeuten.'), -1, (5, 3, 174, 36), 1342177280], [130, _('Ausf\xfchrlichkeit Logdatei'), -1, (5, 44, 77, 8), 1342177280], [129, '', 1061, (84, 42, 31, 14), 1350566016], [128, _('Log ansehen...'), 1093, (117, 41, 62, 14), 1342177280], [128, _('Spamwert sichern'), 1048, (5, 63, 72, 10), 1342242819], [128, _('Abbrechen'), 2, (69, 79, 50, 14), 1073741824], [128, _('Schlie\xdfen'), 1, (129, 79, 50, 14), 1342177281]], 'IDD_FILTER': [[_('Filtern'), (0, 0, 249, 257), 1354760256, 1024, (8, 'Tahoma')], [130, _('Die folgenden Ordner filtern beim Eintreffen neuer Nachrichten'), -1, (8, 4, 207, 11), 1342177280], [130, _('Folder names...\\nLine 2'), 1038, (7, 16, 177, 12), 1342312972], [128, _('Durchsuchen'), 1039, (192, 14, 50, 14), 1342177280], [128, _('Zweifelsfrei Spam'), -1, (7, 31, 235, 82), 1342177287], [130, _('Um sicher Spam zu sein, muss der Spamwert mindestens betragen:'), -1, (12, 40, 225, 10), 1342177280], ['msctls_trackbar32', _('Slider1'), 1023, (13, 50, 165, 22), 1342242821], [129, '', 1024, (184, 53, 51, 14), 1350566016], [130, _('und folgende Aktion soll mit dieser Nachricht durchgef\xfchrt werden:'), -1, (13, 72, 223, 10), 1342177280], [133, '', 1025, (12, 83, 55, 40), 1344339971], [130, _('in Ordner'), -1, (71, 85, 31, 10), 1342177280], [130, _('Ordner Namen'), 1027, (103, 83, 77, 14), 1342312972], [128, _('Durchsuchen'), 1028, (184, 83, 50, 14), 1342177280], [128, _('M\xf6glicherweise Spam'), -1, (6, 117, 235, 84), 1342177287], [130, _('Um als unsicher gelten, muss der Spamwert mindestens betragen:'), -1, (12, 128, 212, 10), 1342177280], ['msctls_trackbar32', _('Slider1'), 1029, (12, 137, 165, 20), 1342242821], [129, '', 1030, (183, 141, 54, 14), 1350566016], [130, _('und folgende Aktion soll mit dieser Nachricht durchgef\xfchrt werden:'), -1, (12, 158, 217, 10), 1342177280], [133, '', 1031, (12, 169, 55, 40), 1344339971], [130, _('in Ordner'), -1, (71, 172, 31, 10), 1342177280], [130, _('(folder name)'), 1033, (103, 169, 77, 14), 1342312972], [128, _('Durchsuchen'), 1034, (184, 169, 50, 14), 1342177280], [128, _('Spam als gelesen markieren'), 1047, (13, 100, 154, 10), 1342242819], [128, _('M\xf6glichen Spam als gelesen markieren'), 1051, (12, 189, 190, 10), 1342242819], [128, _('Sicher gut'), -1, (6, 206, 235, 48), 1342177287], [130, _('Aktion f\xfcr gute Nachrichten:'), -1, (12, 218, 107, 10), 1342177280], [133, '', 1032, (12, 231, 55, 40), 1344339971], [130, _('in Ordner'), -1, (71, 233, 31, 10), 1342177280], [130, _('(folder name)'), 1083, (103, 231, 77, 14), 1342312972], [128, _('Durchsuchen'), 1004, (184, 231, 50, 14), 1342177280]], 'IDD_FILTER_NOW': [[_('Jetzt filtern'), (0, 0, 244, 185), -1865940800, 1024, (8, 'Tahoma')], [130, _('Die folgenden Ordner filtern'), -1, (8, 9, 168, 11), 1342177280], [130, _('Folder names...\\nLine 2'), 1036, (7, 20, 172, 12), 1342181900], [128, _('Durchsuchen'), 1037, (187, 19, 50, 14), 1342177280], [128, _('Filteraktionen'), -1, (7, 38, 230, 40), 1342308359], [128, _('Alle Aktionen ausf\xfchren'), 1019, (15, 49, 126, 10), 1342373897], [128, _('Nachrichten bewerten, aber keine Aktionen ausf\xfchren'), 1018, (15, 62, 203, 10), 1342177289], [128, _('Filter beschr\xe4nken'), -1, (7, 84, 230, 35), 1342308359], [128, _('Nur ungelesene Nachrichten bearbeiten'), 1020, (15, 94, 149, 9), 1342242819], [128, _('Nur ungefilterte Nachrichten verarbeiten'), 1021, (15, 106, 149, 9), 1342242819], ['msctls_progress32', _('Progress1'), 1000, (7, 129, 230, 11), 1350565888], [130, _('Static'), 1001, (7, 144, 227, 10), 1342177280], [128, _('Start filtern'), 1006, (7, 161, 52, 14), 1342177281], [128, _('Schlie\xdfen'), 2, (187, 162, 50, 14), 1342177280]], 'IDD_TRAINING': [[_('Training'), (0, 0, 252, 257), 1354760256, 1024, (8, 'Tahoma')], [128, '', -1, (5, 1, 243, 113), 1342177287], [130, _('Ordner mit bekannterma\xdfen guten Nachrichten'), -1, (11, 11, 170, 11), 1342308364], [130, '', 1002, (11, 21, 175, 12), 1342181900], [128, _('Durchsuchen'), 1004, (192, 20, 50, 14), 1342177280], [130, _('Ordner mit Spam oder anderen M\xfcllnachrichten'), -1, (11, 36, 171, 9), 1342177280], [130, _('Static'), 1003, (11, 46, 174, 12), 1342312972], [128, _('Durchsuchen'), 1005, (192, 46, 50, 14), 1342177280], [128, _('Nachrichten nach Training bewerten'), 1008, (11, 64, 131, 10), 1342242819], [128, _('Datenbank komplett neu'), 1007, (147, 64, 94, 10), 1342242819], ['msctls_progress32', _('Progress1'), 1000, (11, 76, 231, 11), 1350565888], [128, _('Training &starten'), 1006, (11, 91, 54, 14), 1342193664], [130, _('training status training status training status training status training status training status training status '), 1001, (75, 89, 149, 17), 1342177280], [128, _('InkrementellesTraining'), -1, (4, 117, 244, 87), 1342177287], [128, _("Trainieren, dass eine Nachricht 'gut' ist, wenn sie aus einem Spam-Ordner in den Posteingang verschoben wird"), 1010, (11, 127, 204, 18), 1342251011], [130, _("Klicken auf 'Kein Spam' soll die Nachricht..."), -1, (10, 148, 141, 10), 1342177280], [133, '', 1075, (153, 145, 88, 54), 1344339971], [128, _('Trainieren, dass eine Nachricht Spam ist, wenn sie in den Spam-Ordner verschoben wird.'), 1011, (11, 163, 204, 16), 1342251011], [130, _("Klicken auf 'Spam' soll die Nachricht..."), -1, (10, 183, 140, 10), 1342177280], [133, '', 1074, (153, 180, 88, 54), 1344339971]], 'IDD_NOTIFICATIONS': [[_('Notifizierung'), (0, 0, 248, 257), 1354760256, None, (8, 'Tahoma')], [128, _('Kl\xe4nge f\xfcr neue Nachrichten'), -1, (7, 3, 241, 229), 1342177287], [128, _('Kl\xe4nge f\xfcr neue Nachrichten aktivieren'), 1098, (14, 17, 140, 10), 1342242819], [130, _('Gute Nachricht:'), -1, (14, 31, 51, 8), 1342177280], [129, '', 1094, (14, 40, 174, 14), 1350566016], [128, _('Durchsuchen'), 1101, (192, 40, 50, 14), 1342177280], [130, _('Unsichere Nachricht:'), -1, (14, 58, 67, 8), 1342177280], [129, '', 1095, (14, 67, 174, 14), 1350566016], [128, _('Durchsuchen'), 1102, (192, 67, 50, 14), 1342177280], [130, _('Spam:'), -1, (14, 85, 21, 8), 1342177280], [129, '', 1096, (14, 94, 174, 14), 1350566016], [128, _('Durchsuchen'), 1103, (192, 94, 50, 14), 1342177280], [130, _('Zeit, um auf weitere Nachrichten zu warten'), -1, (14, 116, 142, 8), 1342177280], ['msctls_trackbar32', '', 1099, (14, 127, 148, 22), 1342242821], [129, '', 1100, (163, 133, 40, 14), 1350566016], [130, _('Sekunden'), -1, (205, 136, 35, 8), 1342177280]], 'IDD_WIZARD_TRAINING_IS_IMPORTANT': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [130, _('SpamBayes kann nicht effektiv arbeiten, wenn es untrainiert ist.'), -1, (11, 8, 263, 11), 1342177280], [128, _('Training...'), 1017, (225, 140, 49, 15), 1342177280], [130, _("SpamBayes besitzt keine vordefinierten Regeln sondern lernt von Ihnen, Spam von 'guten' Nachrichten (Ham) zu unterscheiden. Sie m\xfcssen SpamBayes deshalb Ordner mit guten und schlechten Nachrichten zum Training zur Verf\xfcgung stellen."), -1, (11, 21, 263, 30), 1342177280], [130, _("In diesem Fall stellt SpamBayes anfangs alle Nachrichten in den Ordner 'unsicher'. W\xe4hrend Sie dann mit den Kn\xf6pfen 'Spam' und 'Kein Spam' die Nachrichten zuordnen, lernt SpamBayes den Umgang mit Ihren Nachrichten."), -1, (22, 61, 252, 29), 1342177280], [130, _('Diese Option wird den Assistenten beenden und erkl\xe4ren, wie Sie Ihre Nachrichten vorsortieren k\xf6nnen. Danach k\xf6nnen Sie SpamBayes trainieren und SpamBayes wird sofort beginnen, effektiv zu arbeiten.'), -1, (22, 106, 252, 27), 1342177280], [130, _("F\xfcr mehr Informationen bet\xe4tigen Sie bitte den Knopf 'Training...'"), -1, (11, 143, 211, 12), 1342177280], [128, _('Ich m\xf6chte ohne Training fortfahren'), 1088, (11, 50, 263, 11), 1342308361], [128, _('Ich werde die Nachrichten vorsortieren und SpamBayes danach konfigurieren.'), 1089, (11, 92, 263, 11), 1342177289]], 'IDD_FOLDER_SELECTOR': [[_('Ordner ausw\xe4hlen'), (0, 0, 247, 215), -1865940800, None, (8, 'Tahoma')], [130, _('&Folders:'), -1, (7, 7, 47, 9), 1342177280], ['SysTreeView32', '', 1040, (7, 21, 172, 140), 1350631735], [128, _('(sub)'), 1041, (7, 167, 126, 9), 1342242819], [130, _('(status1)'), 1043, (7, 180, 220, 9), 1342177280], [130, _('(status2)'), 1044, (7, 194, 220, 9), 1342177280], [128, _('OK'), 1, (190, 21, 50, 14), 1342177281], [128, _('Abbrechen'), 2, (190, 39, 50, 14), 1342177280], [128, _('Alle l\xf6schen'), 1042, (190, 58, 50, 14), 1342177280], [128, _('Neuer Ordner'), 1046, (190, 77, 50, 14), 1342177280]], 'IDD_WIZARD_FOLDERS_WATCH': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [128, _('Durchsuchen'), 1039, (225, 134, 50, 14), 1342177280], [130, _('Ordner, in denen neue Nachrichten eintreffen'), -1, (20, 4, 247, 14), 1342177280], [130, _('SpamBayes muss wissen, in welchen Ordnern neue Nachrichten eintreffen. In den meisen F\xe4llen ist dies der Posteingang. Sie k\xf6nnen aber weitere Ordner angeben, die von SpamBayes \xfcberwacht werden sollen.'), -1, (20, 21, 247, 25), 1342177280], [130, _("Die folgende Liste enth\xe4lt die zu beobachtenden Ordner. Dr\xfccken Sie auf 'Durchsuchen', um die Liste zu \xe4ndern, bzw. auf 'Weiter', um fortzufahren."), -1, (20, 79, 247, 20), 1342177280], [130, _('Wenn Sie den Outlook Regelassistenten benutzen, um Nachrichten zu verschieben, k\xf6nnen Sie solche Ordner zus\xe4tzlich angeben.'), -1, (20, 51, 241, 20), 1342177280], [129, '', 1038, (20, 100, 195, 48), 1350568068]], 'IDD_WIZARD_FINISHED_TRAINED': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [130, _('Gratulation'), -1, (20, 4, 247, 14), 1342177280], [130, _('SpamBayes wurde erfolgreich trainiert und konfiguriert. SpamBayes sollte jetzt bereit sein, die Nachrichten effektiv zu filtern.'), 1035, (20, 35, 247, 26), 1342177280], [130, _("Obwohl SpamBayes jetzt erfolgreich trainiert wurde, lernt SpamBayes weiter. Bitte schauen Sie regelm\xe4\xdfig in den Ordner mit den 'unsicheren' Nachrichten und benutzen die Schaltfl\xe4chen 'Spam' und 'Kein Spam'."), -1, (20, 68, 249, 30), 1342177280], [130, _('Klicken Sie auf Beenden, um den Assistenten zu schlie\xdfen.'), -1, (20, 104, 257, 23), 1342177280]], 'IDD_STATISTICS': [[_('Statistik'), (0, 0, 248, 257), 1354760256, None, (8, 'Tahoma')], [128, _('Statistik'), -1, (7, 3, 241, 229), 1342177287], [130, _('some stats\\nand some more\\nline 3\\nline 4\\nline 5'), 1095, (12, 12, 230, 204), 1342177280], [128, _('Statistik zur\xfccksetzen'), 1096, (165, 238, 83, 14), 1342177280], [130, _('Zuletzt zur\xfcckgesetzt:'), -1, (7, 241, 72, 8), 1342177280], [130, _('<<>>'), 1097, (84, 241, 70, 8), 1342177280]], 'IDD_WIZARD_FOLDERS_TRAIN': [['', (0, 0, 284, 162), 1354760256, 1024, (8, 'Tahoma')], [128, _('Druchsuchen'), 1004, (208, 49, 60, 15), 1342177280], [130, _('Training'), -1, (20, 4, 247, 10), 1342177280], [130, _("Bitte w\xe4hlen Sie die Nachrichten mit dem vorsortierten Spam und den vorsortierten 'guten' Nachrichten."), -1, (20, 16, 243, 16), 1342177280], [129, '', 1083, (20, 49, 179, 14), 1350568064], [130, _('Beispiele von Spam und anderer unerw\xfcnschter Nachrichten finden sich hier:'), -1, (20, 71, 248, 8), 1342177280], [129, '', 1027, (20, 81, 177, 14), 1350568064], [130, _("Beispiele 'guter' Nachrichten finden sich unter"), -1, (20, 38, 153, 8), 1342177280], [128, _('Durchsuchen'), 1005, (208, 81, 60, 15), 1342177280], [130, _('Wenn Sie keine vorsortierten Nachrichten haben oder bereits vorhandene SpamBayes-Daten weiter benutzen m\xf6chten, gehen Sie bitte zur\xfcck und geben an, dass Sie sich nicht vorbereitet haben.'), -1, (20, 128, 243, 26), 1342177280], [128, _('Nachrichten nach dem Training bewerten'), 1008, (20, 108, 163, 16), 1342242819]], 'IDD_ADVANCED': [[_('Erweitert'), (0, 0, 248, 257), 1354760256, 1024, (8, 'Tahoma')], [128, _('Zeitliches Verhalten'), -1, (7, 3, 234, 117), 1342177287], ['msctls_trackbar32', '', 1056, (16, 36, 148, 22), 1342242821], [130, _('Wartezeit vor dem start'), -1, (16, 26, 101, 8), 1342177280], [129, '', 1057, (165, 39, 40, 14), 1350566016], [130, _('seconds'), -1, (208, 41, 28, 8), 1342177280], ['msctls_trackbar32', '', 1058, (16, 73, 148, 22), 1342242821], [130, _('Wartezeit zwischen zwei Elementen'), -1, (16, 62, 142, 8), 1342177280], [129, '', 1059, (165, 79, 40, 14), 1350566016], [130, _('seconds'), -1, (207, 82, 28, 8), 1342177280], [128, _('Nur f\xfcr Ordner, die neue Nachrichten erhalten'), 1060, (16, 100, 217, 10), 1342242819], [128, _('Datenordner zeigen'), 1071, (7, 238, 70, 14), 1342177280], [128, _('Filtern im Hintergrund aktivieren'), 1091, (16, 12, 162, 10), 1342242819], [128, _('Diagnose...'), 1080, (171, 238, 70, 14), 1342177280]]} ids = {'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDD_DIAGNOSTIC': 113, 'IDD_TRAINING': 102, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_BROWSE_SPAM_SOUND': 1103, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDD_GENERAL': 108, 'IDC_BROWSE_UNSURE_SOUND': 1102, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'IDC_BACK_BTN': 1069, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDC_BROWSE_HAM_SOUND': 1101, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDC_RECOVER_RS': 1075, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDC_ACCUMULATE_DELAY_TEXT': 1100, 'IDC_FOLDER_HAM': 1083, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, '_APS_NEXT_RESOURCE_VALUE': 129, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_SLIDER_CERTAIN': 1023, 'IDC_BUT_UNREAD': 1020, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDC_LAST_RESET_DATE': 1097, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'IDD_FOLDER_SELECTOR': 105, 'IDD_STATISTICS': 107, 'IDC_LIST_FOLDERS': 1040, 'IDB_SBWIZLOGO': 125, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'IDC_BROWSE_SPAM': 1005, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDC_BROWSE_HAM_SOUND2': 1103, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'IDC_FOLDER_NAMES': 1036, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDC_HAM_SOUND': 1094, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'IDC_FORWARD_BTN': 1077, '_APS_NEXT_CONTROL_VALUE': 1102, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDD_ADVANCED': 106, 'IDC_WIZ_GRAPHIC': 1092, 'IDC_DEL_SPAM_RS': 1074, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'IDC_DELAY2_SLIDER': 1058, 'IDC_ACCUMULATE_DELAY_SLIDER': 1099, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_FOLDER_CERTAIN': 1027, 'IDB_SBLOGO': 1062, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDC_BUT_RESET_STATS': 1096, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDD_FILTER_SPAM': 110, 'IDC_BUT_RESET': 1073, 'IDD_NOTIFICATIONS': 128, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDC_ACTION_HAM': 1032, 'IDC_BUT_REBUILD': 1007, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDC_ENABLE_SOUNDS': 1098, 'IDC_SPAM_SOUND': 1096, 'IDC_UNSURE_SOUND': 1095, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDC_BUT_TRAIN': 1089, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_LOGO_GRAPHIC': 1063, 'IDC_FILTER_STATUS': 1014, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012} names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1032: 'IDC_ACTION_HAM', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 1051: 'IDC_MARK_UNSURE_AS_READ', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_SBLOGO', 1063: 'IDC_LOGO_GRAPHIC', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 1083: 'IDC_FOLDER_HAM', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: 'IDC_BUT_RESET_STATS', 1097: 'IDC_LAST_RESET_DATE', 1098: 'IDC_ENABLE_SOUNDS', 1099: 'IDC_ACCUMULATE_DELAY_SLIDER', 1100: 'IDC_ACCUMULATE_DELAY_TEXT', 1101: 'IDC_BROWSE_HAM_SOUND', 1102: 'IDC_BROWSE_UNSURE_SOUND', 1103: 'IDC_BROWSE_HAM_SOUND2', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ADVANCED', 107: 'IDD_STATISTICS', 108: 'IDD_GENERAL', 110: 'IDD_FILTER_SPAM', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 128: 'IDD_NOTIFICATIONS', 129: '_APS_NEXT_RESOURCE_VALUE', 40001: '_APS_NEXT_COMMAND_VALUE', 1092: 'IDC_WIZ_GRAPHIC', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'} bitmaps = {'IDB_SBWIZLOGO': 'sbwizlogo.bmp', 'IDB_SBLOGO': 'sblogo.bmp', 'IDB_FOLDERS': 'folders.bmp'} def ParseDialogs(s): return FakeParser() From mhammond at users.sourceforge.net Wed Mar 14 02:05:47 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Tue, 13 Mar 2007 17:05:47 -0800 Subject: [Spambayes-checkins] spambayes/spambayes/languages/de - New directory Message-ID: <20070314013345.10C4A1E4010@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/languages/de In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16087/de Log Message: Directory /cvsroot/spambayes/spambayes/spambayes/languages/de added to the repository From anadelonbrin at users.sourceforge.net Sun Mar 25 06:01:24 2007 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Sat, 24 Mar 2007 20:01:24 -0800 Subject: [Spambayes-checkins] website Makefile,1.20,1.21 Message-ID: <20070325040128.057091E4016@bag.python.org> Update of /cvsroot/spambayes/website In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24773 Modified Files: Makefile Log Message: Use a posix style path, which should still work on Windows (which I don't think anyone uses for this script anyway), and will work on cygwin/*nix. Index: Makefile =================================================================== RCS file: /cvsroot/spambayes/website/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile 16 Jan 2005 22:22:54 -0000 1.20 --- Makefile 25 Mar 2007 04:01:10 -0000 1.21 *************** *** 22,26 **** ') ! $(shell python scripts\create_experimental_pages.py) $(TARGETS): links.h --- 22,26 ---- ') ! $(shell python scripts/create_experimental_pages.py) $(TARGETS): links.h From anadelonbrin at users.sourceforge.net Sun Mar 25 06:07:33 2007 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Sat, 24 Mar 2007 20:07:33 -0800 Subject: [Spambayes-checkins] website/scripts make.rules,1.5,1.6 Message-ID: <20070325040734.F05401E401A@bag.python.org> Update of /cvsroot/spambayes/website/scripts In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27450/scripts Modified Files: make.rules Log Message: It seems that html.py is rst2html.py in new versions of docutils. Index: make.rules =================================================================== RCS file: /cvsroot/spambayes/website/scripts/make.rules,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** make.rules 28 Oct 2003 04:43:49 -0000 1.5 --- make.rules 25 Mar 2007 04:07:30 -0000 1.6 *************** *** 21,25 **** # Where to upload stuff for make install. LIVE_ROOT is the actual # physical location of files on the server. ! LIVE_HOST = shell1.sourceforge.net LIVE_ROOT = /home/groups/s/sp/spambayes/htdocs/ LIVE_DEST = $(LIVE_HOST):$(LIVE_ROOT)/$(ROOT_OFFSET) --- 21,25 ---- # Where to upload stuff for make install. LIVE_ROOT is the actual # physical location of files on the server. ! LIVE_HOST = anadelonbrin at shell1.sourceforge.net LIVE_ROOT = /home/groups/s/sp/spambayes/htdocs/ LIVE_DEST = $(LIVE_HOST):$(LIVE_ROOT)/$(ROOT_OFFSET) *************** *** 50,54 **** # docutils 'html.py' script. ! DUHTML = html.py GENERATED_HTML= $(SOURCES:.ht=.html) --- 50,54 ---- # docutils 'html.py' script. ! DUHTML = rst2html.py GENERATED_HTML= $(SOURCES:.ht=.html) From anadelonbrin at users.sourceforge.net Sun Mar 25 06:08:44 2007 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Sat, 24 Mar 2007 20:08:44 -0800 Subject: [Spambayes-checkins] website/scripts make.rules,1.6,1.7 Message-ID: <20070325040846.2E47B1E4014@bag.python.org> Update of /cvsroot/spambayes/website/scripts In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27888/scripts Modified Files: make.rules Log Message: Typo. Index: make.rules =================================================================== RCS file: /cvsroot/spambayes/website/scripts/make.rules,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** make.rules 25 Mar 2007 04:07:30 -0000 1.6 --- make.rules 25 Mar 2007 04:08:39 -0000 1.7 *************** *** 21,25 **** # Where to upload stuff for make install. LIVE_ROOT is the actual # physical location of files on the server. ! LIVE_HOST = anadelonbrin at shell1.sourceforge.net LIVE_ROOT = /home/groups/s/sp/spambayes/htdocs/ LIVE_DEST = $(LIVE_HOST):$(LIVE_ROOT)/$(ROOT_OFFSET) --- 21,25 ---- # Where to upload stuff for make install. LIVE_ROOT is the actual # physical location of files on the server. ! LIVE_HOST = shell1.sourceforge.net LIVE_ROOT = /home/groups/s/sp/spambayes/htdocs/ LIVE_DEST = $(LIVE_HOST):$(LIVE_ROOT)/$(ROOT_OFFSET) From anadelonbrin at users.sourceforge.net Sun Mar 25 06:22:12 2007 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Sat, 24 Mar 2007 20:22:12 -0800 Subject: [Spambayes-checkins] website/scripts make.rules,1.7,1.8 Message-ID: <20070325042215.41DE71E400E@bag.python.org> Update of /cvsroot/spambayes/website/scripts In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32552/scripts Modified Files: make.rules Log Message: Preserving times doesn't seem to work anymore (a sf change, perhaps?). We don't really need that AFAIK, so take it out. Index: make.rules =================================================================== RCS file: /cvsroot/spambayes/website/scripts/make.rules,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** make.rules 25 Mar 2007 04:08:39 -0000 1.7 --- make.rules 25 Mar 2007 04:22:09 -0000 1.8 *************** *** 87,91 **** fi @echo Push to $(LIVE_DEST) ... ! rsync --rsh=$(RSYNC_RSH) -v -r -l -t --update $(LOCAL_INCLUDE) $(GLOBAL_EXCLUDES) $(EXCLUDE_FROM) ./* $(LIVE_DEST) validate: $(TARGETS) --- 87,91 ---- fi @echo Push to $(LIVE_DEST) ... ! rsync --rsh=$(RSYNC_RSH) -v -r -l --update $(LOCAL_INCLUDE) $(GLOBAL_EXCLUDES) $(EXCLUDE_FROM) ./* $(LIVE_DEST) validate: $(TARGETS) From mhammond at users.sourceforge.net Mon Mar 26 10:05:37 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Mon, 26 Mar 2007 00:05:37 -0800 Subject: [Spambayes-checkins] spambayes/windows/py2exe gocr.txt,NONE,1.1 Message-ID: <20070326083319.494811E4009@bag.python.org> Update of /cvsroot/spambayes/spambayes/windows/py2exe In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5668 Added Files: gocr.txt Log Message: info about gocr, which is installed into the binary builds. --- NEW FILE: gocr.txt --- SpamBayes includes the unmodified gocr 0.43 binary from: http://www-e.uni-magdeburg.de/jschulen/ocr/gocr043.exe md5sum: b21b3c565a185791cf64e546a69b1d55 gocr is distributed under the GPL - please see: http://sourceforge.net/projects/jocr for more information on gocr, or: http://spambayes.org for more information on spambayes. From mhammond at users.sourceforge.net Mon Mar 26 10:05:00 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Mon, 26 Mar 2007 00:05:00 -0800 Subject: [Spambayes-checkins] spambayes/windows spambayes.iss,1.26,1.27 Message-ID: <20070326083319.CD6E71E4009@bag.python.org> Update of /cvsroot/spambayes/spambayes/windows In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5184 Modified Files: spambayes.iss Log Message: Package gocr instead of ocrad Index: spambayes.iss =================================================================== RCS file: /cvsroot/spambayes/spambayes/windows/spambayes.iss,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** spambayes.iss 25 Aug 2006 00:43:28 -0000 1.26 --- spambayes.iss 26 Mar 2007 08:04:57 -0000 1.27 *************** *** 52,58 **** Source: "py2exe\dist\bin\convert_database.exe"; DestDir: "{app}\bin"; Flags: ignoreversion ! ; Include ocrad.exe and the patch required to get it to compile for Windows. ! Source: "py2exe\ocrad.exe"; DestDir: "{app}\bin"; Flags: ignoreversion ! Source: "py2exe\ocrad.patch"; DestDir: "{app}\docs"; Flags: ignoreversion ; There is a problem attempting to get Inno to unregister our DLL. If we mark our DLL --- 52,60 ---- Source: "py2exe\dist\bin\convert_database.exe"; DestDir: "{app}\bin"; Flags: ignoreversion ! ; Include flavour-of-the-day OCR pacakge - currently gocr. ! ; Get from the spambayes package directory - its likely to exist ! ; there as the developer running a source version will have it there. ! Source: "..\spambayes\gocr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion ! Source: "py2exe\gocr.txt"; DestDir: "{app}\docs"; Flags: ignoreversion ; There is a problem attempting to get Inno to unregister our DLL. If we mark our DLL From mhammond at users.sourceforge.net Mon Mar 26 10:03:18 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Mon, 26 Mar 2007 00:03:18 -0800 Subject: [Spambayes-checkins] spambayes/windows/py2exe setup_all.py, 1.27, 1.28 Message-ID: <20070326083320.54DEF1E4009@bag.python.org> Update of /cvsroot/spambayes/spambayes/windows/py2exe In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4338/py2exe Modified Files: setup_all.py Log Message: Include makepy files from CVS rather than generating them at build time and therefore requiring Office 2000 be installed at build time. Index: setup_all.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/windows/py2exe/setup_all.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** setup_all.py 24 Aug 2006 13:18:32 -0000 1.27 --- setup_all.py 26 Mar 2007 08:03:14 -0000 1.28 *************** *** 52,57 **** "win32ui,pywin,pywin.debugger," # *sob* - these still appear # Keep zope out else outlook users lose training. ! # (sob - but some of these may still appear!) ! "ZODB,_zope_interface_coptimizations,_OOBTree,cPersistence", includes = "dialogs.resources.dialogs,weakref," # Outlook dynamic dialogs "BmpImagePlugin,JpegImagePlugin", # PIL modules not auto found --- 52,56 ---- "win32ui,pywin,pywin.debugger," # *sob* - these still appear # Keep zope out else outlook users lose training. ! "ZODB,ZEO,zope,persistent,BTrees", includes = "dialogs.resources.dialogs,weakref," # Outlook dynamic dialogs "BmpImagePlugin,JpegImagePlugin", # PIL modules not auto found *************** *** 59,65 **** "tk84.dll,tcl84.dll", # No Tkinter == no tk/tcl dlls typelibs = [ ! ('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0), ! ('{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}', 0, 2, 1), ! ('{AC0714F2-3D04-11D1-AE7D-00A0C90F26F4}', 0, 1, 0), ] ) --- 58,64 ---- "tk84.dll,tcl84.dll", # No Tkinter == no tk/tcl dlls typelibs = [ ! ('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0, 'gen_py/outlook-9.py'), ! ('{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}', 0, 2, 1, 'gen_py/office-9.py'), ! ('{AC0714F2-3D04-11D1-AE7D-00A0C90F26F4}', 0, 1, 0, 'gen_py/addin-designer.py'), ] ) From mhammond at users.sourceforge.net Mon Mar 26 10:01:11 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Mon, 26 Mar 2007 00:01:11 -0800 Subject: [Spambayes-checkins] spambayes/windows/py2exe/gen_py README.txt, NONE, 1.1 addin-designer.py, NONE, 1.1 office-9.py, NONE, 1.1 outlook-9.py, NONE, 1.1 Message-ID: <20070326083321.24FA51E4015@bag.python.org> Update of /cvsroot/spambayes/spambayes/windows/py2exe/gen_py In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3873/gen_py Added Files: README.txt addin-designer.py office-9.py outlook-9.py Log Message: Files generated by makepy.py from the type-libraries we depend on. This is so developers without Office 2000 can still build a distribution. --- NEW FILE: README.txt --- This directory contains stubs generated by pywin32's 'makepy' utility. They are in source-control so that it is possible to build the spambayes binaries without having the correct Office etc versions installed on the build box. The py2exe script references these files, and compiled versions of them end up in the library used by spambayes. To determine the exact versions of the typelibs used to generate the various files, please just look inside it - all such information is recorded near the top. To generate new files, execute makepy.py with the -o option, and specify the filename you wish to use. --- NEW FILE: addin-designer.py --- # -*- coding: mbcs -*- # Created by makepy.py version 0.4.95 # By python version 2.4.4 (#71, Feb 5 2007, 15:24:39) [MSC v.1310 32 bit (Intel)] # From type library 'MSADDNDR.DLL' # On Mon Mar 26 16:03:36 2007 """Microsoft Add-In Designer""" makepy_version = '0.4.95' python_version = 0x20404f0 import win32com.client.CLSIDToClass, pythoncom import win32com.client.util from pywintypes import IID from win32com.client import Dispatch # The following 3 lines may need tweaking for the particular server # Candidates are pythoncom.Missing, .Empty and .ArgNotFound defaultNamedOptArg=pythoncom.Empty defaultNamedNotOptArg=pythoncom.Empty defaultUnnamedArg=pythoncom.Empty CLSID = IID('{AC0714F2-3D04-11D1-AE7D-00A0C90F26F4}') MajorVersion = 1 MinorVersion = 0 LibraryFlags = 8 LCID = 0x0 class constants: ext_cm_AfterStartup =0x0 # from enum ext_ConnectMode ext_cm_CommandLine =0x3 # from enum ext_ConnectMode ext_cm_External =0x2 # from enum ext_ConnectMode ext_cm_Startup =0x1 # from enum ext_ConnectMode ext_dm_HostShutdown =0x0 # from enum ext_DisconnectMode ext_dm_UserClosed =0x1 # from enum ext_DisconnectMode from win32com.client import DispatchBaseClass class IAddinDesigner(DispatchBaseClass): """Add-In Designer Control""" CLSID = IID('{AC0714F3-3D04-11D1-AE7D-00A0C90F26F4}') coclass_clsid = IID('{AC0714F6-3D04-11D1-AE7D-00A0C90F26F4}') _prop_map_get_ = { } _prop_map_put_ = { } class IAddinInstance(DispatchBaseClass): """Add-In Instance Object""" CLSID = IID('{AC0714F4-3D04-11D1-AE7D-00A0C90F26F4}') coclass_clsid = IID('{AC0714F7-3D04-11D1-AE7D-00A0C90F26F4}') _prop_map_get_ = { } _prop_map_put_ = { } class _IDTExtensibility2: CLSID = CLSID_Sink = IID('{B65AD801-ABAF-11D0-BB8B-00A0C90F2744}') coclass_clsid = IID('{AC0714F7-3D04-11D1-AE7D-00A0C90F26F4}') _public_methods_ = [] # For COM Server support _dispid_to_func_ = { 5 : "OnBeginShutdown", 4 : "OnStartupComplete", 1610678275 : "OnInvoke", 3 : "OnAddInsUpdate", 1 : "OnConnection", 1610678273 : "OnGetTypeInfo", 1610612737 : "OnAddRef", 1610612736 : "OnQueryInterface", 2 : "OnDisconnection", 1610612738 : "OnRelease", 1610678274 : "OnGetIDsOfNames", 1610678272 : "OnGetTypeInfoCount", } def __init__(self, oobj = None): if oobj is None: self._olecp = None else: import win32com.server.util from win32com.server.policy import EventHandlerPolicy cpc=oobj._oleobj_.QueryInterface(pythoncom.IID_IConnectionPointContainer) cp=cpc.FindConnectionPoint(self.CLSID_Sink) cookie=cp.Advise(win32com.server.util.wrap(self, usePolicy=EventHandlerPolicy)) self._olecp,self._olecp_cookie = cp,cookie def __del__(self): try: self.close() except pythoncom.com_error: pass def close(self): if self._olecp is not None: cp,cookie,self._olecp,self._olecp_cookie = self._olecp,self._olecp_cookie,None,None cp.Unadvise(cookie) def _query_interface_(self, iid): import win32com.server.util if iid==self.CLSID_Sink: return win32com.server.util.wrap(self) # Event Handlers # If you create handlers, they should have the following prototypes: # def OnBeginShutdown(self, custom=defaultNamedNotOptArg): # def OnStartupComplete(self, custom=defaultNamedNotOptArg): # def OnInvoke(self, dispidMember=defaultNamedNotOptArg, riid=defaultNamedNotOptArg, lcid=defaultNamedNotOptArg, wFlags=defaultNamedNotOptArg # , pdispparams=defaultNamedNotOptArg, pvarResult=pythoncom.Missing, pexcepinfo=pythoncom.Missing, puArgErr=pythoncom.Missing): # def OnAddInsUpdate(self, custom=defaultNamedNotOptArg): # def OnConnection(self, Application=defaultNamedNotOptArg, ConnectMode=defaultNamedNotOptArg, AddInInst=defaultNamedNotOptArg, custom=defaultNamedNotOptArg): # def OnGetTypeInfo(self, itinfo=defaultNamedNotOptArg, lcid=defaultNamedNotOptArg, pptinfo=pythoncom.Missing): # def OnAddRef(self): # def OnQueryInterface(self, riid=defaultNamedNotOptArg, ppvObj=pythoncom.Missing): # def OnDisconnection(self, RemoveMode=defaultNamedNotOptArg, custom=defaultNamedNotOptArg): # def OnRelease(self): # def OnGetIDsOfNames(self, riid=defaultNamedNotOptArg, rgszNames=defaultNamedNotOptArg, cNames=defaultNamedNotOptArg, lcid=defaultNamedNotOptArg # , rgdispid=pythoncom.Missing): # def OnGetTypeInfoCount(self, pctinfo=pythoncom.Missing): from win32com.client import CoClassBaseClass # This CoClass is known by the name 'MSAddnDr.AddInDesigner.1' class AddinDesigner(CoClassBaseClass): # A CoClass # Add-In Designer control CLSID = IID('{AC0714F6-3D04-11D1-AE7D-00A0C90F26F4}') coclass_sources = [ _IDTExtensibility2, ] default_source = _IDTExtensibility2 coclass_interfaces = [ IAddinDesigner, ] default_interface = IAddinDesigner # This CoClass is known by the name 'MSAddnDr.AddInInstance.1' class AddinInstance(CoClassBaseClass): # A CoClass # Add-In Instance Object CLSID = IID('{AC0714F7-3D04-11D1-AE7D-00A0C90F26F4}') coclass_sources = [ _IDTExtensibility2, ] default_source = _IDTExtensibility2 coclass_interfaces = [ IAddinInstance, ] default_interface = IAddinInstance IAddinDesigner_vtables_dispatch_ = 1 IAddinDesigner_vtables_ = [ ] IAddinInstance_vtables_dispatch_ = 1 IAddinInstance_vtables_ = [ ] _IDTExtensibility2_vtables_dispatch_ = 1 _IDTExtensibility2_vtables_ = [ (( 'OnConnection' , 'Application' , 'ConnectMode' , 'AddInInst' , 'custom' , ), 1, (1, (), [ (9, 1, None, None) , (3, 1, None, None) , (9, 1, None, None) , (24588, 1, None, None) , ], 1 , 1 , 4 , 0 , 28 , (3, 0, None, None) , 0 , )), (( 'OnDisconnection' , 'RemoveMode' , 'custom' , ), 2, (2, (), [ (3, 1, None, None) , (24588, 1, None, None) , ], 1 , 1 , 4 , 0 , 32 , (3, 0, None, None) , 0 , )), (( 'OnAddInsUpdate' , 'custom' , ), 3, (3, (), [ (24588, 1, None, None) , ], 1 , 1 , 4 , 0 , 36 , (3, 0, None, None) , 0 , )), (( 'OnStartupComplete' , 'custom' , ), 4, (4, (), [ (24588, 1, None, None) , ], 1 , 1 , 4 , 0 , 40 , (3, 0, None, None) , 0 , )), (( 'OnBeginShutdown' , 'custom' , ), 5, (5, (), [ (24588, 1, None, None) , ], 1 , 1 , 4 , 0 , 44 , (3, 0, None, None) , 0 , )), ] RecordMap = { } CLSIDToClassMap = { '{AC0714F6-3D04-11D1-AE7D-00A0C90F26F4}' : AddinDesigner, '{AC0714F7-3D04-11D1-AE7D-00A0C90F26F4}' : AddinInstance, '{B65AD801-ABAF-11D0-BB8B-00A0C90F2744}' : _IDTExtensibility2, '{AC0714F3-3D04-11D1-AE7D-00A0C90F26F4}' : IAddinDesigner, '{AC0714F4-3D04-11D1-AE7D-00A0C90F26F4}' : IAddinInstance, } CLSIDToPackageMap = {} win32com.client.CLSIDToClass.RegisterCLSIDsFromDict( CLSIDToClassMap ) VTablesToPackageMap = {} VTablesToClassMap = { '{B65AD801-ABAF-11D0-BB8B-00A0C90F2744}' : '_IDTExtensibility2', '{AC0714F3-3D04-11D1-AE7D-00A0C90F26F4}' : 'IAddinDesigner', '{AC0714F4-3D04-11D1-AE7D-00A0C90F26F4}' : 'IAddinInstance', } NamesToIIDMap = { 'IAddinInstance' : '{AC0714F4-3D04-11D1-AE7D-00A0C90F26F4}', '_IDTExtensibility2' : '{B65AD801-ABAF-11D0-BB8B-00A0C90F2744}', 'IAddinDesigner' : '{AC0714F3-3D04-11D1-AE7D-00A0C90F26F4}', } win32com.client.constants.__dicts__.append(constants.__dict__) --- NEW FILE: office-9.py --- # -*- coding: mbcs -*- # Created by makepy.py version 0.4.95 # By python version 2.4.4 (#71, Feb 5 2007, 15:24:39) [MSC v.1310 32 bit (Intel)] # From type library 'MSO9.DLL' # On Mon Mar 26 16:03:03 2007 """Microsoft Office 9.0 Object Library""" makepy_version = '0.4.95' python_version = 0x20404f0 import win32com.client.CLSIDToClass, pythoncom import win32com.client.util from pywintypes import IID from win32com.client import Dispatch # The following 3 lines may need tweaking for the particular server # Candidates are pythoncom.Missing, .Empty and .ArgNotFound defaultNamedOptArg=pythoncom.Empty defaultNamedNotOptArg=pythoncom.Empty defaultUnnamedArg=pythoncom.Empty [...6816 lines suppressed...] 'BalloonCheckboxes' : '{000C0326-0000-0000-C000-000000000046}', 'PropertyTests' : '{000C0334-0000-0000-C000-000000000046}', '_CommandBarsEvents' : '{000C0352-0000-0000-C000-000000000046}', 'IFoundFiles' : '{000C0338-0000-0000-C000-000000000046}', '_IMsoOleAccDispObj' : '{000C0301-0000-0000-C000-000000000046}', 'ShapeNode' : '{000C0318-0000-0000-C000-000000000046}', 'PropertyTest' : '{000C0333-0000-0000-C000-000000000046}', 'Adjustments' : '{000C0310-0000-0000-C000-000000000046}', 'BalloonCheckbox' : '{000C0328-0000-0000-C000-000000000046}', 'HTMLProject' : '{000C0356-0000-0000-C000-000000000046}', 'Shape' : '{000C031C-0000-0000-C000-000000000046}', 'CalloutFormat' : '{000C0311-0000-0000-C000-000000000046}', 'CommandBarControl' : '{000C0308-0000-0000-C000-000000000046}', 'LineFormat' : '{000C0317-0000-0000-C000-000000000046}', '_IMsoDispObj' : '{000C0300-0000-0000-C000-000000000046}', '_CommandBarComboBox' : '{000C030C-0000-0000-C000-000000000046}', } win32com.client.constants.__dicts__.append(constants.__dict__) --- NEW FILE: outlook-9.py --- # -*- coding: mbcs -*- # Created by makepy.py version 0.4.95 # By python version 2.4.4 (#71, Feb 5 2007, 15:24:39) [MSC v.1310 32 bit (Intel)] # From type library 'msoutl9.olb' # On Mon Mar 26 16:02:37 2007 """Microsoft Outlook 9.0 Object Library""" makepy_version = '0.4.95' python_version = 0x20404f0 import win32com.client.CLSIDToClass, pythoncom import win32com.client.util from pywintypes import IID from win32com.client import Dispatch # The following 3 lines may need tweaking for the particular server # Candidates are pythoncom.Missing, .Empty and .ArgNotFound defaultNamedOptArg=pythoncom.Empty defaultNamedNotOptArg=pythoncom.Empty defaultUnnamedArg=pythoncom.Empty [...7742 lines suppressed...] 'PropertyPages' : '{00063080-0000-0000-C000-000000000046}', 'Attachments' : '{0006303C-0000-0000-C000-000000000046}', 'Links' : '{0006308A-0000-0000-C000-000000000046}', '_ReportItem' : '{00063026-0000-0000-C000-000000000046}', '_Inspector' : '{00063005-0000-0000-C000-000000000046}', '_NoteItem' : '{00063025-0000-0000-C000-000000000046}', 'SyncObjects' : '{00063086-0000-0000-C000-000000000046}', 'Actions' : '{0006303E-0000-0000-C000-000000000046}', 'OutlookBarGroupsEvents' : '{0006307B-0000-0000-C000-000000000046}', '_ContactItem' : '{00063021-0000-0000-C000-000000000046}', '_TaskRequestUpdateItem' : '{00063037-0000-0000-C000-000000000046}', '_TaskRequestItem' : '{00063036-0000-0000-C000-000000000046}', '_DRecipientControl' : '{0006F025-0000-0000-C000-000000000046}', '_DocumentItem' : '{00063020-0000-0000-C000-000000000046}', '_IRecipientControl' : '{D87E7E16-6897-11CE-A6C0-00AA00608FAA}', 'RecurrencePattern' : '{00063044-0000-0000-C000-000000000046}', } win32com.client.constants.__dicts__.append(constants.__dict__) From mhammond at users.sourceforge.net Mon Mar 26 09:59:53 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Sun, 25 Mar 2007 23:59:53 -0800 Subject: [Spambayes-checkins] spambayes/windows/py2exe/gen_py - New directory Message-ID: <20070326083322.2EBDD1E4010@bag.python.org> Update of /cvsroot/spambayes/spambayes/windows/py2exe/gen_py In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3467/gen_py Log Message: Directory /cvsroot/spambayes/spambayes/windows/py2exe/gen_py added to the repository From mhammond at users.sourceforge.net Mon Mar 26 09:58:26 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Sun, 25 Mar 2007 23:58:26 -0800 Subject: [Spambayes-checkins] spambayes/Outlook2000 default_bayes_customize.ini, 1.10, 1.11 Message-ID: <20070326083323.131711E4010@bag.python.org> Update of /cvsroot/spambayes/spambayes/Outlook2000 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3036 Modified Files: default_bayes_customize.ini Log Message: enable image cracking for the outlook client. Index: default_bayes_customize.ini =================================================================== RCS file: /cvsroot/spambayes/spambayes/Outlook2000/default_bayes_customize.ini,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** default_bayes_customize.ini 14 Dec 2003 11:23:03 -0000 1.10 --- default_bayes_customize.ini 26 Mar 2007 07:58:24 -0000 1.11 *************** *** 32,33 **** --- 32,41 ---- # It's helpful for Tim . record_header_absence: True + + # Enable basic image cracking - the Windows binaries ship with a gocr binary + crack_images: True + + # For markh, image_size seems maginally helpful for images that the OCR + # engine fails to find any text in (the simple fact a .gif is attached is + # similarly helpful, but we stick with it for now) + image_size: True From mhammond at users.sourceforge.net Mon Mar 26 09:57:16 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Sun, 25 Mar 2007 23:57:16 -0800 Subject: [Spambayes-checkins] spambayes/spambayes Options.py, 1.140, 1.141 tokenizer.py, 1.47, 1.48 Message-ID: <20070326083323.CBB9F1E4014@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2236/spambayes Modified Files: Options.py tokenizer.py Log Message: x-crack-images, x-ocr-engine and x-image-size all get upgraded to non experimental options - congratulations, options! Index: Options.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** Options.py 12 Feb 2007 11:24:59 -0000 1.140 --- Options.py 26 Mar 2007 07:57:13 -0000 1.141 *************** *** 120,137 **** PATH, RESTORE), ! ("x-image_size", _("Generate image size tokens"), False, ! _("""(EXPERIMENTAL) If true, generate tokens based on the sizes of embedded images."""), BOOLEAN, RESTORE), ! ("x-crack_images", _("Look inside images for text"), False, ! _("""(EXPERIMENTAL) If true, generate tokens based on the (hopefully) text content contained in any images in each message. The current support is minimal, relies on the installation of ! an OCR 'engine' (see x-ocr_engine.)"""), BOOLEAN, RESTORE), ! ("x-ocr_engine", _("OCR engine to use"), "", ! _("""(EXPERIMENTAL) The name of the OCR engine to use. If empty, all supported engines will be checked to see if they are installed. Engines currently supported include ocrad --- 120,137 ---- PATH, RESTORE), ! ("image_size", _("Generate image size tokens"), False, ! _("""If true, generate tokens based on the sizes of embedded images."""), BOOLEAN, RESTORE), ! ("crack_images", _("Look inside images for text"), False, ! _("""If true, generate tokens based on the (hopefully) text content contained in any images in each message. The current support is minimal, relies on the installation of ! an OCR 'engine' (see ocr_engine.)"""), BOOLEAN, RESTORE), ! ("ocr_engine", _("OCR engine to use"), "", ! _("""The name of the OCR engine to use. If empty, all supported engines will be checked to see if they are installed. Engines currently supported include ocrad Index: tokenizer.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/tokenizer.py,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** tokenizer.py 12 Feb 2007 11:25:00 -0000 1.47 --- tokenizer.py 26 Mar 2007 07:57:13 -0000 1.48 *************** *** 1616,1620 **** parts = imageparts(msg) ! if options["Tokenizer", "x-image_size"]: # Find image/* parts of the body, calculating the log(size) of # each image. --- 1616,1620 ---- parts = imageparts(msg) ! if options["Tokenizer", "image_size"]: # Find image/* parts of the body, calculating the log(size) of # each image. *************** *** 1635,1640 **** yield "image-size:2**%d" % round(log2(total_len)) ! if options["Tokenizer", "x-crack_images"]: ! engine_name = options["Tokenizer", 'x-ocr_engine'] from spambayes.ImageStripper import crack_images text, tokens = crack_images(engine_name, parts) --- 1635,1640 ---- yield "image-size:2**%d" % round(log2(total_len)) ! if options["Tokenizer", "crack_images"]: ! engine_name = options["Tokenizer", 'ocr_engine'] from spambayes.ImageStripper import crack_images text, tokens = crack_images(engine_name, parts) From mhammond at users.sourceforge.net Mon Mar 26 09:57:15 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Sun, 25 Mar 2007 23:57:15 -0800 Subject: [Spambayes-checkins] spambayes/Outlook2000 msgstore.py, 1.101, 1.102 Message-ID: <20070326083324.675951E400C@bag.python.org> Update of /cvsroot/spambayes/spambayes/Outlook2000 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2236/Outlook2000 Modified Files: msgstore.py Log Message: x-crack-images, x-ocr-engine and x-image-size all get upgraded to non experimental options - congratulations, options! Index: msgstore.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** msgstore.py 12 Feb 2007 11:35:34 -0000 1.101 --- msgstore.py 26 Mar 2007 07:57:12 -0000 1.102 *************** *** 1094,1099 **** # For now, we know these are the only 2 options that need attachments. ! if not options['Tokenizer', 'x-crack_images'] and \ ! not options['Tokenizer', 'x-image_size']: return [] try: --- 1094,1099 ---- # For now, we know these are the only 2 options that need attachments. ! if not options['Tokenizer', 'crack_images'] and \ ! not options['Tokenizer', 'image_size']: return [] try: From mhammond at users.sourceforge.net Mon Mar 26 09:50:34 2007 From: mhammond at users.sourceforge.net (Mark Hammond) Date: Sun, 25 Mar 2007 23:50:34 -0800 Subject: [Spambayes-checkins] spambayes/spambayes ImageStripper.py, 1.13, 1.14 Message-ID: <20070326083325.28BD31E4011@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31720 Modified Files: ImageStripper.py Log Message: * Refactor popen() usage into 1 place and print a warning if the ocr engine fails. * In frozen builds on windows, only look in the 'bin' dir for OCR executables, and use the short version of the path to the exe to avoid insane weirdness regarding quotes and popen Index: ImageStripper.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/ImageStripper.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ImageStripper.py 14 Feb 2007 00:53:22 -0000 1.13 --- ImageStripper.py 26 Mar 2007 07:50:31 -0000 1.14 *************** *** 73,79 **** # so add that directory to the path and make sure we # look for a file ending in ".exe". ! # Put it at the *start* of the paths we search - who knows ! # what else me may encounter in the wild! ! path.insert(0, os.path.dirname(sys.executable)) else: # a source build - for testing, allow it in SB package dir. --- 73,86 ---- # so add that directory to the path and make sure we # look for a file ending in ".exe". ! if sys.frozen=="dll": ! import win32api ! sentinal = win32api.GetModuleFileName(sys.frozendllhandle) ! else: ! sentinal = sys.executable ! # os.popen() trying to quote both the program and argv[1] fails. ! # So just use the short version. ! # For the sake of safety, in a binary build we *only* look in ! # our bin dir. ! path=[win32api.GetShortPathName(os.path.dirname(sentinal))] else: # a source build - for testing, allow it in SB package dir. *************** *** 236,263 **** program = property(get_program) ! class OCREngineOCRAD(OCRExecutableEngine): ! engine_name = "ocrad" def extract_text(self, pnmfile): assert self.is_enabled(), "I'm not working!" ! scale = options["Tokenizer", "ocrad_scale"] or 1 ! charset = options["Tokenizer", "ocrad_charset"] ! ocr = os.popen('%s -s %s -c %s -f "%s" 2>%s' % ! (self.program, scale, charset, ! pnmfile, os.path.devnull)) ret = ocr.read() ! ocr.close() return ret class OCREngineGOCR(OCRExecutableEngine): engine_name="gocr" ! def extract_text(self, pnmfile): ! assert self.is_enabled(), "I'm not working!" ! ocr = os.popen('%s "%s" 2>%s' % ! (self.program, pnmfile, os.path.devnull)) ! ret = ocr.read() ! ocr.close() ! return ret # This lists all engines, with the first listed that is enabled winning. --- 243,275 ---- program = property(get_program) ! def get_command_line(self, pnmfile): ! raise NotImplementedError, "base classes must override" def extract_text(self, pnmfile): + # Generically reads output from stdout. assert self.is_enabled(), "I'm not working!" ! cmdline = self.get_command_line(pnmfile) ! ocr = os.popen(cmdline) ret = ocr.read() ! exit_code = ocr.close() ! if exit_code: ! print "warning:", self.engine_name, "failed with exit code", exit_code ! print "command line was:", repr(cmdline) return ret + class OCREngineOCRAD(OCRExecutableEngine): + engine_name = "ocrad" + + def get_command_line(self, pnmfile): + scale = options["Tokenizer", "ocrad_scale"] or 1 + charset = options["Tokenizer", "ocrad_charset"] + return '%s -s %s -c %s -f "%s" 2>%s' % \ + (self.program, scale, charset, pnmfile, os.path.devnull) + class OCREngineGOCR(OCRExecutableEngine): engine_name="gocr" ! def get_command_line(self, pnmfile): ! return '%s "%s" 2>%s' % (self.program, pnmfile, os.path.devnull) # This lists all engines, with the first listed that is enabled winning. From anadelonbrin at users.sourceforge.net Tue Mar 27 12:52:16 2007 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Tue, 27 Mar 2007 02:52:16 -0800 Subject: [Spambayes-checkins] spambayes/scripts sb_filter.py,1.20,1.21 Message-ID: <20070327105219.49B011E4006@bag.python.org> Update of /cvsroot/spambayes/spambayes/scripts In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8313/scripts Modified Files: sb_filter.py Log Message: Close db, for those that require it. Index: sb_filter.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/scripts/sb_filter.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** sb_filter.py 6 Aug 2006 14:50:29 -0000 1.20 --- sb_filter.py 27 Mar 2007 10:52:06 -0000 1.21 *************** *** 168,171 **** --- 168,172 ---- if self.mode != 'r': self.h.store() + self.h.close() self.mode = mode self.h = hammie.open(self.dbname, self.usedb, self.mode) *************** *** 175,178 **** --- 176,180 ---- if self.mode != 'r': self.h.store() + self.h.close() self.h = None From anadelonbrin at users.sourceforge.net Tue Mar 27 12:57:56 2007 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Tue, 27 Mar 2007 02:57:56 -0800 Subject: [Spambayes-checkins] spambayes/spambayes storage.py,1.60,1.61 Message-ID: <20070327105800.A23CA1E4006@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11482/spambayes Modified Files: storage.py Log Message: Improvements to ZODB and ZEO storage classes: * don't try storing to a read-only database; * make packing on close optional; * don't pack after closing; * optionally remove the pack backup file; * handle username, password, storage name, wait, and wait timeout for ZEO; * use persistent caches for ZEO. Index: storage.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** storage.py 22 Apr 2006 04:41:54 -0000 1.60 --- storage.py 27 Mar 2007 10:57:53 -0000 1.61 *************** *** 67,70 **** --- 67,71 ---- import time import types + import tempfile from spambayes import classifier from spambayes.Options import options, get_pathname_option *************** *** 676,679 **** --- 677,681 ---- except ImportError: Persistent = object + class _PersistentClassifier(classifier.Classifier, Persistent): def __init__(self): *************** *** 759,762 **** --- 761,765 ---- abort = ZODB.Transaction.get_transaction().abort from ZODB.POSException import ConflictError + from ZODB.POSException import ReadOnlyError from ZODB.POSException import TransactionFailedError *************** *** 781,786 **** self.db_name abort() ! def close(self): # Ensure that the db is saved before closing. Alternatively, we # could abort any waiting transaction. We need to do *something* --- 784,792 ---- self.db_name abort() + except ReadOnlyError: + print >> sys.stderr, "Can't store transaction to read-only db." + abort() ! def close(self, pack=True, retain_backup=True): # Ensure that the db is saved before closing. Alternatively, we # could abort any waiting transaction. We need to do *something* *************** *** 791,805 **** self.store() - # Do the closing. - self.DB.close() - # We don't make any use of the 'undo' capabilities of the # FileStorage at the moment, so might as well pack the database # each time it is closed, to save as much disk space as possible. # Pack it up to where it was 'yesterday'. ! # XXX What is the 'referencesf' parameter for pack()? It doesn't ! # XXX seem to do anything according to the source. ! if self.mode != 'r' and hasattr(self.storage, "pack"): ! self.storage.pack(time.time()-60*60*24, None) self.storage.close() --- 797,809 ---- self.store() # We don't make any use of the 'undo' capabilities of the # FileStorage at the moment, so might as well pack the database # each time it is closed, to save as much disk space as possible. # Pack it up to where it was 'yesterday'. ! if pack and self.mode != 'r': ! self.pack(time.time()-60*60*24, retain_backup) ! ! # Do the closing. ! self.DB.close() self.storage.close() *************** *** 811,814 **** --- 815,831 ---- print >> sys.stderr, 'Closed', self.db_name, 'database' + def pack(self, t, retain_backup=True): + """Like FileStorage pack(), but optionally remove the .old + backup file that is created. Often for our purposes we do + not care about being able to recover from this. Also + ignore the referencesf parameter, which appears to not do + anything.""" + if hasattr(self.storage, "pack"): + self.storage.pack(t, None) + if not retain_backup: + old_name = self.db_filename + ".old" + if os.path.exists(old_name): + os.remove(old_name) + class ZEOClassifier(ZODBClassifier): *************** *** 818,828 **** self.port = None db_name = "SpamBayes" for info in source_info: if info.startswith("host"): ! self.host = info[5:] elif info.startswith("port"): self.port = int(info[5:]) elif info.startswith("dbname"): db_name = info[7:] ZODBClassifier.__init__(self, db_name) --- 835,865 ---- self.port = None db_name = "SpamBayes" + self.username = '' + self.password = '' + self.storage_name = '1' + self.wait = None + self.wait_timeout = None for info in source_info: if info.startswith("host"): ! try: ! # ZEO only accepts strings, not unicode. ! self.host = str(info[5:]) ! except UnicodeDecodeError, e: ! print >> sys.stderr, "Couldn't set host", \ ! info[5:], str(e) elif info.startswith("port"): self.port = int(info[5:]) elif info.startswith("dbname"): db_name = info[7:] + elif info.startswith("user"): + self.username = info[5:] + elif info.startswith("pass"): + self.password = info[5:] + elif info.startswith("storage_name"): + self.storage_name = info[13:] + elif info.startswith("wait_timeout"): + self.wait_timeout = int(info[13:]) + elif info.startswith("wait"): + self.wait = info[5:] == "True" ZODBClassifier.__init__(self, db_name) *************** *** 833,837 **** else: addr = self.host ! self.storage = ClientStorage(addr) --- 870,908 ---- else: addr = self.host ! if options["globals", "verbose"]: ! print >> sys.stderr, "Connecting to ZEO server", addr, \ ! self.username, self.password ! # Use persistent caches, with the cache in the temp directory. ! # If the temp directory is cleared out, we lose the cache, but ! # that doesn't really matter, and we should always be able to ! # write to it. ! try: ! self.storage = ClientStorage(addr, name=self.db_name, ! read_only=self.mode=='r', ! username=self.username, ! client=self.db_name, ! wait=self.wait, ! wait_timeout=self.wait_timeout, ! storage=self.storage_name, ! var=tempfile.gettempdir(), ! password=self.password) ! except ValueError: ! # Probably bad cache; remove it and try without the cache. ! try: ! os.remove(os.path.join(tempfile.gettempdir(), ! self.db_name + \ ! self.storage_name + ".zec")) ! except OSError: ! pass ! self.storage = ClientStorage(addr, name=self.db_name, ! read_only=self.mode=='r', ! username=self.username, ! wait=self.wait, ! wait_timeout=self.wait_timeout, ! storage=self.storage_name, ! password=self.password) ! ! def is_connected(self): ! return self.storage.is_connected() *************** *** 840,849 **** NO_TRAINING_FLAG = 1 ! class Trainer: '''Associates a Classifier object and one or more Corpora, \ is an observer of the corpora''' def __init__(self, bayes, is_spam, updateprobs=NO_UPDATEPROBS): ! '''Constructor(Classifier, is_spam(True|False), updprobs(True|False)''' self.bayes = bayes --- 911,921 ---- NO_TRAINING_FLAG = 1 ! class Trainer(object): '''Associates a Classifier object and one or more Corpora, \ is an observer of the corpora''' def __init__(self, bayes, is_spam, updateprobs=NO_UPDATEPROBS): ! '''Constructor(Classifier, is_spam(True|False), ! updateprobs(True|False)''' self.bayes = bayes *************** *** 860,867 **** if options["globals", "verbose"]: ! print >> sys.stderr, 'training with',message.key() self.bayes.learn(message.tokenize(), self.is_spam) - # self.updateprobs) message.setId(message.key()) message.RememberTrained(self.is_spam) --- 932,938 ---- if options["globals", "verbose"]: ! print >> sys.stderr, 'training with ', message.key() self.bayes.learn(message.tokenize(), self.is_spam) message.setId(message.key()) message.RememberTrained(self.is_spam) From anadelonbrin at users.sourceforge.net Tue Mar 27 12:59:28 2007 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Tue, 27 Mar 2007 02:59:28 -0800 Subject: [Spambayes-checkins] spambayes/spambayes mboxutils.py,1.9,1.10 Message-ID: <20070327105930.5EE731E4006@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12424/spambayes Modified Files: mboxutils.py Log Message: Handle Apple Mail's emlx format. Index: mboxutils.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/mboxutils.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mboxutils.py 5 Nov 2004 03:03:00 -0000 1.9 --- mboxutils.py 27 Mar 2007 10:59:24 -0000 1.10 *************** *** 31,37 **** class DirOfTxtFileMailbox: - """Directory of files each assumed to contain an RFC-822 message. Subdirectories are traversed recursively. """ --- 31,43 ---- class DirOfTxtFileMailbox: """Directory of files each assumed to contain an RFC-822 message. + If the filename ends with ".emlx", assumes that the file is an + RFC-822 message wrapped in Apple Mail's proprietory .emlx format. + The emlx format is simply the length of the message (as a string + on the first line, then the raw message text, then the contents of + a plist (XML) file that contains data that Mail uses (subject, + flags, sender, and so forth). We ignore this plist data). + Subdirectories are traversed recursively. """ *************** *** 47,50 **** --- 53,61 ---- for mbox in DirOfTxtFileMailbox(name, self.factory): yield mbox + elif os.path.splitext(name)[1] == ".emlx": + f = open(name) + length = int(f.readline().rstrip()) + yield self.factory(f.read(length)) + f.close() else: try: