Rename additional header files to avoid conflicts with KDE4

1 files changed, 41 insertions, 41 deletions

diff --git a/koffice-i18n-es/messages/koffice/kword.po b/koffice-i18n-es/messages/koffice/kword.po
index 40117913..1ff832ba 100644
--- a/koffice-i18n-es/messages/koffice/kword.po
+++ b/koffice-i18n-es/messages/koffice/kword.po
@@ -333,31 +333,31 @@ msgstr "&Puerto:"
 msgid "default"
 msgstr "por omisión"
 
-#. 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 "Selección de dirección"
 
-#. 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 "&Añadir >>"
 
-#. 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 "<< Elimina&r"
 
-#. 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 "Guardar como lista de &distribución..."
 
-#. 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."
@@ -365,62 +365,62 @@ msgstr ""
 "Guarda las entradas individuales seleccionadas en una nueva lista de "
 "distribución."
 
-#. 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 "&Filtrar sobre:"
 
-#. 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 "Nombre"
 
-#. 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 "Listas de distribución"
 
-#. 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 "Entradas individuales"
 
-#. 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 "Libret&a de direcciones"
 
-#. 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 "Lanzar KAddressbook"
 
-#. 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 "Libret&a de direcciones"
 
-#. 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"
@@ -4587,7 +4587,7 @@ msgstr ""
 ">>>El campo %1 es desconocido en la consulta actual de la base de datos<<<"
 
 #: 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
@@ -4657,52 +4657,52 @@ msgstr "Valor"
 msgid "NOT"
 msgstr "NO"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:171
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:171
 msgid "KAddressbook entry '%1' not available."
 msgstr "Entrada «%1» de KAddressbook no disponible."
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:353
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:353
 msgid "%1 South"
 msgstr "%1 Sur"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:355
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:355
 msgid "%1 North"
 msgstr "%1 Norte"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:360
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:360
 msgid "%1 West"
 msgstr "%1 Oeste"
 
-#: mailmerge/kabc/KWMailMergeKABC.cpp:362
+#: mailmerge/tdeabc/KWMailMergeKABC.cpp:362
 msgid "%1 East"
 msgstr "%1 Este"
 
-#: 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 "Variable de carta en serie desconocida: %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 "sin categoría"
 
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:367
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:367
 msgid "New Distribution List"
 msgstr "Nueva lista de distribución"
 
-#: mailmerge/kabc/KWMailMergeKABCConfig.cpp:368
+#: mailmerge/tdeabc/KWMailMergeKABCConfig.cpp:368
 msgid "Please enter name:"
 msgstr "Introduzca un nombre:"
 
-#: 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>"