author | zautrix <zautrix> | 2004-10-25 23:39:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-25 23:39:31 (UTC) |
commit | e7c948b76a46c923c21f2f35c677912b462fa1f4 (patch) (unidiff) | |
tree | a9f9a0c696ea3809f2e0bfc27e643d70c4e123e3 | |
parent | 86ad7f5fe2a20f9dfd37d6891b57b326f8ee507b (diff) | |
download | kdepimpi-e7c948b76a46c923c21f2f35c677912b462fa1f4.zip kdepimpi-e7c948b76a46c923c21f2f35c677912b462fa1f4.tar.gz kdepimpi-e7c948b76a46c923c21f2f35c677912b462fa1f4.tar.bz2 |
kopiemail fixes
-rw-r--r-- | bin/kdepim/kopiemail/filesave.png | bin | 0 -> 728 bytes | |||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 20 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/icons22/filesave.png | bin | 0 -> 821 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | kmicromail/composemail.cpp | 28 | ||||
-rw-r--r-- | kmicromail/composemailui.ui | 4 | ||||
-rw-r--r-- | kmicromail/selectstoreui.ui | 8 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 2 |
8 files changed, 42 insertions, 24 deletions
diff --git a/bin/kdepim/kopiemail/filesave.png b/bin/kdepim/kopiemail/filesave.png new file mode 100644 index 0000000..14d339d --- a/dev/null +++ b/bin/kdepim/kopiemail/filesave.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 7a53d36..1abe14a 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -2,53 +2,53 @@ | |||
2 | { "Preferences","Vorlieben" }, | 2 | { "Preferences","Vorlieben" }, |
3 | { "Ok","Ok" }, | 3 | { "Ok","Ok" }, |
4 | { "Default","Standard" }, | 4 | { "Default","Standard" }, |
5 | { "Cancel","Abbrechen" }, | 5 | { "Cancel","Abbrechen" }, |
6 | { "Global","Global" }, | 6 | { "Global","Global" }, |
7 | { "Email","Email" }, | 7 | { "Email","Email" }, |
8 | { "Phone","Phone" }, | 8 | { "Phone","Phone" }, |
9 | { "SMS","SMS" }, | 9 | { "SMS","SMS" }, |
10 | { "Fax","Fax" }, | 10 | { "Fax","Fax" }, |
11 | { "Pager","Pager" }, | 11 | { "Pager","Pager" }, |
12 | { "SIP","SIP" }, | 12 | { "SIP","SIP" }, |
13 | { "Language:(needs restart)","Sprache (Neustart!)" }, | 13 | { "Language:(needs restart)","Sprache (Neustart!)" }, |
14 | { "English","Englisch" }, | 14 | { "English","Englisch" }, |
15 | { "German","Deutsch" }, | 15 | { "German","Deutsch" }, |
16 | { "French","Französich" }, | 16 | { "French","Französich" }, |
17 | { "Italian","Italienisch" }, | 17 | { "Italian","Italienisch" }, |
18 | { "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" }, | 18 | { "User defined (usertranslation.txt)","Benutzerdef.(usertranslation.txt)" }, |
19 | { "Time Format(nr):","Zeit Format(Neustart!)" }, | 19 | { "Time Format(nr):","Zeit Format(Neustart!)" }, |
20 | { "24:00","24:00" }, | 20 | { "24:00","24:00" }, |
21 | { "12:00am","12:00am" }, | 21 | { "12:00am","12:00am" }, |
22 | { "Week starts on Sunday","Woche beginnt Sonntags" }, | 22 | { "Week starts on Sunday","Woche beginnt Sonntags" }, |
23 | { "Locale","Localisation" }, | 23 | { "Locale","Localisation" }, |
24 | { "Date Format:","Datums Format:" }, | 24 | { "Date Format:","Datums Format:" }, |
25 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, | 25 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, |
26 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, | 26 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, |
27 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, | 27 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, |
28 | { "User defined","Benutzerdefiniert" }, | 28 | { "User defined","Benutzerdefiniert" }, |
29 | { "User long date:","Format langes Datum:" }, | 29 | { "User long date:","Format langes Datum:" }, |
30 | { "User short date:","Format kurzes Datum:" }, | 30 | { "User short date:","Format kurzes Datum:" }, |
31 | { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" }, | 31 | { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" }, |
32 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, | 32 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, |
33 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, | 33 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, |
34 | { "Date Format","Datums Format" }, | 34 | { "Date Format","Datums Format" }, |
35 | { "Timezone:","Zeitzone:" }, | 35 | { "Timezone:","Zeitzone:" }, |
36 | { "Add 30 min (+00:30) to selected Timezone","Addiere 30 min zur selektierten Zeitzone" }, | 36 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, |
37 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, | 37 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, |
38 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" }, | 38 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, |
39 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | 39 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, |
40 | { "Daylight start:","Sommerzeit Beginn:" }, | 40 | { "Daylight start:","Sommerzeit Beginn:" }, |
41 | { "Mon","Mo" }, | 41 | { "Mon","Mo" }, |
42 | { "Tue","Di" }, | 42 | { "Tue","Di" }, |
43 | { "Wed","Mi" }, | 43 | { "Wed","Mi" }, |
44 | { "Thu","Do" }, | 44 | { "Thu","Do" }, |
45 | { "Fri","Fr" }, | 45 | { "Fri","Fr" }, |
46 | { "Sat","Sa" }, | 46 | { "Sat","Sa" }, |
47 | { "Sun","So" }, | 47 | { "Sun","So" }, |
48 | { "January","Januar" }, | 48 | { "January","Januar" }, |
49 | { "February","Februar" }, | 49 | { "February","Februar" }, |
50 | { "March","März" }, | 50 | { "March","März" }, |
51 | { "April","April" }, | 51 | { "April","April" }, |
52 | { "May","Mai" }, | 52 | { "May","Mai" }, |
53 | { "June","Juni" }, | 53 | { "June","Juni" }, |
54 | { "July","Juli" }, | 54 | { "July","Juli" }, |
@@ -84,54 +84,54 @@ | |||
84 | { "Fonts","Schriftart" }, | 84 | { "Fonts","Schriftart" }, |
85 | { "Choose...","Wähle..." }, | 85 | { "Choose...","Wähle..." }, |
86 | { "Used %1 Client","Benutzter %1 Client" }, | 86 | { "Used %1 Client","Benutzter %1 Client" }, |
87 | { "No email client installed","Kein Email Klient installiert" }, | 87 | { "No email client installed","Kein Email Klient installiert" }, |
88 | { "Userdefined email client","Benutzerdef. Email Klient" }, | 88 | { "Userdefined email client","Benutzerdef. Email Klient" }, |
89 | { "OM/Pi email client","OM/Pi Email Klient" }, | 89 | { "OM/Pi email client","OM/Pi Email Klient" }, |
90 | { "Delete","Löschen" }, | 90 | { "Delete","Löschen" }, |
91 | { "New","Neu" }, | 91 | { "New","Neu" }, |
92 | { "Edit","Bearbeite" }, | 92 | { "Edit","Bearbeite" }, |
93 | { "Close","Schließen" }, | 93 | { "Close","Schließen" }, |
94 | { "Size","Größe" }, | 94 | { "Size","Größe" }, |
95 | { "Date","Datum" }, | 95 | { "Date","Datum" }, |
96 | { "Please set at","Bitte einstellen in" }, | 96 | { "Please set at","Bitte einstellen in" }, |
97 | { "Settings@General TAB","Einstellungen@Allgemein TAB" }, | 97 | { "Settings@General TAB","Einstellungen@Allgemein TAB" }, |
98 | { "KOpieMail/Pi","KOpieMail/Pi" }, | 98 | { "KOpieMail/Pi","KOpieMail/Pi" }, |
99 | { "Mail","Mail" }, | 99 | { "Mail","Mail" }, |
100 | { "Settings","Einstellungen" }, | 100 | { "Settings","Konfig" }, |
101 | { "Get all new mails","Hole alle neuen Mails" }, | 101 | { "Get all new mails","Hole alle neuen Mails" }, |
102 | { "Get new messages","Hole neue mails" }, | 102 | { "Get new messages","Hole neue mails" }, |
103 | { "Compose new mail","Schreibe neue Mail" }, | 103 | { "Compose new mail","Schreibe neue Mail" }, |
104 | { "Send queued mails","Sende gespeicherte Mails" }, | 104 | { "Send queued mails","Sende gespeicherte Mails" }, |
105 | { "Show/Hide folders","Zeige Verzeichnisse" }, | 105 | { "Show/Hide folders","Zeige Verzeichnisse" }, |
106 | { "Delete Mail","Lösche Mail" }, | 106 | { "Delete Mail","Lösche Mail" }, |
107 | { "Edit settings","Ändere Einstellungen" }, | 107 | { "Edit settings","Ändere Einstellungen" }, |
108 | { "Configure accounts","Konfiguriere Zugänge" }, | 108 | { "Configure accounts","Konfiguriere Zugänge" }, |
109 | { "Mailbox","Mailbox" }, | 109 | { "Mailbox","Mailbox" }, |
110 | { "Subject","Betreff" }, | 110 | { "Subject","Betreff" }, |
111 | { "Sender","Sender" }, | 111 | { "Sender","Sender" }, |
112 | { "Size","Größe" }, | 112 | { "Size","Größe" }, |
113 | { "Date","Datum" }, | 113 | { "Date","Datum" }, |
114 | { "Close","Schliessen" }, | 114 | { "Close","Schliessen" }, |
115 | { "Help","Hilfe" }, | 115 | { "Help","Hilfe" }, |
116 | { "About","Über" }, | 116 | { "About","Über" }, |
117 | { "Licence","Lizenz" }, | 117 | { "Licence","Lizenz" }, |
118 | { "LibEtPan Licence","LibEtPan Lizenz" }, | 118 | { "LibEtPan Licence","LibEtPan Lizenz" }, |
119 | { "Settings - some need a restart (nr)","Einstellungen - manche benötigen einen Neustart (nr)" }, | 119 | { "Settings - some need a restart (nr)","Einstellungen - manche benötigen einen Neustart (nr)" }, |
120 | { "HINT: Separate multiple\neMail addresses by ";"","Hinweis: Trenne mehrere Addressen mit einem ";"" }, | 120 | { "HINT: Separate multiple\neMail addresses by ";"","Hinweis:Trenne mehrere\nAddressen mit einem ";"" }, |
121 | { "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich" stattdessen!" }, | 121 | { "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich"\nstattdessen!" }, |
122 | { "View mail as html","Zeige Mails als html" }, | 122 | { "View mail as html","Zeige Mails als html" }, |
123 | { "Send mails later","Sende Mails später" }, | 123 | { "Send mails later","Sende Mails später" }, |
124 | { "Application(nr)","Applikation(nr)" }, | 124 | { "Application(nr)","Applikation(nr)" }, |
125 | { "OK","OK" }, | 125 | { "OK","OK" }, |
126 | { "Compose mail:","Verfasse Mail:" }, | 126 | { "Compose mail:","Verfasse Mail:" }, |
127 | { "Dear Mr.","Hallo Herr" }, | 127 | { "Dear Mr.","Hallo Herr" }, |
128 | { "Read mail:","Lese Mail:" }, | 128 | { "Read mail:","Lese Mail:" }, |
129 | { "Hello","Hallo" }, | 129 | { "Hello","Hallo" }, |
130 | { "Configure Accounts","Konfigure Zugänge" }, | 130 | { "Configure Accounts","Konfigure Zugänge" }, |
131 | { "Name of the Account","Name des Zugangs" }, | 131 | { "Name of the Account","Name des Zugangs" }, |
132 | { "News","News" }, | 132 | { "News","News" }, |
133 | { "Account","Zugang" }, | 133 | { "Account","Zugang" }, |
134 | { "Type","Typ" }, | 134 | { "Type","Typ" }, |
135 | { "<p>Please select an account.</p>","<p>Bitte wähle einen Zugang.</p>" }, | 135 | { "<p>Please select an account.</p>","<p>Bitte wähle einen Zugang.</p>" }, |
136 | { "Error","Fehler" }, | 136 | { "Error","Fehler" }, |
137 | { "Configure NNTP","Konfiguriere News" }, | 137 | { "Configure NNTP","Konfiguriere News" }, |
@@ -180,35 +180,35 @@ | |||
180 | { "To","An" }, | 180 | { "To","An" }, |
181 | { "From","Von" }, | 181 | { "From","Von" }, |
182 | { "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" }, | 182 | { "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" }, |
183 | { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" }, | 183 | { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" }, |
184 | { "Move/Copie all mails","Verschiebe/kopiere alle Mails" }, | 184 | { "Move/Copie all mails","Verschiebe/kopiere alle Mails" }, |
185 | { "Delete all mails","Lösche alle Mails" }, | 185 | { "Delete all mails","Lösche alle Mails" }, |
186 | { "Create new subfolder","Neues Unterverzeichnis" }, | 186 | { "Create new subfolder","Neues Unterverzeichnis" }, |
187 | { "Delete folder","Lösche Verzeichnis" }, | 187 | { "Delete folder","Lösche Verzeichnis" }, |
188 | { "Refresh folder list","Aktualisiere Verzeichnis Liste" }, | 188 | { "Refresh folder list","Aktualisiere Verzeichnis Liste" }, |
189 | { "Create new folder","Neues Verzeichnis" }, | 189 | { "Create new folder","Neues Verzeichnis" }, |
190 | { "Disconnect","Disconnect" }, | 190 | { "Disconnect","Disconnect" }, |
191 | { "Set offline","Gehe offline" }, | 191 | { "Set offline","Gehe offline" }, |
192 | { "Select target box","Wähle Ziel Box" }, | 192 | { "Select target box","Wähle Ziel Box" }, |
193 | { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, | 193 | { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, |
194 | { "Folder:","Verzeichnis:" }, | 194 | { "Folder:","Verzeichnis:" }, |
195 | { "Account:","Zugang:" }, | 195 | { "Account:","Zugang:" }, |
196 | { "Prefix will prepend, no need to enter it!","Prefix wird vorangestellt, braucht nicht eingegeben zu werden!" }, | 196 | { "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" }, |
197 | { "Move mail(s)","Verschiebe Mail(s)" }, | 197 | { "Move mail(s)","Verschiebe Mail(s)" }, |
198 | { "apply only to mails smaller","wende nur auf Mails an, kleiner als" }, | 198 | { "only mails smaller","nur Mails kleiner" }, |
199 | { " kB"," kB" }, | 199 | { " kB"," kB" }, |
200 | { " message %1 of %2"," Nachricht %1 von %2" }, | 200 | { " message %1 of %2"," Nachricht %1 von %2" }, |
201 | { "Copying...","Am Kopieren..." }, | 201 | { "Copying...","Am Kopieren..." }, |
202 | { "Copy message %1 of %2","Kopiere Nachricht %1 von %2" }, | 202 | { "Copy message %1 of %2","Kopiere Nachricht %1 von %2" }, |
203 | { "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" }, | 203 | { "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" }, |
204 | { "Delete All Mails","Lösche alle Mails" }, | 204 | { "Delete All Mails","Lösche alle Mails" }, |
205 | { "Deleting ...","Am Löschen..." }, | 205 | { "Deleting ...","Am Löschen..." }, |
206 | { "Delete message %1 of %2","Lösche Nachricht %1 von %2" }, | 206 | { "Delete message %1 of %2","Lösche Nachricht %1 von %2" }, |
207 | { "Compose Message","Verfasse Nachricht" }, | 207 | { "Compose Message","Verfasse Nachricht" }, |
208 | { "Reply-To","Antwort-An" }, | 208 | { "Reply-To","Antwort-An" }, |
209 | { "BCC","BCC" }, | 209 | { "BCC","BCC" }, |
210 | { "Signature","Signatur" }, | 210 | { "Signature","Signatur" }, |
211 | { "CC","Kopie" }, | 211 | { "CC","Kopie" }, |
212 | { "Options","Optionen" }, | 212 | { "Options","Optionen" }, |
213 | { "Delete File","Lösche Datei" }, | 213 | { "Delete File","Lösche Datei" }, |
214 | { "Add File","Füge Datei hinzu" }, | 214 | { "Add File","Füge Datei hinzu" }, |
@@ -222,22 +222,26 @@ | |||
222 | { "No","Nein" }, | 222 | { "No","Nein" }, |
223 | { "Yes","Ja" }, | 223 | { "Yes","Ja" }, |
224 | { "Store message into drafts?\n","Speichere Nachricht in Entwürfe?\n" }, | 224 | { "Store message into drafts?\n","Speichere Nachricht in Entwürfe?\n" }, |
225 | { "Store message?","Nachricht speichern?" }, | 225 | { "Store message?","Nachricht speichern?" }, |
226 | { "Select Type","Selektiere Typ" }, | 226 | { "Select Type","Selektiere Typ" }, |
227 | { "Select Account Type","Wähle Art des Zugangs" }, | 227 | { "Select Account Type","Wähle Art des Zugangs" }, |
228 | { "IMAP","IMAP (online lesen)" }, | 228 | { "IMAP","IMAP (online lesen)" }, |
229 | { "POP3","POP3 (holen)" }, | 229 | { "POP3","POP3 (holen)" }, |
230 | { "SMTP","SMTP (senden)" }, | 230 | { "SMTP","SMTP (senden)" }, |
231 | { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" }, | 231 | { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" }, |
232 | { "Question","Eine Frage..." }, | 232 | { "Question","Eine Frage..." }, |
233 | { "Send this message?","Nachricht wirklich senden?" }, | 233 | { "Send this message?","Nachricht wirklich senden?" }, |
234 | { "Stop editing message","Stop editing message" }, | 234 | { "Stop editing message","Stop editing message" }, |
235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, | 235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, |
236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, | 236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, |
237 | { "Refresh header list","Aktualisiere Titel Liste" }, | 237 | { "Refresh header list","Aktualisiere Titel Liste" }, |
238 | { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" }, | ||
239 | { "Mail queue flushed","Gespeicherte Mails gesendet!" }, | ||
240 | { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" }, | ||
241 | { "","" }, | ||
238 | { "","" }, | 242 | { "","" }, |
239 | { "","" }, | 243 | { "","" }, |
240 | { "","" }, | 244 | { "","" }, |
241 | { "","" }, | 245 | { "","" }, |
242 | { "","" }, | 246 | { "","" }, |
243 | { "","" }, | 247 | { "","" }, |
diff --git a/bin/kdepim/kopiemail/icons22/filesave.png b/bin/kdepim/kopiemail/icons22/filesave.png new file mode 100644 index 0000000..3bc2a37 --- a/dev/null +++ b/bin/kdepim/kopiemail/icons22/filesave.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index c5cae20..8251259 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -439,33 +439,33 @@ | |||
439 | { "Weekly","Wöchentlich" }, | 439 | { "Weekly","Wöchentlich" }, |
440 | { "Week starts on Sunday","Woche beginnt Sonntags" }, | 440 | { "Week starts on Sunday","Woche beginnt Sonntags" }, |
441 | { "What's Next View:","What's Next Anz." }, | 441 | { "What's Next View:","What's Next Anz." }, |
442 | { "What's next ?","Was kommt als nächstes?(What's Next)" }, | 442 | { "What's next ?","Was kommt als nächstes?(What's Next)" }, |
443 | { "Working Hours","Tägliche Arbeitszeit" }, | 443 | { "Working Hours","Tägliche Arbeitszeit" }, |
444 | { "Working hours color:","Arbeitszeit in der Agenda Ansicht:" }, | 444 | { "Working hours color:","Arbeitszeit in der Agenda Ansicht:" }, |
445 | { "Write back existing entries only","Nur exisitierende Einträge zurückschreiben" }, | 445 | { "Write back existing entries only","Nur exisitierende Einträge zurückschreiben" }, |
446 | { "Write back synced file","Syncronisierte Datei zurückschreiben" }, | 446 | { "Write back synced file","Syncronisierte Datei zurückschreiben" }, |
447 | { "Yearly","Jährlich" }, | 447 | { "Yearly","Jährlich" }, |
448 | { "year(s)","Jahr(e)" }, | 448 | { "year(s)","Jahr(e)" }, |
449 | { "Yes","Ja" }, | 449 | { "Yes","Ja" }, |
450 | { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" }, | 450 | { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" }, |
451 | { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." }, | 451 | { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." }, |
452 | { "week(s) on:","Woche(n) am: " }, | 452 | { "week(s) on:","Woche(n) am: " }, |
453 | { "Full menu bar(nr)","Volle Menuleiste(bn)" }, | 453 | { "Full menu bar(nr)","Volle Menuleiste(bn)" }, |
454 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, | 454 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, |
455 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" }, | 455 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, |
456 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | 456 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, |
457 | { "Daylight start:","Sommerzeit Beginn:" }, | 457 | { "Daylight start:","Sommerzeit Beginn:" }, |
458 | { "Daylight end:","Sommerzeit Ende:" }, | 458 | { "Daylight end:","Sommerzeit Ende:" }, |
459 | { "Time Zone","Zeitzone" }, | 459 | { "Time Zone","Zeitzone" }, |
460 | { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" }, | 460 | { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" }, |
461 | { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" }, | 461 | { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" }, |
462 | { "minutely","minütlich" }, | 462 | { "minutely","minütlich" }, |
463 | { "hourly","stündlich" }, | 463 | { "hourly","stündlich" }, |
464 | { "daily","täglich" }, | 464 | { "daily","täglich" }, |
465 | { "weekly","wöchentlich" }, | 465 | { "weekly","wöchentlich" }, |
466 | { "monthly","monatlich" }, | 466 | { "monthly","monatlich" }, |
467 | { "day-monthly","tag-monatlich" }, | 467 | { "day-monthly","tag-monatlich" }, |
468 | { "month-yearly","monat-jährlich" }, | 468 | { "month-yearly","monat-jährlich" }, |
469 | { "day-yearly","tag-jährlich" }, | 469 | { "day-yearly","tag-jährlich" }, |
470 | { "position-yearly","pos-jährlich" }, | 470 | { "position-yearly","pos-jährlich" }, |
471 | { "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" }, | 471 | { "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" }, |
@@ -900,33 +900,33 @@ | |||
900 | { "Export filtered calendar","Exportiere gefilterten Kalender" }, | 900 | { "Export filtered calendar","Exportiere gefilterten Kalender" }, |
901 | { "Preferences","Vorlieben" }, | 901 | { "Preferences","Vorlieben" }, |
902 | { "Global","Global" }, | 902 | { "Global","Global" }, |
903 | { "Phone","Phone" }, | 903 | { "Phone","Phone" }, |
904 | { "SMS","SMS" }, | 904 | { "SMS","SMS" }, |
905 | { "Fax","Fax" }, | 905 | { "Fax","Fax" }, |
906 | { "Pager","Pager" }, | 906 | { "Pager","Pager" }, |
907 | { "SIP","SIP" }, | 907 | { "SIP","SIP" }, |
908 | { "Italian","Italienisch" }, | 908 | { "Italian","Italienisch" }, |
909 | { "24:00","24:00" }, | 909 | { "24:00","24:00" }, |
910 | { "12:00am","12:00am" }, | 910 | { "12:00am","12:00am" }, |
911 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, | 911 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, |
912 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, | 912 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, |
913 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, | 913 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, |
914 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, | 914 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, |
915 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, | 915 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, |
916 | { "Add 30 min (+00:30) to selected Timezone","Addiere 30 min zur selektierten Zeitzone" }, | 916 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, |
917 | { "Used Mail Client","Benutzter Mail Client" }, | 917 | { "Used Mail Client","Benutzter Mail Client" }, |
918 | { "Channel:","Channel:" }, | 918 | { "Channel:","Channel:" }, |
919 | { "Message:","Message:" }, | 919 | { "Message:","Message:" }, |
920 | { "Parameters:","Parameter:" }, | 920 | { "Parameters:","Parameter:" }, |
921 | { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" }, | 921 | { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" }, |
922 | { "extra Message:","extra Message:" }, | 922 | { "extra Message:","extra Message:" }, |
923 | { "extra Parameters:","extra Parameter:" }, | 923 | { "extra Parameters:","extra Parameter:" }, |
924 | { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, | 924 | { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, |
925 | { "External Apps.","Externe Appl." }, | 925 | { "External Apps.","Externe Appl." }, |
926 | { "24 hours","24 Std." }, | 926 | { "24 hours","24 Std." }, |
927 | { "3 hours","3 Std." }, | 927 | { "3 hours","3 Std." }, |
928 | { "1 hour","1 Std." }, | 928 | { "1 hour","1 Std." }, |
929 | { "15 minutes","15 Min." }, | 929 | { "15 minutes","15 Min." }, |
930 | { "5 minutes","5 Min." }, | 930 | { "5 minutes","5 Min." }, |
931 | { "1 minute","1 Min." }, | 931 | { "1 minute","1 Min." }, |
932 | { "23","23" }, | 932 | { "23","23" }, |
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 35ad367..5f7a76f 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -5,32 +5,33 @@ | |||
5 | #include <libmailwrapper/smtpwrapper.h> | 5 | #include <libmailwrapper/smtpwrapper.h> |
6 | #include <libmailwrapper/storemail.h> | 6 | #include <libmailwrapper/storemail.h> |
7 | #include <libmailwrapper/abstractmail.h> | 7 | #include <libmailwrapper/abstractmail.h> |
8 | #include <libmailwrapper/mailtypes.h> | 8 | #include <libmailwrapper/mailtypes.h> |
9 | 9 | ||
10 | /* OPIE */ | 10 | /* OPIE */ |
11 | //#include <opie2/ofiledialog.h> | 11 | //#include <opie2/ofiledialog.h> |
12 | //#include <opie2/odebug.h> | 12 | //#include <opie2/odebug.h> |
13 | #include <kfiledialog.h> | 13 | #include <kfiledialog.h> |
14 | //#include <qpe/resource.h> | 14 | //#include <qpe/resource.h> |
15 | #include <qpe/global.h> | 15 | #include <qpe/global.h> |
16 | //#include <qpe/contact.h> | 16 | //#include <qpe/contact.h> |
17 | 17 | ||
18 | 18 | ||
19 | #include <qcombobox.h> | 19 | #include <qcombobox.h> |
20 | #include <qcheckbox.h> | 20 | #include <qcheckbox.h> |
21 | #include <qiconset.h> | ||
21 | #include <qtimer.h> | 22 | #include <qtimer.h> |
22 | #include <qmessagebox.h> | 23 | #include <qmessagebox.h> |
23 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
24 | #include <qmultilineedit.h> | 25 | #include <qmultilineedit.h> |
25 | #include <qlabel.h> | 26 | #include <qlabel.h> |
26 | #include <qtabwidget.h> | 27 | #include <qtabwidget.h> |
27 | #include <qlistview.h> | 28 | #include <qlistview.h> |
28 | #include <kabc/addresseedialog.h> | 29 | #include <kabc/addresseedialog.h> |
29 | #include <kabc/stdaddressbook.h> | 30 | #include <kabc/stdaddressbook.h> |
30 | #include <kabc/addressee.h> | 31 | #include <kabc/addressee.h> |
31 | #ifdef DESKTOP_VERSION | 32 | #ifdef DESKTOP_VERSION |
32 | #include <kabc/addresseedialog.h> | 33 | #include <kabc/addresseedialog.h> |
33 | #else //DESKTOP_VERSION | 34 | #else //DESKTOP_VERSION |
34 | #include <libkdepim/externalapphandler.h> | 35 | #include <libkdepim/externalapphandler.h> |
35 | #endif //DESKTOP_VERSION | 36 | #endif //DESKTOP_VERSION |
36 | 37 | ||
@@ -97,46 +98,59 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
97 | for ( it = accounts.first(); it; it = accounts.next() ) { | 98 | for ( it = accounts.first(); it; it = accounts.next() ) { |
98 | if ( it->getType()==MAILLIB::A_SMTP ) { | 99 | if ( it->getType()==MAILLIB::A_SMTP ) { |
99 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); | 100 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); |
100 | smtpAccountBox->insertItem( smtp->getAccountName() ); | 101 | smtpAccountBox->insertItem( smtp->getAccountName() ); |
101 | smtpAccounts.append( smtp ); | 102 | smtpAccounts.append( smtp ); |
102 | } | 103 | } |
103 | } | 104 | } |
104 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); | 105 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); |
105 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); | 106 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); |
106 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); | 107 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); |
107 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); | 108 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); |
108 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); | 109 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); |
109 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); | 110 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); |
110 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); | 111 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); |
111 | mMail = 0; | 112 | mMail = 0; |
112 | warnAttach = true; | 113 | warnAttach = true; |
114 | QIconSet icon; | ||
115 | //icon = SmallIcon("fileexport"); | ||
116 | icon = SmallIcon("filesave"); | ||
117 | SaveButton->setIconSet (icon ) ; | ||
118 | if ( QApplication::desktop()->width() < 320 ) { | ||
119 | SaveButton->setText ("") ; | ||
120 | SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ; | ||
121 | } | ||
122 | else | ||
123 | SaveButton->setText (i18n("Save")); | ||
124 | #ifndef DESKTOP_VERSION | ||
125 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); | ||
126 | QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold ); | ||
127 | QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold ); | ||
128 | #endif | ||
129 | message->setFont ( KOPrefs::instance()->mComposeFont ); | ||
130 | message->setWordWrap (QMultiLineEdit::WidgetWidth); | ||
113 | if ( smtpAccounts.count() > 0 ) { | 131 | if ( smtpAccounts.count() > 0 ) { |
114 | fillValues( smtpAccountBox->currentItem() ); | 132 | fillValues( smtpAccountBox->currentItem() ); |
115 | } else { | 133 | } else { |
116 | QMessageBox::information( 0, i18n( "Problem" ), | 134 | QMessageBox::information( 0, i18n( "Problem" ), |
117 | i18n( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ), | 135 | i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ), |
118 | i18n( "Ok" ) ); | 136 | i18n( "Ok" ) ); |
119 | return; | 137 | return; |
120 | } | 138 | } |
121 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); | 139 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); |
122 | message->setFont ( KOPrefs::instance()->mComposeFont ); | 140 | |
123 | message->setWordWrap (QMultiLineEdit::WidgetWidth); | ||
124 | #ifndef DESKTOP_VERSION | ||
125 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); | ||
126 | #endif | ||
127 | 141 | ||
128 | } | 142 | } |
129 | 143 | ||
130 | void ComposeMail::fillSettings() | 144 | void ComposeMail::fillSettings() |
131 | { | 145 | { |
132 | if ( QApplication::desktop()->width() < 320 ) | 146 | if ( QApplication::desktop()->width() < 320 ) |
133 | fromBox->setMaximumWidth( 100 ); | 147 | fromBox->setMaximumWidth( 100 ); |
134 | QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail); | 148 | QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail); |
135 | QStringList::ConstIterator sit = mailList.begin(); | 149 | QStringList::ConstIterator sit = mailList.begin(); |
136 | int pref = 0; | 150 | int pref = 0; |
137 | for (;sit!=mailList.end();++sit) { | 151 | for (;sit!=mailList.end();++sit) { |
138 | fromBox->insertItem((*sit)); | 152 | fromBox->insertItem((*sit)); |
139 | } | 153 | } |
140 | senderNameEdit->setText(KOPrefs::instance()->mName); | 154 | senderNameEdit->setText(KOPrefs::instance()->mName); |
141 | } | 155 | } |
142 | 156 | ||
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui index 0a5a750..c66b0c8 100644 --- a/kmicromail/composemailui.ui +++ b/kmicromail/composemailui.ui | |||
@@ -1,32 +1,32 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>ComposeMailUI</class> | 2 | <class>ComposeMailUI</class> |
3 | <include location="local">tr.h</include> | 3 | <include location="local">tr.h</include> |
4 | <widget> | 4 | <widget> |
5 | <class>QDialog</class> | 5 | <class>QDialog</class> |
6 | <property stdset="1"> | 6 | <property stdset="1"> |
7 | <name>name</name> | 7 | <name>name</name> |
8 | <cstring>ComposeMailUI</cstring> | 8 | <cstring>ComposeMailUI</cstring> |
9 | </property> | 9 | </property> |
10 | <property stdset="1"> | 10 | <property stdset="1"> |
11 | <name>geometry</name> | 11 | <name>geometry</name> |
12 | <rect> | 12 | <rect> |
13 | <x>0</x> | 13 | <x>0</x> |
14 | <y>0</y> | 14 | <y>0</y> |
15 | <width>276</width> | 15 | <width>276</width> |
16 | <height>262</height> | 16 | <height>263</height> |
17 | </rect> | 17 | </rect> |
18 | </property> | 18 | </property> |
19 | <property stdset="1"> | 19 | <property stdset="1"> |
20 | <name>caption</name> | 20 | <name>caption</name> |
21 | <string>Compose Message</string> | 21 | <string>Compose Message</string> |
22 | </property> | 22 | </property> |
23 | <property> | 23 | <property> |
24 | <name>layoutMargin</name> | 24 | <name>layoutMargin</name> |
25 | </property> | 25 | </property> |
26 | <property> | 26 | <property> |
27 | <name>layoutSpacing</name> | 27 | <name>layoutSpacing</name> |
28 | </property> | 28 | </property> |
29 | <grid> | 29 | <grid> |
30 | <property stdset="1"> | 30 | <property stdset="1"> |
31 | <name>margin</name> | 31 | <name>margin</name> |
32 | <number>2</number> | 32 | <number>2</number> |
@@ -434,33 +434,33 @@ | |||
434 | <property stdset="1"> | 434 | <property stdset="1"> |
435 | <name>sizePolicy</name> | 435 | <name>sizePolicy</name> |
436 | <sizepolicy> | 436 | <sizepolicy> |
437 | <hsizetype>3</hsizetype> | 437 | <hsizetype>3</hsizetype> |
438 | <vsizetype>0</vsizetype> | 438 | <vsizetype>0</vsizetype> |
439 | </sizepolicy> | 439 | </sizepolicy> |
440 | </property> | 440 | </property> |
441 | </widget> | 441 | </widget> |
442 | <widget row="0" column="3" > | 442 | <widget row="0" column="3" > |
443 | <class>QPushButton</class> | 443 | <class>QPushButton</class> |
444 | <property stdset="1"> | 444 | <property stdset="1"> |
445 | <name>name</name> | 445 | <name>name</name> |
446 | <cstring>SaveButton</cstring> | 446 | <cstring>SaveButton</cstring> |
447 | </property> | 447 | </property> |
448 | <property stdset="1"> | 448 | <property stdset="1"> |
449 | <name>text</name> | 449 | <name>text</name> |
450 | <string>Save</string> | 450 | <string> S</string> |
451 | </property> | 451 | </property> |
452 | </widget> | 452 | </widget> |
453 | </grid> | 453 | </grid> |
454 | </widget> | 454 | </widget> |
455 | <tabstops> | 455 | <tabstops> |
456 | <tabstop>fromBox</tabstop> | 456 | <tabstop>fromBox</tabstop> |
457 | <tabstop>toButton</tabstop> | 457 | <tabstop>toButton</tabstop> |
458 | <tabstop>toLine</tabstop> | 458 | <tabstop>toLine</tabstop> |
459 | <tabstop>subjectLine</tabstop> | 459 | <tabstop>subjectLine</tabstop> |
460 | <tabstop>message</tabstop> | 460 | <tabstop>message</tabstop> |
461 | <tabstop>tabWidget</tabstop> | 461 | <tabstop>tabWidget</tabstop> |
462 | <tabstop>ccButton</tabstop> | 462 | <tabstop>ccButton</tabstop> |
463 | <tabstop>ccLine</tabstop> | 463 | <tabstop>ccLine</tabstop> |
464 | <tabstop>bccButton</tabstop> | 464 | <tabstop>bccButton</tabstop> |
465 | <tabstop>bccLine</tabstop> | 465 | <tabstop>bccLine</tabstop> |
466 | <tabstop>replyButton</tabstop> | 466 | <tabstop>replyButton</tabstop> |
diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui index 2da103b..89f6ebc 100644 --- a/kmicromail/selectstoreui.ui +++ b/kmicromail/selectstoreui.ui | |||
@@ -1,32 +1,32 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>selectstoreui</class> | 2 | <class>selectstoreui</class> |
3 | <include location="local">tr.h</include> | 3 | <include location="local">tr.h</include> |
4 | <widget> | 4 | <widget> |
5 | <class>QDialog</class> | 5 | <class>QDialog</class> |
6 | <property stdset="1"> | 6 | <property stdset="1"> |
7 | <name>name</name> | 7 | <name>name</name> |
8 | <cstring>selectstoreui</cstring> | 8 | <cstring>selectstoreui</cstring> |
9 | </property> | 9 | </property> |
10 | <property stdset="1"> | 10 | <property stdset="1"> |
11 | <name>geometry</name> | 11 | <name>geometry</name> |
12 | <rect> | 12 | <rect> |
13 | <x>0</x> | 13 | <x>0</x> |
14 | <y>0</y> | 14 | <y>0</y> |
15 | <width>279</width> | 15 | <width>230</width> |
16 | <height>304</height> | 16 | <height>307</height> |
17 | </rect> | 17 | </rect> |
18 | </property> | 18 | </property> |
19 | <property stdset="1"> | 19 | <property stdset="1"> |
20 | <name>caption</name> | 20 | <name>caption</name> |
21 | <string>Select target box</string> | 21 | <string>Select target box</string> |
22 | </property> | 22 | </property> |
23 | <property> | 23 | <property> |
24 | <name>layoutMargin</name> | 24 | <name>layoutMargin</name> |
25 | </property> | 25 | </property> |
26 | <property> | 26 | <property> |
27 | <name>layoutSpacing</name> | 27 | <name>layoutSpacing</name> |
28 | </property> | 28 | </property> |
29 | <grid> | 29 | <grid> |
30 | <property stdset="1"> | 30 | <property stdset="1"> |
31 | <name>margin</name> | 31 | <name>margin</name> |
32 | <number>11</number> | 32 | <number>11</number> |
@@ -169,33 +169,33 @@ | |||
169 | <name>name</name> | 169 | <name>name</name> |
170 | <cstring>newFolderedit</cstring> | 170 | <cstring>newFolderedit</cstring> |
171 | </property> | 171 | </property> |
172 | <property stdset="1"> | 172 | <property stdset="1"> |
173 | <name>enabled</name> | 173 | <name>enabled</name> |
174 | <bool>false</bool> | 174 | <bool>false</bool> |
175 | </property> | 175 | </property> |
176 | </widget> | 176 | </widget> |
177 | <widget row="5" column="0" rowspan="1" colspan="2" > | 177 | <widget row="5" column="0" rowspan="1" colspan="2" > |
178 | <class>QLabel</class> | 178 | <class>QLabel</class> |
179 | <property stdset="1"> | 179 | <property stdset="1"> |
180 | <name>name</name> | 180 | <name>name</name> |
181 | <cstring>newFolderLabel</cstring> | 181 | <cstring>newFolderLabel</cstring> |
182 | </property> | 182 | </property> |
183 | <property stdset="1"> | 183 | <property stdset="1"> |
184 | <name>text</name> | 184 | <name>text</name> |
185 | <string>Prefix will prepend, no need to enter it!</string> | 185 | <string>Prefix will prepend, do not enter</string> |
186 | </property> | 186 | </property> |
187 | <property stdset="1"> | 187 | <property stdset="1"> |
188 | <name>alignment</name> | 188 | <name>alignment</name> |
189 | <set>WordBreak|AlignCenter</set> | 189 | <set>WordBreak|AlignCenter</set> |
190 | </property> | 190 | </property> |
191 | <property> | 191 | <property> |
192 | <name>hAlign</name> | 192 | <name>hAlign</name> |
193 | </property> | 193 | </property> |
194 | <property> | 194 | <property> |
195 | <name>wordwrap</name> | 195 | <name>wordwrap</name> |
196 | </property> | 196 | </property> |
197 | </widget> | 197 | </widget> |
198 | <widget row="6" column="0" rowspan="1" colspan="2" > | 198 | <widget row="6" column="0" rowspan="1" colspan="2" > |
199 | <class>Line</class> | 199 | <class>Line</class> |
200 | <property stdset="1"> | 200 | <property stdset="1"> |
201 | <name>name</name> | 201 | <name>name</name> |
@@ -233,33 +233,33 @@ | |||
233 | <name>name</name> | 233 | <name>name</name> |
234 | <cstring>selMove</cstring> | 234 | <cstring>selMove</cstring> |
235 | </property> | 235 | </property> |
236 | <property stdset="1"> | 236 | <property stdset="1"> |
237 | <name>text</name> | 237 | <name>text</name> |
238 | <string>Move mail(s)</string> | 238 | <string>Move mail(s)</string> |
239 | </property> | 239 | </property> |
240 | </widget> | 240 | </widget> |
241 | <widget row="7" column="0" > | 241 | <widget row="7" column="0" > |
242 | <class>QCheckBox</class> | 242 | <class>QCheckBox</class> |
243 | <property stdset="1"> | 243 | <property stdset="1"> |
244 | <name>name</name> | 244 | <name>name</name> |
245 | <cstring>useSize</cstring> | 245 | <cstring>useSize</cstring> |
246 | </property> | 246 | </property> |
247 | <property stdset="1"> | 247 | <property stdset="1"> |
248 | <name>text</name> | 248 | <name>text</name> |
249 | <string>apply only to mails smaller</string> | 249 | <string>only mails smaller</string> |
250 | </property> | 250 | </property> |
251 | </widget> | 251 | </widget> |
252 | <widget row="7" column="1" > | 252 | <widget row="7" column="1" > |
253 | <class>QSpinBox</class> | 253 | <class>QSpinBox</class> |
254 | <property stdset="1"> | 254 | <property stdset="1"> |
255 | <name>name</name> | 255 | <name>name</name> |
256 | <cstring>sizeSpinBox</cstring> | 256 | <cstring>sizeSpinBox</cstring> |
257 | </property> | 257 | </property> |
258 | <property stdset="1"> | 258 | <property stdset="1"> |
259 | <name>suffix</name> | 259 | <name>suffix</name> |
260 | <string> kB</string> | 260 | <string> kB</string> |
261 | </property> | 261 | </property> |
262 | <property stdset="1"> | 262 | <property stdset="1"> |
263 | <name>maxValue</name> | 263 | <name>maxValue</name> |
264 | <number>8192</number> | 264 | <number>8192</number> |
265 | </property> | 265 | </property> |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 1fae41f..4817a3f 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -317,33 +317,33 @@ void KDEPIMConfigWidget::setupTimeZoneTab() | |||
317 | mTimeZoneCombo->insertStringList(list); | 317 | mTimeZoneCombo->insertStringList(list); |
318 | 318 | ||
319 | // find the currently set time zone and select it | 319 | // find the currently set time zone and select it |
320 | QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; | 320 | QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; |
321 | int nCurrentlySet = 11; | 321 | int nCurrentlySet = 11; |
322 | for (int i = 0; i < mTimeZoneCombo->count(); i++) | 322 | for (int i = 0; i < mTimeZoneCombo->count(); i++) |
323 | { | 323 | { |
324 | if (mTimeZoneCombo->text(i) == sCurrentlySet) | 324 | if (mTimeZoneCombo->text(i) == sCurrentlySet) |
325 | { | 325 | { |
326 | nCurrentlySet = i; | 326 | nCurrentlySet = i; |
327 | break; | 327 | break; |
328 | } | 328 | } |
329 | } | 329 | } |
330 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); | 330 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); |
331 | int iii = 1; | 331 | int iii = 1; |
332 | KPrefsWidBool *sb = | 332 | KPrefsWidBool *sb = |
333 | addWidBool(i18n("Add 30 min (+00:30) to selected Timezone"), | 333 | addWidBool(i18n("Add 30 min to selected Timezone"), |
334 | &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); | 334 | &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); |
335 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 335 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
336 | ++iii; | 336 | ++iii; |
337 | sb = | 337 | sb = |
338 | addWidBool(i18n("Timezone has daylight saving"), | 338 | addWidBool(i18n("Timezone has daylight saving"), |
339 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); | 339 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); |
340 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 340 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
341 | ++iii; | 341 | ++iii; |
342 | QLabel* lab; | 342 | QLabel* lab; |
343 | 343 | ||
344 | lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | 344 | lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); |
345 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 345 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
346 | ++iii; | 346 | ++iii; |
347 | 347 | ||
348 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | 348 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); |
349 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 349 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |