Rename additional header files to avoid conflicts with KDE4

2 files changed, 43 insertions, 43 deletions

diff --git a/koffice-i18n-sl/messages/koffice/desktop_koffice.po b/koffice-i18n-sl/messages/koffice/desktop_koffice.po
index 223f0b17..9197fc85 100644
--- a/koffice-i18n-sl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sl/messages/koffice/desktop_koffice.po
@@ -1907,11 +1907,11 @@ msgstr "Name=Komponenta za obdelovanje besedil za KOffice"
 msgid "GenericName=Text Documents"
 msgstr "GenericName=Besedilni dokumenti"
 
-#: kword/mailmerge/kabc/kwmailmerge_kabc.desktop:6
+#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6
 msgid "Name=KDE Addressbook Plugin"
 msgstr "Name=Vstavek Adresar KDE"
 
-#: kword/mailmerge/kabc/kwmailmerge_kabc.desktop:55
+#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55
 msgid ""
 "Comment=This datasource type lets you use your KDE Address Book entries."
 msgstr ""
diff --git a/koffice-i18n-sl/messages/koffice/kword.po b/koffice-i18n-sl/messages/koffice/kword.po
index e8fb9dbd..0734e8f1 100644
--- a/koffice-i18n-sl/messages/koffice/kword.po
+++ b/koffice-i18n-sl/messages/koffice/kword.po
@@ -336,92 +336,92 @@ msgstr "&Vrata:"
 msgid "default"
 msgstr "privzeto"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 16
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 16
 #: rc.cpp:216
 #, no-c-format
 msgid "Address Selection"
 msgstr "Izbor naslova"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 55
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 55
 #: rc.cpp:219
 #, no-c-format
 msgid "&Add >>"
 msgstr "&Dodaj >>"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 66
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 66
 #: rc.cpp:222
 #, no-c-format
 msgid "<< &Remove"
 msgstr "<< Odst&rani"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 96
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 96
 #: rc.cpp:225
 #, no-c-format
 msgid "Save as &Distribution List..."
 msgstr "Shrani kot &distribucijski seznam ..."
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 99
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 99
 #: rc.cpp:228
 #, no-c-format
 msgid "Save selected single entries to a new distribution list."
 msgstr "Shrani izbrane posamezne vnose v nov distribucijski seznam."
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 115
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 115
 #: rc.cpp:231
 #, no-c-format
 msgid "&Filter on:"
 msgstr "&Filter na:"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 142
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 142
 #: mailmerge/KWClassicSerialDataSource.cpp:245 rc.cpp:235 rc.cpp:256
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 153
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:72
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:104
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:122
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:167
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:202
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:243
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:245
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:297
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:339
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:385
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:483 rc.cpp:238
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 153
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:72
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:104
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:122
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:167
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:202
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:243
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:245
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:297
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:339
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:385
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:483 rc.cpp:238
 #, no-c-format
 msgid "Distribution Lists"
 msgstr "Distribucijski seznami"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 161
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:82
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:102
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:199
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:390 rc.cpp:241
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 161
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:82
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:102
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:199
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:390 rc.cpp:241
 #, no-c-format
 msgid "Single Entries"
 msgstr "Enotni vnosi"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 202
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 202
 #: rc.cpp:244
 #, no-c-format
 msgid "Address B&ook"
 msgstr "&Adresar"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 205
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 205
 #: rc.cpp:247
 #, no-c-format
 msgid "Launch KAddressbook"
 msgstr "Poženi Adresar"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 218
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 218
 #: rc.cpp:250
 #, no-c-format
 msgid "&Address Book"
 msgstr "&Adresar"
 
-#. i18n: file mailmerge/kabc/addresspicker.ui line 237
+#. i18n: file mailmerge/tdeabc/addresspicker.ui line 237
 #: rc.cpp:253
 #, no-c-format
 msgid "&Selected Addresses"
@@ -4545,7 +4545,7 @@ msgid ">>>Field %1 is unknown in the current database query<<<"
 msgstr ">>>Polje %1 je neznano v trenutnem povpraševanju zbirke<<<"
 
 #: mailmerge/KWClassicSerialDataSource.cpp:333
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:43
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:43
 #: mailmerge/kspread/kwmailmerge_kspread_config.cpp:38
 #: mailmerge/sql/KWQtSqlEasyFilter.cpp:10
 #: mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp:179
@@ -4615,52 +4615,52 @@ msgstr "Vrednost"
 msgid "NOT"
 msgstr "NE"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:171
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:171
 msgid "KAddressbook entry '%1' not available."
 msgstr "Vnos v Adresarju »%1« ni na voljo."
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:353
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:353
 msgid "%1 South"
 msgstr "%1 južno"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:355
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:355
 msgid "%1 North"
 msgstr "%1 severno"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:360
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:360
 msgid "%1 West"
 msgstr "%1 zahodno"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:362
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:362
 msgid "%1 East"
 msgstr "%1 vzhodno"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:364
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:364
 msgid ""
 "_: Geographic coordinates\n"
 "%1, %2"
 msgstr "%1, %2"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:389
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:389
 #: mailmerge/kspread/kwmailmerge_kspread.cpp:56
 #, c-format
 msgid "Unkown mail merge variable: %1"
 msgstr "Neznana spremenljivka zlivanja pošte: %1"
 
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:331
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:432
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:331
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:432
 msgid "no category"
 msgstr "brez kategorije"
 
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:367
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:367
 msgid "New Distribution List"
 msgstr "Nov distribucijski seznam"
 
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:368
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:368
 msgid "Please enter name:"
 msgstr "Prosim vnesite ime:"
 
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:377
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:377
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"