- update translation strings

- fixed multiple paints when showing quickpaste window

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@515 595ec19a-5cb4-439b-94a8-42fb3063c22c

CP_Main.cpp

@@ -227,11 +227,13 @@ BOOL CCP_MainApp::InitInstance()
 	}
 
 	CString csFile = CGetSetOptions::GetLanguageFile();
-	if(csFile.GetLength() > 0 && !m_Language.LoadLanguageFile(csFile))
+	if(m_Language.LoadLanguageFile(csFile) == false)
 	{
 		CString cs;
 		cs.Format(_T("Error loading language file - %s - \n\n%s"), csFile, m_Language.m_csLastError);
 		Log(cs);
+
+		m_Language.LoadLanguageFile(_T("English.xml"));
 	}
 
 	//The first time we run Ditto on U3 show a web page about ditto

CP_Main.rc

@@ -167,7 +167,7 @@ BEGIN
         MENUITEM "Show Quick Paste",            ID_FIRST_SHOWQUICKPASTE
         MENUITEM "Options",                     ID_FIRST_OPTION
         MENUITEM SEPARATOR
-        MENUITEM "Import",                      ID_FIRST_IMPORT
+        MENUITEM "Import Clip(s)",              ID_FIRST_IMPORT
         MENUITEM "New Clip",                    ID_FIRST_NEWCLIP
         MENUITEM SEPARATOR
         MENUITEM "Help",                        ID_FIRST_HELP
@@ -190,7 +190,7 @@ BEGIN
         END
         POPUP "Quick Options",                  65535,MFT_STRING,MFS_ENABLED
         BEGIN
-            POPUP "Lines Per Row",                  65535,MFT_STRING,MFS_ENABLED
+            POPUP "Lines Per Clip",                 65535,MFT_STRING,MFS_ENABLED
             BEGIN
                 MENUITEM "1",                           32807,MFT_STRING,MFS_ENABLED
                 MENUITEM "2",                           32786,MFT_STRING,MFS_ENABLED
@@ -227,7 +227,7 @@ BEGIN
                 MENUITEM "Bottom",                      32781,MFT_STRING,MFS_ENABLED
                 MENUITEM "Left",                        32782,MFT_STRING,MFS_ENABLED
             END
-            POPUP "Sort",                           65535,MFT_STRING,MFS_ENABLED
+            POPUP "Order",                          65535,MFT_STRING,MFS_ENABLED
             BEGIN
                 MENUITEM "Ascending (Latest on the Top)", 32795,MFT_STRING,MFS_ENABLED
                 MENUITEM "Descending (Latest on the Bottom)", 32797,MFT_STRING,MFS_ENABLED
@@ -288,8 +288,8 @@ BEGIN
             MENUITEM "Remove Quick Paste",          32856,MFT_STRING | MFT_RIGHTJUSTIFY,MFS_ENABLED
         END
         MENUITEM MFT_SEPARATOR
-        MENUITEM "Import",                      32855,MFT_STRING,MFS_ENABLED
-        MENUITEM "Export",                      32853,MFT_STRING,MFS_ENABLED
+        MENUITEM "Import Clip(s)",              32855,MFT_STRING,MFS_ENABLED
+        MENUITEM "Export Clip(s)",              32853,MFT_STRING,MFS_ENABLED
         MENUITEM MFT_SEPARATOR
         MENUITEM "Options...",                  32805,MFT_STRING,MFS_ENABLED
         MENUITEM MFT_SEPARATOR
@@ -377,7 +377,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,30,335,10
     CONTROL         "Show leading whitespace",IDC_DESC_SHOW_LEADING_WHITESPACE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,41,335,10
-    LTEXT           "Text Lines per Row",IDC_STATIC_LINES,18,54,93,8
+    LTEXT           "Text Lines per Clip",IDC_STATIC_LINES,18,54,93,8
     EDITTEXT        IDC_LINES_ROW,114,52,19,12,ES_AUTOHSCROLL
     CONTROL         "Enable Quick Paste Transparency",IDC_TRANSPARENCY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,67,155,10
@@ -498,7 +498,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,215,306,10
     LTEXT           "Days",IDC_STATIC_DAYS,201,53,51,12,SS_CENTERIMAGE
     CONTROL         "Set Database Path",IDC_SET_DB_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,79,320,10
-    LTEXT           "Lanuage",IDC_STATIC_LANGUAGE,23,65,36,12,SS_CENTERIMAGE
+    LTEXT           "Language",IDC_STATIC_LANGUAGE,23,65,36,12,SS_CENTERIMAGE
 END
 
 IDD_SELECT_DB DIALOGEX 0, 0, 276, 46
@@ -588,7 +588,7 @@ END
 
 IDD_ABOUT DIALOGEX 0, 0, 329, 153
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About"
+CAPTION "About Ditto"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LISTBOX         IDC_LIST,7,16,315,86,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP

Debug/Language/German.xml → Debug/Language/Deutsch.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Ditto_Language_File Version = "1.1" Author = "Stephan Jaeger" Notes = "" LanguageCode="ger">
+<Ditto_Language_File Version = "1.2" Author = "Guido Schroeder" Notes = "based on file German.xml by Stephan Jaeger" LanguageCode="ger">
 	<Ditto_Right_Click_Menu>
 		<Item English_Text = "Groups" ID = "-1">Gruppen</Item>
-		<Item English_Text = "New Group	Ctrl-F7" ID = "32811">Neue Gruppe STRG-F7</Item>
-		<Item English_Text = "New Group Selection	F7" ID = "32812">Neue Gruppenauswahl F7</Item>
-		<Item English_Text = "Move to Group" ID = "32840">Zu Gruppe verschieben</Item>
-		<Item English_Text = "Quick Options" ID = "-1">Schnelleinstellungen</Item>
-		<Item English_Text = "Lines Per Row" ID = "-1">Zeilen pro Reihe</Item>
+		<Item English_Text = "New Group	Ctrl-F7" ID = "32811">Neue Gruppe anlegen</Item>
+		<Item English_Text = "New Group Selection	F7" ID = "32812">Neue Gruppenauswahl</Item>
+		<Item English_Text = "Move to Group" ID = "32840">In Gruppe verschieben</Item>
+		<Item English_Text = "Quick Options" ID = "-1">Kurzoptionen</Item>
+		<Item English_Text = "Lines Per Clip" ID = "-1">Zeilen pro Eintrag</Item>
 		<Item English_Text = "1" ID = "32807">1</Item>
 		<Item English_Text = "2" ID = "32786">2</Item>
 		<Item English_Text = "3" ID = "32787">3</Item>
 		<Item English_Text = "4" ID = "32788">4</Item>
 		<Item English_Text = "5" ID = "32789">5</Item>
-		<Item English_Text = "Transparency" ID = "-1">Transparenz</Item>
+		<Item English_Text = "Transparency" ID = "-1">Transparenz der Listenansicht</Item>
 		<Item English_Text = "None" ID = "32800">Keine</Item>
 		<Item English_Text = "5 " ID = "32808">5</Item>
 		<Item English_Text = "10 " ID = "32792">10</Item>
@@ -21,70 +21,70 @@
 		<Item English_Text = "25 " ID = "32798">25</Item>
 		<Item English_Text = "30 " ID = "32799">30</Item>
 		<Item English_Text = "40 " ID = "32790">40</Item>
-		<Item English_Text = "Positioning" ID = "-1">Positionierung</Item>
-		<Item English_Text = "At Caret" ID = "32802">Am Caret</Item>
-		<Item English_Text = "At Cursor" ID = "32803">Am Cursor</Item>
-		<Item English_Text = "At Previous Position" ID = "32804">An der vorherigen Position</Item>
-		<Item English_Text = "First Ten Hot Keys" ID = "-1">Ersten zehn Hotkeys</Item>
+		<Item English_Text = "Positioning" ID = "-1">Position der Listenansicht</Item>
+		<Item English_Text = "At Caret" ID = "32802">Cursor</Item>
+		<Item English_Text = "At Cursor" ID = "32803">Mauszeiger</Item>
+		<Item English_Text = "At Previous Position" ID = "32804">Letzte Fensterposition</Item>
+		<Item English_Text = "First Ten Hot Keys" ID = "-1">Ersten zehn Tastenkürzels</Item>
 		<Item English_Text = "Use Ctrl - Num" ID = "32777">STRG-Num verwenden</Item>
-		<Item English_Text = "Show Hot Key Text" ID = "32778">Hotkeytext anzeigen</Item>
-		<Item English_Text = "View Caption Bar On" ID = "-1">Beschriftungsleiste anzeigen</Item>
+		<Item English_Text = "Show Hot Key Text" ID = "32778">Tastenkürzeltext anzeigen</Item>
+		<Item English_Text = "View Caption Bar On" ID = "-1">Position der Titelleiste</Item>
 		<Item English_Text = "Top" ID = "32783">Oben</Item>
 		<Item English_Text = "Right" ID = "32780">Rechts</Item>
 		<Item English_Text = "Bottom" ID = "32781">Unten</Item>
 		<Item English_Text = "Left" ID = "32782">Links</Item>
-		<Item English_Text = "Sort" ID = "-1">Sortieren</Item>
-		<Item English_Text = "Ascending (Latest on the Top)" ID = "32795">Aufsteigend (die neusten oben)</Item>
-		<Item English_Text = "Descending (Latest on the Bottom)" ID = "32797">Absteigend (die neusten unten)</Item>
-		<Item English_Text = "Double Clicking on Caption" ID = "-1">Doppelklick auf die Beschriftung</Item>
-		<Item English_Text = "Toggles Always on Top" ID = "32814">Immer im Vordergrund: ein/aus</Item>
-		<Item English_Text = "Rolls-up Window" ID = "32815">Fenster hochrollen</Item>
-		<Item English_Text = "Toggles Always Show Description" ID = "32816">Beschreibung immer anzeigen: ein/aus</Item>
-		<Item English_Text = "Always on Top	Ctrl-Space" ID = "32784">Immer im Vordergrund Strg-Leertaste</Item>
-		<Item English_Text = "Auto Roll-up" ID = "32791">Immer hochrollen</Item>
-		<Item English_Text = "Always Show Description" ID = "32813">Beschriftung immer anzeigen</Item>
-		<Item English_Text = "Prompt For New Group Names" ID = "32817">Nach neuen Gruppennamen fragen</Item>
-		<Item English_Text = "Select Font" ID = "32844">Zeichensatz wählen</Item>
+		<Item English_Text = "Order" ID = "-1">Reihenfolge</Item>
+		<Item English_Text = "Ascending (Latest on the Top)" ID = "32795">Aufsteigend (Neu -> Alt)</Item>
+		<Item English_Text = "Descending (Latest on the Bottom)" ID = "32797">Absteigend (Alt -> Neu)</Item>
+		<Item English_Text = "Double Clicking on Caption" ID = "-1">Doppelklick auf Titelleiste</Item>
+		<Item English_Text = "Toggles Always on Top" ID = "32814">Immer im Vordergrund</Item>
+		<Item English_Text = "Rolls-up Window" ID = "32815">Listenansicht aufrollen</Item>
+		<Item English_Text = "Toggles Always Show Description" ID = "32816">Anzeige der Kurzansicht</Item>
+		<Item English_Text = "Always on Top	Ctrl-Space" ID = "32784">Immer im Vordergrund</Item>
+		<Item English_Text = "Auto Roll-up" ID = "32791">Automatisch aufrollen</Item>
+		<Item English_Text = "Always Show Description" ID = "32813">Kurzansicht immer anzeigen</Item>
+		<Item English_Text = "Prompt For New Group Names" ID = "32817">Neuen Gruppennamen abfragen</Item>
+		<Item English_Text = "Select Font" ID = "32844">Schriftart wählen</Item>
 		<Item English_Text = "Show Thumbnails" ID = "32845">Bildvorschau anzeigen</Item>
 		<Item English_Text = "Draw RTF Text" ID = "32846">RTF Text einfügen</Item>
-		<Item English_Text = "Paste Clip after selection" ID = "32847">Ausschnitt nach Auswahl einfügen</Item>
-		<Item English_Text = "Find As You Type" ID = "32848">Suche während der Eingabe</Item>
-		<Item English_Text = "Ensure Entire Window Is Visible" ID = "32849">Gesamtes Fenster immer sichtbar</Item>
-		<Item English_Text = "Show Clips That are in Groups in Main List" ID = "32850">Ausschnitte immer anzeigen, die sich in Gruppen in der Hauptliste befinden</Item>
-		<Item English_Text = "Send To" ID = "-1">Gesendet an</Item>
-		<Item English_Text = "(192.168.1.101) - same computer" ID = "32824">(192.168.1.101) - selben computer</Item>
-		<Item English_Text = "View Full Description	F3" ID = "32793">Komplette Beschreibung anzeigen</Item>
-		<Item English_Text = "View Groups	Ctrl-G" ID = "32819">Gruppen anzeigen   Strg-G</Item>
-		<Item English_Text = "Paste Plain Text Only	Shift-Enter" ID = "32841">Nur Text einfügen Umschalt-Enter</Item>
-		<Item English_Text = "Paste HTML as Plain Text" ID = "32851">HTML als Text einfügen</Item>
-		<Item English_Text = "Delete Entry	Del" ID = "32801">Eintrag löschen  Del</Item>
-		<Item English_Text = "Properties	Alt-Enter" ID = "32776">Eigenschaften    Alt-Enter</Item>
-		<Item English_Text = "Quick Properties" ID = "-1">Schnelleinstellungen</Item>
-		<Item English_Text = "Never Auto Delete" ID = "32820">Niemals sofort löschen</Item>
-		<Item English_Text = "Auto Delete" ID = "32821">Sofort löschen</Item>
-		<Item English_Text = "Remove Hot Key" ID = "32822">Hotkey entfernen</Item>
-		<Item English_Text = "Options..." ID = "32805">Einstellungen...</Item>
-		<Item English_Text = "Help" ID = "32842">Hilfe</Item>
-		<Item English_Text = "Disconnect from Clipboard" ID = "32775">Verbindung zur Zwischenablage beenden</Item>
+		<Item English_Text = "Paste Clip after selection" ID = "32847">Eintrag nach Auswahl einfügen</Item>
+		<Item English_Text = "Find As You Type" ID = "32848">Inkrementelle Suche</Item>
+		<Item English_Text = "Ensure Entire Window Is Visible" ID = "32849">Listenansicht immer ganz sichtbar</Item>
+		<Item English_Text = "Show Clips That are in Groups in Main List" ID = "32850">Gruppeneinträge in Hauptliste anzeigen</Item>
+		<Item English_Text = "Sent To" ID = "-1">Senden an</Item>
+		<Item English_Text = "(192.168.1.101) - same computer" ID = "32824">(192.168.1.101) - selber Computer</Item>
+		<Item English_Text = "View Full Description	F3" ID = "32793">Kurzansicht anzeigen</Item>
+		<Item English_Text = "View Groups	Ctrl-G" ID = "32819">Gruppen anzeigen</Item>
+		<Item English_Text = "Paste Plain Text Only	Shift-Enter" ID = "32841">Als einfachen Text einfügen</Item>
+		<Item English_Text = "Paste HTML as Plain Text" ID = "32851">HTML als einfachen Text einfügen</Item>
+		<Item English_Text = "Delete Entry	Del" ID = "32801">Einträge löschen</Item>
+		<Item English_Text = "Properties	Alt-Enter" ID = "32776">Eigenschaften</Item>
+		<Item English_Text = "Quick Properties" ID = "-1">Kurzeigenschaften</Item>
+		<Item English_Text = "Never Auto Delete" ID = "32820">Automatisches Löschen aus</Item>
+		<Item English_Text = "Auto Delete" ID = "32821">Automatisches Löschen ein</Item>
+		<Item English_Text = "Remove Hot Key" ID = "32822">Tastenkürzel entfernen</Item>
+		<Item English_Text = "Options..." ID = "32805">Optionen...</Item>
+		<Item English_Text = "Help" ID = "32842">Online-Hilfe</Item>
+		<Item English_Text = "Disconnect from Clipboard" ID = "32775">Verbindung zur Zwischenablage trennen</Item>
 		<Item English_Text = "Exit Program" ID = "32806">Programm beenden</Item>
 		
 		//New strings added in 3.6 6-9-06
-		<Item English_Text = "Prompt to Delete Clip" ID = "32852">Bei Ausschnittlöschung nachfragen</Item>	
-		<Item English_Text = "Import" ID = "32855">Importieren</Item>
-		<Item English_Text = "Export" ID = "32853">Exportieren</Item>
-		<Item English_Text = "Remove Quick Paste" ID = "32856">Schnelleinfügen entfernen</Item>	
-		<Item English_Text = "Edit Clip" ID = "32860">Ausschnitt bearbeiten</Item>
-		<Item English_Text = "New Clip" ID = "32867">Neuer Ausschnitt</Item>	
+		<Item English_Text = "Prompt to Delete Clip" ID = "32852">Löschen eines Eintrags bestätigen</Item>	
+		<Item English_Text = "Import" ID = "32855">Einträge importieren</Item>
+		<Item English_Text = "Export" ID = "32853">Einträge exportieren</Item>
+		<Item English_Text = "Remove Quick Paste" ID = "32856">Kein direktes Einfügen</Item>	
+		<Item English_Text = "Edit Clip" ID = "32860">Eintrag editieren</Item>
+		<Item English_Text = "New Clip" ID = "32867">Neuer Eintrag</Item>	
 		
 	</Ditto_Right_Click_Menu>
 	<Ditto_Clip_Properties>
-		<Item English_Text = "Hot Key" ID = "2039">Hot Key</Item>
-		<Item English_Text = "Hot Key" ID = "2039">Hot Key</Item>
+		<Item English_Text = "Hot Key" ID = "2039">Tastenkürzel</Item>
+		<Item English_Text = "Hot Key" ID = "2039">Tastenkürzel</Item>
 		<Item English_Text = "Date" ID = "2040">Datum</Item>
-		<Item English_Text = "&Never Auto Delete" ID = "1025">&Niemals sofort löschen</Item>
-		<Item English_Text = "Parse" ID = "1040">Analysieren</Item>
-		<Item English_Text = "Move To Group" ID = "2041">Zu Gruppe verschieben</Item>
-		<Item English_Text = "Item Title" ID = "2042">Name der Sache</Item>
+		<Item English_Text = "&Never Auto Delete" ID = "1025">&Kein automatisches Löschen</Item>
+		<Item English_Text = "Parse" ID = "1040">Prüfen</Item>
+		<Item English_Text = "Move To Group" ID = "2041">In Gruppe verschieben</Item>
+		<Item English_Text = "Item Title" ID = "2042">Kurzansicht</Item>
 		<Item English_Text = "Copy Formats" ID = "2029">Formate kopieren</Item>
 		<Item English_Text = "Delete" ID = "1021">Löschen</Item>
 		<Item English_Text = "OK" ID = "1">Ok</Item>
@@ -92,29 +92,30 @@
 		<Item English_Text = "Copy Properties" ID = "-1">Eigenschaften kopieren</Item>
 	</Ditto_Clip_Properties>
 	<Ditto_Options_General>
-		<Item English_Text = "Start Ditto on System Startup" ID = "2004">Ditto beim Systemstart starten</Item>
-		<Item English_Text = "Display Icon in System Tray" ID = "2003">Symbol im Systemtray zeigen</Item>
-		<Item English_Text = "Maximum Number of Saved Copies" ID = "2008">Maximale Anzahl gespeicherter Kopien</Item>
+		<Item English_Text = "Start Ditto on System Startup" ID = "2004">Beim Systemstart starten</Item>
+		<Item English_Text = "Display Icon in System Tray" ID = "2003">Symbol im Infobereich anzeigen</Item>
+		<Item English_Text = "Maximum Number of Saved Copies" ID = "2008">Höchstzahl zu speichernder Einträge</Item>
 		<Item English_Text = "Paste Entries Expire after" ID = "2009">Eingefügte Einträge löschen nach</Item>
 		<Item English_Text = "Days" ID = "2043">Tagen</Item>
 		<Item English_Text = "Compact and Repair" ID = "1028">Komprimieren und reparieren</Item>
-		<Item English_Text = "Automatically check for updates online" ID = "1029">Automatisch auf Updates prüfen</Item>
-		<Item English_Text = "Check Now" ID = "1030">Auf Updates prüfen</Item>
-		<Item English_Text = "Allow Duplicates" ID = "1037">Duplikate zulassen</Item>
-		<Item English_Text = "Update Clip Time On Paste" ID = "1038">Ausschnittzeit beim Einfügen aktualisieren</Item>
-		<Item English_Text = "Save Multi-Pastes" ID = "1039">Mehrfache Einfügungen speichern</Item>
-		<Item English_Text = "Hide Ditto on Hot Key if Ditto is Visible" ID = "1040">Angezeigtes Ditto minimieren nach Hotkeyverwendung</Item>
-		<Item English_Text = "Amount of text to save for description" ID = "2044">Abspeicherbarer Textumfang für Beschreibung</Item>
-		<Item English_Text = "On copy play the sound" ID = "2045">Geräusch beim Kopieren abspielen</Item>
+		<Item English_Text = "Automatically check for updates online" ID = "1029">Automatisch auf aktuellere Version prüfen</Item>
+		<Item English_Text = "Check Now" ID = "1030">Jetzt prüfen</Item>
+		<Item English_Text = "Allow Duplicates" ID = "1037">Doppelte Einträge erlauben</Item>
+		<Item English_Text = "Update Clip Time On Paste" ID = "1038">Beim Einfügen Zeit eines Eintrags aktualisieren</Item>
+		<Item English_Text = "Save Multi-Pastes" ID = "1039">Einfügen mehrerer Einträge als neuen Eintrag speichern</Item>
+		<Item English_Text = "Hide Ditto on Hot Key if Ditto is Visible" ID = "1040">Listenansicht nach Tastenkürzel minimieren</Item>
+		<Item English_Text = "Amount of text to save for description" ID = "2044">Umfang des in Kurzansicht gespeicherten Textes</Item>
+		<Item English_Text = "On copy play the sound" ID = "2045">Klang beim Kopieren abspielen</Item>
 		<Item English_Text = "Play" ID = "2034">Abspielen</Item>
-		<Item English_Text = "Paste Clip in active window after selection" ID = "1041">Ausschnitt nach der Auswahl im aktiven Fenster einfügen</Item>
-		<Item English_Text = "Maximum Clip Size in Bytes" ID = "2046">Maximale Ausschnittgröße in Bytes</Item>
-		<Item English_Text = "(Leave blank for no limit)" ID = "2047">(Leer für unbeschränkt)</Item>
-		<Item English_Text = "Set Database Path" ID = "1034">Datenbankpfad setzen</Item>
+		<Item English_Text = "Paste Clip in active window after selection" ID = "1041">Eintrag nach der Auswahl in aktives Fenster einfügen</Item>
+		<Item English_Text = "Maximum Clip Size in Bytes" ID = "2046">Maximale Größe des Eintrags (in Byte)</Item>
+		<Item English_Text = "(Leave blank for no limit)" ID = "2047">(Leer = kein Maximum)</Item>
+		<Item English_Text = "Set Database Path" ID = "1034">Pfad der Datenbank ändern</Item>
 		<Item English_Text = "Language" ID = "2069">Sprache</Item>
-		<Item English_Text = "Ignore copies that occur X milliseconds from the last copy (1000 ms = 1 sec)" ID = "2072">Kopien ignorieren, die X Millisekunden (1000 ms = 1 Sek) nach der letzten Kopie auftreten</Item>
-		<Item English_Text = "General" ID = "-1" PropertyPage = "true">Allgemeines</Item>
-		<Item English_Text = "Ensure Ditto is always connected to the clipboard" ID = "1042">Sicherstellen, dass Ditto die Zwischenablage überwacht</Item>
+		<Item English_Text = "Ignore copies that occur X milliseconds from the last copy (1000 ms = 1 sec)" ID = "2072">Weitere Kopien ignorieren für Millisekunden (= 1/1000 Sekunden)</Item>
+		<Item English_Text = "General" ID = "-1" PropertyPage = "true">Allgemein</Item>
+		<Item English_Text = "Ensure Ditto is always connected to the clipboard" ID = "1042">Verbindung mit Zwischenablage überwachen</Item>
+		<Item English_Text = "Multi-Paste clip separator ([LF] = line feed)" ID = "2090"></Item>
 	</Ditto_Options_General>
 	<Ditto_Options_Supported_Types>
 		<Item English_Text = "&Add" ID = "1015">&Hinzufügen</Item>
@@ -122,12 +123,12 @@
 		<Item English_Text = "Supported Types" ID = "-1" PropertyPage = "true">Unterstützte Typen</Item>
 	</Ditto_Options_Supported_Types>
 	<Ditto_Options_Shortcuts>
-		<Item English_Text = "Activate Ditto" ID = "2048">Ditto aktivieren</Item>
-		<Item English_Text = "Win" ID = "2035">Win</Item>
-		<Item English_Text = "Named Copy" ID = "2049">benannte Kopie</Item>
-		<Item English_Text = "Win" ID = "2036">Win</Item>
-		<Item English_Text = "Global Hot Keys for Last Ten Items Copied" ID = "2051">Globale Hotkeys für die letzten zehn kopierten Ausschnitte</Item>
-		<Item English_Text = "Send Paste (Otherwise it will just load the item on the clipboard)" ID = "1042">Einfügung senden (andernfalls wird nur der Inhalt in die Zwischenablage geladen)</Item>
+		<Item English_Text = "Activate Ditto" ID = "2048">Listenansicht aufrufen</Item>
+		<Item English_Text = "Win" ID = "2035">WIN</Item>
+		<Item English_Text = "Named Copy" ID = "2049">Benannte Kopie</Item>
+		<Item English_Text = "Win" ID = "2036">WIN</Item>
+		<Item English_Text = "Global Hot Keys for Last Ten Items Copied" ID = "2051">Globale Tastenkürzel der letzten zehn Einträge</Item>
+		<Item English_Text = "Send Paste (Otherwise it will just load the item on the clipboard)" ID = "1042">Eintrag direkt einfügen (nicht nur in die Zwischenablage)</Item>
 		<Item English_Text = "Position 1" ID = "2052">1</Item>
 		<Item English_Text = "Position 2" ID = "2053">2</Item>
 		<Item English_Text = "Position 3" ID = "2054">3</Item>
@@ -138,78 +139,82 @@
 		<Item English_Text = "Position 8" ID = "2059">8</Item>
 		<Item English_Text = "Position 9" ID = "2060">9</Item>
 		<Item English_Text = "Position 10" ID = "2061">10</Item>
-		<Item English_Text = "Win" ID = "2042">Win</Item>
-		<Item English_Text = "Win" ID = "2043">Win</Item>
-		<Item English_Text = "Win" ID = "2044">Win</Item>
-		<Item English_Text = "Win" ID = "2045">Win</Item>
-		<Item English_Text = "Win" ID = "2046">Win</Item>
-		<Item English_Text = "Win" ID = "2037">Win</Item>
-		<Item English_Text = "Win" ID = "2038">Win</Item>
-		<Item English_Text = "Win" ID = "2039">Win</Item>
-		<Item English_Text = "Win" ID = "2040">Win</Item>
-		<Item English_Text = "Win" ID = "2041">Win</Item>
-		<Item English_Text = "Check the 'Win' Button to include the windows keyboard key in your hot key." ID = "2050">Aktiviere das 'Win'-Kästchen, damit die Windowstaste auch als Hotkey verwendet werden kann.</Item>
+		<Item English_Text = "Win" ID = "2042">WIN</Item>
+		<Item English_Text = "Win" ID = "2043">WIN</Item>
+		<Item English_Text = "Win" ID = "2044">WIN</Item>
+		<Item English_Text = "Win" ID = "2045">WIN</Item>
+		<Item English_Text = "Win" ID = "2046">WIN</Item>
+		<Item English_Text = "Win" ID = "2037">WIN</Item>
+		<Item English_Text = "Win" ID = "2038">WIN</Item>
+		<Item English_Text = "Win" ID = "2039">WIN</Item>
+		<Item English_Text = "Win" ID = "2040">WIN</Item>
+		<Item English_Text = "Win" ID = "2041">WIN</Item>
+		<Item English_Text = "Check the 'Win' Button to include the windows keyboard key in your hot key." ID = "2050">Um Windows-Taste in Kürzeln verwenden, bitte Taste jeweils aktivieren.</Item>
 		<Item English_Text = "Keyboard Shortcuts" ID = "-1" PropertyPage = "true">Tastaturkürzel</Item>
 	</Ditto_Options_Shortcuts>
 	<Ditto_Options_Quick_Paste>
-		<Item English_Text = "History Starts at the Top of the list (vs. Bottom)" ID = "1042">Verlauf beginnt am Beginn der Liste (vs. Ende)</Item>
-		<Item English_Text = "Use Ctrl - Num for first ten copy hot keys" ID = "1033">Strg - Num für die ersten zehn kopierten Einträge verwenden</Item>
-		<Item English_Text = "Show text for first ten copy hot keys" ID = "1034">Text für die ersten zehn Kopier-Hotkeys anzeigen</Item>
-		<Item English_Text = "Show leading whitespace" ID = "2021">führende Leerzeichen anzeigen</Item>
-		<Item English_Text = "Text Lines per Row" ID = "2062">Textzeilen pro Reihe</Item>
-		<Item English_Text = "Enable Quick Paste Transparency" ID = "2006">Transparenz für Schnelleinfügen aktivieren</Item>
-		<Item English_Text = "Show thumbnails (for CF_DIB types) (Could Increase Memory Usage and Display Speed)" ID = "2022">Vorschau anzeigen (für CF_DIB Typen) (könnte PC langsamer machen)</Item>
-		<Item English_Text = "Draw RTF Text in List (for RTF types) (Could Increase Memory Usage an Display Speed)" ID = "2023">RTF Text in Liste malen (für RTF Typen) (könnte PC langsamer machen)</Item>
-		<Item English_Text = "Find As You Type" ID = "2036">Parallele Suche zur Eingabe</Item>
-		<Item English_Text = "Ensure Entire Window is Visible" ID = "2037">Fenster immer sichtbar</Item>
-		<Item English_Text = "Show Clips That are in Groups in Main List" ID = "2038">Ausschnitte immer anzeigen, die sich in Gruppen in der Hauptliste befinden</Item>
+		<Item English_Text = "History Starts at the Top of the list (vs. Bottom)" ID = "1042">Verlauf beginnt am Listenanfang (vs. -ende)</Item>
+		<Item English_Text = "Use Ctrl - Num for first ten copy hot keys" ID = "1033">Strg-Num als Kürzel für die ersten zehn Einträge</Item>
+		<Item English_Text = "Show text for first ten copy hot keys" ID = "1034">Bei ersten zehn Einträgen Tastenkürzel anzeigen</Item>
+		<Item English_Text = "Show leading whitespace" ID = "2021">Führende Leerzeichen anzeigen</Item>
+		<Item English_Text = "Text Lines per Row" ID = "2062">Zeilen pro Eintrag</Item>
+		<Item English_Text = "Enable Quick Paste Transparency" ID = "2006">Transparenz für Listenansicht aktivieren</Item>
+		<Item English_Text = "Show thumbnails (for CF_DIB types) (Could Increase Memory Usage and Display Speed)" ID = "2022">Bildvorschau anzeigen (beim Typ CF_DIB) (Evtl. mehr Speicherbedarf/langsame Ausgabe)</Item>
+		<Item English_Text = "Draw RTF Text in List (for RTF types) (Could Increase Memory Usage an Display Speed)" ID = "2023">RTF Text in Liste malen (beim Typ RTF) (Evtl. mehr Speicherbedarf/langsame Ausgabe)</Item>
+		<Item English_Text = "Find As You Type" ID = "2036">Inkrementelle Suche</Item>
+		<Item English_Text = "Ensure Entire Window is Visible" ID = "2037">Listenansicht immer ganz sichtbar</Item>
+		<Item English_Text = "Show Clips That are in Groups in Main List" ID = "2038">Gruppeneinträge in Hauptliste anzeigen</Item>
 		<Item English_Text = "Font" ID = "1040">Zeichensatz</Item>
 		<Item English_Text = "Default Font" ID = "2031">Voreinstellung</Item>
-		<Item English_Text = "Popup Positioning" ID = "2063">Popupposition</Item>
-		<Item English_Text = "At Caret" ID = "2015">Am Caret</Item>
-		<Item English_Text = "At Cursor" ID = "2016">Am Cursor</Item>
-		<Item English_Text = "At Previous Position" ID = "2017">An der vorherigen Position</Item>
-		<Item English_Text = "List Item Prefix Legend" ID = "2064">Posten Prefix Verlauf anzeigen</Item>
-		<Item English_Text = "  * = Don't Auto Delete\n  s = Shortcut exists\n G = Item is a Group\n  ! = Item is attached to a Group" ID = "2065">  * = Nicht austomatisch löschen\n  s = Kürzel existiert bereits\n G = Posten ist in einer Gruppe\n  ! = Posten ist einer Gruppe zugeordnet</Item>
-		<Item English_Text = "Quick Paste" ID = "-1" PropertyPage = "true">Schnelleinfügen</Item>
+		<Item English_Text = "Popup Positioning" ID = "2063">Position der Listenansicht</Item>
+		<Item English_Text = "At Caret" ID = "2015">Cursor</Item>
+		<Item English_Text = "At Cursor" ID = "2016">Mauszeiger</Item>
+		<Item English_Text = "At Previous Position" ID = "2017">Letzte Position</Item>
+		<Item English_Text = "List Item Prefix Legend" ID = "2064">Bedeutung der Präfixe in der Listenansicht</Item>
+		<Item English_Text = "  * = Don't Auto Delete\n  s = Shortcut exists\n G = Item is a Group\n  ! = Item is attached to a Group" ID = "2065">  * = Kein automatisches Löschen\n  s = Tastenkürzel vorhanden\n G = Gruppe\n  ! = Eintrag in Gruppe</Item>
+		<Item English_Text = "Quick Paste" ID = "-1" PropertyPage = "true">Listenansicht</Item>
 		
 		//New strings added in 3.6 6-9-06
-		<Item English_Text = "Prompt when deleting clips" ID = "2039">Bei Ausschnittlöschung nachfragen</Item>
+		<Item English_Text = "Prompt when deleting clips" ID = "2039">Löschen von Einträgen bestätigen</Item>
+		
+		//New strings added in 3.15.2 10-6-07
+		<Item English_Text = "Theme" ID = "2092"></Item>
+		<Item English_Text = "About Theme" ID = "2094"></Item>
 		
 	</Ditto_Options_Quick_Paste>	
 	<Ditto_Options_Friends>
-		<Item English_Text = "When you receive a sent copy if their ip or computer name is in this list then it will be put on the clipboard.  Otherwise it will be in the saved clips to use at a later time." ID = "2052">Beim Empfang einer Kopie von einer IP oder einem Computername aus dieser Liste wird diese in die Zwischenablage eingefügt. Ansonsten wird sie für die spätere Nutzung bei den gespeicherten Ausschnitten abgelegt.</Item>
-		<Item English_Text = "IP/Computer Names seperated by commas" ID = "2053">IP/Computernamen, durch Kommas getrennt</Item>
-		<Item English_Text = "Disable Receiving Clips" ID = "2026">Empfang von Ausschnitten deaktiveren</Item>
-		<Item English_Text = "Network Password" ID = "2054">Netzwerkpasswort</Item>
-		<Item English_Text = "If you are receiving clips from computers where your network password does not match, enter additional network passwords separated by commas" ID = "2055">Zusätzliche Netzwerkpasswörter eingeben für den Empfang von Ausschnitten aus dem Netzwerk, die von PCs stammen, deren Netzwerkpasswort nicht übereinstimmt.</Item>
-		<Item English_Text = "Receive Passwords" ID = "2056">Passwörter empfangen</Item>
-		<Item English_Text = "If Send All Copies is selected then all copies from this computer will be sent to the other computer.  If that is not selected then it will just be in the right click menu to send a copy to that computer." ID = "2057">Bei Auswahl von Sende-Alle-Kopien werden alle Kopien von diesem zum anderen Computer geschickt. Andernfalls erscheinen Sie nur im Kontextmenu.</Item>
-		<Item English_Text = "Log Send Receive Commands" ID = "1042">Sende-Empfangene-Befehle mitprotokollieren</Item>
-		<Item English_Text = "Friends" ID = "-1" PropertyPage = "true">Freunde</Item>
+		<Item English_Text = "When you receive a sent copy if their ip or computer name is in this list then it will be put on the clipboard.  Otherwise it will be in the saved clips to use at a later time." ID = "2052">Folgende Rechner senden Einträge direkt in die Zwischenablage (statt sie nur in die Liste zu kopieren)</Item>
+		<Item English_Text = "IP/Computer Names seperated by commas" ID = "2053">Rechnername oder IP (durch Komma getrennt)</Item>
+		<Item English_Text = "Disable Receiving Clips" ID = "2026">Empfang von Einträgen deaktivieren</Item>
+		<Item English_Text = "Network Password" ID = "2054">Gruppenpasswort (Senden/Empfangen)</Item>
+		<Item English_Text = "If you are receiving clips from computers where your network password does not match, enter additional network passwords separated by commas" ID = "2055">Weitere Passwörter (von Rechnern, die nicht das Gruppenpasswort verwenden)</Item>
+		<Item English_Text = "Receive Passwords" ID = "2056">Empfangspasswörter (durch Komma getrennt)</Item>
+		<Item English_Text = "If Send All Copies is selected then all copies from this computer will be sent to the other computer.  If that is not selected then it will just be in the right click menu to send a copy to that computer." ID = "2057">Liste der Rechner in der Gruppe (Standardmäßig erscheint der Rechner im Kontextmenu unter 'Senden an'. Zusätzlich werden bei Auswahl von 'Send All Copies' alle Einträge dem anderen Rechner geschickt.)</Item>
+		<Item English_Text = "Log Send Receive Commands" ID = "1042">Kommunikation protokollieren</Item>
+		<Item English_Text = "Friends" ID = "-1" PropertyPage = "true">Netzwerk</Item>
 	</Ditto_Options_Friends>
 	<Ditto_Options_Friends_Detail>
-		<Item English_Text = "Send All Copies to this friend" ID = "1015">Alle Kopien an diesen Freund senden</Item>
-		<Item English_Text = "IP/Name" ID = "2052">IP/Name</Item>
+		<Item English_Text = "Send All Copies to this friend" ID = "1015">Alle Einträge diesem Rechner senden</Item>
+		<Item English_Text = "IP/Name" ID = "2052">Rechnername oder IP</Item>
 		<Item English_Text = "Description" ID = "2053">Beschreibung</Item>
-		<Item English_Text = "Friend Details" ID = "-1">Details über Freund</Item>
+		<Item English_Text = "Friend Details" ID = "-1">Details über Rechner</Item>
 	</Ditto_Options_Friends_Detail>
 	<Ditto_Options_Stats>
-		<Item English_Text = "Odometer" ID = "2052">Odometer</Item>
-		<Item English_Text = "Trip Odometer" ID = "2053">Reise Odometer</Item>
+		<Item English_Text = "Odometer" ID = "2052">Kilometerzähler</Item>
+		<Item English_Text = "Trip Odometer" ID = "2053">Tageszähler</Item>
 		<Item English_Text = "Copies" ID = "2054">Kopien</Item>
 		<Item English_Text = "Pastes" ID = "2055">Einfügungen</Item>
 		<Item English_Text = "Copies" ID = "2056">Kopien</Item>
 		<Item English_Text = "Pastes" ID = "2057">Einfügungen</Item>
-		<Item English_Text = "Reset" ID = "1006">Zurücksetzen</Item>
+		<Item English_Text = "Reset" ID = "1006">Nullstellen</Item>
 		<Item English_Text = "Saved Copies" ID = "2058">Gespeicherte Kopien</Item>
 		<Item English_Text = "Saved Copy Data" ID = "2059">Daten der gespeicherte Kopien</Item>
 		<Item English_Text = "Remove All" ID = "1013">Alle entfernen</Item>
 		<Item English_Text = "Last Started" ID = "2060">Letzter Programmstart</Item>
-		<Item English_Text = "Database Size" ID = "2061">Datenbankgröße</Item>
-		<Item English_Text = "Clips Sent" ID = "2066">Gesendete Ausschnitte</Item>
-		<Item English_Text = "Clips Received" ID = "2067">Empfangene Ausschnitte</Item>
-		<Item English_Text = "Since Last Start" ID = "2068">Seit dem letzten Start</Item>
+		<Item English_Text = "Database Size" ID = "2061">Größe der Datenbank</Item>
+		<Item English_Text = "Clips Sent" ID = "2066">Gesendete Einträge</Item>
+		<Item English_Text = "Clips Received" ID = "2067">Empfangene Einträge</Item>
+		<Item English_Text = "Since Last Start" ID = "2068">Seit letztem Start</Item>
 		<Item English_Text = "Stats" ID = "-1" PropertyPage = "true">Statistik</Item>
 	</Ditto_Options_Stats>
 	<Ditto_Options_Supported_Types_Add>
@@ -226,17 +231,17 @@
 		<Item English_Text = "New Group" ID = "1040">Neue Gruppe</Item>
 		<Item English_Text = "OK" ID = "1">Ok</Item>
 		<Item English_Text = "Cancel" ID = "2">Abbrechen</Item>
-		<Item English_Text = "Move to Group" ID = "-1">Zu Gruppe verschieben</Item>
+		<Item English_Text = "Move to Group" ID = "-1">In Gruppe verschieben</Item>
 	</Ditto_Move_To_Groups>
 	
 	<Ditto_String_Table>
 		<Item English_Text = "General" ID = "GeneralTitle">Allgemein</Item>
 		<Item English_Text = "Supported Types" ID = "SupportedTypesTitle">Unterstützte Typen</Item>
 		<Item English_Text = "Stats" ID = "StatsTitle">Statistik</Item>
-		<Item English_Text = "Friends" ID = "FriendsTitle">Freunde</Item>
-		<Item English_Text = "Quick Paste" ID = "QuickPasteTitle">Schnelleinfügen</Item>
+		<Item English_Text = "Friends" ID = "FriendsTitle">Netzwerk</Item>
+		<Item English_Text = "Quick Paste" ID = "QuickPasteTitle">Listenansicht</Item>
 		<Item English_Text = "Keyboard Shortcuts" ID = "KeyboardShortcutsTitle">Tastaturkürzel</Item>
-		<Item English_Text = "About" ID = "AboutTitle">Über</Item>
+		<Item English_Text = "About" ID = "AboutTitle">Über Ditto</Item>
 		<Item English_Text = "Error Opening Database." ID = "Error_Opening_Database">Fehler beim Öffnen der Datenbank</Item>
 		<Item English_Text = "Unable to initialize DAO/Jet db engine.\nSelect YES to download DAO from http://ditto-cp.sourceforge.net/dao_setup.exe\n\nRestart Ditto after installation of DAO." ID = "Error_Init_Dao">Initialisierung der DAO/Jet Datenbank fehlgeschlagen\nKlicke Ja zum Herunterladen von DAO von http://ditto-cp.sourceforge.net/dao_setup.exe\n\nNach der Installation von DAO Ditto neustarten.</Item>
 		<Item English_Text = "Unrecognized Database Format" ID = "Database_Format">Unbekanntes Datenbankformat</Item>
@@ -244,31 +249,31 @@
 		<Item English_Text = "and a new database will be created" ID = "New_Database">und eine neue Datenbank erstellt</Item>
 		<Item English_Text = "Updates available for Ditto.\nVisit ditto-cp.sourceforge.net for details\n\nRunning Version" ID = "Updates_Available">Updates für Ditto verfügbar\nFür Details -> ditto-cp.sourceforge.net\n\nInstallierte Version</Item>
 		<Item English_Text = "Update Version" ID = "Update_Version">Updateversion</Item>
-		<Item English_Text = "Download updated version?" ID = "Download_Update">Neuste Version herunterladen?</Item>			
-		<Item English_Text = "No updates available" ID = "No_Updates">Keine Updates verfügbar</Item>			
-		<Item English_Text = "This will remove all Copy Entries!\n\nContinue?" ID = "Remove_All">Alle Kopien werden gelöscht!\n\nFortsetzen?</Item>
-		<Item English_Text = "Disconnect from Clipboard" ID = "Disconnect_Clipboard">Verbindung zur Zwischenablage beenden</Item>			
+		<Item English_Text = "Download updated version?" ID = "Download_Update">Neueste Version herunterladen?</Item>			
+		<Item English_Text = "No updates available" ID = "No_Updates">Keine neuere Version verfügbar</Item>			
+		<Item English_Text = "This will remove all Copy Entries!\n\nContinue?" ID = "Remove_All">Alle Einträge werden gelöscht!\n\nFortsetzen?</Item>
+		<Item English_Text = "Disconnect from Clipboard" ID = "Disconnect_Clipboard">Verbindung zur Zwischenablage trennen</Item>			
 		<Item English_Text = "Connect to Clipboard" ID = "Connect_Clipboard">Zur Zwischenablage verbinden</Item>			
-		<Item English_Text = "Unable to initialize DAO/Jet db engine.  DAO will now be installed.\n\nRestart Ditto after installation of DAO." ID = "Error_Init_Dao_Intall">DAO/Jet db Engine konnte nicht initialisiert werden. DAO wird installiert\n\nBitte starten sie Ditto nach der Installation von DAO neu." ID = " Error_Init_Dao_Intall"</Item>
+		<Item English_Text = "Unable to initialize DAO/Jet db engine.  DAO will now be installed.\n\nRestart Ditto after installation of DAO." ID = "Error_Init_Dao_Intall">DAO/Jet db Engine konnte nicht initialisiert werden. DAO wird installiert\n\nBitte starten sie Ditto nach Installation von DAO neu." ID = " Error_Init_Dao_Intall"</Item>
 		
 		//New strings added in 3.6 6-9-06
-		<Item English_Text = "Prompt when deleting clips" ID = "2039">Bei Ausschnittlöschung nachfragen</Item>
-		<Item English_Text = "Delete Selected Clips?" ID = "Delete_Clip">Ausgewählten Ausschnitt löschen</Item>		
-		<Item English_Text = "Error importing exported clip" ID = "Error_Importing">Fehler beim Importieren des exportierten Ausschnitts</Item>
-		<Item English_Text = "Error parsing exported clip" ID = "Error_Parsing">Fehler beim Analysieren des exportierten Ausschnitts</Item>
-		<Item English_Text = "Clip placed on clipboard" ID = "Importing_Good">Ausschnitt in der Zwischenablage gespeichert</Item>
-		<Item English_Text = "Successfully imported" ID = "Import_Successfully">Import erfolgreich</Item>
-		<Item English_Text = "clip" ID = "Clip">Ausschnitt</Item>
-		<Item English_Text = "clips" ID = "Clips">Ausschnitte</Item>
-		<Item English_Text = "Update clip description on save?" ID = "Update_Desc">Ausschnittbeschreibung beim Abspeichern aktualisieren</Item>
-		<Item English_Text = "New Clip" ID = "New_Clip">Neuer Ausschnitt</Item>
+		<Item English_Text = "Prompt when deleting clips" ID = "2039">Löschen von Einträgen bestätigen</Item>
+		<Item English_Text = "Delete Selected Clips?" ID = "Delete_Clip">Ausgewählten Eintrag löschen?</Item>		
+		<Item English_Text = "Error importing exported clip" ID = "Error_Importing">Fehler beim Importieren des exportierten Eintrags</Item>
+		<Item English_Text = "Error parsing exported clip" ID = "Error_Parsing">Fehler beim Analysieren des exportierten Eintrags</Item>
+		<Item English_Text = "Clip placed on clipboard" ID = "Importing_Good">Eintrag in der Zwischenablage gespeichert</Item>
+		<Item English_Text = "Successfully imported" ID = "Import_Successfully">Import erfolgreich: </Item>
+		<Item English_Text = "clip" ID = "Clip">Eintrag</Item>
+		<Item English_Text = "clips" ID = "Clips">Einträge</Item>
+		<Item English_Text = "Update clip description on save?" ID = "Update_Desc">Kurzansicht beim Speichern aktualisieren</Item>
+		<Item English_Text = "New Clip" ID = "New_Clip">Neuer Eintrag</Item>
 		<Item English_Text = "Save" ID = "Save">Speichern</Item>
 		<Item English_Text = "Save All" ID = "Save_All">Alle speichern</Item>
 		<Item English_Text = "Close Current Tab" ID = "Close">Aktuellen Reiter schließen</Item>
-		<Item English_Text = "NotEditable" ID = "Current Item is not editable.  A clip must have one of the clip types">Aktueller Ausschnitt ist nicht editierbar. Ein Ausschnitt muss aus einem der Ausschnitttypen bestehen</Item>
-		<Item English_Text = "Editable" ID = "to be editable">Bearbeitbar</Item>
+		<Item English_Text = "NotEditable" ID = "Current Item is not editable.  A clip must have one of the clip types">Aktueller Eintrag ist nicht editierbar. Ein Eintrag muss aus einem der Eintragtypen bestehen</Item>
+		<Item English_Text = "Editable" ID = "to be editable">editierbar</Item>
 		<Item English_Text = "SaveChanges" ID = "Do you want to save changes to">Änderungen speichern</Item>
-		<Item English_Text = "ErrorSaving" ID = "Error saving clip">Fehler beim Speichern des Ausschnitts</Item>
+		<Item English_Text = "ErrorSaving" ID = "Error saving clip">Fehler beim Speichern des Eintrags</Item>
 		<Item English_Text = "New" ID = "New">Neu</Item>
 		<Item English_Text = "Save_Close" ID = "Save, Close and place on clipboard">Speichern, schließen und in Zwischenablage ablegen</Item>
 		<Item English_Text = "Ditto Edit" ID = "Ditto_Edit"></Item>
@@ -281,6 +286,9 @@
 		<Item English_Text = "Exception saving Named Copy" ID = "Named_Copy_Error2"></Item>
 		<Item English_Text = "Ditto did not receive a copy" ID = "Named_Copy_Error3"></Item> 
 		
+		//New strings added in 3.17 2-28-10
+		<Item English_Text = "Add-Ins" ID = "Add_Ins"></Item> 
+		
 	</Ditto_String_Table>
 	<Ditto_Options_Sheet>
 		<Item English_Text = "OK" ID = "1">Ok</Item>
@@ -288,14 +296,43 @@
 		<Item English_Text = "Apply" ID = "12321">Anwenden</Item>
 	</Ditto_Options_Sheet>
 	<Ditto_Tray_Icon_Menu>
-		<Item English_Text = "Show Quick Paste" ID = "32773">Schnelleinfügen anzeigen</Item>
-		<Item English_Text = "Options" ID = "32771">Einstellungen</Item>
-		<Item English_Text = "Help" ID = "32843">Hilfe</Item>
+		<Item English_Text = "Show Quick Paste" ID = "32773">Listenansicht anzeigen</Item>
+		<Item English_Text = "Options" ID = "32771">Optionen</Item>
+		<Item English_Text = "Help" ID = "32843">Online-Hilfe</Item>
 		<Item English_Text = "Exit" ID = "32772">Beenden</Item>	
 		
 		//New strings added in 3.6 6-9-06
-		<Item English_Text = "Import" ID = "32854">Importieren</Item>
-		<Item English_Text = "New Clip" ID = "32868">Neuer Ausschnitt</Item>
+		<Item English_Text = "Import" ID = "32854">Einträge importieren</Item>
+		<Item English_Text = "New Clip" ID = "32868">Neuer Eintrag</Item>
 		
 	</Ditto_Tray_Icon_Menu>
+	
+	<Ditto_Options_CopyBuffers>
+		<Item English_Text = "Copy Buffer 1" ID = "2088">Copy Buffer 1-test</Item>
+		<Item English_Text = "Copy" ID = "2079">Copy-test</Item>
+		<Item English_Text = "Paste" ID = "2080">Paste-test</Item>
+		<Item English_Text = "Cut" ID = "2081">Cut-test</Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1042">Play Sound on Copy-test</Item>
+		<Item English_Text = "Win" ID = "2085">Win1Copy-test</Item>
+		<Item English_Text = "Win" ID = "2086">Win1Paste-test</Item>
+		<Item English_Text = "Win" ID = "2087">Win1Cut-test</Item>
+		
+		<Item English_Text = "Copy Buffer 2" ID = "2098">Copy Buffer 1-test</Item>
+		<Item English_Text = "Copy" ID = "2093">Copy-test</Item>
+		<Item English_Text = "Paste" ID = "2094">Paste-test</Item>
+		<Item English_Text = "Cut" ID = "2097">Cut-test</Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1043">Play Sound on Copy-test</Item>
+		<Item English_Text = "Win" ID = "2090">Win2Copy-test</Item>
+		<Item English_Text = "Win" ID = "2092">Win2Paste-test</Item>
+		<Item English_Text = "Win" ID = "2096">Win2Cut-test</Item>
+		
+		<Item English_Text = "Copy Buffer 3" ID = "2108">Copy Buffer 1-test</Item>
+		<Item English_Text = "Copy" ID = "2103">Copy-test</Item>
+		<Item English_Text = "Paste" ID = "2104">Paste-test</Item>
+		<Item English_Text = "Cut" ID = "2107">Cut-test</Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1044">Play Sound on Copy-test</Item>
+		<Item English_Text = "Win" ID = "2100">Win3Copy-test</Item>
+		<Item English_Text = "Win" ID = "2102">Win3Paste-test</Item>
+		<Item English_Text = "Win" ID = "2106">Win3Cut-test</Item>
+	</Ditto_Options_CopyBuffers>
 </Ditto_Language_File>

Debug/Language/Dutch.xml

@@ -6,7 +6,7 @@
 		<Item English_Text = "New Group Selection F7" ID = "32812">Nieuwe Groep selectie</Item>		
 		<Item English_Text = "Move to Group" ID = "32840">Verplaats naar Groep</Item>		
 		<Item English_Text = "Quick Options" ID = "-1">Spoed Opties</Item>		
-		<Item English_Text = "Lines Per Row" ID = "-1">Regels per Rij</Item>		
+		<Item English_Text = "Lines Per Clip" ID = "-1">Regels per Rij</Item>		
 		<Item English_Text = "1" ID = "32807">1</Item>		
 		<Item English_Text = "2" ID = "32786">2</Item>		
 		<Item English_Text = "3" ID = "32787">3</Item>		
@@ -33,7 +33,7 @@
 		<Item English_Text = "Right" ID = "32780">Rechts</Item>		
 		<Item English_Text = "Bottom" ID = "32781">Onder</Item>		
 		<Item English_Text = "Left" ID = "32782">Links</Item>		
-		<Item English_Text = "Sort" ID = "-1">Sorteren</Item>		
+		<Item English_Text = "Order" ID = "-1">Sorteren</Item>		
 		<Item English_Text = "Ascending (Latest on the Top)" ID = "32795">Opklimmend (Laatste boven)</Item>		
 		<Item English_Text = "Descending (Latest on the Bottom)" ID = "32797">Afdalend Laatste onder)</Item>		
 		<Item English_Text = "Double Clicking on Caption" ID = "-1">Dubbelklik op Titelbalk</Item>		
@@ -116,6 +116,9 @@
 		<Item English_Text = "About Language" ID = "2073">Kommentaar vertaling</Item>		
 		<Item English_Text = "Ensure Ditto is always connected to the clipboard" ID = "1042">Verkrijg zekerheid dat Ditto altijd verbinding maakt met het klembord</Item>		
 		<Item English_Text = "General" ID = "-1" PropertyPage = "true">Algemeen</Item>	
+		
+		<Item English_Text = "Multi-Paste clip separator ([LF] = line feed)" ID = "2090"></Item>
+		
 	</Ditto_Options_General>
 	<Ditto_Options_Supported_Types>			
 		<Item English_Text = "&Add" ID = "1015">&Toevoegen</Item>		
@@ -290,6 +293,9 @@
 		<Item English_Text = "IP/Name" ID = "IP_Name">IP_Naam</Item>
 		<Item English_Text = "Descriptions" ID = "Descriptions">Omschrijvingen</Item> 
 		
+		//New strings added in 3.17 2-28-10
+		<Item English_Text = "Add-Ins" ID = "Add_Ins"></Item> 
+		
 	</Ditto_String_Table>
 	<Ditto_Options_Sheet>			
 		<Item English_Text = "OK" ID = "1">OK</Item>		
@@ -307,4 +313,35 @@
 		<Item English_Text = "New Clip" ID = "32868">Nieuwe Clip</Item>
 		
 	</Ditto_Tray_Icon_Menu>
+	
+		//Added in 9-11-09
+	<Ditto_Options_CopyBuffers>
+		<Item English_Text = "Copy Buffer 1" ID = "2088"></Item>
+		<Item English_Text = "Copy" ID = "2079"></Item>
+		<Item English_Text = "Paste" ID = "2080"></Item>
+		<Item English_Text = "Cut" ID = "2081"></Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1042"></Item>
+		<Item English_Text = "Win" ID = "2085"></Item>
+		<Item English_Text = "Win" ID = "2086"></Item>
+		<Item English_Text = "Win" ID = "2087"></Item>
+		
+		<Item English_Text = "Copy Buffer 2" ID = "2098"></Item>
+		<Item English_Text = "Copy" ID = "2093"></Item>
+		<Item English_Text = "Paste" ID = "2094"></Item>
+		<Item English_Text = "Cut" ID = "2097"></Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1043"></Item>
+		<Item English_Text = "Win" ID = "2090"></Item>
+		<Item English_Text = "Win" ID = "2092"></Item>
+		<Item English_Text = "Win" ID = "2096"></Item>
+		
+		<Item English_Text = "Copy Buffer 3" ID = "2108"></Item>
+		<Item English_Text = "Copy" ID = "2103"></Item>
+		<Item English_Text = "Paste" ID = "2104"></Item>
+		<Item English_Text = "Cut" ID = "2107"></Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1044"></Item>
+		<Item English_Text = "Win" ID = "2100"></Item>
+		<Item English_Text = "Win" ID = "2102"></Item>
+		<Item English_Text = "Win" ID = "2106"></Item>
+	</Ditto_Options_CopyBuffers>
+	
 </Ditto_Language_File>

Debug/Language/English.xml

@@ -6,7 +6,7 @@
 		<Item English_Text = "New Group Selection	F7" ID = "32812"></Item>
 		<Item English_Text = "Move to Group" ID = "32840"></Item>
 		<Item English_Text = "Quick Options" ID = "-1"></Item>
-		<Item English_Text = "Lines Per Row" ID = "-1"></Item>
+		<Item English_Text = "Lines Per Clip" ID = "-1"></Item>
 		<Item English_Text = "1" ID = "32807"></Item>
 		<Item English_Text = "2" ID = "32786"></Item>
 		<Item English_Text = "3" ID = "32787"></Item>
@@ -33,14 +33,14 @@
 		<Item English_Text = "Right" ID = "32780"></Item>
 		<Item English_Text = "Bottom" ID = "32781"></Item>
 		<Item English_Text = "Left" ID = "32782"></Item>
-		<Item English_Text = "Sort" ID = "-1"></Item>
+		<Item English_Text = "Order" ID = "-1"></Item>
 		<Item English_Text = "Ascending (Latest on the Top)" ID = "32795"></Item>
 		<Item English_Text = "Descending (Latest on the Bottom)" ID = "32797"></Item>
 		<Item English_Text = "Double Clicking on Caption" ID = "-1"></Item>
 		<Item English_Text = "Toggles Always on Top" ID = "32814"></Item>
 		<Item English_Text = "Rolls-up Window" ID = "32815"></Item>
 		<Item English_Text = "Toggles Always Show Description" ID = "32816"></Item>
-		<Item English_Text = "Always on Top	Ctrl-Space" ID = "32784"></Item>
+		<Item English_Text = "Always on Top" ID = "32784"></Item>
 		<Item English_Text = "Auto Roll-up" ID = "32791"></Item>
 		<Item English_Text = "Always Show Description" ID = "32813"></Item>
 		<Item English_Text = "Prompt For New Group Names" ID = "32817"></Item>
@@ -54,11 +54,11 @@
 		<Item English_Text = "Send To" ID = "-1"></Item>
 		<Item English_Text = "(192.168.1.101) - same computer" ID = "32824"></Item>
 		<Item English_Text = "View Full Description	F3" ID = "32793"></Item>
-		<Item English_Text = "View Groups	Ctrl-G" ID = "32819"></Item>
+		<Item English_Text = "View Groups" ID = "32819"></Item>
 		<Item English_Text = "Paste Plain Text Only	Shift-Enter" ID = "32841"></Item>
 		<Item English_Text = "Paste HTML as Plain Text" ID = "32851"></Item>
-		<Item English_Text = "Delete Entry	Del" ID = "32801"></Item>
-		<Item English_Text = "Properties	Alt-Enter" ID = "32776"></Item>
+		<Item English_Text = "Delete Entry" ID = "32801"></Item>
+		<Item English_Text = "Properties" ID = "32776"></Item>
 		<Item English_Text = "Quick Properties" ID = "-1"></Item>
 		<Item English_Text = "Never Auto Delete" ID = "32820"></Item>
 		<Item English_Text = "Auto Delete" ID = "32821"></Item>
@@ -70,8 +70,8 @@
 		
 		//New strings added in 3.6 6-9-06
 		<Item English_Text = "Prompt to Delete Clip" ID = "32852"></Item>	
-		<Item English_Text = "Import" ID = "32855"></Item>
-		<Item English_Text = "Export" ID = "32853"></Item>
+		<Item English_Text = "Import Clip(s)" ID = "32855"></Item>
+		<Item English_Text = "Export Clip(s)" ID = "32853"></Item>
 		<Item English_Text = "Remove Quick Paste" ID = "32856"></Item>	
 		<Item English_Text = "Edit Clip" ID = "32860"></Item>
 		<Item English_Text = "New Clip" ID = "32867"></Item>	
@@ -97,7 +97,6 @@
 		<Item English_Text = "Paste Entries Expire after" ID = "2009"></Item>
 		<Item English_Text = "Days" ID = "2043"></Item>
 		<Item English_Text = "Compact and Repair" ID = "1028"></Item>
-		<Item English_Text = "Automatically check for updates online" ID = "1029"></Item>
 		<Item English_Text = "Check Now" ID = "1030"></Item>
 		<Item English_Text = "Allow Duplicates" ID = "1037"></Item>
 		<Item English_Text = "Update Clip Time On Paste" ID = "1038"></Item>
@@ -107,7 +106,7 @@
 		<Item English_Text = "On copy play the sound" ID = "2045"></Item>
 		<Item English_Text = "Play" ID = "2034"></Item>
 		<Item English_Text = "Paste Clip in active window after selection" ID = "1041"></Item>
-		<Item English_Text = "Maximum Clip Size in Bytes" ID = "2046"></Item>
+		<Item English_Text = "Maximum Clip Size (in Bytes)" ID = "2046"></Item>
 		<Item English_Text = "(Leave blank for no limit)" ID = "2047"></Item>
 		<Item English_Text = "Set Database Path" ID = "1034"></Item>
 		<Item English_Text = "Language" ID = "2069"></Item>
@@ -115,6 +114,7 @@
 		<Item English_Text = "About Language" ID = "2073"></Item>
 		<Item English_Text = "Ensure Ditto is always connected to the clipboard" ID = "1042"></Item>
 		<Item English_Text = "General" ID = "-1" PropertyPage = "true"></Item>
+		<Item English_Text = "Multi-Paste clip separator ([LF] = line feed)" ID = "2090"></Item>
 	</Ditto_Options_General>
 	<Ditto_Options_Supported_Types>
 		<Item English_Text = "&Add" ID = "1015"></Item>
@@ -153,16 +153,13 @@
 		
 		//New item added in 3.15.1 8/18/07
 		<Item English_Text = "Send custom strokes Per Application" ID = "2091"></Item>
-		
-		//Added in 9-11-09
-		<Item English_Text = "Named Paste" ID = "2062">test</Item>
 	</Ditto_Options_Shortcuts>
 	<Ditto_Options_Quick_Paste>
 		<Item English_Text = "History Starts at the Top of the list (vs. Bottom)" ID = "1042"></Item>
 		<Item English_Text = "Use Ctrl - Num for first ten copy hot keys" ID = "1033"></Item>
 		<Item English_Text = "Show text for first ten copy hot keys" ID = "1034"></Item>
 		<Item English_Text = "Show leading whitespace" ID = "2021"></Item>
-		<Item English_Text = "Text Lines per Row" ID = "2062"></Item>
+		<Item English_Text = "Text Lines per Entry" ID = "2062"></Item>
 		<Item English_Text = "Enable Quick Paste Transparency" ID = "2006"></Item>
 		<Item English_Text = "Show thumbnails (for CF_DIB types) (Could Increase Memory Usage and Display Speed)" ID = "2022"></Item>
 		<Item English_Text = "Draw RTF Text in List (for RTF types) (Could Increase Memory Usage an Display Speed)" ID = "2023"></Item>
@@ -191,12 +188,12 @@
 		<Item English_Text = "When you recieve a sent copy if their ip or computer name is in this list then it will be put on the clipboard.  Otherwise it will be in the saved clips to use at a later time." ID = "2052"></Item>
 		<Item English_Text = "IP/Computer Names seperated by commas" ID = "2053"></Item>
 		<Item English_Text = "Disable Recieving Clips" ID = "2026"></Item>
-		<Item English_Text = "Network Password" ID = "2054"></Item>
-		<Item English_Text = "If you are receiving clips from computers where your network password does not match, enter additional network passwords separated by commas" ID = "2055"></Item>
+		<Item English_Text = "Group Password" ID = "2054"></Item>
+		<Item English_Text = "If you are receiving clips from computers where your group password does not match, enter additional group passwords separated by commas" ID = "2055"></Item>
 		<Item English_Text = "Receive Passwords" ID = "2056"></Item>
 		<Item English_Text = "If Send All Copies is selected then all copies from this computer will be sent to the other computer.  If that is not selected then it will just be in the right click menu to send a copy to that computer." ID = "2057"></Item>
 		<Item English_Text = "Log Send Receive Commands" ID = "1042"></Item>
-		<Item English_Text = "Friends" ID = "-1" PropertyPage = "true"></Item>
+			<Item English_Text = "Friends" ID = "-1" PropertyPage = "true"></Item>
 		
 		//Added in 9-11-09
 		<Item English_Text = "Send All Copies" ID = "Send_All_Copies">test</Item>
@@ -247,10 +244,10 @@
 		<Item English_Text = "General" ID = "GeneralTitle"></Item>
 		<Item English_Text = "Supported Types" ID = "SupportedTypesTitle"></Item>
 		<Item English_Text = "Stats" ID = "StatsTitle"></Item>
-		<Item English_Text = "Friends" ID = "FriendsTitle"></Item>
+		<Item English_Text = "NetwFriendsork" ID = "FriendsTitle"></Item>
 		<Item English_Text = "Quick Paste" ID = "QuickPasteTitle"></Item>
 		<Item English_Text = "Keyboard Shortcuts" ID = "KeyboardShortcutsTitle"></Item>
-		<Item English_Text = "About" ID = "AboutTitle"></Item>
+		<Item English_Text = "About Ditto" ID = "AboutTitle"></Item>
 		<Item English_Text = "Error Opening Database." ID = "Error_Opening_Database"></Item>
 		<Item English_Text = "Unable to initialize DAO/Jet db engine.\nSelect YES to download DAO from http://ditto-cp.sourceforge.net/dao_setup.exe\n\nRestart Ditto after installation of DAO." ID = "Error_Init_Dao"></Item>
 		<Item English_Text = "Unrecognized Database Format" ID = "Database_Format"></Item>
@@ -295,6 +292,9 @@
 		<Item English_Text = "Error saving Named Copy to Database" ID = "Named_Copy_Error1"></Item>
 		<Item English_Text = "Exception saving Named Copy" ID = "Named_Copy_Error2"></Item>
 		<Item English_Text = "Ditto did not receive a copy" ID = "Named_Copy_Error3"></Item> 
+		
+		//New strings added in 3.17 2-28-10
+		<Item English_Text = "Add-Ins" ID = "Add_Ins"></Item> 
 				
 	</Ditto_String_Table>
 	<Ditto_Options_Sheet>
@@ -313,34 +313,34 @@
 		<Item English_Text = "New Clip" ID = "32868"></Item>
 		
 	</Ditto_Tray_Icon_Menu>
-	
+
 	//Added in 9-11-09
 	<Ditto_Options_CopyBuffers>
-		<Item English_Text = "Copy Buffer 1" ID = "2088">Copy Buffer 1-test</Item>
-		<Item English_Text = "Copy" ID = "2079">Copy-test</Item>
-		<Item English_Text = "Paste" ID = "2080">Paste-test</Item>
-		<Item English_Text = "Cut" ID = "2081">Cut-test</Item>
-		<Item English_Text = "Play Sound on Copy" ID = "1042">Play Sound on Copy-test</Item>
-		<Item English_Text = "Win" ID = "2085">Win1Copy-test</Item>
-		<Item English_Text = "Win" ID = "2086">Win1Paste-test</Item>
-		<Item English_Text = "Win" ID = "2087">Win1Cut-test</Item>
+		<Item English_Text = "Copy Buffer 1" ID = "2088"></Item>
+		<Item English_Text = "Copy" ID = "2079"></Item>
+		<Item English_Text = "Paste" ID = "2080"></Item>
+		<Item English_Text = "Cut" ID = "2081"></Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1042"></Item>
+		<Item English_Text = "Win" ID = "2085"></Item>
+		<Item English_Text = "Win" ID = "2086"></Item>
+		<Item English_Text = "Win" ID = "2087"></Item>
 		
-		<Item English_Text = "Copy Buffer 2" ID = "2098">Copy Buffer 1-test</Item>
-		<Item English_Text = "Copy" ID = "2093">Copy-test</Item>
-		<Item English_Text = "Paste" ID = "2094">Paste-test</Item>
-		<Item English_Text = "Cut" ID = "2097">Cut-test</Item>
-		<Item English_Text = "Play Sound on Copy" ID = "1043">Play Sound on Copy-test</Item>
-		<Item English_Text = "Win" ID = "2090">Win2Copy-test</Item>
-		<Item English_Text = "Win" ID = "2092">Win2Paste-test</Item>
-		<Item English_Text = "Win" ID = "2096">Win2Cut-test</Item>
+		<Item English_Text = "Copy Buffer 2" ID = "2098"></Item>
+		<Item English_Text = "Copy" ID = "2093"></Item>
+		<Item English_Text = "Paste" ID = "2094"></Item>
+		<Item English_Text = "Cut" ID = "2097"></Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1043"></Item>
+		<Item English_Text = "Win" ID = "2090"></Item>
+		<Item English_Text = "Win" ID = "2092"></Item>
+		<Item English_Text = "Win" ID = "2096"></Item>
 		
-		<Item English_Text = "Copy Buffer 3" ID = "2108">Copy Buffer 1-test</Item>
-		<Item English_Text = "Copy" ID = "2103">Copy-test</Item>
-		<Item English_Text = "Paste" ID = "2104">Paste-test</Item>
-		<Item English_Text = "Cut" ID = "2107">Cut-test</Item>
-		<Item English_Text = "Play Sound on Copy" ID = "1044">Play Sound on Copy-test</Item>
-		<Item English_Text = "Win" ID = "2100">Win3Copy-test</Item>
-		<Item English_Text = "Win" ID = "2102">Win3Paste-test</Item>
-		<Item English_Text = "Win" ID = "2106">Win3Cut-test</Item>
+		<Item English_Text = "Copy Buffer 3" ID = "2108"></Item>
+		<Item English_Text = "Copy" ID = "2103"></Item>
+		<Item English_Text = "Paste" ID = "2104"></Item>
+		<Item English_Text = "Cut" ID = "2107"></Item>
+		<Item English_Text = "Play Sound on Copy" ID = "1044"></Item>
+		<Item English_Text = "Win" ID = "2100"></Item>
+		<Item English_Text = "Win" ID = "2102"></Item>
+		<Item English_Text = "Win" ID = "2106"></Item>
 	</Ditto_Options_CopyBuffers>
 </Ditto_Language_File>

DittoAddins.cpp

@@ -119,7 +119,7 @@ bool CDittoAddins::AddPrePasteAddinsToMenu(CMenu *pMenu)
 
 	if(bRet)
 	{
-		pMenu->InsertMenu(3, MF_BYPOSITION|MF_ENABLED|MF_STRING|MF_POPUP, (UINT)AllAddinsMenu, _T("Add-Ins"));
+		pMenu->InsertMenu(3, MF_BYPOSITION|MF_ENABLED|MF_STRING|MF_POPUP, (UINT)AllAddinsMenu, theApp.m_Language.GetString("Add_Ins", "Add-Ins"));
 	}
 
 	return bRet;

DittoSetup/DittoSetup_10.iss

@@ -23,7 +23,7 @@ ChangesAssociations=yes
 
 [Languages]
 Name: English; MessagesFile: compiler:Default.isl
-Name: German; MessagesFile: German.isl
+Name: Deutsch; MessagesFile: German.isl
 Name: Italiano; MessagesFile: Italian.isl
 Name: French; MessagesFile: French.isl
 Name: Portuguese; MessagesFile: Portuguese.isl
@@ -127,3 +127,4 @@ begin
 
     RenameFile(sDir+'\Language\Italian.xml', sDir+'\Language\Italian.xml.old')
 end;
+

QListCtrl.cpp

@@ -28,6 +28,7 @@ CQListCtrl::CQListCtrl()
 {
 	m_pchTip = NULL;
 	m_pwchTip = NULL;
+	m_linesPerRow = 0;
 	
 	LOGFONT lf;
 	
@@ -320,26 +321,31 @@ BOOL CQListCtrl::SetFormattedText(int nRow, int nCol, LPCTSTR lpszFormat,...)
 
 void CQListCtrl::SetNumberOfLinesPerRow(int nLines)
 {
-	CDC *pDC = GetDC();
-	
-	CRect crRect(0, 0, 0, 0);
-	
-	CFont *pOldFont = pDC->SelectObject(GetFont());
-	
-	//Get the height to draw one character
-	pDC->DrawText("W", crRect, DT_VCENTER | DT_EXPANDTABS | DT_CALCRECT);
-	
-	pDC->SelectObject(pOldFont);
-	
-	//Get the total height of each row
-	int nHeight = (crRect.Height() * nLines) + ROW_BOTTOM_BORDER;
+	if(m_linesPerRow != nLines)
+	{
+		m_linesPerRow = nLines;
+
+		CDC *pDC = GetDC();
 	
-	//Create a image list of that height and set it to the list box
-	CImageList imglist;
-	imglist.Create(DUMMY_COL_WIDTH, nHeight, ILC_COLOR16 | ILC_MASK, 1, 1);
-	SetImageList(&imglist, LVSIL_SMALL );
+		CRect crRect(0, 0, 0, 0);
+		
+		CFont *pOldFont = pDC->SelectObject(GetFont());
+		
+		//Get the height to draw one character
+		pDC->DrawText("W", crRect, DT_VCENTER | DT_EXPANDTABS | DT_CALCRECT);
+		
+		pDC->SelectObject(pOldFont);
+		
+		//Get the total height of each row
+		int nHeight = (crRect.Height() * nLines) + ROW_BOTTOM_BORDER;
+		
+		//Create a image list of that height and set it to the list box
+		CImageList imglist;
+		imglist.Create(DUMMY_COL_WIDTH, nHeight, ILC_COLOR16 | ILC_MASK, 1, 1);
+		SetImageList(&imglist, LVSIL_SMALL );
 
-	ReleaseDC(pDC);
+		ReleaseDC(pDC);
+	}
 }
 
 void CQListCtrl::OnCustomdrawList(NMHDR* pNMHDR, LRESULT* pResult)
@@ -638,7 +644,7 @@ BOOL CQListCtrl::OnEraseBkgnd(CDC* pDC)
 	// However, for some reason, bulk erasure is very noticeable when
 	//	shift-scrolling the page to select a block of items, so
 	//	I made a special case for that:
-	if( GetSelectedCount() >= 2 )
+	if(GetSelectedCount() >= 2)
 		return TRUE;
 	return CListCtrl::OnEraseBkgnd(pDC);
 }

QListCtrl.h

@@ -150,7 +150,8 @@ protected:
 	CFont m_Font;
 	IFormattedTextDraw *m_pFormatter;
 	bool m_allSelected;
-	
+	int m_linesPerRow;
+
 	// Generated message map functions
 protected:
 	//{{AFX_MSG(CQListCtrl)

QPasteWnd.cpp

@@ -509,7 +509,7 @@ BOOL CQPasteWnd::ShowQPasteWindow(BOOL bFillList)
     }
     else
     {
-        MoveControls();
+        //MoveControls();
     }
 
     // from now on, for interactive use, we can repaint immediately
@@ -735,11 +735,11 @@ LRESULT CQPasteWnd::OnRefreshView(WPARAM wParam, LPARAM lParam)
 {
     MSG msg;
     // remove all additional refresh view messages from the queue
-    while(::PeekMessage(&msg, m_hWnd, WM_REFRESH_VIEW, WM_REFRESH_VIEW, PM_REMOVE)){}
+	while(::PeekMessage(&msg, m_hWnd, WM_REFRESH_VIEW, WM_REFRESH_VIEW, PM_REMOVE)){}
 
-    Log(_T("OnRefreshView - Start"));
+	Log(_T("OnRefreshView - Start"));
 
-    theApp.m_FocusID =  - 1;
+	theApp.m_FocusID =  - 1;
 
 	if(theApp.m_bShowingQuickPaste)
 	{
@@ -759,6 +759,8 @@ LRESULT CQPasteWnd::OnRefreshView(WPARAM wParam, LPARAM lParam)
 		m_lstHeader.RefreshVisibleRows();
     }
 
+    Log(_T("OnRefreshView - End"));
+
     return TRUE;
 }
 
@@ -2423,7 +2425,6 @@ void CQPasteWnd::GetDispInfo(NMHDR *pNMHDR, LRESULT *pResult)
     LV_ITEM *pItem = &(pDispInfo)->item;
 
     if(pItem->mask &LVIF_TEXT)
-    //valid text buffer?
     {
         switch(pItem->iSubItem)
         {
@@ -2519,89 +2520,85 @@ void CQPasteWnd::GetDispInfo(NMHDR *pNMHDR, LRESULT *pResult)
         }
     }
 
-    if(pItem->mask &LVIF_CF_DIB)
+    if(pItem->mask & LVIF_CF_DIB && g_Opt.m_bDrawThumbnail)
     {
+		ATL::CCritSecLock csLock(m_CritSection.m_sect);
+     
+		MainTypeMap::iterator iter = m_mapCache.find(pItem->iItem);
+        if(iter != m_mapCache.end())
         {
-			ATL::CCritSecLock csLock(m_CritSection.m_sect);
-         
-			MainTypeMap::iterator iter = m_mapCache.find(pItem->iItem);
-            if(iter != m_mapCache.end())
+            CF_DibTypeMap::iterator iterDib = m_cf_dibCache.find(iter->second.m_lID);
+            if(iterDib == m_cf_dibCache.end())
             {
-                CF_DibTypeMap::iterator iterDib = m_cf_dibCache.find(iter->second.m_lID);
-                if(iterDib == m_cf_dibCache.end())
-                {
-                    bool exists = false;
-					for (std::list<CClipFormatQListCtrl>::iterator it = m_ExtraDataLoadItems.begin(); it != m_ExtraDataLoadItems.end(); it++)
+                bool exists = false;
+				for (std::list<CClipFormatQListCtrl>::iterator it = m_ExtraDataLoadItems.begin(); it != m_ExtraDataLoadItems.end(); it++)
+				{
+					if(it->m_cfType == CF_DIB && it->m_lDBID == iter->second.m_lID)
 					{
-						if(it->m_cfType == CF_DIB && it->m_lDBID == iter->second.m_lID)
-						{
-							exists = true;
-							break;
-						}
+						exists = true;
+						break;
 					}
+				}
 
-                    if(exists == false)
-                    {
-                        CClipFormatQListCtrl format;
-                        format.m_cfType = CF_DIB;
-                        format.m_lDBID = iter->second.m_lID;
-                        format.m_clipRow = pItem->iItem;
-                        format.m_autoDeleteData = false;
-                        m_ExtraDataLoadItems.push_back(format);
-
-                        m_thread.FireLoadExtraData();
-                    }
+                if(exists == false)
+                {
+                    CClipFormatQListCtrl format;
+                    format.m_cfType = CF_DIB;
+                    format.m_lDBID = iter->second.m_lID;
+                    format.m_clipRow = pItem->iItem;
+                    format.m_autoDeleteData = false;
+                    m_ExtraDataLoadItems.push_back(format);
+
+                    m_thread.FireLoadExtraData();
                 }
-                else
+            }
+            else
+            {
+                if(iterDib->second.m_hgData != NULL)
                 {
-                    if(iterDib->second.m_hgData != NULL)
-                    {
-                        pItem->lParam = (LPARAM) &(iterDib->second);
-                    }
+                    pItem->lParam = (LPARAM) &(iterDib->second);
                 }
             }
         }
     }
 
-    if(pItem->mask & LVIF_CF_RICHTEXT)
+    if(pItem->mask & LVIF_CF_RICHTEXT && g_Opt.m_bDrawRTF)
     {
-        {
-			ATL::CCritSecLock csLock(m_CritSection.m_sect);
+		ATL::CCritSecLock csLock(m_CritSection.m_sect);
 
-            MainTypeMap::iterator iter = m_mapCache.find(pItem->iItem);
-            if(iter != m_mapCache.end())
+        MainTypeMap::iterator iter = m_mapCache.find(pItem->iItem);
+        if(iter != m_mapCache.end())
+        {
+            CF_DibTypeMap::iterator iterDib = m_cf_rtfCache.find(iter->second.m_lID);
+            if(iterDib == m_cf_rtfCache.end())
             {
-                CF_DibTypeMap::iterator iterDib = m_cf_rtfCache.find(iter->second.m_lID);
-                if(iterDib == m_cf_rtfCache.end())
-                {
-                    bool exists = false;
-					for (std::list<CClipFormatQListCtrl>::iterator it = m_ExtraDataLoadItems.begin(); it != m_ExtraDataLoadItems.end(); it++)
+                bool exists = false;
+				for (std::list<CClipFormatQListCtrl>::iterator it = m_ExtraDataLoadItems.begin(); it != m_ExtraDataLoadItems.end(); it++)
+				{
+					if(it->m_cfType == CF_DIB && it->m_lDBID == iter->second.m_lID)
 					{
-						if(it->m_cfType == CF_DIB && it->m_lDBID == iter->second.m_lID)
-						{
-							exists = true;
-							break;
-						}
+						exists = true;
+						break;
 					}
+				}
 
-                    if(exists == false)
-                    {
-                        CClipFormatQListCtrl format;
-                        format.m_cfType = theApp.m_RTFFormat;
-                        format.m_lDBID = iter->second.m_lID;
-                        format.m_clipRow = pItem->iItem;
-                        format.m_autoDeleteData = false;
-                        m_ExtraDataLoadItems.push_back(format);
-
-                        m_thread.FireLoadExtraData();
-                    }
+                if(exists == false)
+                {
+                    CClipFormatQListCtrl format;
+                    format.m_cfType = theApp.m_RTFFormat;
+                    format.m_lDBID = iter->second.m_lID;
+                    format.m_clipRow = pItem->iItem;
+                    format.m_autoDeleteData = false;
+                    m_ExtraDataLoadItems.push_back(format);
+
+                    m_thread.FireLoadExtraData();
                 }
-                else
+            }
+            else
+            {
+                if(iterDib->second.m_hgData != NULL)
                 {
-                    if(iterDib->second.m_hgData != NULL)
-                    {
-                        pItem->lParam = (LPARAM) &(iterDib->second);
-                    }
+                    pItem->lParam = (LPARAM) &(iterDib->second);
                 }
             }
         }