author | zautrix <zautrix> | 2004-10-23 22:58:21 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 22:58:21 (UTC) |
commit | fcea043d2200bb4bb0b1146a69204af15fb58a7d (patch) (unidiff) | |
tree | c2c210290c02f20af3b307f4c4e47ba8915f7a05 | |
parent | 22c26311ca936fa1036e406c86e0178c16acd090 (diff) | |
download | kdepimpi-fcea043d2200bb4bb0b1146a69204af15fb58a7d.zip kdepimpi-fcea043d2200bb4bb0b1146a69204af15fb58a7d.tar.gz kdepimpi-fcea043d2200bb4bb0b1146a69204af15fb58a7d.tar.bz2 |
kopimail translation
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 243 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/usertranslation.txt | 243 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.cpp | 13 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/sendmailprogress.cpp | 5 | ||||
-rw-r--r-- | kmicromail/main.cpp | 1 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 1 | ||||
-rw-r--r-- | microkde/kdecore/klocale.cpp | 62 |
7 files changed, 553 insertions, 15 deletions
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt new file mode 100644 index 0000000..7a53d36 --- a/dev/null +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -0,0 +1,243 @@ | |||
1 | { " Local Time"," Locale Zeit" }, | ||
2 | { "Preferences","Vorlieben" }, | ||
3 | { "Ok","Ok" }, | ||
4 | { "Default","Standard" }, | ||
5 | { "Cancel","Abbrechen" }, | ||
6 | { "Global","Global" }, | ||
7 | { "Email","Email" }, | ||
8 | { "Phone","Phone" }, | ||
9 | { "SMS","SMS" }, | ||
10 | { "Fax","Fax" }, | ||
11 | { "Pager","Pager" }, | ||
12 | { "SIP","SIP" }, | ||
13 | { "Language:(needs restart)","Sprache (Neustart!)" }, | ||
14 | { "English","Englisch" }, | ||
15 | { "German","Deutsch" }, | ||
16 | { "French","Französich" }, | ||
17 | { "Italian","Italienisch" }, | ||
18 | { "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" }, | ||
19 | { "Time Format(nr):","Zeit Format(Neustart!)" }, | ||
20 | { "24:00","24:00" }, | ||
21 | { "12:00am","12:00am" }, | ||
22 | { "Week starts on Sunday","Woche beginnt Sonntags" }, | ||
23 | { "Locale","Localisation" }, | ||
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)" }, | ||
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)" }, | ||
28 | { "User defined","Benutzerdefiniert" }, | ||
29 | { "User long date:","Format langes 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" }, | ||
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" }, | ||
34 | { "Date Format","Datums Format" }, | ||
35 | { "Timezone:","Zeitzone:" }, | ||
36 | { "Add 30 min (+00:30) to selected Timezone","Addiere 30 min zur selektierten Zeitzone" }, | ||
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!" }, | ||
39 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | ||
40 | { "Daylight start:","Sommerzeit Beginn:" }, | ||
41 | { "Mon","Mo" }, | ||
42 | { "Tue","Di" }, | ||
43 | { "Wed","Mi" }, | ||
44 | { "Thu","Do" }, | ||
45 | { "Fri","Fr" }, | ||
46 | { "Sat","Sa" }, | ||
47 | { "Sun","So" }, | ||
48 | { "January","Januar" }, | ||
49 | { "February","Februar" }, | ||
50 | { "March","März" }, | ||
51 | { "April","April" }, | ||
52 | { "May","Mai" }, | ||
53 | { "June","Juni" }, | ||
54 | { "July","Juli" }, | ||
55 | { "August","August" }, | ||
56 | { "September","September" }, | ||
57 | { "October","Oktober" }, | ||
58 | { "November","November" }, | ||
59 | { "December","Dezember" }, | ||
60 | { "tomorrow","morgen" }, | ||
61 | { "today","heute" }, | ||
62 | { "yesterday","gestern" }, | ||
63 | { "Monday","Montag" }, | ||
64 | { "Tuesday","Dienstag" }, | ||
65 | { "Wednesday","Mittwoch" }, | ||
66 | { "Thursday","Donnerstag" }, | ||
67 | { "Friday","Freitag" }, | ||
68 | { "Saturday","Samstag" }, | ||
69 | { "Sunday","Sonntag" }, | ||
70 | { "Daylight end:","Sommerzeit Ende:" }, | ||
71 | { "Time Zone","Zeitzone" }, | ||
72 | { "Used Mail Client","Benutzter Mail Client" }, | ||
73 | { "Channel:","Channel:" }, | ||
74 | { "Message:","Message:" }, | ||
75 | { "Parameters:","Parameter:" }, | ||
76 | { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" }, | ||
77 | { "extra Message:","extra Message:" }, | ||
78 | { "extra Parameters:","extra Parameter:" }, | ||
79 | { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, | ||
80 | { "External Apps.","Externe Appl." }, | ||
81 | { "General","Allgemein" }, | ||
82 | { "Full &name:","Vor- und &Nachname:" }, | ||
83 | { "E&mail address:","E&mail Adresse:" }, | ||
84 | { "Fonts","Schriftart" }, | ||
85 | { "Choose...","Wähle..." }, | ||
86 | { "Used %1 Client","Benutzter %1 Client" }, | ||
87 | { "No email client installed","Kein Email Klient installiert" }, | ||
88 | { "Userdefined email client","Benutzerdef. Email Klient" }, | ||
89 | { "OM/Pi email client","OM/Pi Email Klient" }, | ||
90 | { "Delete","Löschen" }, | ||
91 | { "New","Neu" }, | ||
92 | { "Edit","Bearbeite" }, | ||
93 | { "Close","Schließen" }, | ||
94 | { "Size","Größe" }, | ||
95 | { "Date","Datum" }, | ||
96 | { "Please set at","Bitte einstellen in" }, | ||
97 | { "Settings@General TAB","Einstellungen@Allgemein TAB" }, | ||
98 | { "KOpieMail/Pi","KOpieMail/Pi" }, | ||
99 | { "Mail","Mail" }, | ||
100 | { "Settings","Einstellungen" }, | ||
101 | { "Get all new mails","Hole alle neuen Mails" }, | ||
102 | { "Get new messages","Hole neue mails" }, | ||
103 | { "Compose new mail","Schreibe neue Mail" }, | ||
104 | { "Send queued mails","Sende gespeicherte Mails" }, | ||
105 | { "Show/Hide folders","Zeige Verzeichnisse" }, | ||
106 | { "Delete Mail","Lösche Mail" }, | ||
107 | { "Edit settings","Ändere Einstellungen" }, | ||
108 | { "Configure accounts","Konfiguriere Zugänge" }, | ||
109 | { "Mailbox","Mailbox" }, | ||
110 | { "Subject","Betreff" }, | ||
111 | { "Sender","Sender" }, | ||
112 | { "Size","Größe" }, | ||
113 | { "Date","Datum" }, | ||
114 | { "Close","Schliessen" }, | ||
115 | { "Help","Hilfe" }, | ||
116 | { "About","Über" }, | ||
117 | { "Licence","Lizenz" }, | ||
118 | { "LibEtPan Licence","LibEtPan Lizenz" }, | ||
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 ";"" }, | ||
121 | { "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich" stattdessen!" }, | ||
122 | { "View mail as html","Zeige Mails als html" }, | ||
123 | { "Send mails later","Sende Mails später" }, | ||
124 | { "Application(nr)","Applikation(nr)" }, | ||
125 | { "OK","OK" }, | ||
126 | { "Compose mail:","Verfasse Mail:" }, | ||
127 | { "Dear Mr.","Hallo Herr" }, | ||
128 | { "Read mail:","Lese Mail:" }, | ||
129 | { "Hello","Hallo" }, | ||
130 | { "Configure Accounts","Konfigure Zugänge" }, | ||
131 | { "Name of the Account","Name des Zugangs" }, | ||
132 | { "News","News" }, | ||
133 | { "Account","Zugang" }, | ||
134 | { "Type","Typ" }, | ||
135 | { "<p>Please select an account.</p>","<p>Bitte wähle einen Zugang.</p>" }, | ||
136 | { "Error","Fehler" }, | ||
137 | { "Configure NNTP","Konfiguriere News" }, | ||
138 | { "Port","Port" }, | ||
139 | { "Server","Server" }, | ||
140 | { "Use SSL","Benutze SSL" }, | ||
141 | { "User","Benutzer" }, | ||
142 | { "Password","Passwort" }, | ||
143 | { "Use Login","Benutze Login" }, | ||
144 | { "Newsgroup","Newsgroup" }, | ||
145 | { "Get newsgroup list from server","Hole Newsgroup Liste vom Server" }, | ||
146 | { "Filter:","Filter:" }, | ||
147 | { "Show subscribed","Zeige abbonnierte" }, | ||
148 | { "Groups","NewsGroups" }, | ||
149 | { "Configure IMAP","Konfiguriere IMAP" }, | ||
150 | { "Use secure sockets:","Benutze sichere Verbindung:" }, | ||
151 | { "ssh $SERVER exec","ssh $SERVER exec" }, | ||
152 | { "Prefix","Prefix" }, | ||
153 | { "Local storage folder:","Lokales Verzeichnis:" }, | ||
154 | { "Get only messages smaller","Hole nur Nachrichten kleiner" }, | ||
155 | { "kB","kB" }, | ||
156 | { "Leave Messages on Server","Belasse Nachrichten auf dem Server" }, | ||
157 | { "Configure POP3","Konfiguriere POP3" }, | ||
158 | { "ssh $SERVER exec imapd","ssh $SERVER exec imapd" }, | ||
159 | { "Configure SMTP","Konfiguriere SMTP" }, | ||
160 | { "Name of the SMTP Server","Name des SMTP Servers" }, | ||
161 | { "Port of the SMTP Server","Port des SMTP Servers" }, | ||
162 | { "Fetching folder list","Hole Verzeichnis Liste" }, | ||
163 | { "Fetch ","Hole " }, | ||
164 | { "Fetching header list","Hole Titel Liste" }, | ||
165 | { "Mailbox has %1 mails","Mailbox hat %1 Mails" }, | ||
166 | { "Read this mail","Lies diese Mail" }, | ||
167 | { "Move/Copy this mail","Verschiebe/kopiere diese Mail" }, | ||
168 | { "Delete this mail","Lösche diese Mail" }, | ||
169 | { "Move/Copy all selected mail","Verschiebe/kopiere selektierte Mails" }, | ||
170 | { "Delete all selected mails","Lösche alle selektierten Mails" }, | ||
171 | { "Clear selection","Selektion aufheben" }, | ||
172 | { "Reply","Antworten" }, | ||
173 | { "Forward","Weiterleiten" }, | ||
174 | { "Attachments","Anhang" }, | ||
175 | { "Show Html","Zeige in html" }, | ||
176 | { "Description","Beschreibung" }, | ||
177 | { "Filename","Dateiname" }, | ||
178 | { "E-Mail by %1","E-Mail von %1" }, | ||
179 | { "Cc","Kopie" }, | ||
180 | { "To","An" }, | ||
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>" }, | ||
183 | { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" }, | ||
184 | { "Move/Copie all mails","Verschiebe/kopiere alle Mails" }, | ||
185 | { "Delete all mails","Lösche alle Mails" }, | ||
186 | { "Create new subfolder","Neues Unterverzeichnis" }, | ||
187 | { "Delete folder","Lösche Verzeichnis" }, | ||
188 | { "Refresh folder list","Aktualisiere Verzeichnis Liste" }, | ||
189 | { "Create new folder","Neues Verzeichnis" }, | ||
190 | { "Disconnect","Disconnect" }, | ||
191 | { "Set offline","Gehe offline" }, | ||
192 | { "Select target box","Wähle Ziel Box" }, | ||
193 | { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, | ||
194 | { "Folder:","Verzeichnis:" }, | ||
195 | { "Account:","Zugang:" }, | ||
196 | { "Prefix will prepend, no need to enter it!","Prefix wird vorangestellt, braucht nicht eingegeben zu werden!" }, | ||
197 | { "Move mail(s)","Verschiebe Mail(s)" }, | ||
198 | { "apply only to mails smaller","wende nur auf Mails an, kleiner als" }, | ||
199 | { " kB"," kB" }, | ||
200 | { " message %1 of %2"," Nachricht %1 von %2" }, | ||
201 | { "Copying...","Am Kopieren..." }, | ||
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?" }, | ||
204 | { "Delete All Mails","Lösche alle Mails" }, | ||
205 | { "Deleting ...","Am Löschen..." }, | ||
206 | { "Delete message %1 of %2","Lösche Nachricht %1 von %2" }, | ||
207 | { "Compose Message","Verfasse Nachricht" }, | ||
208 | { "Reply-To","Antwort-An" }, | ||
209 | { "BCC","BCC" }, | ||
210 | { "Signature","Signatur" }, | ||
211 | { "CC","Kopie" }, | ||
212 | { "Options","Optionen" }, | ||
213 | { "Delete File","Lösche Datei" }, | ||
214 | { "Add File","Füge Datei hinzu" }, | ||
215 | { "Attachment","Anhang" }, | ||
216 | { "send later","sende später" }, | ||
217 | { "use:","via:" }, | ||
218 | { "Save","Speichern" }, | ||
219 | { "Name","Name" }, | ||
220 | { "No Receiver spezified","Kein Empfänger angegeben" }, | ||
221 | { "Sending mail","Sende Mail" }, | ||
222 | { "No","Nein" }, | ||
223 | { "Yes","Ja" }, | ||
224 | { "Store message into drafts?\n","Speichere Nachricht in Entwürfe?\n" }, | ||
225 | { "Store message?","Nachricht speichern?" }, | ||
226 | { "Select Type","Selektiere Typ" }, | ||
227 | { "Select Account Type","Wähle Art des Zugangs" }, | ||
228 | { "IMAP","IMAP (online lesen)" }, | ||
229 | { "POP3","POP3 (holen)" }, | ||
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>" }, | ||
232 | { "Question","Eine Frage..." }, | ||
233 | { "Send this message?","Nachricht wirklich senden?" }, | ||
234 | { "Stop editing message","Stop editing message" }, | ||
235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, | ||
236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, | ||
237 | { "Refresh header list","Aktualisiere Titel Liste" }, | ||
238 | { "","" }, | ||
239 | { "","" }, | ||
240 | { "","" }, | ||
241 | { "","" }, | ||
242 | { "","" }, | ||
243 | { "","" }, | ||
diff --git a/bin/kdepim/kopiemail/usertranslation.txt b/bin/kdepim/kopiemail/usertranslation.txt new file mode 100644 index 0000000..7a53d36 --- a/dev/null +++ b/bin/kdepim/kopiemail/usertranslation.txt | |||
@@ -0,0 +1,243 @@ | |||
1 | { " Local Time"," Locale Zeit" }, | ||
2 | { "Preferences","Vorlieben" }, | ||
3 | { "Ok","Ok" }, | ||
4 | { "Default","Standard" }, | ||
5 | { "Cancel","Abbrechen" }, | ||
6 | { "Global","Global" }, | ||
7 | { "Email","Email" }, | ||
8 | { "Phone","Phone" }, | ||
9 | { "SMS","SMS" }, | ||
10 | { "Fax","Fax" }, | ||
11 | { "Pager","Pager" }, | ||
12 | { "SIP","SIP" }, | ||
13 | { "Language:(needs restart)","Sprache (Neustart!)" }, | ||
14 | { "English","Englisch" }, | ||
15 | { "German","Deutsch" }, | ||
16 | { "French","Französich" }, | ||
17 | { "Italian","Italienisch" }, | ||
18 | { "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" }, | ||
19 | { "Time Format(nr):","Zeit Format(Neustart!)" }, | ||
20 | { "24:00","24:00" }, | ||
21 | { "12:00am","12:00am" }, | ||
22 | { "Week starts on Sunday","Woche beginnt Sonntags" }, | ||
23 | { "Locale","Localisation" }, | ||
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)" }, | ||
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)" }, | ||
28 | { "User defined","Benutzerdefiniert" }, | ||
29 | { "User long date:","Format langes 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" }, | ||
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" }, | ||
34 | { "Date Format","Datums Format" }, | ||
35 | { "Timezone:","Zeitzone:" }, | ||
36 | { "Add 30 min (+00:30) to selected Timezone","Addiere 30 min zur selektierten Zeitzone" }, | ||
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!" }, | ||
39 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | ||
40 | { "Daylight start:","Sommerzeit Beginn:" }, | ||
41 | { "Mon","Mo" }, | ||
42 | { "Tue","Di" }, | ||
43 | { "Wed","Mi" }, | ||
44 | { "Thu","Do" }, | ||
45 | { "Fri","Fr" }, | ||
46 | { "Sat","Sa" }, | ||
47 | { "Sun","So" }, | ||
48 | { "January","Januar" }, | ||
49 | { "February","Februar" }, | ||
50 | { "March","März" }, | ||
51 | { "April","April" }, | ||
52 | { "May","Mai" }, | ||
53 | { "June","Juni" }, | ||
54 | { "July","Juli" }, | ||
55 | { "August","August" }, | ||
56 | { "September","September" }, | ||
57 | { "October","Oktober" }, | ||
58 | { "November","November" }, | ||
59 | { "December","Dezember" }, | ||
60 | { "tomorrow","morgen" }, | ||
61 | { "today","heute" }, | ||
62 | { "yesterday","gestern" }, | ||
63 | { "Monday","Montag" }, | ||
64 | { "Tuesday","Dienstag" }, | ||
65 | { "Wednesday","Mittwoch" }, | ||
66 | { "Thursday","Donnerstag" }, | ||
67 | { "Friday","Freitag" }, | ||
68 | { "Saturday","Samstag" }, | ||
69 | { "Sunday","Sonntag" }, | ||
70 | { "Daylight end:","Sommerzeit Ende:" }, | ||
71 | { "Time Zone","Zeitzone" }, | ||
72 | { "Used Mail Client","Benutzter Mail Client" }, | ||
73 | { "Channel:","Channel:" }, | ||
74 | { "Message:","Message:" }, | ||
75 | { "Parameters:","Parameter:" }, | ||
76 | { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" }, | ||
77 | { "extra Message:","extra Message:" }, | ||
78 | { "extra Parameters:","extra Parameter:" }, | ||
79 | { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, | ||
80 | { "External Apps.","Externe Appl." }, | ||
81 | { "General","Allgemein" }, | ||
82 | { "Full &name:","Vor- und &Nachname:" }, | ||
83 | { "E&mail address:","E&mail Adresse:" }, | ||
84 | { "Fonts","Schriftart" }, | ||
85 | { "Choose...","Wähle..." }, | ||
86 | { "Used %1 Client","Benutzter %1 Client" }, | ||
87 | { "No email client installed","Kein Email Klient installiert" }, | ||
88 | { "Userdefined email client","Benutzerdef. Email Klient" }, | ||
89 | { "OM/Pi email client","OM/Pi Email Klient" }, | ||
90 | { "Delete","Löschen" }, | ||
91 | { "New","Neu" }, | ||
92 | { "Edit","Bearbeite" }, | ||
93 | { "Close","Schließen" }, | ||
94 | { "Size","Größe" }, | ||
95 | { "Date","Datum" }, | ||
96 | { "Please set at","Bitte einstellen in" }, | ||
97 | { "Settings@General TAB","Einstellungen@Allgemein TAB" }, | ||
98 | { "KOpieMail/Pi","KOpieMail/Pi" }, | ||
99 | { "Mail","Mail" }, | ||
100 | { "Settings","Einstellungen" }, | ||
101 | { "Get all new mails","Hole alle neuen Mails" }, | ||
102 | { "Get new messages","Hole neue mails" }, | ||
103 | { "Compose new mail","Schreibe neue Mail" }, | ||
104 | { "Send queued mails","Sende gespeicherte Mails" }, | ||
105 | { "Show/Hide folders","Zeige Verzeichnisse" }, | ||
106 | { "Delete Mail","Lösche Mail" }, | ||
107 | { "Edit settings","Ändere Einstellungen" }, | ||
108 | { "Configure accounts","Konfiguriere Zugänge" }, | ||
109 | { "Mailbox","Mailbox" }, | ||
110 | { "Subject","Betreff" }, | ||
111 | { "Sender","Sender" }, | ||
112 | { "Size","Größe" }, | ||
113 | { "Date","Datum" }, | ||
114 | { "Close","Schliessen" }, | ||
115 | { "Help","Hilfe" }, | ||
116 | { "About","Über" }, | ||
117 | { "Licence","Lizenz" }, | ||
118 | { "LibEtPan Licence","LibEtPan Lizenz" }, | ||
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 ";"" }, | ||
121 | { "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich" stattdessen!" }, | ||
122 | { "View mail as html","Zeige Mails als html" }, | ||
123 | { "Send mails later","Sende Mails später" }, | ||
124 | { "Application(nr)","Applikation(nr)" }, | ||
125 | { "OK","OK" }, | ||
126 | { "Compose mail:","Verfasse Mail:" }, | ||
127 | { "Dear Mr.","Hallo Herr" }, | ||
128 | { "Read mail:","Lese Mail:" }, | ||
129 | { "Hello","Hallo" }, | ||
130 | { "Configure Accounts","Konfigure Zugänge" }, | ||
131 | { "Name of the Account","Name des Zugangs" }, | ||
132 | { "News","News" }, | ||
133 | { "Account","Zugang" }, | ||
134 | { "Type","Typ" }, | ||
135 | { "<p>Please select an account.</p>","<p>Bitte wähle einen Zugang.</p>" }, | ||
136 | { "Error","Fehler" }, | ||
137 | { "Configure NNTP","Konfiguriere News" }, | ||
138 | { "Port","Port" }, | ||
139 | { "Server","Server" }, | ||
140 | { "Use SSL","Benutze SSL" }, | ||
141 | { "User","Benutzer" }, | ||
142 | { "Password","Passwort" }, | ||
143 | { "Use Login","Benutze Login" }, | ||
144 | { "Newsgroup","Newsgroup" }, | ||
145 | { "Get newsgroup list from server","Hole Newsgroup Liste vom Server" }, | ||
146 | { "Filter:","Filter:" }, | ||
147 | { "Show subscribed","Zeige abbonnierte" }, | ||
148 | { "Groups","NewsGroups" }, | ||
149 | { "Configure IMAP","Konfiguriere IMAP" }, | ||
150 | { "Use secure sockets:","Benutze sichere Verbindung:" }, | ||
151 | { "ssh $SERVER exec","ssh $SERVER exec" }, | ||
152 | { "Prefix","Prefix" }, | ||
153 | { "Local storage folder:","Lokales Verzeichnis:" }, | ||
154 | { "Get only messages smaller","Hole nur Nachrichten kleiner" }, | ||
155 | { "kB","kB" }, | ||
156 | { "Leave Messages on Server","Belasse Nachrichten auf dem Server" }, | ||
157 | { "Configure POP3","Konfiguriere POP3" }, | ||
158 | { "ssh $SERVER exec imapd","ssh $SERVER exec imapd" }, | ||
159 | { "Configure SMTP","Konfiguriere SMTP" }, | ||
160 | { "Name of the SMTP Server","Name des SMTP Servers" }, | ||
161 | { "Port of the SMTP Server","Port des SMTP Servers" }, | ||
162 | { "Fetching folder list","Hole Verzeichnis Liste" }, | ||
163 | { "Fetch ","Hole " }, | ||
164 | { "Fetching header list","Hole Titel Liste" }, | ||
165 | { "Mailbox has %1 mails","Mailbox hat %1 Mails" }, | ||
166 | { "Read this mail","Lies diese Mail" }, | ||
167 | { "Move/Copy this mail","Verschiebe/kopiere diese Mail" }, | ||
168 | { "Delete this mail","Lösche diese Mail" }, | ||
169 | { "Move/Copy all selected mail","Verschiebe/kopiere selektierte Mails" }, | ||
170 | { "Delete all selected mails","Lösche alle selektierten Mails" }, | ||
171 | { "Clear selection","Selektion aufheben" }, | ||
172 | { "Reply","Antworten" }, | ||
173 | { "Forward","Weiterleiten" }, | ||
174 | { "Attachments","Anhang" }, | ||
175 | { "Show Html","Zeige in html" }, | ||
176 | { "Description","Beschreibung" }, | ||
177 | { "Filename","Dateiname" }, | ||
178 | { "E-Mail by %1","E-Mail von %1" }, | ||
179 | { "Cc","Kopie" }, | ||
180 | { "To","An" }, | ||
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>" }, | ||
183 | { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" }, | ||
184 | { "Move/Copie all mails","Verschiebe/kopiere alle Mails" }, | ||
185 | { "Delete all mails","Lösche alle Mails" }, | ||
186 | { "Create new subfolder","Neues Unterverzeichnis" }, | ||
187 | { "Delete folder","Lösche Verzeichnis" }, | ||
188 | { "Refresh folder list","Aktualisiere Verzeichnis Liste" }, | ||
189 | { "Create new folder","Neues Verzeichnis" }, | ||
190 | { "Disconnect","Disconnect" }, | ||
191 | { "Set offline","Gehe offline" }, | ||
192 | { "Select target box","Wähle Ziel Box" }, | ||
193 | { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, | ||
194 | { "Folder:","Verzeichnis:" }, | ||
195 | { "Account:","Zugang:" }, | ||
196 | { "Prefix will prepend, no need to enter it!","Prefix wird vorangestellt, braucht nicht eingegeben zu werden!" }, | ||
197 | { "Move mail(s)","Verschiebe Mail(s)" }, | ||
198 | { "apply only to mails smaller","wende nur auf Mails an, kleiner als" }, | ||
199 | { " kB"," kB" }, | ||
200 | { " message %1 of %2"," Nachricht %1 von %2" }, | ||
201 | { "Copying...","Am Kopieren..." }, | ||
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?" }, | ||
204 | { "Delete All Mails","Lösche alle Mails" }, | ||
205 | { "Deleting ...","Am Löschen..." }, | ||
206 | { "Delete message %1 of %2","Lösche Nachricht %1 von %2" }, | ||
207 | { "Compose Message","Verfasse Nachricht" }, | ||
208 | { "Reply-To","Antwort-An" }, | ||
209 | { "BCC","BCC" }, | ||
210 | { "Signature","Signatur" }, | ||
211 | { "CC","Kopie" }, | ||
212 | { "Options","Optionen" }, | ||
213 | { "Delete File","Lösche Datei" }, | ||
214 | { "Add File","Füge Datei hinzu" }, | ||
215 | { "Attachment","Anhang" }, | ||
216 | { "send later","sende später" }, | ||
217 | { "use:","via:" }, | ||
218 | { "Save","Speichern" }, | ||
219 | { "Name","Name" }, | ||
220 | { "No Receiver spezified","Kein Empfänger angegeben" }, | ||
221 | { "Sending mail","Sende Mail" }, | ||
222 | { "No","Nein" }, | ||
223 | { "Yes","Ja" }, | ||
224 | { "Store message into drafts?\n","Speichere Nachricht in Entwürfe?\n" }, | ||
225 | { "Store message?","Nachricht speichern?" }, | ||
226 | { "Select Type","Selektiere Typ" }, | ||
227 | { "Select Account Type","Wähle Art des Zugangs" }, | ||
228 | { "IMAP","IMAP (online lesen)" }, | ||
229 | { "POP3","POP3 (holen)" }, | ||
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>" }, | ||
232 | { "Question","Eine Frage..." }, | ||
233 | { "Send this message?","Nachricht wirklich senden?" }, | ||
234 | { "Stop editing message","Stop editing message" }, | ||
235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, | ||
236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, | ||
237 | { "Refresh header list","Aktualisiere Titel Liste" }, | ||
238 | { "","" }, | ||
239 | { "","" }, | ||
240 | { "","" }, | ||
241 | { "","" }, | ||
242 | { "","" }, | ||
243 | { "","" }, | ||
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp index 641d4d9..f4133c0 100644 --- a/kmicromail/libmailwrapper/mhwrapper.cpp +++ b/kmicromail/libmailwrapper/mhwrapper.cpp | |||
@@ -1,34 +1,35 @@ | |||
1 | // CHANGED 2004-09-31 Lutz Rogowski | 1 | // CHANGED 2004-09-31 Lutz Rogowski |
2 | #include "mhwrapper.h" | 2 | #include "mhwrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include "mailwrapper.h" | 4 | #include "mailwrapper.h" |
5 | #include <libetpan/libetpan.h> | 5 | #include <libetpan/libetpan.h> |
6 | #include <qdir.h> | 6 | #include <qdir.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <qpe/global.h> | 9 | #include <qpe/global.h> |
10 | #include <oprocess.h> | 10 | #include <oprocess.h> |
11 | #include <klocale.h> | ||
11 | //#include <opie2/odebug.h> | 12 | //#include <opie2/odebug.h> |
12 | 13 | ||
13 | using namespace Opie::Core; | 14 | using namespace Opie::Core; |
14 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | 15 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) |
15 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) | 16 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) |
16 | { | 17 | { |
17 | if (MHPath.length()>0) { | 18 | if (MHPath.length()>0) { |
18 | if (MHPath[MHPath.length()-1]=='/') { | 19 | if (MHPath[MHPath.length()-1]=='/') { |
19 | MHPath=MHPath.left(MHPath.length()-1); | 20 | MHPath=MHPath.left(MHPath.length()-1); |
20 | } | 21 | } |
21 | //odebug << MHPath << oendl; | 22 | //odebug << MHPath << oendl; |
22 | QDir dir(MHPath); | 23 | QDir dir(MHPath); |
23 | if (!dir.exists()) { | 24 | if (!dir.exists()) { |
24 | dir.mkdir(MHPath); | 25 | dir.mkdir(MHPath); |
25 | } | 26 | } |
26 | init_storage(); | 27 | init_storage(); |
27 | } | 28 | } |
28 | } | 29 | } |
29 | 30 | ||
30 | void MHwrapper::init_storage() | 31 | void MHwrapper::init_storage() |
31 | { | 32 | { |
32 | int r; | 33 | int r; |
33 | QString pre = MHPath; | 34 | QString pre = MHPath; |
34 | if (!m_storage) { | 35 | if (!m_storage) { |
@@ -55,49 +56,49 @@ void MHwrapper::clean_storage() | |||
55 | mailstorage_disconnect(m_storage); | 56 | mailstorage_disconnect(m_storage); |
56 | mailstorage_free(m_storage); | 57 | mailstorage_free(m_storage); |
57 | m_storage = 0; | 58 | m_storage = 0; |
58 | } | 59 | } |
59 | } | 60 | } |
60 | 61 | ||
61 | MHwrapper::~MHwrapper() | 62 | MHwrapper::~MHwrapper() |
62 | { | 63 | { |
63 | clean_storage(); | 64 | clean_storage(); |
64 | } | 65 | } |
65 | 66 | ||
66 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb ) | 67 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb ) |
67 | { | 68 | { |
68 | init_storage(); | 69 | init_storage(); |
69 | if (!m_storage) { | 70 | if (!m_storage) { |
70 | return; | 71 | return; |
71 | } | 72 | } |
72 | QString f = buildPath(mailbox); | 73 | QString f = buildPath(mailbox); |
73 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 74 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
74 | if (r!=MAIL_NO_ERROR) { | 75 | if (r!=MAIL_NO_ERROR) { |
75 | qDebug("listMessages: error selecting folder! "); | 76 | qDebug("listMessages: error selecting folder! "); |
76 | return; | 77 | return; |
77 | } | 78 | } |
78 | parseList(target,m_storage->sto_session,f, false, maxSizeInKb ); | 79 | parseList(target,m_storage->sto_session,f, false, maxSizeInKb ); |
79 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); | 80 | Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count())); |
80 | } | 81 | } |
81 | 82 | ||
82 | QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() | 83 | QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() |
83 | { | 84 | { |
84 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); | 85 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); |
85 | /* this is needed! */ | 86 | /* this is needed! */ |
86 | if (m_storage) mailstorage_disconnect(m_storage); | 87 | if (m_storage) mailstorage_disconnect(m_storage); |
87 | init_storage(); | 88 | init_storage(); |
88 | if (!m_storage) { | 89 | if (!m_storage) { |
89 | return folders; | 90 | return folders; |
90 | } | 91 | } |
91 | mail_list*flist = 0; | 92 | mail_list*flist = 0; |
92 | clistcell*current=0; | 93 | clistcell*current=0; |
93 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); | 94 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); |
94 | if (r != MAIL_NO_ERROR || !flist) { | 95 | if (r != MAIL_NO_ERROR || !flist) { |
95 | qDebug("error getting folder list "); | 96 | qDebug("error getting folder list "); |
96 | return folders; | 97 | return folders; |
97 | } | 98 | } |
98 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { | 99 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { |
99 | QString t = (char*)current->data; | 100 | QString t = (char*)current->data; |
100 | t.replace(0,MHPath.length(),""); | 101 | t.replace(0,MHPath.length(),""); |
101 | folders->append(new MHFolder(t,MHPath)); | 102 | folders->append(new MHFolder(t,MHPath)); |
102 | } | 103 | } |
103 | mail_list_free(flist); | 104 | mail_list_free(flist); |
@@ -211,54 +212,54 @@ void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) | |||
211 | r = mailsession_append_message(m_storage->sto_session,(char*)msg,length); | 212 | r = mailsession_append_message(m_storage->sto_session,(char*)msg,length); |
212 | if (r!=MAIL_NO_ERROR) { | 213 | if (r!=MAIL_NO_ERROR) { |
213 | qDebug("error storing mail "); | 214 | qDebug("error storing mail "); |
214 | } | 215 | } |
215 | return; | 216 | return; |
216 | } | 217 | } |
217 | 218 | ||
218 | encodedString* MHwrapper::fetchRawBody(const RecMailP&mail) | 219 | encodedString* MHwrapper::fetchRawBody(const RecMailP&mail) |
219 | { | 220 | { |
220 | encodedString*result = 0; | 221 | encodedString*result = 0; |
221 | init_storage(); | 222 | init_storage(); |
222 | if (!m_storage) { | 223 | if (!m_storage) { |
223 | return result; | 224 | return result; |
224 | } | 225 | } |
225 | mailmessage * msg = 0; | 226 | mailmessage * msg = 0; |
226 | char*data=0; | 227 | char*data=0; |
227 | size_t size; | 228 | size_t size; |
228 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 229 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
229 | if (r!=MAIL_NO_ERROR) { | 230 | if (r!=MAIL_NO_ERROR) { |
230 | qDebug("error selecting folder! "); | 231 | qDebug("error selecting folder! "); |
231 | return result; | 232 | return result; |
232 | } | 233 | } |
233 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); | 234 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); |
234 | if (r != MAIL_NO_ERROR) { | 235 | if (r != MAIL_NO_ERROR) { |
235 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); | 236 | Global::statusMessage(i18n("Error fetching mail %i").arg(mail->getNumber())); |
236 | return 0; | 237 | return 0; |
237 | } | 238 | } |
238 | r = mailmessage_fetch(msg,&data,&size); | 239 | r = mailmessage_fetch(msg,&data,&size); |
239 | if (r != MAIL_NO_ERROR) { | 240 | if (r != MAIL_NO_ERROR) { |
240 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); | 241 | Global::statusMessage(i18n("Error fetching mail %i").arg(mail->getNumber())); |
241 | if (msg) mailmessage_free(msg); | 242 | if (msg) mailmessage_free(msg); |
242 | return 0; | 243 | return 0; |
243 | } | 244 | } |
244 | result = new encodedString(data,size); | 245 | result = new encodedString(data,size); |
245 | if (msg) mailmessage_free(msg); | 246 | if (msg) mailmessage_free(msg); |
246 | return result; | 247 | return result; |
247 | } | 248 | } |
248 | 249 | ||
249 | void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target) | 250 | void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target) |
250 | { | 251 | { |
251 | QString f = buildPath(mailbox); | 252 | QString f = buildPath(mailbox); |
252 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 253 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
253 | if (r!=MAIL_NO_ERROR) { | 254 | if (r!=MAIL_NO_ERROR) { |
254 | qDebug("deleteMails: error selecting folder! "); | 255 | qDebug("deleteMails: error selecting folder! "); |
255 | return; | 256 | return; |
256 | } | 257 | } |
257 | QValueList<RecMailP>::ConstIterator it; | 258 | QValueList<RecMailP>::ConstIterator it; |
258 | for (it=target.begin(); it!=target.end();++it) { | 259 | for (it=target.begin(); it!=target.end();++it) { |
259 | r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber()); | 260 | r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber()); |
260 | if (r != MAIL_NO_ERROR) { | 261 | if (r != MAIL_NO_ERROR) { |
261 | qDebug("error deleting mail "); | 262 | qDebug("error deleting mail "); |
262 | break; | 263 | break; |
263 | } | 264 | } |
264 | } | 265 | } |
@@ -269,49 +270,49 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder) | |||
269 | init_storage(); | 270 | init_storage(); |
270 | if (!m_storage) { | 271 | if (!m_storage) { |
271 | return 0; | 272 | return 0; |
272 | } | 273 | } |
273 | int res = 1; | 274 | int res = 1; |
274 | if (!tfolder) return 0; | 275 | if (!tfolder) return 0; |
275 | int r = mailsession_select_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 276 | int r = mailsession_select_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
276 | if (r!=MAIL_NO_ERROR) { | 277 | if (r!=MAIL_NO_ERROR) { |
277 | qDebug("error selecting folder! "); | 278 | qDebug("error selecting folder! "); |
278 | return 0; | 279 | return 0; |
279 | } | 280 | } |
280 | mailmessage_list*l=0; | 281 | mailmessage_list*l=0; |
281 | r = mailsession_get_messages_list(m_storage->sto_session,&l); | 282 | r = mailsession_get_messages_list(m_storage->sto_session,&l); |
282 | if (r != MAIL_NO_ERROR) { | 283 | if (r != MAIL_NO_ERROR) { |
283 | qDebug("Error message list "); | 284 | qDebug("Error message list "); |
284 | res = 0; | 285 | res = 0; |
285 | } | 286 | } |
286 | unsigned j = 0; | 287 | unsigned j = 0; |
287 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { | 288 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { |
288 | mailmessage * msg; | 289 | mailmessage * msg; |
289 | msg = (mailmessage*)carray_get(l->msg_tab, i); | 290 | msg = (mailmessage*)carray_get(l->msg_tab, i); |
290 | j = msg->msg_index; | 291 | j = msg->msg_index; |
291 | r = mailsession_remove_message(m_storage->sto_session,j); | 292 | r = mailsession_remove_message(m_storage->sto_session,j); |
292 | if (r != MAIL_NO_ERROR) { | 293 | if (r != MAIL_NO_ERROR) { |
293 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | 294 | Global::statusMessage(i18n("Error deleting mail %1").arg(i+1)); |
294 | res = 0; | 295 | res = 0; |
295 | break; | 296 | break; |
296 | } | 297 | } |
297 | } | 298 | } |
298 | if (l) mailmessage_list_free(l); | 299 | if (l) mailmessage_list_free(l); |
299 | return res; | 300 | return res; |
300 | } | 301 | } |
301 | 302 | ||
302 | int MHwrapper::deleteMbox(const FolderP&tfolder) | 303 | int MHwrapper::deleteMbox(const FolderP&tfolder) |
303 | { | 304 | { |
304 | init_storage(); | 305 | init_storage(); |
305 | if (!m_storage) { | 306 | if (!m_storage) { |
306 | return 0; | 307 | return 0; |
307 | } | 308 | } |
308 | if (!tfolder) return 0; | 309 | if (!tfolder) return 0; |
309 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; | 310 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; |
310 | 311 | ||
311 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 312 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
312 | 313 | ||
313 | if (r != MAIL_NO_ERROR) { | 314 | if (r != MAIL_NO_ERROR) { |
314 | qDebug("error deleting mail box "); | 315 | qDebug("error deleting mail box "); |
315 | return 0; | 316 | return 0; |
316 | } | 317 | } |
317 | QString cmd = "rm -rf "+tfolder->getName(); | 318 | QString cmd = "rm -rf "+tfolder->getName(); |
@@ -323,66 +324,66 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) | |||
323 | 324 | ||
324 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), | 325 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
325 | this, SLOT( processEnded(Opie::Core::OProcess*))); | 326 | this, SLOT( processEnded(Opie::Core::OProcess*))); |
326 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), | 327 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
327 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); | 328 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
328 | 329 | ||
329 | *process << command; | 330 | *process << command; |
330 | removeMboxfailed = false; | 331 | removeMboxfailed = false; |
331 | if(!process->start(OProcess::Block, OProcess::All) ) { | 332 | if(!process->start(OProcess::Block, OProcess::All) ) { |
332 | qDebug("could not start process "); | 333 | qDebug("could not start process "); |
333 | return 0; | 334 | return 0; |
334 | } | 335 | } |
335 | qDebug("mail box deleted "); | 336 | qDebug("mail box deleted "); |
336 | return 1; | 337 | return 1; |
337 | } | 338 | } |
338 | 339 | ||
339 | void MHwrapper::processEnded(OProcess *p) | 340 | void MHwrapper::processEnded(OProcess *p) |
340 | { | 341 | { |
341 | if (p) delete p; | 342 | if (p) delete p; |
342 | } | 343 | } |
343 | 344 | ||
344 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) | 345 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) |
345 | { | 346 | { |
346 | QString lineStr = buffer; | 347 | QString lineStr = buffer; |
347 | QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); | 348 | QMessageBox::warning( 0, i18n("Error"), lineStr ,i18n("Ok") ); |
348 | removeMboxfailed = true; | 349 | removeMboxfailed = true; |
349 | } | 350 | } |
350 | 351 | ||
351 | void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) | 352 | void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) |
352 | { | 353 | { |
353 | init_storage(); | 354 | init_storage(); |
354 | if (!m_storage) { | 355 | if (!m_storage) { |
355 | return; | 356 | return; |
356 | } | 357 | } |
357 | target_stat.message_count = 0; | 358 | target_stat.message_count = 0; |
358 | target_stat.message_unseen = 0; | 359 | target_stat.message_unseen = 0; |
359 | target_stat.message_recent = 0; | 360 | target_stat.message_recent = 0; |
360 | QString f = buildPath(mailbox); | 361 | QString f = buildPath(mailbox); |
361 | int r = mailsession_status_folder(m_storage->sto_session,(char*)f.latin1(),&target_stat.message_count, | 362 | int r = mailsession_status_folder(m_storage->sto_session,(char*)f.latin1(),&target_stat.message_count, |
362 | &target_stat.message_recent,&target_stat.message_unseen); | 363 | &target_stat.message_recent,&target_stat.message_unseen); |
363 | if (r != MAIL_NO_ERROR) { | 364 | if (r != MAIL_NO_ERROR) { |
364 | Global::statusMessage(tr("Error retrieving status")); | 365 | Global::statusMessage(i18n("Error retrieving status")); |
365 | } | 366 | } |
366 | } | 367 | } |
367 | 368 | ||
368 | MAILLIB::ATYPE MHwrapper::getType()const | 369 | MAILLIB::ATYPE MHwrapper::getType()const |
369 | { | 370 | { |
370 | return MAILLIB::A_MH; | 371 | return MAILLIB::A_MH; |
371 | } | 372 | } |
372 | 373 | ||
373 | const QString&MHwrapper::getName()const | 374 | const QString&MHwrapper::getName()const |
374 | { | 375 | { |
375 | return MHName; | 376 | return MHName; |
376 | } | 377 | } |
377 | void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 378 | void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
378 | { | 379 | { |
379 | init_storage(); | 380 | init_storage(); |
380 | if (!m_storage) { | 381 | if (!m_storage) { |
381 | return; | 382 | return; |
382 | } | 383 | } |
383 | if (targetWrapper != this) { | 384 | if (targetWrapper != this) { |
384 | qDebug("Using generic "); | 385 | qDebug("Using generic "); |
385 | Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit); | 386 | Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit); |
386 | return; | 387 | return; |
387 | } | 388 | } |
388 | qDebug("Using internal routines for move/copy "); | 389 | qDebug("Using internal routines for move/copy "); |
diff --git a/kmicromail/libmailwrapper/sendmailprogress.cpp b/kmicromail/libmailwrapper/sendmailprogress.cpp index dc0c75a..20dfe9b 100644 --- a/kmicromail/libmailwrapper/sendmailprogress.cpp +++ b/kmicromail/libmailwrapper/sendmailprogress.cpp | |||
@@ -1,47 +1,48 @@ | |||
1 | #include "sendmailprogress.h" | 1 | #include "sendmailprogress.h" |
2 | #include <qprogressbar.h> | 2 | #include <qprogressbar.h> |
3 | #include <qlabel.h> | 3 | #include <qlabel.h> |
4 | #include <klocale.h> | ||
4 | 5 | ||
5 | progressMailSend::progressMailSend(QWidget*parent, const char * name) | 6 | progressMailSend::progressMailSend(QWidget*parent, const char * name) |
6 | :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0) | 7 | :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0) |
7 | { | 8 | { |
8 | } | 9 | } |
9 | 10 | ||
10 | progressMailSend::~progressMailSend() | 11 | progressMailSend::~progressMailSend() |
11 | { | 12 | { |
12 | } | 13 | } |
13 | 14 | ||
14 | void progressMailSend::setMaxMails(unsigned int aMaxMails) | 15 | void progressMailSend::setMaxMails(unsigned int aMaxMails) |
15 | { | 16 | { |
16 | m_max_mail = aMaxMails; | 17 | m_max_mail = aMaxMails; |
17 | allMailProgressBar->setTotalSteps(aMaxMails); | 18 | allMailProgressBar->setTotalSteps(aMaxMails); |
18 | setMails(); | 19 | setMails(); |
19 | } | 20 | } |
20 | 21 | ||
21 | void progressMailSend::setCurrentMails(unsigned int aCurrent) | 22 | void progressMailSend::setCurrentMails(unsigned int aCurrent) |
22 | { | 23 | { |
23 | m_current_mail = aCurrent; | 24 | m_current_mail = aCurrent; |
24 | allMailProgressBar->setProgress(aCurrent); | 25 | allMailProgressBar->setProgress(aCurrent); |
25 | setMails(); | 26 | setMails(); |
26 | } | 27 | } |
27 | 28 | ||
28 | void progressMailSend::setSingleMail(unsigned int aCurrent,unsigned int aMax) | 29 | void progressMailSend::setSingleMail(unsigned int aCurrent,unsigned int aMax) |
29 | { | 30 | { |
30 | m_current_single = aCurrent; | 31 | m_current_single = aCurrent; |
31 | m_max_single = aMax; | 32 | m_max_single = aMax; |
32 | setSingle(); | 33 | setSingle(); |
33 | } | 34 | } |
34 | 35 | ||
35 | void progressMailSend::setSingle() | 36 | void progressMailSend::setSingle() |
36 | { | 37 | { |
37 | QString text = QString(tr("%1 of %2 bytes send")).arg(m_current_single).arg(m_max_single); | 38 | QString text = QString(i18n("%1 of %2 bytes send")).arg(m_current_single).arg(m_max_single); |
38 | singleMailLabel->setText(text); | 39 | singleMailLabel->setText(text); |
39 | singleMailProgressBar->setTotalSteps(m_max_single); | 40 | singleMailProgressBar->setTotalSteps(m_max_single); |
40 | singleMailProgressBar->setProgress(m_current_single); | 41 | singleMailProgressBar->setProgress(m_current_single); |
41 | } | 42 | } |
42 | 43 | ||
43 | void progressMailSend::setMails() | 44 | void progressMailSend::setMails() |
44 | { | 45 | { |
45 | QString text = QString(tr("Sending mail %1 of %2")).arg(m_current_mail+1).arg(m_max_mail); | 46 | QString text = QString(i18n("Sending mail %1 of %2")).arg(m_current_mail+1).arg(m_max_mail); |
46 | allMailLabel->setText(text); | 47 | allMailLabel->setText(text); |
47 | } | 48 | } |
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp index 8341c5a..006390c 100644 --- a/kmicromail/main.cpp +++ b/kmicromail/main.cpp | |||
@@ -24,43 +24,44 @@ void dumpMissing(); | |||
24 | //using namespace Opie::Core; | 24 | //using namespace Opie::Core; |
25 | int main( int argc, char **argv ) { | 25 | int main( int argc, char **argv ) { |
26 | 26 | ||
27 | #ifndef DESKTOP_VERSION | 27 | #ifndef DESKTOP_VERSION |
28 | QPEApplication a( argc, argv ); | 28 | QPEApplication a( argc, argv ); |
29 | a.setKeepRunning (); | 29 | a.setKeepRunning (); |
30 | #else | 30 | #else |
31 | QApplication a( argc, argv ); | 31 | QApplication a( argc, argv ); |
32 | QApplication::setStyle( new QPlatinumStyle ()); | 32 | QApplication::setStyle( new QPlatinumStyle ()); |
33 | #endif | 33 | #endif |
34 | a.setFont( KOPrefs::instance()->mAppFont ); | 34 | a.setFont( KOPrefs::instance()->mAppFont ); |
35 | KGlobal::setAppName( "kopiemail" ); | 35 | KGlobal::setAppName( "kopiemail" ); |
36 | QString fileName ; | 36 | QString fileName ; |
37 | #ifndef DESKTOP_VERSION | 37 | #ifndef DESKTOP_VERSION |
38 | fileName = getenv("QPEDIR"); | 38 | fileName = getenv("QPEDIR"); |
39 | if ( QApplication::desktop()->width() > 320 ) | 39 | if ( QApplication::desktop()->width() > 320 ) |
40 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/icons22/"); | 40 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/icons22/"); |
41 | else | 41 | else |
42 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/"); | 42 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/"); |
43 | #else | 43 | #else |
44 | fileName = qApp->applicationDirPath () + "/kdepim/kopiemail/"; | 44 | fileName = qApp->applicationDirPath () + "/kdepim/kopiemail/"; |
45 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 45 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
46 | #endif | 46 | #endif |
47 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); | 47 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); |
48 | KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
48 | OpieMail mw; | 49 | OpieMail mw; |
49 | #ifndef DESKTOP_VERSION | 50 | #ifndef DESKTOP_VERSION |
50 | //qDebug("CONNECT "); | 51 | //qDebug("CONNECT "); |
51 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); | 52 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); |
52 | // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 53 | // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
53 | a.showMainWidget(&mw ); | 54 | a.showMainWidget(&mw ); |
54 | #else | 55 | #else |
55 | a.setMainWidget(&mw ); | 56 | a.setMainWidget(&mw ); |
56 | mw.show(); | 57 | mw.show(); |
57 | //m.resize( 800, 600 ); | 58 | //m.resize( 800, 600 ); |
58 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | 59 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); |
59 | #endif | 60 | #endif |
60 | int rv = a.exec(); | 61 | int rv = a.exec(); |
61 | dumpMissing(); | 62 | dumpMissing(); |
62 | 63 | ||
63 | KPimGlobalPrefs::instance()->writeConfig(); | 64 | KPimGlobalPrefs::instance()->writeConfig(); |
64 | return rv; | 65 | return rv; |
65 | 66 | ||
66 | } | 67 | } |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 3aa7905..a32983c 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -13,49 +13,48 @@ | |||
13 | #include "koprefsdialog.h" | 13 | #include "koprefsdialog.h" |
14 | #include "klocale.h" | 14 | #include "klocale.h" |
15 | 15 | ||
16 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
17 | #include <qtimer.h> | 17 | #include <qtimer.h> |
18 | #include <libkdepim/externalapphandler.h> | 18 | #include <libkdepim/externalapphandler.h> |
19 | #include <libkdepim/kpimglobalprefs.h> | 19 | #include <libkdepim/kpimglobalprefs.h> |
20 | 20 | ||
21 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
22 | #include <libmailwrapper/smtpwrapper.h> | 22 | #include <libmailwrapper/smtpwrapper.h> |
23 | #include <libmailwrapper/mailtypes.h> | 23 | #include <libmailwrapper/mailtypes.h> |
24 | #include <libmailwrapper/abstractmail.h> | 24 | #include <libmailwrapper/abstractmail.h> |
25 | /* OPIE */ | 25 | /* OPIE */ |
26 | //#include <qpe/resource.h> | 26 | //#include <qpe/resource.h> |
27 | //#include <qpe/qpeapplication.h> | 27 | //#include <qpe/qpeapplication.h> |
28 | 28 | ||
29 | /* QT */ | 29 | /* QT */ |
30 | 30 | ||
31 | //using namespace Opie::Core; | 31 | //using namespace Opie::Core; |
32 | 32 | ||
33 | OpieMail::OpieMail( QWidget *parent, const char *name ) | 33 | OpieMail::OpieMail( QWidget *parent, const char *name ) |
34 | : MainWindow( parent, name) //, WStyle_ContextHelp ) | 34 | : MainWindow( parent, name) //, WStyle_ContextHelp ) |
35 | { | 35 | { |
36 | settings = new Settings(); | 36 | settings = new Settings(); |
37 | KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
38 | 37 | ||
39 | folderView->populate( settings->getAccounts() ); | 38 | folderView->populate( settings->getAccounts() ); |
40 | 39 | ||
41 | } | 40 | } |
42 | 41 | ||
43 | OpieMail::~OpieMail() | 42 | OpieMail::~OpieMail() |
44 | { | 43 | { |
45 | if (settings) delete settings; | 44 | if (settings) delete settings; |
46 | } | 45 | } |
47 | 46 | ||
48 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 47 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
49 | { | 48 | { |
50 | 49 | ||
51 | } | 50 | } |
52 | #include <stdlib.h> | 51 | #include <stdlib.h> |
53 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 52 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
54 | { | 53 | { |
55 | // copied from old mail2 | 54 | // copied from old mail2 |
56 | static int ii = 0; | 55 | static int ii = 0; |
57 | //qDebug("QCOP CALL ############################# %d ", ii); | 56 | //qDebug("QCOP CALL ############################# %d ", ii); |
58 | //QString mess ( msg ); | 57 | //QString mess ( msg ); |
59 | //qDebug("Message = %s ",mess.latin1()); | 58 | //qDebug("Message = %s ",mess.latin1()); |
60 | ++ii; | 59 | ++ii; |
61 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 60 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index d3b04dc..1da1e99 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp | |||
@@ -1,93 +1,143 @@ | |||
1 | #include <qregexp.h> | 1 | #include <qregexp.h> |
2 | #include <qapplication.h> | 2 | #include <qapplication.h> |
3 | 3 | ||
4 | #include "kdebug.h" | 4 | #include "kdebug.h" |
5 | #include "kcalendarsystemgregorian.h" | 5 | #include "kcalendarsystemgregorian.h" |
6 | 6 | ||
7 | #include "klocale.h" | 7 | #include "klocale.h" |
8 | 8 | ||
9 | #include <qstringlist.h> | 9 | #include <qstringlist.h> |
10 | QStringList missingTrans; | 10 | |
11 | //#define COLLECT_TRANSLATION | ||
12 | |||
11 | 13 | ||
12 | QDict<QString> *mLocaleDict = 0; | 14 | QDict<QString> *mLocaleDict = 0; |
13 | void setLocaleDict( QDict<QString> * dict ) | 15 | void setLocaleDict( QDict<QString> * dict ) |
14 | { | 16 | { |
15 | mLocaleDict = dict; | 17 | mLocaleDict = dict; |
16 | 18 | ||
17 | } | 19 | } |
20 | |||
21 | #ifdef COLLECT_TRANSLATION | ||
22 | |||
23 | QStringList missingTrans; | ||
24 | QStringList existingTrans1; | ||
25 | QStringList existingTrans2; | ||
26 | |||
18 | void addMissing(const char *text) | 27 | void addMissing(const char *text) |
19 | { | 28 | { |
20 | return; | 29 | |
21 | QString mis ( text ); | 30 | QString mis ( text ); |
22 | if ( !missingTrans.contains( mis ) ) | 31 | if ( !missingTrans.contains( mis ) ) |
23 | missingTrans.append(mis); | 32 | missingTrans.append(mis); |
24 | 33 | ||
25 | } | 34 | } |
35 | void addExist(const char *text,QString trans ) | ||
36 | { | ||
37 | //return; | ||
38 | QString mis ( text ); | ||
39 | if ( !existingTrans1.contains( mis ) ) { | ||
40 | existingTrans1.append(mis); | ||
41 | existingTrans2.append(trans); | ||
42 | |||
43 | } | ||
44 | |||
45 | } | ||
26 | 46 | ||
27 | #include <qfile.h> | 47 | #include <qfile.h> |
28 | #include <qtextstream.h> | 48 | #include <qtextstream.h> |
29 | #include <qtextcodec.h> | 49 | #include <qtextcodec.h> |
50 | #endif | ||
30 | void dumpMissing() | 51 | void dumpMissing() |
31 | { | 52 | { |
32 | return; | 53 | #ifdef COLLECT_TRANSLATION |
33 | QString fileName = "/tmp/usertrans.txt"; | 54 | QString fileName = "/tmp/usernewtrans.txt"; |
34 | QFile file( fileName ); | 55 | QFile file( fileName ); |
35 | if (!file.open( IO_WriteOnly ) ) { | 56 | if (!file.open( IO_WriteOnly ) ) { |
36 | return ; | 57 | return ; |
37 | } | 58 | } |
38 | QTextStream ts( &file ); | 59 | QTextStream ts( &file ); |
39 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 60 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
40 | 61 | ||
41 | int i; | 62 | int i; |
42 | for ( i = 0; i< missingTrans.count(); ++i ) { | 63 | for ( i = 0; i< missingTrans.count(); ++i ) { |
43 | 64 | ||
44 | QString text = missingTrans[i].replace( QRegExp("\n"),"\\n" ); | 65 | QString text = missingTrans[i].replace( QRegExp("\n"),"\\n" ); |
45 | ts << "{ \""<<text<< "\",\""<< text <<"\" },\n"; | 66 | ts << "{ \""<<text<< "\",\""<< text <<"\" },\n"; |
46 | 67 | ||
47 | } | 68 | } |
48 | file.close(); | 69 | file.close(); |
49 | } | 70 | { |
71 | QString fileName = "/tmp/usertrans.txt"; | ||
72 | QFile file( fileName ); | ||
73 | if (!file.open( IO_WriteOnly ) ) { | ||
74 | return ; | ||
75 | } | ||
76 | QTextStream ts( &file ); | ||
77 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
78 | |||
79 | int i; | ||
80 | for ( i = 0; i< existingTrans1.count(); ++i ) { | ||
81 | |||
82 | QString text = existingTrans1[i].replace( QRegExp("\n"),"\\n" ); | ||
83 | QString text2 = existingTrans2[i].replace( QRegExp("\n"),"\\n" ); | ||
84 | ts << "{ \""<<text<< "\",\""<< text2 <<"\" },\n"; | ||
50 | 85 | ||
86 | } | ||
87 | file.close(); | ||
88 | } | ||
89 | #endif | ||
90 | } | ||
51 | QString i18n(const char *text) | 91 | QString i18n(const char *text) |
52 | { | 92 | { |
53 | if ( ! mLocaleDict ) { | 93 | if ( ! mLocaleDict ) { |
94 | #ifdef COLLECT_TRANSLATION | ||
54 | addMissing( text ); | 95 | addMissing( text ); |
96 | #endif | ||
55 | return QString( text ); | 97 | return QString( text ); |
56 | } | 98 | } |
57 | else { | 99 | else { |
58 | QString* ret = mLocaleDict->find(QString(text)) ; | 100 | QString* ret = mLocaleDict->find(QString(text)) ; |
59 | if ( ret == 0 ) { | 101 | if ( ret == 0 ) { |
102 | #ifdef COLLECT_TRANSLATION | ||
60 | addMissing( text ); | 103 | addMissing( text ); |
104 | #endif | ||
61 | return QString( text ); | 105 | return QString( text ); |
62 | } | 106 | } |
63 | else { | 107 | else { |
64 | if ( (*ret).isEmpty() ) { | 108 | if ( (*ret).isEmpty() ) { |
109 | #ifdef COLLECT_TRANSLATION | ||
65 | addMissing( text ); | 110 | addMissing( text ); |
111 | #endif | ||
66 | return QString( text ); | 112 | return QString( text ); |
67 | } | 113 | } |
68 | else | 114 | else { |
115 | #ifdef COLLECT_TRANSLATION | ||
116 | addExist( text, *ret ); | ||
117 | #endif | ||
69 | return (*ret); | 118 | return (*ret); |
119 | } | ||
70 | } | 120 | } |
71 | } | 121 | } |
72 | 122 | ||
73 | } | 123 | } |
74 | 124 | ||
75 | QString i18n(const char *,const char *text) | 125 | QString i18n(const char *,const char *text) |
76 | { | 126 | { |
77 | return i18n( text ); | 127 | return i18n( text ); |
78 | } | 128 | } |
79 | 129 | ||
80 | QString i18n(const char *text1, const char *textn, int num) | 130 | QString i18n(const char *text1, const char *textn, int num) |
81 | { | 131 | { |
82 | if ( num == 1 ) return i18n( text1 ); | 132 | if ( num == 1 ) return i18n( text1 ); |
83 | else { | 133 | else { |
84 | QString text = i18n( textn ); | 134 | QString text = i18n( textn ); |
85 | int pos = text.find( "%n" ); | 135 | int pos = text.find( "%n" ); |
86 | if ( pos >= 0 ) text.replace( pos, 2, QString::number( num ) ); | 136 | if ( pos >= 0 ) text.replace( pos, 2, QString::number( num ) ); |
87 | return text; | 137 | return text; |
88 | } | 138 | } |
89 | } | 139 | } |
90 | 140 | ||
91 | inline void put_it_in( QChar *buffer, uint& index, const QString &s ) | 141 | inline void put_it_in( QChar *buffer, uint& index, const QString &s ) |
92 | { | 142 | { |
93 | for ( uint l = 0; l < s.length(); l++ ) | 143 | for ( uint l = 0; l < s.length(); l++ ) |