-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/kaddressbook/usertranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/korganizer/usertranslation.txt | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.h | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/resourceqtopiaconfig.cpp | 3 | ||||
-rw-r--r-- | korganizer/wordsgerman.h | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 9 |
9 files changed, 13 insertions, 13 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index a5ba794..16c4178 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -111,65 +111,65 @@ | |||
111 | { "&Misc","&Misc" }, | 111 | { "&Misc","&Misc" }, |
112 | { "Photo","Photo" }, | 112 | { "Photo","Photo" }, |
113 | { "Store as URL","Store as URL" }, | 113 | { "Store as URL","Store as URL" }, |
114 | { "Logo","Logo" }, | 114 | { "Logo","Logo" }, |
115 | { "&Images","&Images" }, | 115 | { "&Images","&Images" }, |
116 | { "Home","Home" }, | 116 | { "Home","Home" }, |
117 | { "Work","Work" }, | 117 | { "Work","Work" }, |
118 | { "Mobile","Mobile" }, | 118 | { "Mobile","Mobile" }, |
119 | { "Fax","Fax" }, | 119 | { "Fax","Fax" }, |
120 | { "Contact Editor","Contact Editor" }, | 120 | { "Contact Editor","Contact Editor" }, |
121 | { "&Mail...","&Mail..." }, | 121 | { "&Mail...","&Mail..." }, |
122 | { "&Print...","&Print..." }, | 122 | { "&Print...","&Print..." }, |
123 | { "&Save","&Save" }, | 123 | { "&Save","&Save" }, |
124 | { "&New Contact...","&New Contact..." }, | 124 | { "&New Contact...","&New Contact..." }, |
125 | { "Mail &vCard...","Mail &vCard..." }, | 125 | { "Mail &vCard...","Mail &vCard..." }, |
126 | { "Selected to phone","Selected to phone" }, | 126 | { "Selected to phone","Selected to phone" }, |
127 | { "Beam selected v&Card(s)","Beam selected v&Card(s)" }, | 127 | { "Beam selected v&Card(s)","Beam selected v&Card(s)" }, |
128 | { "&Beam personal vCard","&Beam personal vCard" }, | 128 | { "&Beam personal vCard","&Beam personal vCard" }, |
129 | { "&Edit Contact...","&Edit Contact..." }, | 129 | { "&Edit Contact...","&Edit Contact..." }, |
130 | { "&Exit","&Exit" }, | 130 | { "&Exit","&Exit" }, |
131 | { "&Copy","&Copy" }, | 131 | { "&Copy","&Copy" }, |
132 | { "Cu&t","Cu&t" }, | 132 | { "Cu&t","Cu&t" }, |
133 | { "&Paste","&Paste" }, | 133 | { "&Paste","&Paste" }, |
134 | { "Select &All","Select &All" }, | 134 | { "Select &All","Select &All" }, |
135 | { "&Undo","&Undo" }, | 135 | { "&Undo","&Undo" }, |
136 | { "Re&do","Re&do" }, | 136 | { "Re&do","Re&do" }, |
137 | { "&Delete Contact","&Delete Contact" }, | 137 | { "&Delete Contact","&Delete Contact" }, |
138 | { "Configure &Resources...","Configure &Resources..." }, | 138 | { "Configure &Resources...","Configure &Resources..." }, |
139 | { "&Configure %1...","&Configure %1..." }, | 139 | { "&Configure %1...","&Configure %1..." }, |
140 | { "Configure S&hortcuts...","Configure S&hortcuts..." }, | 140 | { "Configure S&hortcuts...","Configure S&hortcuts..." }, |
141 | { "Show Jump Bar","Show Jump Bar" }, | 141 | { "Show Jump Bar","Show Jump Bar" }, |
142 | { "Show Details","Show Details" }, | 142 | { "Show Details","Show Details" }, |
143 | { "Beam receice enabled","Beam receice enabled" }, | 143 | { "Beam receive enabled","Beam receice enabled" }, |
144 | { "Set Who Am I","Set Who Am I" }, | 144 | { "Set Who Am I","Set Who Am I" }, |
145 | { "Set Categories","Set Categories" }, | 145 | { "Set Categories","Set Categories" }, |
146 | { "Remove "voice"...","Remove "voice"..." }, | 146 | { "Remove "voice"...","Remove "voice"..." }, |
147 | { "Import from Outlook...","Import from Outlook..." }, | 147 | { "Import from Outlook...","Import from Outlook..." }, |
148 | { "Licence","Licence" }, | 148 | { "Licence","Licence" }, |
149 | { "Faq","Faq" }, | 149 | { "Faq","Faq" }, |
150 | { "What's New?","What's New?" }, | 150 | { "What's New?","What's New?" }, |
151 | { "Sync HowTo","Sync HowTo" }, | 151 | { "Sync HowTo","Sync HowTo" }, |
152 | { "&About KAddressBook","&About KAddressBook" }, | 152 | { "&About KAddressBook","&About KAddressBook" }, |
153 | { "Select Incremental Search Field","Select Incremental Search Field" }, | 153 | { "Select Incremental Search Field","Select Incremental Search Field" }, |
154 | { "Synchronize","Synchronize" }, | 154 | { "Synchronize","Synchronize" }, |
155 | { "Configure...","Configure..." }, | 155 | { "Configure...","Configure..." }, |
156 | { "Enable Pi-Sync","Enable Pi-Sync" }, | 156 | { "Enable Pi-Sync","Enable Pi-Sync" }, |
157 | { "Multiple sync","Multiple sync" }, | 157 | { "Multiple sync","Multiple sync" }, |
158 | { "Import CSV List...","Import CSV List..." }, | 158 | { "Import CSV List...","Import CSV List..." }, |
159 | { "Export CSV List...","Export CSV List..." }, | 159 | { "Export CSV List...","Export CSV List..." }, |
160 | { "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." }, | 160 | { "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." }, |
161 | { "Import vCard...","Import vCard..." }, | 161 | { "Import vCard...","Import vCard..." }, |
162 | { "Export vCard 3.0...","Export vCard 3.0..." }, | 162 | { "Export vCard 3.0...","Export vCard 3.0..." }, |
163 | { "Import Qtopia...","Import Qtopia..." }, | 163 | { "Import Qtopia...","Import Qtopia..." }, |
164 | { "Export Qtopia...","Export Qtopia..." }, | 164 | { "Export Qtopia...","Export Qtopia..." }, |
165 | { "Edit Contact","Edit Contact" }, | 165 | { "Edit Contact","Edit Contact" }, |
166 | { "Ok","Ok" }, | 166 | { "Ok","Ok" }, |
167 | { "Apply","Apply" }, | 167 | { "Apply","Apply" }, |
168 | { "Cancel","Cancel" }, | 168 | { "Cancel","Cancel" }, |
169 | { "KAddressbook/Pi","KAddressbook/Pi" }, | 169 | { "KAddressbook/Pi","KAddressbook/Pi" }, |
170 | { "No Filter","No Filter" }, | 170 | { "No Filter","No Filter" }, |
171 | { "Given Name","Given Name" }, | 171 | { "Given Name","Given Name" }, |
172 | { "Family Name","Family Name" }, | 172 | { "Family Name","Family Name" }, |
173 | { "Email Address","Email Address" }, | 173 | { "Email Address","Email Address" }, |
174 | { "All Fields","All Fields" }, | 174 | { "All Fields","All Fields" }, |
175 | { "Question","Question" }, | 175 | { "Question","Question" }, |
diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt index a5ba794..16c4178 100644 --- a/bin/kdepim/kaddressbook/usertranslation.txt +++ b/bin/kdepim/kaddressbook/usertranslation.txt | |||
@@ -111,65 +111,65 @@ | |||
111 | { "&Misc","&Misc" }, | 111 | { "&Misc","&Misc" }, |
112 | { "Photo","Photo" }, | 112 | { "Photo","Photo" }, |
113 | { "Store as URL","Store as URL" }, | 113 | { "Store as URL","Store as URL" }, |
114 | { "Logo","Logo" }, | 114 | { "Logo","Logo" }, |
115 | { "&Images","&Images" }, | 115 | { "&Images","&Images" }, |
116 | { "Home","Home" }, | 116 | { "Home","Home" }, |
117 | { "Work","Work" }, | 117 | { "Work","Work" }, |
118 | { "Mobile","Mobile" }, | 118 | { "Mobile","Mobile" }, |
119 | { "Fax","Fax" }, | 119 | { "Fax","Fax" }, |
120 | { "Contact Editor","Contact Editor" }, | 120 | { "Contact Editor","Contact Editor" }, |
121 | { "&Mail...","&Mail..." }, | 121 | { "&Mail...","&Mail..." }, |
122 | { "&Print...","&Print..." }, | 122 | { "&Print...","&Print..." }, |
123 | { "&Save","&Save" }, | 123 | { "&Save","&Save" }, |
124 | { "&New Contact...","&New Contact..." }, | 124 | { "&New Contact...","&New Contact..." }, |
125 | { "Mail &vCard...","Mail &vCard..." }, | 125 | { "Mail &vCard...","Mail &vCard..." }, |
126 | { "Selected to phone","Selected to phone" }, | 126 | { "Selected to phone","Selected to phone" }, |
127 | { "Beam selected v&Card(s)","Beam selected v&Card(s)" }, | 127 | { "Beam selected v&Card(s)","Beam selected v&Card(s)" }, |
128 | { "&Beam personal vCard","&Beam personal vCard" }, | 128 | { "&Beam personal vCard","&Beam personal vCard" }, |
129 | { "&Edit Contact...","&Edit Contact..." }, | 129 | { "&Edit Contact...","&Edit Contact..." }, |
130 | { "&Exit","&Exit" }, | 130 | { "&Exit","&Exit" }, |
131 | { "&Copy","&Copy" }, | 131 | { "&Copy","&Copy" }, |
132 | { "Cu&t","Cu&t" }, | 132 | { "Cu&t","Cu&t" }, |
133 | { "&Paste","&Paste" }, | 133 | { "&Paste","&Paste" }, |
134 | { "Select &All","Select &All" }, | 134 | { "Select &All","Select &All" }, |
135 | { "&Undo","&Undo" }, | 135 | { "&Undo","&Undo" }, |
136 | { "Re&do","Re&do" }, | 136 | { "Re&do","Re&do" }, |
137 | { "&Delete Contact","&Delete Contact" }, | 137 | { "&Delete Contact","&Delete Contact" }, |
138 | { "Configure &Resources...","Configure &Resources..." }, | 138 | { "Configure &Resources...","Configure &Resources..." }, |
139 | { "&Configure %1...","&Configure %1..." }, | 139 | { "&Configure %1...","&Configure %1..." }, |
140 | { "Configure S&hortcuts...","Configure S&hortcuts..." }, | 140 | { "Configure S&hortcuts...","Configure S&hortcuts..." }, |
141 | { "Show Jump Bar","Show Jump Bar" }, | 141 | { "Show Jump Bar","Show Jump Bar" }, |
142 | { "Show Details","Show Details" }, | 142 | { "Show Details","Show Details" }, |
143 | { "Beam receice enabled","Beam receice enabled" }, | 143 | { "Beam receive enabled","Beam receice enabled" }, |
144 | { "Set Who Am I","Set Who Am I" }, | 144 | { "Set Who Am I","Set Who Am I" }, |
145 | { "Set Categories","Set Categories" }, | 145 | { "Set Categories","Set Categories" }, |
146 | { "Remove "voice"...","Remove "voice"..." }, | 146 | { "Remove "voice"...","Remove "voice"..." }, |
147 | { "Import from Outlook...","Import from Outlook..." }, | 147 | { "Import from Outlook...","Import from Outlook..." }, |
148 | { "Licence","Licence" }, | 148 | { "Licence","Licence" }, |
149 | { "Faq","Faq" }, | 149 | { "Faq","Faq" }, |
150 | { "What's New?","What's New?" }, | 150 | { "What's New?","What's New?" }, |
151 | { "Sync HowTo","Sync HowTo" }, | 151 | { "Sync HowTo","Sync HowTo" }, |
152 | { "&About KAddressBook","&About KAddressBook" }, | 152 | { "&About KAddressBook","&About KAddressBook" }, |
153 | { "Select Incremental Search Field","Select Incremental Search Field" }, | 153 | { "Select Incremental Search Field","Select Incremental Search Field" }, |
154 | { "Synchronize","Synchronize" }, | 154 | { "Synchronize","Synchronize" }, |
155 | { "Configure...","Configure..." }, | 155 | { "Configure...","Configure..." }, |
156 | { "Enable Pi-Sync","Enable Pi-Sync" }, | 156 | { "Enable Pi-Sync","Enable Pi-Sync" }, |
157 | { "Multiple sync","Multiple sync" }, | 157 | { "Multiple sync","Multiple sync" }, |
158 | { "Import CSV List...","Import CSV List..." }, | 158 | { "Import CSV List...","Import CSV List..." }, |
159 | { "Export CSV List...","Export CSV List..." }, | 159 | { "Export CSV List...","Export CSV List..." }, |
160 | { "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." }, | 160 | { "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." }, |
161 | { "Import vCard...","Import vCard..." }, | 161 | { "Import vCard...","Import vCard..." }, |
162 | { "Export vCard 3.0...","Export vCard 3.0..." }, | 162 | { "Export vCard 3.0...","Export vCard 3.0..." }, |
163 | { "Import Qtopia...","Import Qtopia..." }, | 163 | { "Import Qtopia...","Import Qtopia..." }, |
164 | { "Export Qtopia...","Export Qtopia..." }, | 164 | { "Export Qtopia...","Export Qtopia..." }, |
165 | { "Edit Contact","Edit Contact" }, | 165 | { "Edit Contact","Edit Contact" }, |
166 | { "Ok","Ok" }, | 166 | { "Ok","Ok" }, |
167 | { "Apply","Apply" }, | 167 | { "Apply","Apply" }, |
168 | { "Cancel","Cancel" }, | 168 | { "Cancel","Cancel" }, |
169 | { "KAddressbook/Pi","KAddressbook/Pi" }, | 169 | { "KAddressbook/Pi","KAddressbook/Pi" }, |
170 | { "No Filter","No Filter" }, | 170 | { "No Filter","No Filter" }, |
171 | { "Given Name","Given Name" }, | 171 | { "Given Name","Given Name" }, |
172 | { "Family Name","Family Name" }, | 172 | { "Family Name","Family Name" }, |
173 | { "Email Address","Email Address" }, | 173 | { "Email Address","Email Address" }, |
174 | { "All Fields","All Fields" }, | 174 | { "All Fields","All Fields" }, |
175 | { "Question","Question" }, | 175 | { "Question","Question" }, |
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt index 0236b92..f4c4698 100644 --- a/bin/kdepim/korganizer/usertranslation.txt +++ b/bin/kdepim/korganizer/usertranslation.txt | |||
@@ -839,65 +839,65 @@ | |||
839 | { "nobody@nowhere","niemand@nirgendwo" }, | 839 | { "nobody@nowhere","niemand@nirgendwo" }, |
840 | { "calendar.html","calendar.html" }, | 840 | { "calendar.html","calendar.html" }, |
841 | { "Unknown Name","Unbekannter Name" }, | 841 | { "Unknown Name","Unbekannter Name" }, |
842 | { "unknown@nowhere","unbekannt@nirgendwo" }, | 842 | { "unknown@nowhere","unbekannt@nirgendwo" }, |
843 | { "Beam via IR!","Beam via IR!" }, | 843 | { "Beam via IR!","Beam via IR!" }, |
844 | { "Next Month","Nächster Monat" }, | 844 | { "Next Month","Nächster Monat" }, |
845 | { "Prio","Prio" }, | 845 | { "Prio","Prio" }, |
846 | { "Reparent Todo","Mache Sub-Todo" }, | 846 | { "Reparent Todo","Mache Sub-Todo" }, |
847 | { "tomorrow","morgen" }, | 847 | { "tomorrow","morgen" }, |
848 | { "today","heute" }, | 848 | { "today","heute" }, |
849 | { "yesterday","gestern" }, | 849 | { "yesterday","gestern" }, |
850 | { "Ok","Ok" }, | 850 | { "Ok","Ok" }, |
851 | { "Ok+Agenda","Ok+Agenda" }, | 851 | { "Ok+Agenda","Ok+Agenda" }, |
852 | { "Email","Email" }, | 852 | { "Email","Email" }, |
853 | { "RSVP","RSVP" }, | 853 | { "RSVP","RSVP" }, |
854 | { "Email:","Email:" }, | 854 | { "Email:","Email:" }, |
855 | { "Appointment Time ","Termin Zeit " }, | 855 | { "Appointment Time ","Termin Zeit " }, |
856 | { "2","2" }, | 856 | { "2","2" }, |
857 | { "3","3" }, | 857 | { "3","3" }, |
858 | { "4","4" }, | 858 | { "4","4" }, |
859 | { " 0 %"," 0 %" }, | 859 | { " 0 %"," 0 %" }, |
860 | { " 20 %"," 20 %" }, | 860 | { " 20 %"," 20 %" }, |
861 | { " 40 %"," 40 %" }, | 861 | { " 40 %"," 40 %" }, |
862 | { " 60 %"," 60 %" }, | 862 | { " 60 %"," 60 %" }, |
863 | { " 80 %"," 80 %" }, | 863 | { " 80 %"," 80 %" }, |
864 | { "100 %","100 %" }, | 864 | { "100 %","100 %" }, |
865 | { "Filter","Filter" }, | 865 | { "Filter","Filter" }, |
866 | { "Configure","Konfiguriere" }, | 866 | { "Configure","Konfiguriere" }, |
867 | { "What's Next","What's Next" }, | 867 | { "What's Next","What's Next" }, |
868 | { "Complete calendar...","Kompletten Kalender..." }, | 868 | { "Complete calendar...","Kompletten Kalender..." }, |
869 | { "Filtered calendar...","Gefilterten Kalender..." }, | 869 | { "Filtered calendar...","Gefilterten Kalender..." }, |
870 | { "Export to phone","Exportiere zum Handy" }, | 870 | { "Export to phone","Exportiere zum Handy" }, |
871 | { "Beam receice enabled","Beam Empfang an" }, | 871 | { "Beam receive enabled","Beam Empfang an" }, |
872 | { "What's new?","Was ist neu?" }, | 872 | { "What's new?","Was ist neu?" }, |
873 | { "FAQ...","FAQ..." }, | 873 | { "FAQ...","FAQ..." }, |
874 | { "Licence...","Licence..." }, | 874 | { "Licence...","Licence..." }, |
875 | { "What's This?","What's This?" }, | 875 | { "What's This?","What's This?" }, |
876 | { "&Edit...","&Editiere..." }, | 876 | { "&Edit...","&Editiere..." }, |
877 | { "Oktober","Oktober" }, | 877 | { "Oktober","Oktober" }, |
878 | { "Title","Titel" }, | 878 | { "Title","Titel" }, |
879 | { "%1 %","%1 %" }, | 879 | { "%1 %","%1 %" }, |
880 | { "Enable Pi-Sync","Schalte Pi-Sync an" }, | 880 | { "Enable Pi-Sync","Schalte Pi-Sync an" }, |
881 | { "Import!","Importiere!" }, | 881 | { "Import!","Importiere!" }, |
882 | { "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" }, | 882 | { "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" }, |
883 | { "Export to phone options","Export ans Handy Optionen" }, | 883 | { "Export to phone options","Export ans Handy Optionen" }, |
884 | { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." }, | 884 | { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." }, |
885 | { "I/O device: ","I/O device: " }, | 885 | { "I/O device: ","I/O device: " }, |
886 | { "Connection: ","Connection: " }, | 886 | { "Connection: ","Connection: " }, |
887 | { "Model(opt.): ","Model(opt.): " }, | 887 | { "Model(opt.): ","Model(opt.): " }, |
888 | { "Write back events in future only","Schreibe nur zukünftige Termine zurück" }, | 888 | { "Write back events in future only","Schreibe nur zukünftige Termine zurück" }, |
889 | { "Max. weeks in future: ","Max. Wochen in der Zukunft: " }, | 889 | { "Max. weeks in future: ","Max. Wochen in der Zukunft: " }, |
890 | { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nToDo/Kalender Daten auf dem Handy!" }, | 890 | { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nToDo/Kalender Daten auf dem Handy!" }, |
891 | { "Export to mobile phone!","Exportiere auf das Handy!" }, | 891 | { "Export to mobile phone!","Exportiere auf das Handy!" }, |
892 | { "Export complete calendar","Exportiere kompletten Kalender" }, | 892 | { "Export complete calendar","Exportiere kompletten Kalender" }, |
893 | { "Writing to phone...","Sende Daten ans Handy..." }, | 893 | { "Writing to phone...","Sende Daten ans Handy..." }, |
894 | { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" }, | 894 | { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" }, |
895 | { "Retry","Nochmal versuchen" }, | 895 | { "Retry","Nochmal versuchen" }, |
896 | { "KDE/Pim phone access","KDE/Pim Handy Zugriff" }, | 896 | { "KDE/Pim phone access","KDE/Pim Handy Zugriff" }, |
897 | { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" }, | 897 | { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" }, |
898 | { "Error exporting to phone!","Fehler beim Export auf das Handy!" }, | 898 | { "Error exporting to phone!","Fehler beim Export auf das Handy!" }, |
899 | { "Export filtered calendar","Exportiere gefilterten Kalender" }, | 899 | { "Export filtered calendar","Exportiere gefilterten Kalender" }, |
900 | { "Preferences","Vorlieben" }, | 900 | { "Preferences","Vorlieben" }, |
901 | { "Global","Global" }, | 901 | { "Global","Global" }, |
902 | { "Phone","Phone" }, | 902 | { "Phone","Phone" }, |
903 | { "SMS","SMS" }, | 903 | { "SMS","SMS" }, |
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp index 106596f..39d366b 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.cpp +++ b/kabc/plugins/qtopia/qtopiaconverter.cpp | |||
@@ -8,67 +8,65 @@ | |||
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | //US | 28 | //US |
29 | #include "kglobal.h" | 29 | #include "kglobal.h" |
30 | #include "klocale.h" | 30 | #include "klocale.h" |
31 | 31 | ||
32 | 32 | ||
33 | #include "qtopiaconverter.h" | 33 | #include "qtopiaconverter.h" |
34 | 34 | ||
35 | #include <qfile.h> | 35 | #include <qfile.h> |
36 | #include <qdir.h> | 36 | #include <qdir.h> |
37 | #include <qtextstream.h> | 37 | #include <qtextstream.h> |
38 | //#include <.h> | 38 | //#include <.h> |
39 | 39 | ||
40 | //#include <qpe/categories.h> | ||
41 | #include <libkdepim/ksyncprofile.h> | 40 | #include <libkdepim/ksyncprofile.h> |
42 | //US #include <qpe/categoryselect.h> | ||
43 | 41 | ||
44 | 42 | ||
45 | using namespace KABC; | 43 | using namespace KABC; |
46 | 44 | ||
47 | QtopiaConverter::QtopiaConverter() | 45 | QtopiaConverter::QtopiaConverter() |
48 | { | 46 | { |
49 | m_edit = 0; | 47 | m_edit = 0; |
50 | } | 48 | } |
51 | 49 | ||
52 | QtopiaConverter::~QtopiaConverter() | 50 | QtopiaConverter::~QtopiaConverter() |
53 | { | 51 | { |
54 | deinit(); | 52 | deinit(); |
55 | } | 53 | } |
56 | 54 | ||
57 | bool QtopiaConverter::init() | 55 | bool QtopiaConverter::init() |
58 | { | 56 | { |
59 | QString fn = QDir::homeDirPath() +"/Settings/Categories.xml"; | 57 | QString fn = QDir::homeDirPath() +"/Settings/Categories.xml"; |
60 | m_edit = new CategoryEdit( fn); | 58 | m_edit = new CategoryEdit( fn); |
61 | return true; | 59 | return true; |
62 | } | 60 | } |
63 | 61 | ||
64 | void QtopiaConverter::deinit() | 62 | void QtopiaConverter::deinit() |
65 | { | 63 | { |
66 | if (m_edit) | 64 | if (m_edit) |
67 | { | 65 | { |
68 | delete m_edit; | 66 | delete m_edit; |
69 | m_edit = 0; | 67 | m_edit = 0; |
70 | } | 68 | } |
71 | } | 69 | } |
72 | QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app ) | 70 | QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app ) |
73 | { | 71 | { |
74 | startover: | 72 | startover: |
diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h index d318ded..cb5b433 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.h +++ b/kabc/plugins/qtopia/qtopiaconverter.h | |||
@@ -1,66 +1,64 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | $Id$ | 24 | $Id$ |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifndef KABC_QTOPIACONVERTER_H | 27 | #ifndef KABC_QTOPIACONVERTER_H |
28 | #define KABC_QTOPIACONVERTER_H | 28 | #define KABC_QTOPIACONVERTER_H |
29 | 29 | ||
30 | #include <qstring.h> | 30 | #include <qstring.h> |
31 | 31 | ||
32 | #include "addressee.h" | 32 | #include "addressee.h" |
33 | //#include <qpe/pim/contact.h> | ||
34 | //#include <qpe/quuid.h> | ||
35 | 33 | ||
36 | #include <xml/qdom.h> | 34 | #include <xml/qdom.h> |
37 | class Categories; | 35 | class Categories; |
38 | 36 | ||
39 | namespace KABC { | 37 | namespace KABC { |
40 | 38 | ||
41 | 39 | ||
42 | 40 | ||
43 | class OpieCategories { | 41 | class OpieCategories { |
44 | public: | 42 | public: |
45 | //friend class KSync::OpieSocket; | 43 | //friend class KSync::OpieSocket; |
46 | friend bool operator== ( const OpieCategories &a, const OpieCategories &b ); | 44 | friend bool operator== ( const OpieCategories &a, const OpieCategories &b ); |
47 | OpieCategories(); | 45 | OpieCategories(); |
48 | OpieCategories(const QString &id, const QString &name, const QString &app ); | 46 | OpieCategories(const QString &id, const QString &name, const QString &app ); |
49 | OpieCategories(const OpieCategories & ); | 47 | OpieCategories(const OpieCategories & ); |
50 | ~OpieCategories() {}; | 48 | ~OpieCategories() {}; |
51 | OpieCategories &operator=(const OpieCategories & ); | 49 | OpieCategories &operator=(const OpieCategories & ); |
52 | QString id()const; | 50 | QString id()const; |
53 | QString name()const; | 51 | QString name()const; |
54 | QString app()const; | 52 | QString app()const; |
55 | 53 | ||
56 | private: | 54 | private: |
57 | QString m_name; | 55 | QString m_name; |
58 | QString m_app; | 56 | QString m_app; |
59 | QString m_id; | 57 | QString m_id; |
60 | }; | 58 | }; |
61 | 59 | ||
62 | 60 | ||
63 | class CategoryEdit { | 61 | class CategoryEdit { |
64 | public: | 62 | public: |
65 | CategoryEdit(); | 63 | CategoryEdit(); |
66 | CategoryEdit(const QString &fileName); | 64 | CategoryEdit(const QString &fileName); |
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp index 4ee3c3c..95fa541 100644 --- a/kabc/plugins/qtopia/resourceqtopia.cpp +++ b/kabc/plugins/qtopia/resourceqtopia.cpp | |||
@@ -14,66 +14,64 @@ | |||
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | #include <sys/types.h> | 27 | #include <sys/types.h> |
28 | #include <sys/stat.h> | 28 | #include <sys/stat.h> |
29 | #include <unistd.h> | 29 | #include <unistd.h> |
30 | 30 | ||
31 | #include <qdir.h> | 31 | #include <qdir.h> |
32 | #include <qfile.h> | 32 | #include <qfile.h> |
33 | #include <qtextstream.h> | 33 | #include <qtextstream.h> |
34 | #include <qfileinfo.h> | 34 | #include <qfileinfo.h> |
35 | #include <qregexp.h> | 35 | #include <qregexp.h> |
36 | //US #include <qtimer.h> | 36 | //US #include <qtimer.h> |
37 | 37 | ||
38 | #include <kapplication.h> | 38 | #include <kapplication.h> |
39 | #include <kconfig.h> | 39 | #include <kconfig.h> |
40 | #include <kdebug.h> | 40 | #include <kdebug.h> |
41 | #include <klocale.h> | 41 | #include <klocale.h> |
42 | //US #include <ksavefile.h> | 42 | //US #include <ksavefile.h> |
43 | #include <kstandarddirs.h> | 43 | #include <kstandarddirs.h> |
44 | #include <kmessagebox.h> | 44 | #include <kmessagebox.h> |
45 | 45 | ||
46 | #include <qpe/pim/addressbookaccess.h> | ||
47 | |||
48 | 46 | ||
49 | #include "resourceqtopiaconfig.h" | 47 | #include "resourceqtopiaconfig.h" |
50 | #include "stdaddressbook.h" | 48 | #include "stdaddressbook.h" |
51 | 49 | ||
52 | #include "qtopiaconverter.h" | 50 | #include "qtopiaconverter.h" |
53 | 51 | ||
54 | #include "resourceqtopia.h" | 52 | #include "resourceqtopia.h" |
55 | 53 | ||
56 | using namespace KABC; | 54 | using namespace KABC; |
57 | extern "C" | 55 | extern "C" |
58 | { | 56 | { |
59 | void *init_microkabc_qtopia() | 57 | void *init_microkabc_qtopia() |
60 | { | 58 | { |
61 | return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>(); | 59 | return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>(); |
62 | } | 60 | } |
63 | } | 61 | } |
64 | 62 | ||
65 | ResourceQtopia::ResourceQtopia( const KConfig *config ) | 63 | ResourceQtopia::ResourceQtopia( const KConfig *config ) |
66 | : Resource( config ), mConverter (0) | 64 | : Resource( config ), mConverter (0) |
67 | { | 65 | { |
68 | // we can not choose the filename. Therefore use the default to display | 66 | // we can not choose the filename. Therefore use the default to display |
69 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 67 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
70 | init( fileName ); | 68 | init( fileName ); |
71 | } | 69 | } |
72 | 70 | ||
73 | ResourceQtopia::ResourceQtopia( const QString &fileName ) | 71 | ResourceQtopia::ResourceQtopia( const QString &fileName ) |
74 | : Resource( 0 ) | 72 | : Resource( 0 ) |
75 | { | 73 | { |
76 | init( fileName ); | 74 | init( fileName ); |
77 | } | 75 | } |
78 | 76 | ||
79 | void ResourceQtopia::init( const QString &fileName ) | 77 | void ResourceQtopia::init( const QString &fileName ) |
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp index b2310c4..0505d0b 100644 --- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp +++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp | |||
@@ -9,67 +9,64 @@ | |||
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | 30 | ||
31 | #include <kdebug.h> | 31 | #include <kdebug.h> |
32 | #include <klocale.h> | 32 | #include <klocale.h> |
33 | #include <kstandarddirs.h> | 33 | #include <kstandarddirs.h> |
34 | #include <kdialog.h> | 34 | #include <kdialog.h> |
35 | 35 | ||
36 | #include <unistd.h> | 36 | #include <unistd.h> |
37 | 37 | ||
38 | #include <qdir.h> | 38 | #include <qdir.h> |
39 | #include <qfile.h> | 39 | #include <qfile.h> |
40 | #include "resourceqtopia.h" | 40 | #include "resourceqtopia.h" |
41 | //US #include <qpe/qpeapplication.h> | ||
42 | |||
43 | //US #include "stdaddressbook.h" | ||
44 | 41 | ||
45 | #include "resourceqtopiaconfig.h" | 42 | #include "resourceqtopiaconfig.h" |
46 | 43 | ||
47 | using namespace KABC; | 44 | using namespace KABC; |
48 | 45 | ||
49 | ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent, const char* name ) | 46 | ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent, const char* name ) |
50 | : ConfigWidget( parent, name ) | 47 | : ConfigWidget( parent, name ) |
51 | { | 48 | { |
52 | QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0, | 49 | QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0, |
53 | KDialog::spacingHint() ); | 50 | KDialog::spacingHint() ); |
54 | 51 | ||
55 | QLabel *label = new QLabel( i18n( "Location:" ), this ); | 52 | QLabel *label = new QLabel( i18n( "Location:" ), this ); |
56 | mFileNameEdit = new KURLRequester( this ); | 53 | mFileNameEdit = new KURLRequester( this ); |
57 | 54 | ||
58 | connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ), | 55 | connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ), |
59 | SLOT( checkFilePermissions( const QString & ) ) ); | 56 | SLOT( checkFilePermissions( const QString & ) ) ); |
60 | 57 | ||
61 | mainLayout->addWidget( label, 0, 0 ); | 58 | mainLayout->addWidget( label, 0, 0 ); |
62 | mainLayout->addWidget( mFileNameEdit, 0, 1 ); | 59 | mainLayout->addWidget( mFileNameEdit, 0, 1 ); |
63 | 60 | ||
64 | } | 61 | } |
65 | 62 | ||
66 | void ResourceQtopiaConfig::loadSettings( KRES::Resource *res ) | 63 | void ResourceQtopiaConfig::loadSettings( KRES::Resource *res ) |
67 | { | 64 | { |
68 | //US ResourceFile *resource = dynamic_cast<ResourceFile*>( res ); | 65 | //US ResourceFile *resource = dynamic_cast<ResourceFile*>( res ); |
69 | ResourceQtopia *resource = (ResourceQtopia*)( res ); | 66 | ResourceQtopia *resource = (ResourceQtopia*)( res ); |
70 | 67 | ||
71 | if ( !resource ) { | 68 | if ( !resource ) { |
72 | kdDebug(5700) << "ResourceQtopiaConfig::loadSettings(): cast failed" << endl; | 69 | kdDebug(5700) << "ResourceQtopiaConfig::loadSettings(): cast failed" << endl; |
73 | return; | 70 | return; |
74 | } | 71 | } |
75 | 72 | ||
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h index b2651d4..c5cae20 100644 --- a/korganizer/wordsgerman.h +++ b/korganizer/wordsgerman.h | |||
@@ -840,65 +840,65 @@ | |||
840 | { "calendar.html","calendar.html" }, | 840 | { "calendar.html","calendar.html" }, |
841 | { " Local Time"," Locale Zeit" }, | 841 | { " Local Time"," Locale Zeit" }, |
842 | { "Unknown Name","Unbekannter Name" }, | 842 | { "Unknown Name","Unbekannter Name" }, |
843 | { "unknown@nowhere","unbekannt@nirgendwo" }, | 843 | { "unknown@nowhere","unbekannt@nirgendwo" }, |
844 | { "Beam via IR!","Beam via IR!" }, | 844 | { "Beam via IR!","Beam via IR!" }, |
845 | { "Next Month","Nächster Monat" }, | 845 | { "Next Month","Nächster Monat" }, |
846 | { "Prio","Prio" }, | 846 | { "Prio","Prio" }, |
847 | { "Reparent Todo","Mache Sub-Todo" }, | 847 | { "Reparent Todo","Mache Sub-Todo" }, |
848 | { "tomorrow","morgen" }, | 848 | { "tomorrow","morgen" }, |
849 | { "today","heute" }, | 849 | { "today","heute" }, |
850 | { "yesterday","gestern" }, | 850 | { "yesterday","gestern" }, |
851 | { "Ok","Ok" }, | 851 | { "Ok","Ok" }, |
852 | { "Ok+Agenda","Ok+Agenda" }, | 852 | { "Ok+Agenda","Ok+Agenda" }, |
853 | { "Email","Email" }, | 853 | { "Email","Email" }, |
854 | { "RSVP","RSVP" }, | 854 | { "RSVP","RSVP" }, |
855 | { "Email:","Email:" }, | 855 | { "Email:","Email:" }, |
856 | { "Appointment Time ","Termin Zeit " }, | 856 | { "Appointment Time ","Termin Zeit " }, |
857 | { "2","2" }, | 857 | { "2","2" }, |
858 | { "3","3" }, | 858 | { "3","3" }, |
859 | { "4","4" }, | 859 | { "4","4" }, |
860 | { " 0 %"," 0 %" }, | 860 | { " 0 %"," 0 %" }, |
861 | { " 20 %"," 20 %" }, | 861 | { " 20 %"," 20 %" }, |
862 | { " 40 %"," 40 %" }, | 862 | { " 40 %"," 40 %" }, |
863 | { " 60 %"," 60 %" }, | 863 | { " 60 %"," 60 %" }, |
864 | { " 80 %"," 80 %" }, | 864 | { " 80 %"," 80 %" }, |
865 | { "100 %","100 %" }, | 865 | { "100 %","100 %" }, |
866 | { "Filter","Filter" }, | 866 | { "Filter","Filter" }, |
867 | { "Configure","Konfiguriere" }, | 867 | { "Configure","Konfiguriere" }, |
868 | { "What's Next","What's Next" }, | 868 | { "What's Next","What's Next" }, |
869 | { "Complete calendar...","Kompletten Kalender..." }, | 869 | { "Complete calendar...","Kompletten Kalender..." }, |
870 | { "Filtered calendar...","Gefilterten Kalender..." }, | 870 | { "Filtered calendar...","Gefilterten Kalender..." }, |
871 | { "Export to phone","Exportiere zum Handy" }, | 871 | { "Export to phone","Exportiere zum Handy" }, |
872 | { "Beam receice enabled","Beam Empfang an" }, | 872 | { "Beam receive enabled","Beam Empfang an" }, |
873 | { "What's new?","Was ist neu?" }, | 873 | { "What's new?","Was ist neu?" }, |
874 | { "FAQ...","FAQ..." }, | 874 | { "FAQ...","FAQ..." }, |
875 | { "Licence...","Licence..." }, | 875 | { "Licence...","Licence..." }, |
876 | { "What's This?","What's This?" }, | 876 | { "What's This?","What's This?" }, |
877 | { "&Edit...","&Editiere..." }, | 877 | { "&Edit...","&Editiere..." }, |
878 | { "Oktober","Oktober" }, | 878 | { "Oktober","Oktober" }, |
879 | { "Title","Titel" }, | 879 | { "Title","Titel" }, |
880 | { "%1 %","%1 %" }, | 880 | { "%1 %","%1 %" }, |
881 | { "Enable Pi-Sync","Schalte Pi-Sync an" }, | 881 | { "Enable Pi-Sync","Schalte Pi-Sync an" }, |
882 | { "Import!","Importiere!" }, | 882 | { "Import!","Importiere!" }, |
883 | { "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" }, | 883 | { "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" }, |
884 | { "Export to phone options","Export ans Handy Optionen" }, | 884 | { "Export to phone options","Export ans Handy Optionen" }, |
885 | { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." }, | 885 | { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." }, |
886 | { "I/O device: ","I/O device: " }, | 886 | { "I/O device: ","I/O device: " }, |
887 | { "Connection: ","Connection: " }, | 887 | { "Connection: ","Connection: " }, |
888 | { "Model(opt.): ","Model(opt.): " }, | 888 | { "Model(opt.): ","Model(opt.): " }, |
889 | { "Write back events in future only","Schreibe nur zukünftige Termine zurück" }, | 889 | { "Write back events in future only","Schreibe nur zukünftige Termine zurück" }, |
890 | { "Max. weeks in future: ","Max. Wochen in der Zukunft: " }, | 890 | { "Max. weeks in future: ","Max. Wochen in der Zukunft: " }, |
891 | { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nToDo/Kalender Daten auf dem Handy!" }, | 891 | { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nToDo/Kalender Daten auf dem Handy!" }, |
892 | { "Export to mobile phone!","Exportiere auf das Handy!" }, | 892 | { "Export to mobile phone!","Exportiere auf das Handy!" }, |
893 | { "Export complete calendar","Exportiere kompletten Kalender" }, | 893 | { "Export complete calendar","Exportiere kompletten Kalender" }, |
894 | { "Writing to phone...","Sende Daten ans Handy..." }, | 894 | { "Writing to phone...","Sende Daten ans Handy..." }, |
895 | { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" }, | 895 | { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" }, |
896 | { "Retry","Nochmal versuchen" }, | 896 | { "Retry","Nochmal versuchen" }, |
897 | { "KDE/Pim phone access","KDE/Pim Handy Zugriff" }, | 897 | { "KDE/Pim phone access","KDE/Pim Handy Zugriff" }, |
898 | { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" }, | 898 | { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" }, |
899 | { "Error exporting to phone!","Fehler beim Export auf das Handy!" }, | 899 | { "Error exporting to phone!","Fehler beim Export auf das Handy!" }, |
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" }, |
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index ac0c978..9798e8e 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
@@ -11,64 +11,69 @@ | |||
11 | 11 | ||
12 | /*************************************************************************** | 12 | /*************************************************************************** |
13 | * copyright (C) 2004 by Ulf Schenk | 13 | * copyright (C) 2004 by Ulf Schenk |
14 | * This file is originaly based on version 1.0.1 of pwmanager | 14 | * This file is originaly based on version 1.0.1 of pwmanager |
15 | * and was modified to run on embedded devices that run microkde | 15 | * and was modified to run on embedded devices that run microkde |
16 | * | 16 | * |
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #include <klocale.h> | 20 | #include <klocale.h> |
21 | #include <klistview.h> | 21 | #include <klistview.h> |
22 | #include <ktoolbar.h> | 22 | #include <ktoolbar.h> |
23 | #include <kfiledialog.h> | 23 | #include <kfiledialog.h> |
24 | #include <kiconloader.h> | 24 | #include <kiconloader.h> |
25 | #include <kmessagebox.h> | 25 | #include <kmessagebox.h> |
26 | 26 | ||
27 | #ifndef PWM_EMBEDDED | 27 | #ifndef PWM_EMBEDDED |
28 | #include <kmenubar.h> | 28 | #include <kmenubar.h> |
29 | #include <kstatusbar.h> | 29 | #include <kstatusbar.h> |
30 | #include <dcopclient.h> | 30 | #include <dcopclient.h> |
31 | #include "configwndimpl.h" | 31 | #include "configwndimpl.h" |
32 | #include "configuration.h" | 32 | #include "configuration.h" |
33 | #else | 33 | #else |
34 | #include <qmenubar.h> | 34 | #include <qmenubar.h> |
35 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
36 | #include <pwmprefs.h> | 36 | #include <pwmprefs.h> |
37 | #include <kpimglobalprefs.h> | 37 | #include <kpimglobalprefs.h> |
38 | #include <kcmconfigs/kcmpwmconfig.h> | 38 | #include <kcmconfigs/kcmpwmconfig.h> |
39 | #include <kcmconfigs/kcmkdepimconfig.h> | 39 | #include <kcmconfigs/kcmkdepimconfig.h> |
40 | #include <kcmultidialog.h> | 40 | #include <kcmultidialog.h> |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | |||
44 | #ifndef DESKTOP_VERSION | ||
45 | #include <qpe/global.h> | ||
46 | #endif | ||
47 | |||
43 | #include <qpixmap.h> | 48 | #include <qpixmap.h> |
44 | #include <qcheckbox.h> | 49 | #include <qcheckbox.h> |
45 | #include <qspinbox.h> | 50 | #include <qspinbox.h> |
46 | #include <qlineedit.h> | 51 | #include <qlineedit.h> |
47 | #include <qfileinfo.h> | 52 | #include <qfileinfo.h> |
48 | #include <qclipboard.h> | 53 | #include <qclipboard.h> |
49 | 54 | ||
50 | 55 | ||
51 | #include <stdio.h> | 56 | #include <stdio.h> |
52 | 57 | ||
53 | #include "pwm.h" | 58 | #include "pwm.h" |
54 | #include "pwminit.h" | 59 | #include "pwminit.h" |
55 | #include "pwmprint.h" | 60 | #include "pwmprint.h" |
56 | #include "addentrywndimpl.h" | 61 | #include "addentrywndimpl.h" |
57 | #include "globalstuff.h" | 62 | #include "globalstuff.h" |
58 | #include "findwndimpl.h" | 63 | #include "findwndimpl.h" |
59 | #include "csv.h" | 64 | #include "csv.h" |
60 | 65 | ||
61 | #ifdef CONFIG_KWALLETIF | 66 | #ifdef CONFIG_KWALLETIF |
62 | # include "kwalletif.h" | 67 | # include "kwalletif.h" |
63 | # include "kwalletemu.h" | 68 | # include "kwalletemu.h" |
64 | #endif | 69 | #endif |
65 | #ifdef CONFIG_KEYCARD | 70 | #ifdef CONFIG_KEYCARD |
66 | # include "pwmkeycard.h" | 71 | # include "pwmkeycard.h" |
67 | #endif | 72 | #endif |
68 | 73 | ||
69 | 74 | ||
70 | #define DEFAULT_SIZE (QSize(700, 400)) | 75 | #define DEFAULT_SIZE (QSize(700, 400)) |
71 | 76 | ||
72 | // Button IDs for "file" popup menu | 77 | // Button IDs for "file" popup menu |
73 | enum { | 78 | enum { |
74 | BUTTON_POPUP_FILE_NEW = 0, | 79 | BUTTON_POPUP_FILE_NEW = 0, |
@@ -136,64 +141,65 @@ enum { | |||
136 | BUTTON_POPUP_HELP_LICENSE = 0, | 141 | BUTTON_POPUP_HELP_LICENSE = 0, |
137 | BUTTON_POPUP_HELP_FAQ, | 142 | BUTTON_POPUP_HELP_FAQ, |
138 | BUTTON_POPUP_HELP_ABOUT, | 143 | BUTTON_POPUP_HELP_ABOUT, |
139 | BUTTON_POPUP_HELP_SYNC, | 144 | BUTTON_POPUP_HELP_SYNC, |
140 | BUTTON_POPUP_HELP_WHATSNEW | 145 | BUTTON_POPUP_HELP_WHATSNEW |
141 | }; | 146 | }; |
142 | #endif | 147 | #endif |
143 | 148 | ||
144 | // Button IDs for toolbar | 149 | // Button IDs for toolbar |
145 | enum { | 150 | enum { |
146 | BUTTON_TOOL_NEW = 0, | 151 | BUTTON_TOOL_NEW = 0, |
147 | BUTTON_TOOL_OPEN, | 152 | BUTTON_TOOL_OPEN, |
148 | BUTTON_TOOL_SAVE, | 153 | BUTTON_TOOL_SAVE, |
149 | BUTTON_TOOL_SAVEAS, | 154 | BUTTON_TOOL_SAVEAS, |
150 | BUTTON_TOOL_PRINT, | 155 | BUTTON_TOOL_PRINT, |
151 | BUTTON_TOOL_ADD, | 156 | BUTTON_TOOL_ADD, |
152 | BUTTON_TOOL_EDIT, | 157 | BUTTON_TOOL_EDIT, |
153 | BUTTON_TOOL_DEL, | 158 | BUTTON_TOOL_DEL, |
154 | BUTTON_TOOL_FIND, | 159 | BUTTON_TOOL_FIND, |
155 | BUTTON_TOOL_LOCK, | 160 | BUTTON_TOOL_LOCK, |
156 | BUTTON_TOOL_DEEPLOCK, | 161 | BUTTON_TOOL_DEEPLOCK, |
157 | BUTTON_TOOL_UNLOCK | 162 | BUTTON_TOOL_UNLOCK |
158 | }; | 163 | }; |
159 | 164 | ||
160 | 165 | ||
161 | PwM::PwM(PwMInit *_init, PwMDoc *doc, | 166 | PwM::PwM(PwMInit *_init, PwMDoc *doc, |
162 | bool virginity, | 167 | bool virginity, |
163 | QWidget *parent, const char *name) | 168 | QWidget *parent, const char *name) |
164 | : KMainWindow(parent, "HALLO") | 169 | : KMainWindow(parent, "HALLO") |
165 | , forceQuit (false) | 170 | , forceQuit (false) |
166 | , forceMinimizeToTray (false) | 171 | , forceMinimizeToTray (false) |
167 | { | 172 | { |
173 | virgin = !virginity; | ||
168 | init = _init; | 174 | init = _init; |
169 | connect(doc, SIGNAL(docClosed(PwMDoc *)), | 175 | connect(doc, SIGNAL(docClosed(PwMDoc *)), |
170 | this, SLOT(docClosed(PwMDoc *))); | 176 | this, SLOT(docClosed(PwMDoc *))); |
171 | initMenubar(); | 177 | initMenubar(); |
172 | initToolbar(); | 178 | initToolbar(); |
173 | initMetrics(); | 179 | initMetrics(); |
174 | setVirgin(virginity); | 180 | setVirgin(virginity); |
175 | setFocusPolicy(QWidget::WheelFocus); | 181 | setFocusPolicy(QWidget::WheelFocus); |
176 | #ifndef PWM_EMBEDDED | 182 | #ifndef PWM_EMBEDDED |
177 | statusBar()->show(); | 183 | statusBar()->show(); |
178 | #endif | 184 | #endif |
179 | view = makeNewListView(doc); | 185 | view = makeNewListView(doc); |
180 | setCentralWidget(view); | 186 | setCentralWidget(view); |
181 | updateCaption(); | 187 | updateCaption(); |
182 | showStatMsg(i18n("Ready.")); | 188 | showStatMsg(i18n("Ready.")); |
183 | } | 189 | } |
184 | 190 | ||
185 | PwM::~PwM() | 191 | PwM::~PwM() |
186 | { | 192 | { |
187 | //qDebug("PwM::~PwM()"); | 193 | //qDebug("PwM::~PwM()"); |
188 | disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)), | 194 | disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)), |
189 | this, SLOT(docClosed(PwMDoc *))); | 195 | this, SLOT(docClosed(PwMDoc *))); |
190 | conf()->confWndMainWndSize(size()); | 196 | conf()->confWndMainWndSize(size()); |
191 | emit closed(this); | 197 | emit closed(this); |
192 | //qDebug("PwM::~PwM() emited closed(this)"); | 198 | //qDebug("PwM::~PwM() emited closed(this)"); |
193 | delete view; | 199 | delete view; |
194 | } | 200 | } |
195 | 201 | ||
196 | void PwM::initMenubar() | 202 | void PwM::initMenubar() |
197 | { | 203 | { |
198 | KIconLoader* picons; | 204 | KIconLoader* picons; |
199 | #ifndef PWM_EMBEDDED | 205 | #ifndef PWM_EMBEDDED |
@@ -1330,64 +1336,67 @@ void PwM::goToURL_slot() | |||
1330 | unsigned int curEntryIndex; | 1336 | unsigned int curEntryIndex; |
1331 | if (!view->getCurEntryIndex(&curEntryIndex)) | 1337 | if (!view->getCurEntryIndex(&curEntryIndex)) |
1332 | return; | 1338 | return; |
1333 | bool ret = curDoc()->goToURL(view->getCurrentCategory(), | 1339 | bool ret = curDoc()->goToURL(view->getCurrentCategory(), |
1334 | curEntryIndex); | 1340 | curEntryIndex); |
1335 | if (ret) | 1341 | if (ret) |
1336 | showStatMsg(i18n("started browser with current URL.")); | 1342 | showStatMsg(i18n("started browser with current URL.")); |
1337 | else | 1343 | else |
1338 | showStatMsg(i18n("ERROR: Couldn't start browser! Maybe invalid URL?")); | 1344 | showStatMsg(i18n("ERROR: Couldn't start browser! Maybe invalid URL?")); |
1339 | } | 1345 | } |
1340 | 1346 | ||
1341 | void PwM::copyToClipboard(const QString &s) | 1347 | void PwM::copyToClipboard(const QString &s) |
1342 | { | 1348 | { |
1343 | QClipboard *cb = QApplication::clipboard(); | 1349 | QClipboard *cb = QApplication::clipboard(); |
1344 | #ifndef PWM_EMBEDDED | 1350 | #ifndef PWM_EMBEDDED |
1345 | if (cb->supportsSelection()) | 1351 | if (cb->supportsSelection()) |
1346 | cb->setText(s, QClipboard::Selection); | 1352 | cb->setText(s, QClipboard::Selection); |
1347 | cb->setText(s, QClipboard::Clipboard); | 1353 | cb->setText(s, QClipboard::Clipboard); |
1348 | #else | 1354 | #else |
1349 | cb->setText(s); | 1355 | cb->setText(s); |
1350 | 1356 | ||
1351 | #endif | 1357 | #endif |
1352 | 1358 | ||
1353 | } | 1359 | } |
1354 | 1360 | ||
1355 | void PwM::showStatMsg(const QString &msg) | 1361 | void PwM::showStatMsg(const QString &msg) |
1356 | { | 1362 | { |
1357 | #ifndef PWM_EMBEDDED | 1363 | #ifndef PWM_EMBEDDED |
1358 | KStatusBar *statBar = statusBar(); | 1364 | KStatusBar *statBar = statusBar(); |
1359 | statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); | 1365 | statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); |
1360 | #else | 1366 | #else |
1361 | qDebug("Statusbar : %s",msg.latin1()); | 1367 | qDebug("Statusbar : %s",msg.latin1()); |
1368 | #ifndef DESKTOP_VERSION | ||
1369 | Global::statusMessage(msg); | ||
1370 | #endif | ||
1362 | #endif | 1371 | #endif |
1363 | } | 1372 | } |
1364 | 1373 | ||
1365 | void PwM::focusInEvent(QFocusEvent *e) | 1374 | void PwM::focusInEvent(QFocusEvent *e) |
1366 | { | 1375 | { |
1367 | if (e->gotFocus()) { | 1376 | if (e->gotFocus()) { |
1368 | emit gotFocus(this); | 1377 | emit gotFocus(this); |
1369 | } else if (e->lostFocus()) { | 1378 | } else if (e->lostFocus()) { |
1370 | emit lostFocus(this); | 1379 | emit lostFocus(this); |
1371 | } | 1380 | } |
1372 | } | 1381 | } |
1373 | 1382 | ||
1374 | 1383 | ||
1375 | #ifdef PWM_EMBEDDED | 1384 | #ifdef PWM_EMBEDDED |
1376 | 1385 | ||
1377 | void PwM::whatsnew_slot() | 1386 | void PwM::whatsnew_slot() |
1378 | { | 1387 | { |
1379 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 1388 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
1380 | } | 1389 | } |
1381 | 1390 | ||
1382 | void PwM::showLicense_slot() | 1391 | void PwM::showLicense_slot() |
1383 | { | 1392 | { |
1384 | KApplication::showLicence(); | 1393 | KApplication::showLicence(); |
1385 | } | 1394 | } |
1386 | 1395 | ||
1387 | void PwM::faq_slot() | 1396 | void PwM::faq_slot() |
1388 | { | 1397 | { |
1389 | KApplication::showFile( "PWM/Pi FAQ", "kdepim/pwmanager/pwmanagerFAQ.txt" ); | 1398 | KApplication::showFile( "PWM/Pi FAQ", "kdepim/pwmanager/pwmanagerFAQ.txt" ); |
1390 | } | 1399 | } |
1391 | 1400 | ||
1392 | void PwM::syncHowTo_slot() | 1401 | void PwM::syncHowTo_slot() |
1393 | { | 1402 | { |