Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,7 +15,7 @@
Name[es]=Ejecutor de script para intérprete de comandos de bash
Name[et]=Bash shelli skripti käivitaja
Comment[pa]=ਇੱਕ ਕਾਰਜ ਵਿੱਚ ਬੈਸ਼ ਸ਼ੈਲ ਸਕ੍ਰਿਪਟਾਂ ਚਲਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ
Index: interfaces/kscript/scriptinterface.desktop
===================================================================
---- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Este es un motor de script genérico para probar el interfaz de script.
Comment[et]=Üldise skriptimootori testskript liidese testimiseks.
Comment[fr]=Ceci est un moteur de script de test générique pour expérimenter l'interface de script.
Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Instant Messenger con un interfaz DCOP
Comment[et]=Kiirsuhtlemisrakendus DCOP-liidesega
Comment[fy]=Instant Messenger mei in DCOP-interface
Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -10,6 +10,7 @@
Name[eo]=Tujmesaĝilo
Name[et]=Kiirsuhtlus
Comment[fy]=Mei de instant messenger kinne jo twaspraak hâlde mei in yndividu en groepen.
Index: interfaces/kspeech/dcoptexttospeech.desktop
===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Comment[es]=Texto a servicio de voz con un interfaz DCOP
Comment[et]=Teksti kõneks muutmise teenus DCOP-liidesega
Comment[fy]=tekst-ta-prate mei in DCOP-ynterface
Index: interfaces/ktexteditor/ktexteditoreditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (sin separación Doc/Vista)
Comment[et]=Põimitav tekstiredaktori komponent
Comment[fy]=Yn te sluten tekstbewurkerkomponint (sûnder skieding fan tekst/werjefte)
Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -90,7 +90,7 @@
Comment[es]=El servicio del editor de texto proporciona aplicaciones con un visor de textos y un editor de textos. Las aplicaciones KDE que suministran propiedades de edición deberían utilizar este servicio.
Comment[et]=Tekstiredaktori teenus annab rakendustele komponendi teksti vaatamiseks ja redigeerimiseks. Seda kasutavad kõik KDE rakendused, mis tegelevad teksti redigeerimisega.
Comment[fr]=Le service d'édition de texte fournit des applications comportant un afficheur de texte et un éditeur. Les applications KDE qui fournissent des fonctions d'édition de texte devraient utiliser ce service.
Index: interfaces/ktexteditor/ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (con separación Doc/Vista)
Comment[et]=Põimitav tekstiredaktori komponent (dokument/vaade eraldamisega)
Comment[fy]=Yn te sluten tekstbewurkerkomponint (mei skieding fan tekst/werjefte)
Index: interfaces/ktexteditor/ktexteditorplugin.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Plugin de KTextEditor
Comment[et]=KTextEditori plugin
Comment[fy]=KTextFerwurker-plugin
Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
===================================================================
---- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Name[es]=Plugin KDataTool de KTextEditor
Name[et]=KTextEditori KDataTool plugin
Comment[fy]=Aktivearjen fan dataprogramma's, lykas de tesaurus en stavering (wannear't dy ynstallearre binne)
Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Name[es]=Plugin de inserción de archivos de KTextEditor
Name[et]=KTextEditori faili lisamise plugin
Comment[fy]=Els lêsber Triem by it rinnerke ynfoegje
Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Name[es]=Automarcadores de KTextEditor
Name[et]=KTextEditori järjehoidjate märkija
Comment[fy]=Blêdwizer ynstelle om by it laden fan dokuminten oerienkomstige patroanen
Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -13,6 +13,7 @@
Name[es]=Plugin de completado de palabras de KTextEditor
Name[et]=KTextEditori sõna lõpetamise plugin
Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of popup-basearje
Index: kate/plugins/isearch/ktexteditor_isearch.desktop
===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Name[es]=Plugin de búsqueda incremental de KTextEditor
Name[et]=KTextEditori täpsustava otsingu plugin
Comment[fy]=Ek bekend as"ûnder it typen sykje"
Index: kate/part/katecodecompletion.cpp
===================================================================
---- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -137,6 +137,11 @@
this, SLOT(slotCursorPosChanged()) );
}
}
Index: kate/part/kateconfig.h
===================================================================
---- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -178,7 +178,8 @@
cfReplaceTabsDyn= 0x2000000,
cfRemoveTrailingDyn=0x4000000,
uint configFlags () const;
Index: kate/part/katedocument.h
===================================================================
---- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -993,7 +993,12 @@
*/
static bool checkColorValue( QString value, QColor &col );
KIO::TransferJob *m_job;
Index: kate/part/kateview.cpp
===================================================================
---- kate/part/kateview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -173,7 +173,6 @@
m_doc->removeView( this );
Index: kate/part/katedocument.cpp
===================================================================
---- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2895,8 +2895,8 @@
{
QChar end_ch;
}
Index: kate/part/kateautoindent.h
===================================================================
---- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -67,8 +67,10 @@
* This baseclass is a real dummy, does nothing beside remembering the document it belongs too,
* only to have the object around
Index: kate/part/test_regression.h
===================================================================
--- kate/part/test_regression.h (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,186 @@
+/**
+ * This file is part of the KDE project
+#endif
Index: kate/part/katedialogs.h
===================================================================
---- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -122,7 +122,7 @@
void indenterSelected (int);
KIntNumInput *indentationWidth;
Index: kate/part/kateviewhelpers.cpp
===================================================================
---- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -583,7 +583,7 @@
".+++++++++.",
"..........."};
uint h = m_view->renderer()->config()->fontStruct()->fontHeight;
uint startz = (y / h);
uint endz = startz + 1 + (height / h);
+Index: kate/part/configure.in.in
+===================================================================
+--- kate/part/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -4,6 +4,9 @@
+
+ HAVE_LUA=""
+
++ AC_ARG_WITH([lua],
++ AC_HELP_STRING([--without-lua], [Build without Lua libraries (default: check)]))
++
+ AC_ARG_WITH(lua-dir,
+ AC_HELP_STRING([--with-lua-dir=DIR],[where the root of Lua 5.x is installed]),
+ [
+@@ -21,6 +24,9 @@
+ LUA_LIBS="-L$withval" ])
+
+
++ if test "x$with_lua" = "xno"; then
++ AC_MSG_RESULT([Not using Lua])
++ else
+ if ! test "x$LUA" = "x"; then
+ AC_MSG_RESULT(using Lua from $LUA)
+ fi
+@@ -76,6 +82,7 @@
+ AC_SUBST(LUA)
+ AC_SUBST(LUA_INCLUDES)
+ AC_SUBST(LUA_LIBS)
++ fi
+
+ ])
+
Index: kate/part/kateconfig.cpp
===================================================================
---- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -168,7 +168,8 @@
| KateDocumentConfig::cfKeepIndentProfile
| KateDocumentConfig::cfWrapCursor
Index: kate/part/kateviewinternal.cpp
===================================================================
---- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -870,7 +870,10 @@
void KateViewInternal::updateMicroFocusHint()
{
}
Index: kate/part/katecodecompletion.h
===================================================================
---- kate/part/katecodecompletion.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katecodecompletion.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katecodecompletion.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katecodecompletion.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -72,6 +72,7 @@
public:
Index: kate/part/kateautoindent.cpp
===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -31,6 +31,8 @@
#include <kdebug.h>
#include <kpopupmenu.h>
Index: kate/part/test_regression.cpp
===================================================================
--- kate/part/test_regression.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,1127 @@
+/**
+ * This file is part of the KDE project
+// kate: indent-width 4
Index: kate/part/katedialogs.cpp
===================================================================
---- kate/part/katedialogs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/katedialogs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -140,7 +140,8 @@
KateDocument::cfTabIndents,
KateDocument::cfBackspaceIndents,
Index: kate/part/Makefile.am
===================================================================
---- kate/part/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/part/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/part/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/part/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,6 +1,8 @@
kde_module_LTLIBRARIES = libkatepart.la
+testkateregression_LDADD = $(libkatepart_la_LIBADD)
Index: kate/scripts/jstest.desktop
===================================================================
---- kate/scripts/jstest.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/scripts/jstest.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -9,6 +9,7 @@
Name[es]=Prueba JavaScript de Kate Part
Name[et]=Kate komponendi JavaScripti test
Comment[fi]=Skripti kate partin skriptien testaukseen
Comment[fr]=Script testant le module de scripting de Kate
Comment[fy]=Skript foar it testen fan Kate-part's skriptmooglikheid
+Index: kate/README.testing
+===================================================================
+--- kate/README.testing (.../tags/KDE/3.5.4/kdelibs) (revision 0)
++++ kate/README.testing (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -0,0 +1,241 @@
++ Testing Kate
++==============
++
++Author: Leo Savernik
++
++Kate contains regression tests to ensure that fixed bugs do not reappear in
++newer versions. To facilitate regression testing, a dedicated application
++testkateregression will execute the regression tests and compare them to the
++expecting results, indicating passed as well as failed testcases.
++
++
++1. Using testkateregression
++ --------------------------
++
++We tried to make regression testing for Kate as easy as possible such that you
++can run it before each commit and find out regressions caused by your changes
++before they are shipped as part of a release.
++
++Running all regression tests works by simply invoking
++
++ > make check
++
++in your kate build directory. While executing, testkateregression prints a line
++for each executed testcase, prefixed with "PASS" if it passed, and "FAIL" if it
++failed. Furthermore, testkateregression stores a comprehensive output log under
++<katetests-directory>/output/index.html. The output log is invaluable for
++determining why a certain testcase failed.
++
++If you invoke testkateregression the first time, it will print instructions on
++how to fetch the testsuite and pointing testkateregression to it. This setup
++has only to be done once per branch.
++
++
++2. Discriminating your regressions against existing regressions
++ --------------------------------------------------------------
++
++In an ideal universe, all testcases always pass. In this universe, however,
++some testcases fail, be it because of anticipating future features not
++implemented yet, be it because of nasty bugs which cannot be repaired easily.
++
++This means if you've hacked on kate for quite some while and then fire up
++"make check", you are likely to see many failed tests pass by, most of them
++*not* caused by your very changes, as they failed already before.
++
++To discriminate the failed tests caused by your changes against the unaffected
++failures, testkateregression provides the option --save-failures=<name>, which
++runs the regression tests and stores all failures under a failure snapshot
++identified by <name>.
++
++The next time you run "make check", testkateregression automatically picks up
++the most recently stored failure snapshot and compares the failures and passes
++with the one stored in the snapshot. Each failure not listed in the failure
++snapshot will be prefixed with "FAIL (new)", indicating that this is a new
++failure. Testcases which failed in the snapshot but do pass now are prefixed
++with "PASS (new)", indicating that this testcase seems to be fixed now.
++
++
++3. Using testkateregression efficiently
++ --------------------------------------
++
++Therefore, to get the most out of regression testing, we suggest the following
++development approach:
++
++ 1. Before you change Kate, update and run testkateregression in the part-
++ subdirectory.
++
++ > make testkateregression && ./testkateregression --save-failures=last
++
++ This will produce a failure snapshot called "last".
++
++ 2. Hack on Kate.
++
++ 3. Before you commit, run
++
++ > make check
++
++ It will automatically pick up the failure snapshot "last" (provided you
++ didn't generate a newer one in the meantime) and compare all results with
++ the previously stored ones.
++
++ If you inspect <katetests-directory>/output/index.html, the new failures
++ are marked red. Those are of interest to you, because they have been
++ caused by your changes.
++
++ New passes are marked green. These were former failures which started
++ working due to your changes.
++
++ Goto 2 while there are any new failures.
++
++ 4. Commit.
++
++
++4. Invoking testkateregression directly
++ --------------------------------------
++
++While make check is handy and simple enough for the common case, you might
++sometimes need more control over regression testing.
++
++testkateregression features a broad range of options, enabling you to run
++dedicated testcases only, specifying an alternate output directory for the
++logs, etc.
++
++ > ./testregression --help
++
++will provide you with a complete list of options.
++
++
++5. Structure of the regression test suite
++ ----------------------------------------
++
++Kate's regression testsuite is located in the KDE repository under
++
++ trunk/tests/katetests/regression
++
++and consists of two subdirectories
++
++ baseline
++ tests
++
++The latter, tests, contains a directory hierarchy for all testcases to be run
++by testkateregression. The former, baseline, contains results as they are
++expected by correct operation. Mismatch between the output of a test and its
++baseline is considered to be a failure.
++
++Each directory under tests may optionally contain one of the following files.
++
++ .kateconfig
++ .kateconfig-commands
++ ignore
++ KNOWN_FAILURES
++
++.kateconfig: This file works exactly like .kateconfig as supported by the kate
++and kwrite editors. It may contain any kate line variable necessary to set up
++the testcases proper. Note that .kateconfig files from parent directories are
++not merged with .kateconfig files from child directories.
++
++.kateconfig-commands: This file may contain all commands that can be entered by
++kate's command line (F7). Each line will be interpreted as one command. To the
++contrary of .kateconfig, .kateconfig-commands files are merged with
++.kateconfig-commands files from parent directories. Nearer ancestors' commands
++take precedence over farther ancestors'.
++
++ignore: This file specifies on each line a file to be ignored in the directory
++the ignore-file is located. This enables you to mark any helper files which
++otherwise would be interpreted as testcases. Note that hidden files (.*) are
++ignored by default, and cannot be "unignored".
++
++KNOWN_FAILURES: This file specifies on each line a file name of a testcase
++which is known to fail. Such known failures are counted towards the total count
++of failures but they don't cause testkateregression to return a failure code.
++
++
++6. Structure of a testcase
++ -------------------------
++
++A testcase is comprised of a simple plain text file <testcase>.txt which may
++be located in any subdirectory under tests. This file contains the *initial*
++content the testcase operates on.
++
++Each <testcase>.txt must be accompanied with a <testcase>.txt-script which
++contains the actual tests to be performed on the testcase. It consists of
++simple JavaScript-statements for direct interfacing with Kate.
++
++Last but not least, a <testcase>.txt-result exists under the baseline
++subdirectory, which contains a mirrored directory hierarchy of tests. This very
++file contains the expected *result* of the performed tests.
++
++
++7. Writing a simple testcase
++ ---------------------------
++
++Writing your own testcases is easy once you know how to get started. Let's
++test how Kate's C-Style indenter fares with indenting after opening braces.
++
++First, we create the new initial content under tests/indent/csmart/openbrc.txt
++and fill it with (the dashed lines are not part of the content)
++---------------------------
++
++int main() {
++
++---------------------------
++
++Now, we need to write a script performing some actions. We therefore create
++a file tests/indent/csmart/openbrc.txt-script and fill it with
++---------------------------
++v.setCursorPosition(1,12);
++v.enter();
++v.type("good");
++---------------------------
++
++Here, we set the initial cursor position to line 2 (the coordinates are zero-
++based) and column 13 which happens to be just after the opening brace. Then
++v.enter() simulates pressing the return key in the editor, thus inserting a
++new line. v.type simulates typing of the word "good" at the current position
++of the cursor.
++
++The options under .kateconfig specify the C-Style indenter to be applied to the
++testcases and an indent width of two. With this information, we know what we
++expect as a result.
++
++What we are still missing is the expected result itself which we create under
++baseline/indent/csmart/openbrc.txt-result and fill it with
++---------------------------
++
++int main() {
++ good
++
++---------------------------
++
++You can see that "good" is indented by two spaces, even though we didn't
++specify those with v.type. We expect from the indenter to provide them for us.
++
++Last but not least we test the testcase by invoking in kate's part directory
++
++ > ./testkateregression indent/csmart/openbrc.txt
++
++and checking whether it works the way we intended it.
++
++
++7. The JavaScript-interface to the testcases
++ -------------------------------------------
++
++testkateregression provides you with the following global objects for each
++testcase:
++
++ v - object of view
++ d - object of document
++
++Each object provides the same methods and fields as the respective JavaScript-
++interfaces built in to Kate, like v.setCursorPosition.
++
++Additionally, v provides the following methods unique to testkateregression.
++
++type(<string>)
++ Inserts <string> into the current cursor position as if <string> had
++ been typed by the keyboard. Contrary to insert(<string>), it will
++ trigger indentation and other checks.
++enter(), returnKey()
++ Inserts a new line as if the return key had been pressed. This will
++ trigger special indentation rules.
++
Index: kate/data/katepart.desktop
===================================================================
---- kate/data/katepart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/data/katepart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/data/katepart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/data/katepart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Name[es]=Editor de texto avanzado empotrable
Name[et]=Põimitud võimas tekstiredaktor
Name[fy]=Ynsletten avansearre tekstbewurker
Index: kate/data/latex.xml
===================================================================
---- kate/data/latex.xml (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/data/latex.xml (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/data/latex.xml (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/data/latex.xml (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,123 +1,287 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.01" encoding="UTF-8"?>
<comments>
Index: kate/data/php.xml
===================================================================
---- kate/data/php.xml (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/data/php.xml (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/data/php.xml (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/data/php.xml (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -11,6 +11,7 @@
<list name="control structures">
<item>as</item>
<item> function </item>
Index: kate/data/cpp.xml
===================================================================
---- kate/data/cpp.xml (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kate/data/cpp.xml (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kate/data/cpp.xml (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kate/data/cpp.xml (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<item> Q_DECLARE_FLAGS </item>
Index: kdefx/kcpuinfo.cpp
===================================================================
---- kdefx/kcpuinfo.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdefx/kcpuinfo.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdefx/kcpuinfo.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdefx/kcpuinfo.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -35,14 +35,6 @@
# define HAVE_GNU_INLINE_ASM
#endif
#if defined( __i386__ )
Index: kcmshell/main.cpp
===================================================================
---- kcmshell/main.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kcmshell/main.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kcmshell/main.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kcmshell/main.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -102,6 +102,10 @@
return 0;
}
kdDebug(780) << "According to \"" << module << "\"'s test function, it should Not be loaded." << endl;
Index: doc/kspell/index.docbook
===================================================================
---- doc/kspell/index.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ doc/kspell/index.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- doc/kspell/index.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ doc/kspell/index.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -9,6 +9,7 @@
<bookinfo>
</book>
Index: arts/knotify/knotify.desktop
===================================================================
---- arts/knotify/knotify.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ arts/knotify/knotify.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- arts/knotify/knotify.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ arts/knotify/knotify.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -42,7 +42,7 @@
Comment[es]=Demonio de notificación de KDE
Comment[et]=KDE süsteemsete märguannete deemon
Comment[fr]=Démon de notifications de KDE
Index: mimetypes/all.desktop
===================================================================
---- mimetypes/all.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/all.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/all.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/all.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Todos los archivos y directorios
Comment[et]=Kõik failid ja kataloogid
Comment[fy]=Alle Triemmen en Mappen
Index: mimetypes/audio/x-oggflac.desktop
===================================================================
---- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Audio FLAC de Ogg
Comment[et]=Ogg FLAC audiofail
Comment[ga]=Fuaim Ogg FLAC
Index: mimetypes/audio/vnd.rn-realaudio.desktop
===================================================================
---- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Comment[es]=Archivo de RealAudio
Comment[et]=RealAudio fail
Comment[fy]=RealAudio triem
Index: mimetypes/audio/x-aiff.desktop
===================================================================
---- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Sonido AIFF/Amiga
Comment[et]=AIFF/Amiga audiofail
Comment[fy]=AIFF-/Amiga-audio
Index: mimetypes/audio/mpegurl.desktop
===================================================================
---- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Sonido MPEG esquema 3 por transmisión
Comment[et]=MPEG layer 3 audiovoog
Comment[fy]=Streaming MPEG Layer3-audio
Index: mimetypes/audio/x-musepack.desktop
===================================================================
---- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[eo]=Musepack-sondosiero
Comment[et]=Musepack audiofail
Comment[ga]=Fuaim Musepack
Index: mimetypes/audio/x-mpegurl.desktop
===================================================================
---- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Sonido MPEG esquema 3 por transmisión
Comment[et]=MPEG layer 3 audiovoog
Comment[fy]=Streaming MPEG Layer3-audio
Index: mimetypes/audio/basic.desktop
===================================================================
---- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Sonido ULAW (Sun)
Comment[et]=ULAW (Sun) audiofail
Comment[fy]=ULAW (Sun) audiotriem
Index: mimetypes/audio/prs.sid.desktop
===================================================================
---- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,7 @@
Comment[es]=Música C64 SID
Comment[et]=C64 SID muusikafail
Comment[fy]=C64 SID Muzyk
Index: mimetypes/audio/x-mod.desktop
===================================================================
---- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Sonido SoundTracker de Amiga
Comment[et]=Amiga soundtrackeri audiofail
Comment[fy]=Amiga Soundtracker-audio
Index: mimetypes/audio/x-pn-realaudio.desktop
===================================================================
---- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo de RealAudio
Comment[et]=RealAudio fail
Comment[fy]=RealAudio triem
Index: mimetypes/audio/x-matroska.desktop
===================================================================
---- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Audio de Matroska
Comment[et]=Matroska audiofail
Comment[ga]=Fuaim Matroska
Index: mimetypes/audio/x-midi.desktop
===================================================================
---- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Sonido MIDI
Comment[et]=MIDI audiofail
Comment[fy]=MIDI-audio
Index: mimetypes/audio/mpeg.desktop
===================================================================
---- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,6 +22,7 @@
Comment[es]=Audio de MPEG
Comment[et]=MPEG audiofail
Comment[ga]=Fuaim MPEG
Index: mimetypes/audio/x-adpcm.desktop
===================================================================
---- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Sonido PCM
Comment[et]=PCM audiofail
Comment[fy]=PCM-audio
Index: mimetypes/audio/x-scpls.desktop
===================================================================
---- mimetypes/audio/x-scpls.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-scpls.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-scpls.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-scpls.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Lista de reproducción MP3 de ShoutCast
Comment[et]=ShoutCasti MP3 esitusnimekiri
Comment[fy]=MP3-ShoutCast-ôfspyllist
Index: mimetypes/audio/x-speex.desktop
===================================================================
---- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Audio de Speex
Comment[et]=Speex audiofail
Comment[ga]=Fuaim Speex
Index: mimetypes/audio/x-wav.desktop
===================================================================
---- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Sonido WAV
Comment[et]=WAV audiofail
Comment[fy]=WAV-audio
Index: mimetypes/audio/x-mp2.desktop
===================================================================
---- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,6 +21,7 @@
Comment[es]=Audio MPEG capa 2
Comment[et]=MPEG layer 2 audiofail
Comment[gl]=Son MPEG Capa 2
Index: mimetypes/audio/x-mp3.desktop
===================================================================
---- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Sonido MPEG esquema 3
Comment[et]=MPEG layer 3 audiofail
Comment[fy]=MPEG Layer3-audio
Index: mimetypes/audio/x-ms-wma.desktop
===================================================================
---- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,6 +18,7 @@
Comment[eo]=Vindoza Meta-sondosiero
Comment[et]=Windows Media audiofail
Comment[gl]=Vídeo de Windows Media
Index: mimetypes/multipart/x-mixed-replace.desktop
===================================================================
---- mimetypes/multipart/x-mixed-replace.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/multipart/x-mixed-replace.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/multipart/x-mixed-replace.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/multipart/x-mixed-replace.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Flujo de datos (envio del servidor)
Comment[et]=Andmevoog (server push)
Comment[fy]=Datastream (server push)
Index: mimetypes/multipart/mixed.desktop
===================================================================
---- mimetypes/multipart/mixed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/multipart/mixed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/multipart/mixed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/multipart/mixed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Documento compuesto
Comment[et]=Dokumentide kogum
Comment[fy]=Gearstald dokumint
Index: mimetypes/image/x-portable-pixmap.desktop
===================================================================
---- mimetypes/image/x-portable-pixmap.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-portable-pixmap.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-portable-pixmap.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-portable-pixmap.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Imagen portable Pixmap
Comment[et]=Portable pikselraster-pildifail
Comment[fy]=Portable Pixmap-ôfbylding
Index: mimetypes/image/x-dds.desktop
===================================================================
---- mimetypes/image/x-dds.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-dds.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-dds.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-dds.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,6 +15,7 @@
Comment[de]=DirectDraw-Oberfläche
Comment[eo]=Rekta desegnosurfaco
Comment[gl]=Superfície DirectDraw
Index: mimetypes/image/x-xcf-gimp.desktop
===================================================================
---- mimetypes/image/x-xcf-gimp.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-xcf-gimp.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-xcf-gimp.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-xcf-gimp.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Comment[es]=Formato de imagen nativo de GIMP
Comment[et]=GIMP-i pildifail
Comment[fy]=GIMP's eigen ôfbyldingsyndieling
Index: mimetypes/image/x-hdr.desktop
===================================================================
---- mimetypes/image/x-hdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-hdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-hdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-hdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,6 +15,7 @@
Comment[es]=Imagen de gran rango dinámico
Comment[et]=High Dynamic Range pildifail
Comment[fy]=High Dynamic Range-ôfbylding
Index: mimetypes/image/x-vnd.trolltech.qpicture.desktop
===================================================================
---- mimetypes/image/x-vnd.trolltech.qpicture.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-vnd.trolltech.qpicture.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-vnd.trolltech.qpicture.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-vnd.trolltech.qpicture.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Metaarchivo QPicture
Comment[et]=QPicture MetaFile
Comment[fy]=QPicture Metatriem
Index: mimetypes/image/svg+xml.desktop
===================================================================
---- mimetypes/image/svg+xml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/svg+xml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/svg+xml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/svg+xml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,7 @@
Comment[es]=Gráficos vectoriales escalables
Comment[et]=Skaleeritav vektorgraafika
Comment[ga]=Scalable Vector Graphics (SVG)
Index: mimetypes/image/x-xbm.desktop
===================================================================
---- mimetypes/image/x-xbm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-xbm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-xbm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-xbm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Imagen mapa de bits de X
Comment[et]=X bittraster-pildifail
Comment[fy]=X BitMap-ôfbylding
Index: mimetypes/image/x-eps.desktop
===================================================================
---- mimetypes/image/x-eps.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-eps.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-eps.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-eps.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Imagen PostScript encapsulado
Comment[et]=Kapseldatud PostScript pildifail
Comment[fy]=Ynsletten PostScript-ôfbylding
Index: mimetypes/image/x-exr.desktop
===================================================================
---- mimetypes/image/x-exr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-exr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-exr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-exr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,7 @@
Comment[es]=Imagen ILM EXR
Comment[et]=ILM EXR pildifail
Comment[fy]=ILM EXR ôfbylding
Index: mimetypes/image/cgm.desktop
===================================================================
---- mimetypes/image/cgm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/cgm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/cgm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/cgm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Metaarchivo de gráficos por ordenador
Comment[et]=Arvutigraafika metafail
Comment[fy]=Computer Graphics Meta-triem
Index: mimetypes/image/x-msod.desktop
===================================================================
---- mimetypes/image/x-msod.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-msod.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-msod.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-msod.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,6 +23,7 @@
Comment[es]=Dibujo de Microsoft Office
Comment[et]=MS Office'i joonistus
Comment[ga]=Líníocht Microsoft Office
Index: mimetypes/image/x-xpm.desktop
===================================================================
---- mimetypes/image/x-xpm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-xpm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-xpm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-xpm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Imagen mapa de pixels de X
Comment[et]=X pikselraster-pildifail
Comment[fy]=X PixMap-ôfbylding
Index: mimetypes/image/x-xcursor.desktop
===================================================================
---- mimetypes/image/x-xcursor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-xcursor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-xcursor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-xcursor.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Cursor de ratón X11
Comment[et]=X11 hiirekursor
Comment[fy]=X11 mûs rinnerke
Index: mimetypes/image/x-djvu-2.desktop
===================================================================
---- mimetypes/image/x-djvu-2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-djvu-2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-djvu-2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-djvu-2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Documento DjVu
Comment[et]=DjVu dokument
Comment[fy]=DjVu-dokumint
Index: mimetypes/image/x-djvu.desktop
===================================================================
---- mimetypes/image/x-djvu.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-djvu.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-djvu.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-djvu.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Documento DjVu
Comment[et]=DjVu dokument
Comment[fy]=DjVu-dokumint
Index: mimetypes/image/x-rgb.desktop
===================================================================
---- mimetypes/image/x-rgb.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-rgb.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-rgb.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-rgb.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,6 +21,7 @@
Comment[es]=Imagen SGI (RGB)
Comment[et]=SGI pildifail (RGB)
Comment[fy]=SGI ôfbylding (RBG)
Index: mimetypes/image/x-portable-greymap.desktop
===================================================================
---- mimetypes/image/x-portable-greymap.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-portable-greymap.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-portable-greymap.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-portable-greymap.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Imagen portable Graymap
Comment[et]=Portable Graymap pildifail
Comment[fy]=Portable Graymap-ôfbylding
Index: mimetypes/image/fax-g3.desktop
===================================================================
---- mimetypes/image/fax-g3.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/fax-g3.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/fax-g3.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/fax-g3.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Fax g3 CCITT
Comment[et]=CCITT g3 fax
Comment[fy]=CCITT G3-fax
Index: mimetypes/image/x-portable-bitmap.desktop
===================================================================
---- mimetypes/image/x-portable-bitmap.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-portable-bitmap.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-portable-bitmap.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-portable-bitmap.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Imagen Bitmap portable
Comment[et]=Portable bittraster-pildifail
Comment[fy]=Portable Bitmap-ôfbylding
Index: mimetypes/image/x-raw.desktop
===================================================================
---- mimetypes/image/x-raw.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-raw.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-raw.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-raw.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Imagen RAW de cámara
Comment[et]=Kaamera toorpilt
Comment[sr]=Сирова слика са камере
Index: mimetypes/image/x-wmf.desktop
===================================================================
---- mimetypes/image/x-wmf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-wmf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-wmf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-wmf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Comment[eo]=Vindoza Meta-grafiko-dosiero
Comment[es]=Metaarchivo de Windows
Comment[fy]=Windows Metatriem
Index: mimetypes/image/x-xfig.desktop
===================================================================
---- mimetypes/image/x-xfig.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/x-xfig.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/x-xfig.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/x-xfig.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo de XFig
Comment[et]=XFigi fail
Comment[fy]=XFig-triem
Index: mimetypes/image/fits.desktop
===================================================================
---- mimetypes/image/fits.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/image/fits.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/image/fits.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/image/fits.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Imagen FITS
Comment[et]=FITS pildifail
Comment[fy]=FITS-ôfbylding
Index: mimetypes/allfiles.desktop
===================================================================
---- mimetypes/allfiles.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/allfiles.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/allfiles.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/allfiles.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Todos los archivos
Comment[et]=Kõik failid
Comment[fy]=Alle triemmen
Index: mimetypes/application/chm.desktop
===================================================================
---- mimetypes/application/chm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/chm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/chm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/chm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -12,6 +12,7 @@
Comment[es]=Documento de ayuda HTML
Comment[et]=HTML abi dokument
Comment[fy]=HTML Helpdokumint
Index: mimetypes/application/x-graphite.desktop
===================================================================
---- mimetypes/application/x-graphite.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-graphite.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-graphite.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-graphite.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Gráfica científica Graphite
Comment[et]=Graphite Scientific graafik
Comment[fy]=Graphite - wittenskiplike grafyk
Index: mimetypes/application/x-pkcs12.desktop
===================================================================
---- mimetypes/application/x-pkcs12.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-pkcs12.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-pkcs12.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-pkcs12.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Paquete de certificado PKCS#12
Comment[et]=PKCS#12 sertifikaatide kogum
Comment[fy]=PKCS#12 sertifikaatbondel
Index: mimetypes/application/sieve.desktop
===================================================================
---- mimetypes/application/sieve.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/sieve.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/sieve.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/sieve.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Script de filtro de correo SIEVE
Comment[et]=SIEVE e-kirjade filtri skript
Comment[fy]=Filterskript foar SIEVE Mail
Index: mimetypes/application/x-tex-pk.desktop
===================================================================
---- mimetypes/application/x-tex-pk.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-tex-pk.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-tex-pk.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-tex-pk.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Fuente empaquetada
Comment[et]=Pakitud fondifail
Comment[fy]=Komprimearre lettertype
Index: mimetypes/application/x-vnd.kde.kexi.desktop
===================================================================
---- mimetypes/application/x-vnd.kde.kexi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-vnd.kde.kexi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-vnd.kde.kexi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-vnd.kde.kexi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Comment[es]=Archivo de proyecto Kexi
Comment[et]=Kexi projektifail
Comment[fy]=Kexi Project Triem
Index: mimetypes/application/x-cpio.desktop
===================================================================
---- mimetypes/application/x-cpio.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-cpio.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-cpio.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-cpio.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo CPIO
Comment[et]=CPIO arhiiv
Comment[fi]=CPIO-paketti
Comment[fr]=Archive CPIO
Comment[fy]=CPIO-argyf
+@@ -52,7 +52,7 @@
+ Comment[nso]=Polokelo ya CPIO
+ Comment[pa]=CPIO ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum CPIO
+-Comment[pt]=Arquivo CPIO
++Comment[pt]=Pacote CPIO
+ Comment[pt_BR]=Pacote CPIO
+ Comment[ro]=Arhivă CPIO
+ Comment[ru]=Архив CPIO
Index: mimetypes/application/x-magicpoint.desktop
===================================================================
---- mimetypes/application/x-magicpoint.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-magicpoint.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-magicpoint.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-magicpoint.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Presentación de MagicPoint
Comment[et]=MagicPointi esitlus
Comment[fy]=MagicPoint Presentaasje
Index: mimetypes/application/vnd.mozilla.xul+xml.desktop
===================================================================
---- mimetypes/application/vnd.mozilla.xul+xml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.mozilla.xul+xml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.mozilla.xul+xml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.mozilla.xul+xml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,7 @@
Comment[es]=Archivo XUL de Mozilla
Comment[et]=Mozilla XUL-fail
Comment[fy]=Mozilla XUL Triem
Index: mimetypes/application/x-mplayer2.desktop
===================================================================
---- mimetypes/application/x-mplayer2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-mplayer2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-mplayer2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-mplayer2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -7,18 +7,31 @@
Icon=multimedia
X-KDE-AutoEmbed=true
Comment[sv]=Microsoft media-format
Index: mimetypes/application/x-bittorrent.desktop
===================================================================
---- mimetypes/application/x-bittorrent.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-bittorrent.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-bittorrent.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-bittorrent.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Comment[es]=Descarga BitTorrent
Comment[et]=BitTorrent allalaadimine
Comment[fy]=Ynlade BitTorrent
Index: mimetypes/application/x-sharedlib.desktop
===================================================================
---- mimetypes/application/x-sharedlib.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-sharedlib.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-sharedlib.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-sharedlib.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Biblioteca compartida
Comment[et]=Jagatud teek
Comment[fy]=Dielde bibleteek
Index: mimetypes/application/vnd.sun.xml.base.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.base.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.base.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.base.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.base.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -13,6 +13,7 @@
Comment[es]=Base de datos de OpenOffice.org
Comment[et]=OpenOffice.org-i andmebaas
Comment[fy]=OpenOffice.org-databank
Index: mimetypes/application/x-linguist.desktop
===================================================================
---- mimetypes/application/x-linguist.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-linguist.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-linguist.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-linguist.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Archivo fuente de traducción de Qt
Comment[et]=Qt Translationi lähtetekst
Comment[fy]=Qt Fertaal Boarnetriem
Index: mimetypes/application/x-tbz.desktop
===================================================================
---- mimetypes/application/x-tbz.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-tbz.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-tbz.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-tbz.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -13,6 +13,7 @@
Comment[es]=Archivo Tar comprimido con Bzip2
Comment[et]=Bzip2-tihendusega tar-arhiiv
Comment[fi]=Bzip2-pakattu Tar-paketti
Comment[fr]=Archive Tar compactée par Bzip2
Comment[fy]=Mei Bzip2 ynpakt Tar-argyf
+@@ -34,7 +35,7 @@
+ Comment[nn]=Bzip2a tar-arkiv
+ Comment[pa]=Bzip2-ed ਟਾਰ ਆਰਚੀਵ
+ Comment[pl]=Archiwum po tarowaniu i spakowaniu bzip2
+-Comment[pt]=Arquivo Tar comprimido com Bzip2
++Comment[pt]=Pacote Tar comprimido com Bzip2
+ Comment[pt_BR]=Arquivo TAR Bzip2
+ Comment[ro]=Arhivă Tar comprimată cu BZip2
+ Comment[ru]=Сжатый bzip архив tar
Index: mimetypes/application/x-zip-compressed.desktop
===================================================================
---- mimetypes/application/x-zip-compressed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-zip-compressed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-zip-compressed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-zip-compressed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo Zip
Comment[et]=Zip-arhiiv
Comment[fi]=Zip-paketti
Comment[fr]=Archive Zip
Comment[fy]=Zip-argyf
+@@ -51,7 +51,7 @@
+ Comment[nso]=Polokelo ya Zip
+ Comment[pa]=Zip ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Zip
+-Comment[pt]=Arquivo Zip
++Comment[pt]=Pacote Zip
+ Comment[pt_BR]=Arquivo ZIP
+ Comment[ro]=Arhivă ZIP
+ Comment[ru]=Архив zip
Index: mimetypes/application/x-kugar.desktop
===================================================================
---- mimetypes/application/x-kugar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-kugar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-kugar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-kugar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo de datos de Kugar
Comment[et]=Kugari andmefail
Comment[fy]=Kugar Datatriem
Index: mimetypes/application/x-gzip.desktop
===================================================================
---- mimetypes/application/x-gzip.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-gzip.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-gzip.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-gzip.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Archivo comprimido Gzip
Comment[et]=Gzip arhiiv
Comment[fy]=Gzip-triem
Index: mimetypes/application/vnd.palm.desktop
===================================================================
---- mimetypes/application/vnd.palm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.palm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.palm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.palm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Documento Palm
Comment[et]=Palmi dokument
Comment[fy]=Palm Dokumint
Index: mimetypes/application/x-tzo.desktop
===================================================================
---- mimetypes/application/x-tzo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-tzo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-tzo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-tzo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo Tar comprimido en Lzop
Comment[et]=Lzopitud TAR-arhiiv
Comment[fi]=Lzop-pakattu Tar-paketti
Comment[fr]=Archive Tar compactée par Lzop
Comment[fy]=Mei Lzop komprimearre Tar-argyf
+@@ -51,7 +51,7 @@
+ Comment[oc]=Archius tar lzopats
+ Comment[pa]=Lzopped Tar ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum po tarowaniu i spakowaniu Lzoppem
+-Comment[pt]=Arquivo Tar Lzop
++Comment[pt]=Pacote Tar Lzop
+ Comment[pt_BR]=Pacote Tar compactado com Lzop
+ Comment[ro]=Arhivă TAR comprimată cu Lzop
+ Comment[ru]=Сжатый lzop архив tar
Index: mimetypes/application/x-font-ghostscript.desktop
===================================================================
---- mimetypes/application/x-font-ghostscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-ghostscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-ghostscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-ghostscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Fuente Ghostscript
Comment[et]=Ghostscripti font
Comment[fy]=Ghostscript-lettertype
Index: mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Plantilla de hoja de cálculo de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument arvutustabeli mall
Comment[fy]=OASIS OpenDocument rekkenboerdsjabloan
Index: mimetypes/application/x-python-bytecode.desktop
===================================================================
---- mimetypes/application/x-python-bytecode.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-python-bytecode.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-python-bytecode.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-python-bytecode.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Código byte de Python
Comment[et]=Pythoni baitkood
Comment[fy]=Python bytekoade
Index: mimetypes/application/x-webarchive.desktop
===================================================================
---- mimetypes/application/x-webarchive.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-webarchive.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-webarchive.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-webarchive.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,6 +15,7 @@
Comment[es]=Archivo web
Comment[et]=Veebiarhiiv
Comment[fi]=www-paketti
Comment[fr]=Archive Web
Comment[fy]=Webargyf
+@@ -40,7 +41,7 @@
+ Comment[nn]=Nett-arkiv
+ Comment[pa]=ਵੈੱਬ ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum strony WWW
+-Comment[pt]=Arquivo Web
++Comment[pt]=Pacote Web
+ Comment[pt_BR]=Arquivo Web
+ Comment[ro]=Arhivă web
+ Comment[ru]=Архив Веб
Index: mimetypes/application/pkcs7-signature.desktop
===================================================================
---- mimetypes/application/pkcs7-signature.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/pkcs7-signature.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/pkcs7-signature.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/pkcs7-signature.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Firma suelta S/MIME
Comment[et]=Eraldiseisev S/MIME signatuur
Comment[fy]=loskeppele S/MIME-sinjatuer
Index: mimetypes/application/pgp.desktop
===================================================================
---- mimetypes/application/pgp.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/pgp.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/pgp.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/pgp.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Mensaje cifrado o firmado PGP/MIME
Comment[et]=PGP-ga krüptitud või signeeritud kiri
Comment[fy]=PGP fersifere of Tekene Berjocht
Index: mimetypes/application/vnd.oasis.opendocument.text.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.text.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.text.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.text.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.text.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=texto de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument tekstidokument
Comment[fy]=OASIS OpenDocument tekst
Index: mimetypes/application/x-ruby.desktop
===================================================================
---- mimetypes/application/x-ruby.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-ruby.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-ruby.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-ruby.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Comment[es]=Programa en Ruby
Comment[et]=Ruby rakendus
Comment[fy]=Ruby Programma
Index: mimetypes/application/x-gettext.desktop
===================================================================
---- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Catálogo de mensajes de GNU Gettext
Comment[et]=GNU Gettexti teadete kataloog
Comment[fy]=GNU Gettext Berjocht Katalog
Index: mimetypes/application/x-tgif.desktop
===================================================================
---- mimetypes/application/x-tgif.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-tgif.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-tgif.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-tgif.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Documento TGIF
Comment[et]=TGIF dokument
Comment[fy]=TGIF-dokumint
Index: mimetypes/application/vnd.oasis.opendocument.text-template.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.text-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.text-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.text-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.text-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Plantilla de documento de texto de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument tekstidokumendi mall
Comment[fy]=OpenOffice.org tekstsjabloan
Index: mimetypes/application/vnd.sun.xml.writer.master.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.writer.master.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.writer.master.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.writer.master.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.writer.master.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Comment[es]=Documento de texto maestro de OpenOffice.org
Comment[et]=OpenOffice.org-i peatekstidokument
Comment[fy]=OpenOffice.org Haad tekst Dokumint
Index: mimetypes/application/x-font-otf.desktop
===================================================================
---- mimetypes/application/x-font-otf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-otf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-otf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-otf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Fuente OpenType
Comment[et]=OpenType'i font
Comment[fy]=OpenType lettertype
Index: mimetypes/application/smil.desktop
===================================================================
---- mimetypes/application/smil.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/smil.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/smil.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/smil.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Lenguaje de integración multimedia sincronizada
Comment[et]=Sünkroniseeritud Multimeedia Integreerimise Keel
Comment[fy]=Synchronized Multimedia Integration Language (SMIL)
Index: mimetypes/application/vnd.sun.xml.calc.template.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.calc.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.calc.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.calc.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.calc.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Plantilla de hoja de cálculo de OpenOffice.org
Comment[et]=OpenOffice.org-i arvutustabeli mall
Comment[fy]=OpenOffice.org Rekkenboerd Sjabloan
Index: mimetypes/application/x-bzip.desktop
===================================================================
---- mimetypes/application/x-bzip.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-bzip.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-bzip.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-bzip.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Archivo comprimido Bzip
Comment[et]=Bzip-arhiiv
Comment[fy]=Bzip-Triem
Index: mimetypes/application/xml-dtd.desktop
===================================================================
---- mimetypes/application/xml-dtd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/xml-dtd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/xml-dtd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/xml-dtd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -13,6 +13,7 @@
Comment[es]=Documento DTD XML
Comment[et]=XML DTD-dokument
Comment[fy]=XML DTD-dokumint
Index: mimetypes/application/x-arc.desktop
===================================================================
---- mimetypes/application/x-arc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-arc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-arc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-arc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo ARC
Comment[et]=ARC arhiiv
Comment[fi]=ARC-paketti
Comment[fr]=Archive ARC
Comment[fy]=ARC Argyf
+@@ -50,7 +50,7 @@
+ Comment[nn]=ARC-arkiv
+ Comment[pa]=ARC ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum ARC
+-Comment[pt]=Arquivo ARC
++Comment[pt]=Pacote ARC
+ Comment[pt_BR]=Pacote ARC
+ Comment[ro]=Arhivă ARC
+ Comment[ru]=Архив ARC
Index: mimetypes/application/pkcs7-mime.desktop
===================================================================
---- mimetypes/application/pkcs7-mime.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/pkcs7-mime.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/pkcs7-mime.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/pkcs7-mime.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Datos formateados PKCS#7 (S/MIME)
Comment[et]=PKCS#7 (S/MIME) vormindatud andmed
Comment[fy]=PKCS#7-opmakke data (S/MIME)
Index: mimetypes/application/x-zoo.desktop
===================================================================
---- mimetypes/application/x-zoo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-zoo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-zoo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-zoo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo Zoo
Comment[et]=Zoo-arhiiv
Comment[fi]=Zoo-paketti
Comment[fr]=Archive Zoo
Comment[fy]=Zoo-argyf
+@@ -52,7 +52,7 @@
+ Comment[nso]=Polokelo ya Zoo
+ Comment[pa]=Zoo ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Zoo
+-Comment[pt]=Arquivo Zoo
++Comment[pt]=Pacote Zoo
+ Comment[pt_BR]=Pacote Zoo
+ Comment[ro]=Arhivă ZOO
+ Comment[ru]=Архив zoo
Index: mimetypes/application/vnd.sun.xml.writer.template.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.writer.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.writer.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.writer.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.writer.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Plantilla de documento de texto de OpenOffice.org
Comment[et]=OpenOffice.org-i tekstidokumendi mall
Comment[fy]=OpenOffice.org Tekst Dokumint Sjabloan
Index: mimetypes/application/x-font-pcf.desktop
===================================================================
---- mimetypes/application/x-font-pcf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-pcf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-pcf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-pcf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Fuente bitmap PCF
Comment[et]=PCF bittrasterfont
Comment[fy]=PCF Bitmap-lettertype
Index: mimetypes/application/x-arj.desktop
===================================================================
---- mimetypes/application/x-arj.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-arj.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-arj.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-arj.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo comprimido ARJ
Comment[et]=ARJ arhiiv
Comment[fi]=ARJ-paketti
Comment[fr]=Archive ARJ
Comment[fy]=ARJ-Argyf
+@@ -52,7 +52,7 @@
+ Comment[nso]=Polokelo ya ARJ
+ Comment[pa]=ARJ ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum ARJ
+-Comment[pt]=Arquivo ARJ
++Comment[pt]=Pacote ARJ
+ Comment[pt_BR]=Pacote ARJ
+ Comment[ro]=Arhivă ARJ
+ Comment[ru]=Архив ARJ
Index: mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Plantilla de presentación de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument esitlusemall
Comment[fy]=OASIS OpenDocument presintaasjesjabloan
Index: mimetypes/application/x-trash.desktop
===================================================================
---- mimetypes/application/x-trash.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-trash.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-trash.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-trash.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo de copia de seguridad
Comment[et]=Varukoopia
Comment[sq]=Skedë Rezervë
Index: mimetypes/application/x-siag.desktop
===================================================================
---- mimetypes/application/x-siag.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-siag.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-siag.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-siag.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Hoja de cálculo de Siag
Comment[et]=Siagi tabel
Comment[fy]=Siag Rekkenboerd
Index: mimetypes/application/x-egon.desktop
===================================================================
---- mimetypes/application/x-egon.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-egon.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-egon.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-egon.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Comment[eo]=Egon-vivigilo
Comment[es]=Archivo de Egon Animator
Comment[fy]=Egon-animaasjeprogramma
Index: mimetypes/application/x-ace.desktop
===================================================================
---- mimetypes/application/x-ace.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-ace.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-ace.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-ace.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo ACE
Comment[et]=ACE arhiiv
Comment[fi]=ACE-paketti
Comment[fr]=Archive ACE
Comment[fy]=ACE Argyf
+@@ -50,7 +50,7 @@
+ Comment[nn]=ACE-arkiv
+ Comment[pa]=ACE ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum ACE
+-Comment[pt]=Arquivo ACE
++Comment[pt]=Pacote ACE
+ Comment[pt_BR]=Arquivo ACE
+ Comment[ro]=Arhivă ACE
+ Comment[ru]=Архив ACE
Index: mimetypes/application/x-kde-wallet.desktop
===================================================================
---- mimetypes/application/x-kde-wallet.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-kde-wallet.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-kde-wallet.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-kde-wallet.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Archivo de cartera de KDE
Comment[et]=KDE turvalaeka fail
Comment[fy]=KDE Wallet Triem
Index: mimetypes/application/x-mimearchive.desktop
===================================================================
---- mimetypes/application/x-mimearchive.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-mimearchive.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-mimearchive.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-mimearchive.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Comment[es]=Archivo web MIME encapsulado
Comment[et]=MIME kapselduses veebiarhiiv
Comment[fi]=Mime pakattu www-paketti
Comment[fr]=Archive Web encapsulé MIME
Comment[fy]=Mime Ynsletten webargyf
+@@ -37,7 +38,7 @@
+ Comment[nn]=Mime-omslutta nettarkiv
+ Comment[pa]=Mime ਇੰਕੈਪਸੂਲੇਟਿਡ ਵੈੱਬ ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum strony WWW opakowane za pomocą MIME
+-Comment[pt]=Arquivo Web Encapsulado em MIME
++Comment[pt]=Pacote Web Encapsulado em MIME
+ Comment[pt_BR]=Arquivo Web Encapsulado
+ Comment[ro]=Arhivă web MIME comprimată
+ Comment[ru]=Архив Веб в формате MIME
Index: mimetypes/application/x-deb.desktop
===================================================================
---- mimetypes/application/x-deb.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-deb.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-deb.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-deb.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Paquete Debian
Comment[et]=Debiani pakett
Comment[fy]=Debian Pakket
Index: mimetypes/application/x-ica.desktop
===================================================================
---- mimetypes/application/x-ica.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-ica.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-ica.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-ica.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Comment[es]=Cliente de configuración Citrix ICA
Comment[et]=Citrix ICA kliendi seadistus
Comment[fy]=Citrix ICA Brûkers Ynstelling
Index: mimetypes/application/x-rpm.desktop
===================================================================
---- mimetypes/application/x-rpm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-rpm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-rpm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-rpm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo de paquete RPM
Comment[et]=RPM-pakett
Comment[fy]=RPM-pakket
Index: mimetypes/application/x-java-jnlp-file.desktop
===================================================================
---- mimetypes/application/x-java-jnlp-file.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-java-jnlp-file.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-java-jnlp-file.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-java-jnlp-file.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -12,6 +12,7 @@
Comment[es]=Aplicación de Java Web Start
Comment[et]=Java Web Start rakendus
Comment[fy]=Java Web Start-applikaasje
Index: mimetypes/application/x-designer.desktop
===================================================================
---- mimetypes/application/x-designer.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-designer.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-designer.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-designer.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo de Qt Designer
Comment[et]=Qt Disaineri fail
Comment[fy]=Qt Designer-triem
Index: mimetypes/application/vnd.sun.xml.writer.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.writer.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.writer.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.writer.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.writer.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Documento de texto de OpenOffice.org
Comment[et]=OpenOffice.org-i tekstidokument
Comment[fy]=OpenOffice.org Tekst Dokumint
Index: mimetypes/application/x-perl.desktop
===================================================================
---- mimetypes/application/x-perl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-perl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-perl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-perl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Programa en Perl
Comment[et]=Perli rakendus
Comment[fy]=Perl-programma
Index: mimetypes/application/x-java-applet.desktop
===================================================================
---- mimetypes/application/x-java-applet.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-java-applet.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-java-applet.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-java-applet.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Applet de Java
Comment[et]=Java aplett
Comment[pa]=ਜਾਵਾ(Java) ਐਪਲਿਟ
Index: mimetypes/application/postscript.desktop
===================================================================
---- mimetypes/application/postscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/postscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/postscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/postscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Comment[es]=Documento PostScript
Comment[et]=PostScript-dokument
Comment[fy]=PostScript-dokumint
Index: mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Plantilla de documento gráfico de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument joonistusemall
Comment[fy]=OASIS OpenDocument grafyske foarstellings sjabloan
Index: mimetypes/application/vnd.oasis.opendocument.presentation.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.presentation.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.presentation.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.presentation.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.presentation.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Presentación de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument esitlus
Comment[fy]=OASIS OpenDocument presintaasje
Index: mimetypes/application/x-xliff.desktop
===================================================================
---- mimetypes/application/x-xliff.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-xliff.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-xliff.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-xliff.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Archivo de traducción XLIFF
Comment[et]=XLIFF tõlkefail
Comment[fy]=XLIFF-FertalingsTriem
Index: mimetypes/application/x-karbon.desktop
===================================================================
---- mimetypes/application/x-karbon.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-karbon.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-karbon.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-karbon.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Documento de Karbon14
Comment[et]=Karbon14 dokument
Comment[fy]=Karbon14 dokumint
Index: mimetypes/application/x-jar.desktop
===================================================================
---- mimetypes/application/x-jar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-jar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-jar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-jar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo Java
Comment[et]=Java arhiiv
Comment[fi]=Java-paketti
Comment[fr]=Archive Java
Comment[fy]=Java-argyf
+@@ -55,7 +55,7 @@
+ Comment[oc]=Archiu Java
+ Comment[pa]=ਜਾਵਾ(Java) ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Javy
+-Comment[pt]=Arquivo Java
++Comment[pt]=Pacote Java
+ Comment[pt_BR]=Pacote Java
+ Comment[ro]=Arhivă Java
+ Comment[ru]=Архив Java
Index: mimetypes/application/java.desktop
===================================================================
---- mimetypes/application/java.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/java.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/java.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/java.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Clase Java
Comment[et]=Java klass
Comment[fy]=Java-klasse
Index: mimetypes/application/pgp-encrypted.desktop
===================================================================
---- mimetypes/application/pgp-encrypted.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/pgp-encrypted.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/pgp-encrypted.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/pgp-encrypted.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Cabecera de mensaje cifrado PGP/MIME
Comment[et]=PGP/MIME krüptitud kirja päis
Comment[fy]=PGP/MIME-fersifere koptekst fan berjocht
Index: mimetypes/application/x-ogg.desktop
===================================================================
---- mimetypes/application/x-ogg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-ogg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-ogg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-ogg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Multimedia Ogg
Comment[et]=Ogg multimeedia
Comment[fy]=Ogg Multymedia
Index: mimetypes/application/vnd.oasis.opendocument.image.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.image.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.image.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.image.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.image.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Imagen de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument pilt
Comment[fy]=OASIS OpenDocument ôfbylding
Index: mimetypes/application/vnd.sun.xml.impress.template.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.impress.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.impress.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.impress.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.impress.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Plantilla de presentación de OpenOffice.org
Comment[et]=OpenOffice.org-i esitlusemall
Comment[fy]=OpenOffice.org Presentaasje Sjabloan
Index: mimetypes/application/x-archive.desktop
===================================================================
---- mimetypes/application/x-archive.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-archive.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-archive.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-archive.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Archivo Ar
Comment[et]=Ar arhiiv
Comment[fi]=Ar-paketti
Comment[fr]=Archive AR
Comment[fy]=Ar-Argyf
+@@ -49,7 +49,7 @@
+ Comment[nso]=Polokelo ya Ar
+ Comment[pa]=Ar ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Ar
+-Comment[pt]=Arquivo Ar
++Comment[pt]=Pacote Ar
+ Comment[pt_BR]=Arquivo AR
+ Comment[ro]=Arhivă Ar
+ Comment[ru]=Архив Ar
Index: mimetypes/application/vnd.rn-realmedia.desktop
===================================================================
---- mimetypes/application/vnd.rn-realmedia.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.rn-realmedia.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.rn-realmedia.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.rn-realmedia.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo de RealMedia
Comment[et]=RealMedia fail
Comment[fy]=RealMedia Triem
Index: mimetypes/application/x-rar.desktop
===================================================================
---- mimetypes/application/x-rar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-rar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-rar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-rar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo RAR
Comment[et]=Rar arhiiv
Comment[fi]=Rar-paketti
Comment[fr]=Archive Rar
Comment[fy]=Rar-argyf
+@@ -52,7 +52,7 @@
+ Comment[nso]=Polokelo ya Rar
+ Comment[pa]=Rar ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Rar
+-Comment[pt]=Arquivo Rar
++Comment[pt]=Pacote Rar
+ Comment[pt_BR]=Pacote Rar
+ Comment[ro]=Arhivă RAR
+ Comment[ru]=Архив rar
Index: mimetypes/application/vnd.stardivision.math.desktop
===================================================================
---- mimetypes/application/vnd.stardivision.math.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.stardivision.math.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.stardivision.math.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.stardivision.math.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,6 +21,7 @@
Comment[es]=Documentos matemáticos de StarOffice
Comment[et]=StarOffice Math'i dokument
Comment[fy]=StarOffice Rekken Dokumint
Index: mimetypes/application/x-iso.desktop
===================================================================
---- mimetypes/application/x-iso.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-iso.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-iso.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-iso.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,6 +18,7 @@
Comment[es]=Archivo de imagen ISO9660
Comment[et]=ISO9660 tõmmisefail
Comment[fy]=ISO9660 Ofbylding Triem
Index: mimetypes/application/x-font-snf.desktop
===================================================================
---- mimetypes/application/x-font-snf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-snf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-snf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-snf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Fuente bitmap SNF
Comment[et]=SNF bittrasterfont
Comment[fy]=SNF Bitmap-lettertype
Index: mimetypes/application/pgp-keys.desktop
===================================================================
---- mimetypes/application/pgp-keys.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/pgp-keys.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/pgp-keys.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/pgp-keys.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Paquete de certificado OpenPGP
Comment[et]=OpenPGP võtmepaar
Comment[fy]=OpenPGP Kaai Bondel
Index: mimetypes/application/x-compress.desktop
===================================================================
---- mimetypes/application/x-compress.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-compress.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-compress.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-compress.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo comprimido de UNIX
Comment[et]=UNIX arhiiv
Comment[fy]=UNIX-komprimearre triem
Index: mimetypes/application/msexcel.desktop
===================================================================
---- mimetypes/application/msexcel.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/msexcel.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/msexcel.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/msexcel.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Comment[es]=Hoja de cálculo de Microsoft Excel
Comment[et]=Microsoft Exceli tabel
Comment[fy]=Microsoft Excel-Rekkenboerd
Index: mimetypes/application/x-applixspread.desktop
===================================================================
---- mimetypes/application/x-applixspread.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-applixspread.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-applixspread.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-applixspread.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Documento hoja de cálculo de Applix
Comment[et]=Applixi arvutustabel
Comment[fy]=Applix Rekkenboerd dokumint
Index: mimetypes/application/x-font-ttc.desktop
===================================================================
---- mimetypes/application/x-font-ttc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-ttc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-ttc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-ttc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Colección de fuentes TrueType
Comment[et]=TrueType fondikogu
Comment[fy]=TrueType lettertype Samling
Index: mimetypes/application/vnd.ms-excel.desktop
===================================================================
---- mimetypes/application/vnd.ms-excel.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.ms-excel.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.ms-excel.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.ms-excel.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Hoja de cálculo de Microsoft Excel
Comment[et]=Microsoft Exceli tabel
Comment[fy]=Microsoft Excel-Rekkenboerd
Index: mimetypes/application/x-bz2dvi.desktop
===================================================================
---- mimetypes/application/x-bz2dvi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-bz2dvi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-bz2dvi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-bz2dvi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Archivo DVI comprimido con Bzip2
Comment[et]=Bzip2 tihendusega DVI-fail
Comment[fy]=Bzip2 komprimearre DVI Triem
Index: mimetypes/application/x-7z.desktop
===================================================================
---- mimetypes/application/x-7z.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-7z.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-7z.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-7z.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Archivo Zip-7
Comment[et]=7-Zip arhiiv
Comment[fi]=7-Zip-paketti
Comment[fr]=Archive 7-Zip
Comment[fy]=7-zip-Argyf
+@@ -41,7 +42,7 @@
+ Comment[nn]=7-Zip-arkiv
+ Comment[pa]=7-Zip ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum 7-Zip
+-Comment[pt]=Arquivo 7-Zip
++Comment[pt]=Pacote 7-Zip
+ Comment[pt_BR]=Arquivo 7-Zip
+ Comment[ro]=Arhivă 7-ZIP
+ Comment[ru]=Архив 7-zip
@@ -62,3 +63,8 @@
Comment[zh_CN]=7-Zip 归档
Comment[zh_HK]=7-Zip 壓縮檔
+
Index: mimetypes/application/x-font-ttf.desktop
===================================================================
---- mimetypes/application/x-font-ttf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-ttf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-ttf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-ttf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Fuente TrueType
Comment[et]=TrueType font
Comment[fy]=TrueType lettertype
Index: mimetypes/application/x-msaccess.desktop
===================================================================
---- mimetypes/application/x-msaccess.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-msaccess.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-msaccess.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-msaccess.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Base de datos de Microsoft Access
Comment[et]=Microsoft Accessi andmebaas
Comment[fi]=Microsoft Access -tietokanta
Comment[fr]=Base de données Microsoft Access
Comment[fy]=Microsoft Access Databank
+@@ -49,7 +49,7 @@
+ Comment[nn]=Microsoft Access-database
+ Comment[pa]=Microsoft Access ਡਾਟਾਬੇਸ
+ Comment[pl]=Baza danych Microsoft Access
+-Comment[pt]=Base de Dados Microsoft Access
++Comment[pt]=Base de Dados do Microsoft Office
+ Comment[pt_BR]=Base de Dados do Microsoft Access
+ Comment[ro]=Bază de date Microsoft Access
+ Comment[ru]=База данных Microsoft Access
Index: mimetypes/application/x-zip.desktop
===================================================================
---- mimetypes/application/x-zip.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-zip.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-zip.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-zip.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo Zip
Comment[et]=Zip-arhiiv
Comment[fi]=Zip-paketti
Comment[fr]=Archive Zip
Comment[fy]=Zip-argyf
+@@ -52,7 +52,7 @@
+ Comment[nso]=Polokelo ya Zip
+ Comment[pa]=Zip ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Zip
+-Comment[pt]=Arquivo Zip
++Comment[pt]=Pacote Zip
+ Comment[pt_BR]=Arquivo ZIP
+ Comment[ro]=Arhivă ZIP
+ Comment[ru]=Архив zip
Index: mimetypes/application/vnd.ms-powerpoint.desktop
===================================================================
---- mimetypes/application/vnd.ms-powerpoint.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.ms-powerpoint.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.ms-powerpoint.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.ms-powerpoint.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Presentación de Microsoft PowerPoint
Comment[et]=Microsoft PowerPointi esitlus
Comment[fy]=Microsoft PowerPoint Presintaasje
Index: mimetypes/application/x-kcsrc.desktop
===================================================================
---- mimetypes/application/x-kcsrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-kcsrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-kcsrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-kcsrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Comment[es]=Tema de color de KDE
Comment[et]=KDE värviteema
Comment[fy]=KDE Kleur tema
Index: mimetypes/application/vnd.ms-word.desktop
===================================================================
---- mimetypes/application/vnd.ms-word.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.ms-word.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.ms-word.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.ms-word.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Documento de Microsoft Word
Comment[et]=Microsoft Wordi dokument
Comment[fy]=Microsoft Word-dokumint
Index: mimetypes/application/x-gzpostscript.desktop
===================================================================
---- mimetypes/application/x-gzpostscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-gzpostscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-gzpostscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-gzpostscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo PostScript comprimido con Gzip
Comment[et]=GZIPiga pakitud PostScript fail
Comment[fy]=Mei Gzip komprimearre PostScript-triem
Index: mimetypes/application/vnd.stardivision.impress.desktop
===================================================================
---- mimetypes/application/vnd.stardivision.impress.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.stardivision.impress.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.stardivision.impress.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.stardivision.impress.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Presentación Impress de StarOffice
Comment[et]=StarOffice Impress'i esitlus
Comment[fy]=StarOffice Impress Presintaasje
Index: mimetypes/application/x-java.desktop
===================================================================
---- mimetypes/application/x-java.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-java.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-java.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-java.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Clase Java
Comment[et]=Java klass
Comment[fy]=Java-klasse
Index: mimetypes/application/x-dvi.desktop
===================================================================
---- mimetypes/application/x-dvi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-dvi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-dvi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-dvi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo TeX independiente del dispositivo
Comment[et]=TeX seadmest sõltumatu fail
Comment[fy]=TeX Device Independent-triem
Index: mimetypes/application/xhtml+xml.desktop
===================================================================
---- mimetypes/application/xhtml+xml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/xhtml+xml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/xhtml+xml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/xhtml+xml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Documento familiar de XHTML
Comment[et]=XHTML-dokument
Comment[fy]=XHTML Family Dokumint
Index: mimetypes/application/vnd.sun.xml.calc.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.calc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.calc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.calc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.calc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Hoja de cálculo de OpenOffice.org
Comment[et]=OpenOffice.org-i arvutustabel
Comment[fy]=OpenOffice.org Rekkenboerd
Index: mimetypes/application/x-applixword.desktop
===================================================================
---- mimetypes/application/x-applixword.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-applixword.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-applixword.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-applixword.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Documento de texto de Applix
Comment[et]=Applixi tekstidokument
Comment[fy]=Applix Words-dokumint
Index: mimetypes/application/pkcs10.desktop
===================================================================
---- mimetypes/application/pkcs10.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/pkcs10.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/pkcs10.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/pkcs10.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Solicitud de certificación S/MIME
Comment[et]=S/MIME sertifitseerimise päring
Comment[fy]=S/MIME sertifikaat-oanfraach
Index: mimetypes/application/vnd.stardivision.chart.desktop
===================================================================
---- mimetypes/application/vnd.stardivision.chart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.stardivision.chart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.stardivision.chart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.stardivision.chart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,7 @@
Comment[es]=Hoja de cálculo de StarOffice
Comment[et]=StarOffice'i diagramm
Comment[ga]=Cairt StarOffice
Index: mimetypes/application/vnd.stardivision.calc.desktop
===================================================================
---- mimetypes/application/vnd.stardivision.calc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.stardivision.calc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.stardivision.calc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.stardivision.calc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Hoja de cálculo de StarOffice
Comment[et]=StarOffice Calc'i arvutustabel
Comment[fy]=StarOffice Calc Rekkenboerd
Index: mimetypes/application/mspowerpoint.desktop
===================================================================
---- mimetypes/application/mspowerpoint.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/mspowerpoint.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/mspowerpoint.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/mspowerpoint.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Comment[es]=Presentación de Microsoft PowerPoint
Comment[et]=Microsoft PowerPointi esitlus
Comment[fy]=Microsoft PowerPoint Presintaasje
Index: mimetypes/application/x-object.desktop
===================================================================
---- mimetypes/application/x-object.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-object.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-object.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-object.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Código objeto
Comment[et]=Objektkood
Comment[fy]=Objektkoade
Index: mimetypes/application/vnd.ms-asf.desktop
===================================================================
---- mimetypes/application/vnd.ms-asf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.ms-asf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.ms-asf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.ms-asf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Medios ASF
Comment[et]=ASF meediafail
Comment[fy]=ASF-media
Index: mimetypes/application/x-desktop.desktop
===================================================================
---- mimetypes/application/x-desktop.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-desktop.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-desktop.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-desktop.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de configuración del escritorio
Comment[et]=Töölaua seadistuste fail
Comment[nn]=Skrivebordsoppsett-fil
Index: mimetypes/application/x-debian-package.desktop
===================================================================
---- mimetypes/application/x-debian-package.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-debian-package.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-debian-package.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-debian-package.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Paquete Debian
Comment[et]=Debiani pakett
Comment[fy]=Debian Pakket
Index: mimetypes/application/x-x509-ca-cert.desktop
===================================================================
---- mimetypes/application/x-x509-ca-cert.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-x509-ca-cert.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-x509-ca-cert.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-x509-ca-cert.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,6 +21,7 @@
Comment[es]=Certificado DER, PEM, o Netscape codificado según X.509
Comment[et]=DER, PEM või Netscape'i kodeeritud X.509 sertifikaat
Comment[fy]=DER-, PEM-, of Netscape-fersifere X.509-sertifikaat
Index: mimetypes/application/x-sqlite2.desktop
===================================================================
---- mimetypes/application/x-sqlite2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-sqlite2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-sqlite2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-sqlite2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,6 +18,7 @@
Comment[es]=Archivo de la base de datos SQLite2
Comment[et]=SQLite2 andmebaasi fail
Comment[fy]=SQLite2 databanktriem
Index: mimetypes/application/x-sqlite3.desktop
===================================================================
---- mimetypes/application/x-sqlite3.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-sqlite3.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-sqlite3.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-sqlite3.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,6 +18,7 @@
Comment[es]=Archivo de la base de datos SQLite3
Comment[et]=SQLite3 andmebaasi fail
Comment[fy]=SQLite3 databanktriem
Index: mimetypes/application/x-perl-module.desktop
===================================================================
---- mimetypes/application/x-perl-module.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-perl-module.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-perl-module.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-perl-module.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Módulo Perl
Comment[et]=Perli moodul
Comment[fy]=Perl-module
Index: mimetypes/application/x-bzip2.desktop
===================================================================
---- mimetypes/application/x-bzip2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-bzip2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-bzip2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-bzip2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Archivo comprimido Bzip2
Comment[et]=Bzip2-arhiiv
Comment[fy]=Bzip2-Triem
Index: mimetypes/application/xsd.desktop
===================================================================
---- mimetypes/application/xsd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/xsd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/xsd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/xsd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -12,6 +12,7 @@
Comment[el]=Σχήμα W3C XML
Comment[es]=Schema XML de W3C
Comment[fy]=W3C XML-skema
Index: mimetypes/application/x-mswrite.desktop
===================================================================
---- mimetypes/application/x-mswrite.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-mswrite.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-mswrite.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-mswrite.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Documento de Microsoft Write
Comment[et]=Microsoft Write'i dokument
Comment[fy]=Microsoft Write-dokumint
Index: mimetypes/application/fits.desktop
===================================================================
---- mimetypes/application/fits.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/fits.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/fits.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/fits.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -12,6 +12,7 @@
Comment[es]=Datos FITS
Comment[et]=FITS-andmed
Comment[fy]=FITS-data
Index: mimetypes/application/x-afm.desktop
===================================================================
---- mimetypes/application/x-afm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-afm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-afm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-afm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Métrica de fuentes Postscript.
Comment[et]=PostScript fondimeetrika (PFM)
Comment[fy]=PostScript Lettertype Metryk
Index: mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Hoja de cálculo de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument arvutustabel
Comment[fy]=OASIS OpenDocument rekkenboerd
Index: mimetypes/application/x-lha.desktop
===================================================================
---- mimetypes/application/x-lha.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-lha.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-lha.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-lha.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Archivo LHA
Comment[et]=Lha arhiiv
Comment[fi]=Lha-paketti
Comment[fr]=Archive LHA
Comment[fy]=Lha-argyf
+@@ -49,7 +49,7 @@
+ Comment[nso]=Polokelo ya Lha
+ Comment[pa]=Lha ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Lha
+-Comment[pt]=Arquivo Lha
++Comment[pt]=Pacote Lha
+ Comment[pt_BR]=Arquivo Lha
+ Comment[ro]=Arhivă LHA
+ Comment[ru]=Архив LHA
Index: mimetypes/application/x-tgz.desktop
===================================================================
---- mimetypes/application/x-tgz.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-tgz.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-tgz.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-tgz.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo Tar comprimido en Gzip
Comment[et]=Gzipitud TAR-arhiiv
Comment[fi]=Gzip-pakattu Tar-paketti
Comment[fr]=Archive Tar compactée par Gzip
Comment[fy]=Mei Gzip komprimearre Tar-argyf
+@@ -54,7 +54,7 @@
+ Comment[oc]=Archius tar gzipats
+ Comment[pa]=Gzipped Tar ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum po tarowaniu i spakowaniu gzipem
+-Comment[pt]=Arquivo Tar Gz
++Comment[pt]=Pacote Tar Gz
+ Comment[pt_BR]=Pacote Tar comprimido via gzip
+ Comment[ro]=Arhivă Tar comprimată cu GZip
+ Comment[ru]=Сжатый gzip архив tar
Index: mimetypes/application/x-javascript.desktop
===================================================================
---- mimetypes/application/x-javascript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-javascript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-javascript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-javascript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Archivo JavaScipt
Comment[et]=JavaScripti fail
Comment[fy]=JavaSkript Triem
Index: mimetypes/application/vnd.sun.xml.impress.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.impress.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.impress.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.impress.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.impress.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Presentación de OpenOffice.org
Comment[et]=OpenOffice.org-i esitlus
Comment[fy]=OpenOffice.org Presentaasje
Index: mimetypes/application/x-vnd.kde.kugar.mixed.desktop
===================================================================
---- mimetypes/application/x-vnd.kde.kugar.mixed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-vnd.kde.kugar.mixed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-vnd.kde.kugar.mixed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-vnd.kde.kugar.mixed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo de archivos Kugar
Comment[et]=Kugari arhiivifail
Comment[fy]=Kugar Argyf Triem
Index: mimetypes/application/x-gnumeric.desktop
===================================================================
---- mimetypes/application/x-gnumeric.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-gnumeric.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-gnumeric.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-gnumeric.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Hoja de cálculo de GNUmeric
Comment[et]=GNUmerici arvutustabel
Comment[fy]=GNUmeric Rekkenboerd
Index: mimetypes/application/wordperfect.desktop
===================================================================
---- mimetypes/application/wordperfect.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/wordperfect.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/wordperfect.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/wordperfect.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Documento de WordPerfect
Comment[et]=WordPerfecti dokument
Comment[fy]=WordPerfect-Dokumint
Index: mimetypes/application/x-executable.desktop
===================================================================
---- mimetypes/application/x-executable.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-executable.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-executable.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-executable.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo ejecutable
Comment[et]=Käivitatav fail
Comment[fy]=Utfierber triem
Index: mimetypes/application/x-executable-script.desktop
===================================================================
---- mimetypes/application/x-executable-script.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-executable-script.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-executable-script.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-executable-script.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Procedimiento (probablemente ejecutable)
Comment[et]=Käivitatav skript
Comment[fy]=Skript (Wierskynlik útfierber)
Index: mimetypes/application/x-lzop.desktop
===================================================================
---- mimetypes/application/x-lzop.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-lzop.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-lzop.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-lzop.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo comprimido Lzop
Comment[et]=LZOP arhiiv
Comment[fy]=Lzop-triem
Index: mimetypes/application/x-shockwave-flash.desktop
===================================================================
---- mimetypes/application/x-shockwave-flash.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-shockwave-flash.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-shockwave-flash.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-shockwave-flash.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Comment[es]=Archivo Shockwave Flash
Comment[et]=Shockwave Flash meedia
Comment[he]=מדיית Flash של Shockwave
Index: mimetypes/application/x-pw.desktop
===================================================================
---- mimetypes/application/x-pw.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-pw.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-pw.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-pw.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Documento de Pathetic Writer
Comment[et]=Pathetic Writeri dokument
Comment[fy]=Pathetic Writer Dokumint
Index: mimetypes/application/x-rar-compressed.desktop
===================================================================
---- mimetypes/application/x-rar-compressed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-rar-compressed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-rar-compressed.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-rar-compressed.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo RAR
Comment[et]=Rar arhiiv
Comment[fi]=Rar-paketti
Comment[fr]=Archive Rar
Comment[fy]=Rar-argyf
+@@ -52,7 +52,7 @@
+ Comment[nso]=Polokelo ya Rar
+ Comment[pa]=Rar ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Rar
+-Comment[pt]=Arquivo Rar
++Comment[pt]=Pacote Rar
+ Comment[pt_BR]=Pacote Rar
+ Comment[ro]=Arhivă RAR
+ Comment[ru]=Архив rar
Index: mimetypes/application/x-kpovmodeler.desktop
===================================================================
---- mimetypes/application/x-kpovmodeler.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-kpovmodeler.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-kpovmodeler.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-kpovmodeler.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de KPovModeler
Comment[et]=KPovModeleri fail
Comment[fy]=KPovModeler-triem
Index: mimetypes/application/x-php.desktop
===================================================================
---- mimetypes/application/x-php.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-php.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-php.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-php.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Script de PHP
Comment[et]=PHP skript
Comment[fy]=PHP Skript
Index: mimetypes/application/x-troff-man.desktop
===================================================================
---- mimetypes/application/x-troff-man.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-troff-man.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-troff-man.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-troff-man.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Documento Troff con macros de páginas de Man
Comment[et]=Manpage makrodega troff-dokument
Comment[fy]=Troff-dokumint mei manpage-makro's
Index: mimetypes/application/x-shellscript.desktop
===================================================================
---- mimetypes/application/x-shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Script para intérprete de comandos
Comment[et]=Shelli skript
Comment[sq]=Skript Guacor
Index: mimetypes/application/vnd.oasis.opendocument.graphics.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.graphics.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.graphics.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.graphics.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.graphics.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Gráfico de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument joonistus
Comment[fy]=OASIS OpenDocument grafyske foarstellings
Index: mimetypes/application/x-font-bdf.desktop
===================================================================
---- mimetypes/application/x-font-bdf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-bdf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-bdf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-bdf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Fuente bitmap BDF
Comment[et]=BDF bittrasterfont
Comment[fy]=BDF Bitmap-lettertype
Index: mimetypes/application/x-kudesigner.desktop
===================================================================
---- mimetypes/application/x-kudesigner.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-kudesigner.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-kudesigner.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-kudesigner.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Plantilla de informe de Kugar
Comment[et]=Kugari rapordimall
Comment[fy]=Kugar Rapport Sjabloan
Index: mimetypes/application/vnd.oasis.opendocument.formula.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.formula.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.formula.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.formula.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.formula.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Fórmula de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument valem
Comment[fy]=OASIS OpenDocument Formule
Index: mimetypes/application/x-font-type1.desktop
===================================================================
---- mimetypes/application/x-font-type1.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-font-type1.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-font-type1.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-font-type1.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Fuente Postscript Tipo1
Comment[et]=PostScript Type1 font
Comment[fy]=PostScript Type1-lettertype
Index: mimetypes/application/msword.desktop
===================================================================
---- mimetypes/application/msword.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/msword.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/msword.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/msword.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -25,7 +25,7 @@
Comment[es]=Documento de Microsoft Word
Comment[et]=Microsoft Wordi dokument
Comment[fy]=Microsoft Word-dokumint
Index: mimetypes/application/ogg.desktop
===================================================================
---- mimetypes/application/ogg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/ogg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/ogg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/ogg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Multimedia Ogg
Comment[et]=Ogg multimeedia
Comment[fy]=Ogg Multymedia
Index: mimetypes/application/vnd.stardivision.writer-global.desktop
===================================================================
---- mimetypes/application/vnd.stardivision.writer-global.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.stardivision.writer-global.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.stardivision.writer-global.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.stardivision.writer-global.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,7 @@
Comment[es]=Documentos maestros de escritura de StarOffice
Comment[et]=StarOffice Writer'i peadokument
Comment[fy]=StarOffice Writer Haad Dokumint
Index: mimetypes/application/x-krita.desktop
===================================================================
---- mimetypes/application/x-krita.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-krita.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-krita.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-krita.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Comment[es]=Documento de Krita
Comment[et]=Krita dokument
Comment[fy]=Krita-dokumint
Index: mimetypes/application/x-pak.desktop
===================================================================
---- mimetypes/application/x-pak.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-pak.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-pak.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-pak.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Archivo de ficheros PAK
Comment[et]=PAK arhiiv
Comment[fi]=PAK-paketti
Comment[fr]=Fichier archive PAK
Comment[fy]=PAK Triem Argyf
+@@ -42,7 +43,7 @@
+ Comment[nn]=PAK-filarkiv
+ Comment[pa]=PAK ਫਾਇਲ਼ ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum plików PAK
+-Comment[pt]=Arquivo de Ficheiros PAK
++Comment[pt]=Pacote de Ficheiros PAK
+ Comment[pt_BR]=Arquivo PAK
+ Comment[ro]=Arhivă PAK
+ Comment[ru]=Архив PAK
Index: mimetypes/application/x-applixgraphics.desktop
===================================================================
---- mimetypes/application/x-applixgraphics.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-applixgraphics.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-applixgraphics.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-applixgraphics.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Documento gráfico de Applix
Comment[et]=Applixi graafikadokument
Comment[fy]=Applix Grafiek Dokumint
Index: mimetypes/application/illustrator.desktop
===================================================================
---- mimetypes/application/illustrator.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/illustrator.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/illustrator.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/illustrator.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Documento de ilustración de Adobe
Comment[et]=Adobe Illustratori dokument
Comment[fy]=Adobe Illustrator-dokumint
Index: mimetypes/application/pgp-signature.desktop
===================================================================
---- mimetypes/application/pgp-signature.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/pgp-signature.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/pgp-signature.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/pgp-signature.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Firma suelta OpenPGP
Comment[et]=Eraldiseisev OpenPGP signatuur
Comment[fy]=Loskeppele OpenPGP-sinjatuer
Index: mimetypes/application/x-tarz.desktop
===================================================================
---- mimetypes/application/x-tarz.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-tarz.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-tarz.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-tarz.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo Tar comprimido
Comment[et]=Pakitud tar-arhiiv
Comment[fi]=Pakattu Tar-paketti
Comment[fr]=Archive Tar compactée
Comment[fy]=Komprimearre tar-argyf
+@@ -50,7 +50,7 @@
+ Comment[oc]=Archiu tar comprimit
+ Comment[pa]=ਨਪੀੜਿਆ Tar ਸੰਕੁਚਿਤ
+ Comment[pl]=Skompresowane archiwum Tar
+-Comment[pt]=Arquivo TAR comprimido
++Comment[pt]=Pacote TAR comprimido
+ Comment[pt_BR]=Pacote TAR comprimido
+ Comment[ro]=Arhivă Tar comprimată
+ Comment[ru]=Сжатый архив tar
Index: mimetypes/application/x-python.desktop
===================================================================
---- mimetypes/application/x-python.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-python.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-python.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-python.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Programa en Python
Comment[et]=Pythoni rakendus
Comment[fy]=Python-programma
Index: mimetypes/application/x-awk.desktop
===================================================================
---- mimetypes/application/x-awk.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-awk.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-awk.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-awk.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Script de AWK
Comment[et]=AWK skript
Comment[fy]=AWK-Skript
Index: mimetypes/application/x-vnd.kde.kplato.desktop
===================================================================
---- mimetypes/application/x-vnd.kde.kplato.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-vnd.kde.kplato.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-vnd.kde.kplato.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-vnd.kde.kplato.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Documento de gestión de proyectos KPlato
Comment[et]=KPlato projektihalduse dokument
Comment[fy]=KPlato Projekt Management Dokumint
Index: mimetypes/application/x-gzdvi.desktop
===================================================================
---- mimetypes/application/x-gzdvi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-gzdvi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-gzdvi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-gzdvi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Archivo DVI comprimido con Gzip
Comment[et]=Gzip tihendusega DVI-fail
Comment[fy]=Gzip komprimearre DVI Triem
Index: mimetypes/application/x-tar.desktop
===================================================================
---- mimetypes/application/x-tar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-tar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-tar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-tar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo Tar
Comment[et]=Tar-arhiiv
Comment[fi]=Tar-paketti
Comment[fr]=Archive Tar
Comment[fy]=Tar-argyf
+@@ -52,7 +52,7 @@
+ Comment[nso]=Polokelo ya Tar
+ Comment[pa]=Tar ਪੁਰਾਲੇਖ
+ Comment[pl]=Archiwum Tar
+-Comment[pt]=Arquivo Tar
++Comment[pt]=Pacote Tar
+ Comment[pt_BR]=Arquivo TAR
+ Comment[ro]=Arhivă Tar
+ Comment[ru]=Архив tar
Index: mimetypes/application/x-cda.desktop
===================================================================
---- mimetypes/application/x-cda.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-cda.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-cda.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-cda.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=CD de audio
Comment[et]=CD audio
Comment[fy]=CD-audio
Index: mimetypes/application/x-core.desktop
===================================================================
---- mimetypes/application/x-core.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/x-core.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/x-core.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/x-core.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Datos sobre el fallo de un programa
Comment[et]=Programmi krahhi andmed
Comment[fy]=Ynformaasje oer crashte programma's
Index: mimetypes/application/vnd.stardivision.draw.desktop
===================================================================
---- mimetypes/application/vnd.stardivision.draw.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.stardivision.draw.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.stardivision.draw.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.stardivision.draw.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,6 +21,7 @@
Comment[es]=Dibujo de StarOffice
Comment[et]=StarOffice joonis
Comment[ga]=Líníocht StarOffice
Index: mimetypes/application/vnd.sun.xml.draw.template.desktop
===================================================================
---- mimetypes/application/vnd.sun.xml.draw.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.sun.xml.draw.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.sun.xml.draw.template.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.sun.xml.draw.template.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Comment[es]=Plantilla de dibujo de OpenOffice.org
Comment[et]=OpenOffice.org-i joonistusemall
Comment[fy]=OpenOffice.org Drawing sjabloan
Index: mimetypes/application/vnd.oasis.opendocument.chart.desktop
===================================================================
---- mimetypes/application/vnd.oasis.opendocument.chart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/vnd.oasis.opendocument.chart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/vnd.oasis.opendocument.chart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/vnd.oasis.opendocument.chart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Carta de OpenDocument OASIS
Comment[et]=OASIS-e OpenDocument diagramm
Comment[fy]=OASIS OpenDocument Grafyk
Index: mimetypes/application/mbox.desktop
===================================================================
---- mimetypes/application/mbox.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/application/mbox.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/application/mbox.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/application/mbox.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Carpeta de correo MBOX
Comment[et]=MBOX e-posti kaust
Comment[sr]=MBOX фасцикла поште
Index: mimetypes/message/news.desktop
===================================================================
---- mimetypes/message/news.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/message/news.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/message/news.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/message/news.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Mensaje de noticias de Usenet
Comment[et]=Uudistegrupi artikkel
Comment[fy]=Usenet-nijsberjocht
Index: mimetypes/message/rfc822.desktop
===================================================================
---- mimetypes/message/rfc822.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/message/rfc822.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/message/rfc822.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/message/rfc822.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Mensaje de correo electrónico
Comment[et]=E-kiri
Comment[fy]=E-postberjocht
Index: mimetypes/text/rss.desktop
===================================================================
---- mimetypes/text/rss.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/rss.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/rss.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/rss.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Comment[es]=Resumen RDF del sitio
Comment[et]=RDF-saidi kokkuvõte
Comment[fy]=Gearfetting fan de RDF-side
Index: mimetypes/text/calendar.desktop
===================================================================
---- mimetypes/text/calendar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/calendar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/calendar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/calendar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo de iCalendar
Comment[et]=iCalendari fail
Comment[fy]=iCalender-triem
Index: mimetypes/text/rdf.desktop
===================================================================
---- mimetypes/text/rdf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/rdf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/rdf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/rdf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de entorno descripción de recursos (RDF)
Comment[et]=Resource Description Framework (RDF) fail
Comment[fy]=Helpboarne Beskriuwing Framework Triem
Index: mimetypes/text/x-diff.desktop
===================================================================
---- mimetypes/text/x-diff.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-diff.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-diff.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-diff.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Diferencias entre archivos
Comment[et]=Failidevaheline erinevus
Comment[fy]=Ferskil tusken triemmen
Index: mimetypes/text/x-objchdr.desktop
===================================================================
---- mimetypes/text/x-objchdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-objchdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-objchdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-objchdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,6 +15,7 @@
Comment[es]=Archivo de cabecera de Objective-C
Comment[et]=Objective-C päisefail
Comment[fy]=Objektive-C koptekst-bestand
Index: mimetypes/text/x-bibtex.desktop
===================================================================
---- mimetypes/text/x-bibtex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-bibtex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-bibtex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-bibtex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Datos bibliográficos (Bibtex)
Comment[et]=Bibliograafilised andmed (bibtex)
Comment[fy]=Bibliografyske data (bibtex)
Index: mimetypes/text/x-java.desktop
===================================================================
---- mimetypes/text/x-java.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-java.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-java.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-java.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo con código Java
Comment[et]=Java lähtetekst
Comment[fy]=Java-boarnetriem
Index: mimetypes/text/x-objcsrc.desktop
===================================================================
---- mimetypes/text/x-objcsrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-objcsrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-objcsrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-objcsrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo con código Objective-C
Comment[et]=Objective-C lähtetekst
Comment[fy]=Objektive-C-boarnetriem
Index: mimetypes/text/rtf.desktop
===================================================================
---- mimetypes/text/rtf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/rtf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/rtf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/rtf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Documento RTF
Comment[et]=RTF-dokument
Comment[fy]=RTF Dokumint
Index: mimetypes/text/x-xslfo.desktop
===================================================================
---- mimetypes/text/x-xslfo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-xslfo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-xslfo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-xslfo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Comment[es]=Archivo de objeto de formato XSL
Comment[et]=XSL vormindamise objektfail
Comment[fy]=XSL-yndielingsobjekt
Index: mimetypes/text/x-adasrc.desktop
===================================================================
---- mimetypes/text/x-adasrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-adasrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-adasrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-adasrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de fuentes Ada
Comment[et]=Ada lähtetekst
Comment[fy]=Ada-boarnetriem
Index: mimetypes/text/html.desktop
===================================================================
---- mimetypes/text/html.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/html.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/html.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/html.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Documento HTML
Comment[et]=HTML-dokument
Comment[fy]=HTML Dokumint
Index: mimetypes/text/javascript.desktop
===================================================================
---- mimetypes/text/javascript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/javascript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/javascript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/javascript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,6 +18,7 @@
Comment[es]=Archivo JavaScipt
Comment[et]=JavaScripti fail
Comment[fy]=JavaSkript Triem
Index: mimetypes/text/x-pascal.desktop
===================================================================
---- mimetypes/text/x-pascal.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-pascal.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-pascal.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-pascal.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo con código Pascal
Comment[et]=Pascali lähtetekst
Comment[fy]=Pascal-boarnetriem
Index: mimetypes/text/x-c++hdr.desktop
===================================================================
---- mimetypes/text/x-c++hdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-c++hdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-c++hdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-c++hdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de cabecera C++
Comment[et]=C++ päis
Comment[fy]=C++-koptekst triem
Index: mimetypes/text/vnd.abc.desktop
===================================================================
---- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Comment[es]=Archivo de música ABC
Comment[et]=ABC muusikafail
Comment[fy]=ABC-Muzyktriem
Index: mimetypes/text/enriched.desktop
===================================================================
---- mimetypes/text/enriched.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/enriched.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/enriched.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/enriched.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Comment[es]=Documento de texto ligeramente enriquecido
Comment[et]=Vormindatud tekstidokument
Comment[fy]=Licht opmakke tekst Dokumint
Index: mimetypes/text/x-latex.desktop
===================================================================
---- mimetypes/text/x-latex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-latex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-latex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-latex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Documento de LaTeX
Comment[et]=LaTeX-dokument
Comment[fy]=LaTeX Dokumint
Index: mimetypes/text/x-moc.desktop
===================================================================
---- mimetypes/text/x-moc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-moc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-moc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-moc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo metaobjeto de Qt
Comment[et]=Qt metaobjektfail
Comment[fy]=Qt-Meta-Objekt-triem
Index: mimetypes/text/x-ldif.desktop
===================================================================
---- mimetypes/text/x-ldif.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-ldif.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-ldif.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-ldif.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Libreta de direcciones LDAP
Comment[et]=LDAP aadressiraamat
Comment[fy]=LDAP adresboek
Index: mimetypes/text/x-katefilelist.desktop
===================================================================
---- mimetypes/text/x-katefilelist.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-katefilelist.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-katefilelist.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-katefilelist.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Comment[es]=Lista de archivos (para el módulo cargador de lista de arhivos de Kate)
Comment[et]=Failide nimekiri (Kate failide nimekirja plugina jaoks)
Comment[fy]=Triemmenlist (foar de Kate-triemmenplugin)
Index: mimetypes/text/x-chdr.desktop
===================================================================
---- mimetypes/text/x-chdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-chdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-chdr.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-chdr.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de cabecera C
Comment[et]=C päis
Comment[fy]=C-koptekst triem
Index: mimetypes/text/x-c++src.desktop
===================================================================
---- mimetypes/text/x-c++src.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-c++src.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-c++src.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-c++src.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de código C++
Comment[et]=C++ lähtetekst
Comment[fy]=C++-boarnetriem
Index: mimetypes/text/x-log.desktop
===================================================================
---- mimetypes/text/x-log.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-log.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-log.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-log.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de registro de aplicación
Comment[et]=Rakenduse logifail
Comment[fy]=Programmalogtriem
Index: mimetypes/text/x-tcl.desktop
===================================================================
---- mimetypes/text/x-tcl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-tcl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-tcl.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-tcl.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo TCL
Comment[et]=Tcl-fail
Comment[fy]=Tcl-triem
Index: mimetypes/text/css.desktop
===================================================================
---- mimetypes/text/css.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/css.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/css.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/css.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,7 +14,7 @@
Comment[eo]=CSS - Stildifino
Comment[es]=Hoja de estilo en cascada
Comment[fy]=Cascading Style Sheet (stylblêd)
Index: mimetypes/text/x-hex.desktop
===================================================================
---- mimetypes/text/x-hex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-hex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-hex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-hex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,6 +18,7 @@
Comment[es]=Formato de archivo Intel® Hexadecimal Object
Comment[et]=Intel® 16nd-objektfaili vorming
Comment[fy]=Intel® Hexadecimal Objekt Triem yndieling
Index: mimetypes/text/x-csrc.desktop
===================================================================
---- mimetypes/text/x-csrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-csrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-csrc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-csrc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de código C
Comment[et]=C lähtetekst
Comment[fy]=C-boarnetriem
Index: mimetypes/text/x-xslt.desktop
===================================================================
---- mimetypes/text/x-xslt.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-xslt.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-xslt.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-xslt.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de hoja de estilo XSLT
Comment[et]=XSLT laaditabeli fail
Comment[fy]=XSLT-stylblêdtriem
Index: mimetypes/text/x-csv.desktop
===================================================================
---- mimetypes/text/x-csv.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-csv.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-csv.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-csv.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Archivo de texto con valores separados por comas
Comment[et]=Komaga eraldatud väärtuste tekstifail
Comment[fy]=Teksttriem mei troch komma's skieden wearden
Index: mimetypes/text/x-vcalendar.desktop
===================================================================
---- mimetypes/text/x-vcalendar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-vcalendar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-vcalendar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-vcalendar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo de intercambio de vCalendar
Comment[et]=vCalendari transpordifail
Comment[fy]=vCalendar utwisseling triem
Index: mimetypes/text/x-vcard.desktop
===================================================================
---- mimetypes/text/x-vcard.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-vcard.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-vcard.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-vcard.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Tarjeta de comercio electrónico
Comment[et]=Elektrooniline visiitkaart
Comment[fy]=Elektroanysk nammekaartsje
Index: mimetypes/text/x-tex.desktop
===================================================================
---- mimetypes/text/x-tex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/text/x-tex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/text/x-tex.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/text/x-tex.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Archivo TeX
Comment[et]=TeX-fail
Comment[fy]=TeX-triem
Index: mimetypes/video/x-ogm.desktop
===================================================================
---- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Vídeo de Ogg/Ogm
Comment[et]=Ogg/Ogm videofail
Comment[fy]=Ogg/Ogm Fideo
Index: mimetypes/video/x-theora.desktop
===================================================================
---- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Vídeo de Theora
Comment[et]=Theora videofail
Comment[fy]=Theora Fideo
Index: mimetypes/video/mpeg.desktop
===================================================================
---- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Vídeo MPEG
Comment[et]=MPEG videofail
Comment[fy]=MPEG-fideo
Index: mimetypes/video/quicktime.desktop
===================================================================
---- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Vídeo QuickTime
Comment[et]=Quicktime videofail
Comment[fy]=Quicktime-fideo
Index: mimetypes/video/x-ms-asf.desktop
===================================================================
---- mimetypes/video/x-ms-asf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/x-ms-asf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/x-ms-asf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/x-ms-asf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Medios ASF
Comment[et]=ASF meediafail
Comment[fy]=ASF-media
Index: mimetypes/video/x-ms-wmv.desktop
===================================================================
---- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Video de media de Windows
Comment[et]=Windows Media videofail
Comment[fy]=Windows Media Fideo
Index: mimetypes/video/x-msvideo.desktop
===================================================================
---- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -22,7 +22,7 @@
Comment[es]=Vídeo AVI de Microsoft
Comment[et]=Microsoft AVI videofail
Comment[fy]=Microsoft AVI-Fideo
Index: mimetypes/video/vnd.rn-realvideo.desktop
===================================================================
---- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo de RealVideo
Comment[et]=RealVideo fail
Comment[fy]=RealFideo triem
Index: mimetypes/video/avi.desktop
===================================================================
---- mimetypes/video/avi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/avi.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Vídeo AVI de Microsoft
Comment[et]=Microsoft AVI videofail
Comment[fy]=Microsoft AVI-Fideo
Index: mimetypes/video/mp4.desktop
===================================================================
---- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Vídeo de MPEG-4
Comment[et]=MPEG-4 videofail
Comment[fy]=MPEG-4 Fideo
Index: mimetypes/video/x-flic.desktop
===================================================================
---- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=Archivo FLIC de Autodesk
Comment[et]=Autodeski FLIC-fail
Comment[fy]=Autodesk's FLIC-triem
Index: mimetypes/video/x-matroska.desktop
===================================================================
---- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Vídeo de Matroska
Comment[et]=Matroska videofail
Comment[fy]=Matroska Fideo
Index: mimetypes/inode/block.desktop
===================================================================
---- mimetypes/inode/block.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/inode/block.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/inode/block.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/inode/block.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Dispositivo de bloques
Comment[et]=Plokkseade
Comment[fy]=Blokapparaat
Index: mimetypes/inode/chardevice.desktop
===================================================================
---- mimetypes/inode/chardevice.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/inode/chardevice.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/inode/chardevice.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/inode/chardevice.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Dispositivo de caracteres
Comment[et]=Sümbolseade
Comment[fy]=Apparaat foar tekstynfier of -útfier
Index: mimetypes/inode/directory-locked.desktop
===================================================================
---- mimetypes/inode/directory-locked.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ mimetypes/inode/directory-locked.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- mimetypes/inode/directory-locked.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ mimetypes/inode/directory-locked.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Archivo bloqueado
Comment[et]=Lukustatud kataloog
Comment[fy]=Map Sletten
Index: kioslave/http/kcookiejar/kcookiejar.desktop
===================================================================
---- kioslave/http/kcookiejar/kcookiejar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kioslave/http/kcookiejar/kcookiejar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kioslave/http/kcookiejar/kcookiejar.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kioslave/http/kcookiejar/kcookiejar.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Name[es]=Módulo Jar de cookies de KDED
Name[et]=KDED Cookie Jar moodul
Comment[fy]=Hâld by wer alle koekjes binne
Index: kioslave/http/http_cache_cleaner.desktop
===================================================================
---- kioslave/http/http_cache_cleaner.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kioslave/http/http_cache_cleaner.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kioslave/http/http_cache_cleaner.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kioslave/http/http_cache_cleaner.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Name[es]=Limpiador del caché de HTTP
Name[et]=HTTP vahemälu puhastaja
Comment[fy]=Ferwidert âlde items út de HTTP-cache
Index: kioslave/http/http.cc
===================================================================
---- kioslave/http/http.cc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kioslave/http/http.cc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kioslave/http/http.cc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kioslave/http/http.cc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -164,7 +164,7 @@
static QString sanitizeCustomHTTPHeader(const QString& _header)
{
{
Index: kioslave/bzip2/kbzip2filter.desktop
===================================================================
---- kioslave/bzip2/kbzip2filter.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kioslave/bzip2/kbzip2filter.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kioslave/bzip2/kbzip2filter.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kioslave/bzip2/kbzip2filter.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Name[es]=Filtro BZip2
Name[et]=BZip2 filter
Name[fy]=BZip2-filter
Index: kioslave/gzip/kgzipfilter.desktop
===================================================================
---- kioslave/gzip/kgzipfilter.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kioslave/gzip/kgzipfilter.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kioslave/gzip/kgzipfilter.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kioslave/gzip/kgzipfilter.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Name[es]=Filtro GZip
Name[et]=GZip filter
Name[fy]=GZip-filter
Index: kinit/kstartupconfig.cpp
===================================================================
---- kinit/kstartupconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kinit/kstartupconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kinit/kstartupconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kinit/kstartupconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -53,8 +53,6 @@
Since the checking is timestamp-based, config files that are frequently updated
should not be used.
Index: kinit/start_kdeinit.c
===================================================================
--- kinit/start_kdeinit.c (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ kinit/start_kdeinit.c (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ kinit/start_kdeinit.c (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,127 @@
+/*
+ * This file is part of the KDE libraries
+#endif
Index: kinit/configure.in.in
===================================================================
---- kinit/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kinit/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kinit/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kinit/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -43,3 +43,16 @@
AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in kdeinit])
fi
+AM_CONDITIONAL(KDEINIT_SETUID, test -n "$kdeinit_setuid" )
Index: kinit/kinit.cpp
===================================================================
---- kinit/kinit.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kinit/kinit.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kinit/kinit.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kinit/kinit.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -41,6 +41,7 @@
#include <stdio.h>
#include <stdlib.h>
}
Index: kinit/Makefile.am
===================================================================
---- kinit/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kinit/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kinit/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kinit/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
SUBDIRS = . tests
-
Index: kimgio/xpm.kimgio
===================================================================
---- kimgio/xpm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/xpm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/xpm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/xpm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Imagen mapa de pixels de X
Name[et]=X pixmap pildifail
Name[fy]=X PixMap ôfbylding
Index: kimgio/g3.kimgio
===================================================================
---- kimgio/g3.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/g3.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/g3.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/g3.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Name[es]=Fax CCITT G3
Name[et]=CCITT g3 fax
Name[fy]=CCITT G3 Faks
Index: kimgio/ico.kimgio
===================================================================
---- kimgio/ico.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/ico.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/ico.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/ico.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Icono de Windows
Name[et]=Windowsi ikoon
Name[fy]=Windows Ikoan
Index: kimgio/rgb.kimgio
===================================================================
---- kimgio/rgb.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/rgb.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/rgb.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/rgb.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,6 +18,7 @@
Name[es]=Imagen SGI (RGB)
Name[et]=SGI pildifail (RGB)
Name[fy]=SGI ôfbylding (RBG)
Index: kimgio/hdr.kimgio
===================================================================
---- kimgio/hdr.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/hdr.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/hdr.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/hdr.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -12,6 +12,7 @@
Name[es]=Imagen de gran rango dinámico
Name[et]=High Dynamic Range pildifail
Name[fy]=High Dynamic Range-ôfbylding
Index: kimgio/xcf.kimgio
===================================================================
---- kimgio/xcf.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/xcf.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/xcf.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/xcf.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,6 +15,7 @@
Name[es]=Imagen GIMP
Name[et]=GIMP-i pildifail
Name[fy]=GIMP-ôfbylding
Index: kimgio/mng.kimgio
===================================================================
---- kimgio/mng.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/mng.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/mng.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/mng.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Name[es]=Imagen MNG
Name[et]=MNG pildifail
Name[fy]=MNG-ôfbylding
Index: kimgio/psd.kimgio
===================================================================
---- kimgio/psd.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/psd.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/psd.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/psd.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,6 +15,7 @@
Name[es]=Imagen Photoshop de Adobe
Name[et]=Adobe Photoshop pildifail
Name[sr]=Слика Adobe-овог Photoshop-а
Index: kimgio/eps.kimgio
===================================================================
---- kimgio/eps.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/eps.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/eps.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/eps.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Imagen PostScript encapsulada
Name[et]=Kapseldatud PostScript pildifail
Name[fy]=Ynsletten PostSkript ôfbylding
Index: kimgio/pcx.kimgio
===================================================================
---- kimgio/pcx.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/pcx.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/pcx.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/pcx.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Imagen PCX
Name[et]=PCX pildifail
Name[fy]=PCX ôfbylding
Index: kimgio/jp2.kimgio
===================================================================
---- kimgio/jp2.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/jp2.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/jp2.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/jp2.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Imagen JPEG 2000
Name[et]=JPEG 2000 pildifail
Name[fy]=JPEG 2000 ôfbylding
Index: kimgio/gif.kimgio
===================================================================
---- kimgio/gif.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/gif.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/gif.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/gif.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Imagen GIF
Name[et]=GIF pildifail
Name[fy]=GIF ôfbylding
Index: kimgio/dds.kimgio
===================================================================
---- kimgio/dds.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/dds.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/dds.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/dds.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -12,6 +12,7 @@
Name[de]=Oberfläche für Direct Draw
Name[eo]=Rekta desegnosurfaco
Name[gl]=Debuxar Superfície Directamente
Index: kimgio/tga.kimgio
===================================================================
---- kimgio/tga.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/tga.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/tga.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/tga.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Imagen de visión verdadera Targa
Name[et]=Truevision Targa pildifail
Name[fy]=Truevision Targa ôfbylding
Index: kimgio/pbm.kimgio
===================================================================
---- kimgio/pbm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/pbm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/pbm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/pbm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Name[es]=Imagen Bitmap portable
Name[et]=Portable bittraster-pildifail
Name[fy]=Portable Bitmap ôfbylding
Index: kimgio/pgm.kimgio
===================================================================
---- kimgio/pgm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/pgm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/pgm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/pgm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Name[es]=Imagen portable Graymap
Name[et]=Portable Graymap pildifail
Name[fy]=Portable Graymap ôfbylding
Index: kimgio/xbm.kimgio
===================================================================
---- kimgio/xbm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/xbm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/xbm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/xbm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Imagen mapa de bits de X
Name[et]=X bitmap pildifail
Name[fy]=X BitMap ôfbylding
Index: kimgio/ppm.kimgio
===================================================================
---- kimgio/ppm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/ppm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/ppm.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/ppm.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Name[es]=Imagen portable Pixmap
Name[et]=Portable pikselrster-pildifail
Name[fy]=Portable Pixmap ôfbylding
Index: kimgio/xv.kimgio
===================================================================
---- kimgio/xv.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/xv.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/xv.kimgio (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/xv.kimgio (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Name[es]=Imagen XView
Name[et]=XView pildifail
Name[fy]=XView ôfbylding
Index: kimgio/jp2.cpp
===================================================================
---- kimgio/jp2.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kimgio/jp2.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kimgio/jp2.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kimgio/jp2.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -247,7 +247,7 @@
} else {
ktempf = new KTempFile;
Index: kio/kfileplugin.desktop
===================================================================
---- kio/kfileplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kfileplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kfileplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kfileplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Name[es]=Plugin de meta datos KFile
Name[et]=KFile'i metaandmete plugin
Name[ga]=Breiseán meiteashonraí do KFile
Index: kio/kio/kfilemetainfo.cpp
===================================================================
---- kio/kio/kfilemetainfo.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/kfilemetainfo.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/kfilemetainfo.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/kfilemetainfo.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -332,11 +332,15 @@
KFilePlugin *p = plugin();
Q_ASSERT( p );
}
Index: kio/kio/kurifilter.h
===================================================================
---- kio/kio/kurifilter.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/kurifilter.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/kurifilter.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/kurifilter.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -185,7 +185,7 @@
*
* @param url the string to be filtered.
Index: kio/kio/ktar.cpp
===================================================================
---- kio/kio/ktar.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/ktar.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/ktar.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/ktar.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -439,8 +439,8 @@
// Let's hack around hard links. Our classes don't support that, so make them symlinks
if ( typeflag == '1' )
// Write header
Index: kio/kio/krun.cpp
===================================================================
---- kio/kio/krun.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/krun.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/krun.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/krun.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -296,7 +296,7 @@
{
switch( option ) {
ret << url.directory();
Index: kio/kio/kurifilter.cpp
===================================================================
---- kio/kio/kurifilter.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/kurifilter.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/kurifilter.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/kurifilter.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -101,6 +101,18 @@
d->typedString = url;
}
return d->typedString;
Index: kio/kio/kservicegroup.cpp
===================================================================
---- kio/kio/kservicegroup.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/kservicegroup.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/kservicegroup.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/kservicegroup.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -48,6 +48,7 @@
{
d = new KServiceGroup::Private;
if (cfg.isEmpty())
Index: kio/kio/job.cpp
===================================================================
---- kio/kio/job.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/job.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/job.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/job.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2082,7 +2082,7 @@
KMimeType::Ptr ptr = KMimeType::findByURL( m_url, 0, true, true );
if ( ptr ) {
m_error = 0;
Index: kio/kio/kservice.h
===================================================================
---- kio/kio/kservice.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/kservice.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/kservice.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/kservice.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -278,12 +278,16 @@
* otherwise false.
*/
Index: kio/kio/kurlcompletion.cpp
===================================================================
---- kio/kio/kurlcompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/kurlcompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/kurlcompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/kurlcompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -210,6 +210,7 @@
dir = ::opendir( QFile::encodeName( *it ) );
if ( ! dir ) {
}
Index: kio/kio/netaccess.cpp
===================================================================
---- kio/kio/netaccess.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kio/netaccess.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kio/netaccess.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kio/netaccess.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -435,7 +435,7 @@
}
else
}
Index: kio/renamedlgplugin.desktop
===================================================================
---- kio/renamedlgplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/renamedlgplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/renamedlgplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/renamedlgplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Plugin para el diálogo de renombrado
Comment[et]=Ümbernimetamise dialoogi plugin
Comment[fy]=Plugin foar it 'Omneame'-dialooch
Index: kio/kioexec/main.cpp
===================================================================
---- kio/kioexec/main.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kioexec/main.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kioexec/main.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kioexec/main.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -82,6 +82,9 @@
for ( int i = 1; i < args->count(); i++ )
{
// => It is not encoded and not shell escaped, too.
Index: kio/kfile/kicondialog.h
===================================================================
---- kio/kfile/kicondialog.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kfile/kicondialog.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kfile/kicondialog.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kfile/kicondialog.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -71,7 +71,7 @@
private:
QStringList mFiles;
virtual void virtual_hook( int id, void* data );
Index: kio/kfile/kpropsdlgplugin.desktop
===================================================================
---- kio/kfile/kpropsdlgplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kfile/kpropsdlgplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kfile/kpropsdlgplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kfile/kpropsdlgplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Plugin para el diálogo de propiedades
Comment[et]=Omaduste dialoogi plugin
Comment[fy]=Plugin foar de 'Eigenskippen'-dialooch
Index: kio/kfile/kicondialog.cpp
===================================================================
---- kio/kfile/kicondialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kfile/kicondialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kfile/kicondialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kfile/kicondialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,6 +15,8 @@
#include <config.h>
Index: kio/kfile/kfiledialog.cpp
===================================================================
---- kio/kfile/kfiledialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kfile/kfiledialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kfile/kfiledialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kfile/kfiledialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1225,7 +1225,10 @@
return;
}
* / on host usr
Index: kio/kdatatool.desktop
===================================================================
---- kio/kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Herramienta KDE de datos
Comment[et]=KDE andmete rakendus
Comment[fy]=KDE data-helpprogramma
Index: kio/misc/kssld/kssld.desktop
===================================================================
---- kio/misc/kssld/kssld.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/kssld/kssld.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/kssld/kssld.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/kssld/kssld.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Name[es]=Módulo de demonio KSSL
Name[et]=KSSL deemoni moodul
Comment[fy]=KSSL daemon module foar KDED
Index: kio/misc/mms.protocol
===================================================================
---- kio/misc/mms.protocol (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/mms.protocol (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/mms.protocol (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/mms.protocol (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,7 @@
Description[es]=Protocolo Microsoft Media Server
Description[et]=Microsoft Media Server protokoll
Description[gl]=Protocolo Microsoft Media Server
Index: kio/misc/kwalletd/kwalletd.desktop
===================================================================
---- kio/misc/kwalletd/kwalletd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/kwalletd/kwalletd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/kwalletd/kwalletd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/kwalletd/kwalletd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,7 +24,7 @@
Name[es]=Módulo de demonio KWallet
Name[et]=KWalleti deemoni moodul
Comment[fy]=KWallet daemon module foar KDED
Index: kio/misc/kwalletd/kwalletd.cpp
===================================================================
---- kio/misc/kwalletd/kwalletd.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/kwalletd/kwalletd.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/kwalletd/kwalletd.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/kwalletd/kwalletd.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -50,10 +50,6 @@
#include <assert.h>
if (p) {
Index: kio/misc/kwalletd/kwalletd.h
===================================================================
---- kio/misc/kwalletd/kwalletd.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/kwalletd/kwalletd.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/kwalletd/kwalletd.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/kwalletd/kwalletd.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -26,6 +26,7 @@
#include <qintdict.h>
#include <qstring.h>
Index: kio/misc/kpac/eventsrc
===================================================================
---- kio/misc/kpac/eventsrc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/kpac/eventsrc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/kpac/eventsrc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/kpac/eventsrc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Configuración automática del Proxy
Comment[et]=Automaatne proxy konfigureerimine
Comment[fy]=Der wie in flater by it útfoeren fan de proxy ynstellings skript
Index: kio/misc/kpac/proxyscout.desktop
===================================================================
---- kio/misc/kpac/proxyscout.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/kpac/proxyscout.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/kpac/proxyscout.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/kpac/proxyscout.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -12,7 +12,7 @@
Name[el]=Διαμεσολαβητής Scout
Name[eo]=Prokurilo
Comment[fy]=Automatyske proxy ynstelling
Index: kio/misc/kio_uiserver.desktop
===================================================================
---- kio/misc/kio_uiserver.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/kio_uiserver.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/kio_uiserver.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/kio_uiserver.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -31,7 +31,7 @@
Comment[es]=Servidor UI de información de progreso de KDE
Comment[et]=KDE edenemise info UI server
Comment[fy]=KDE's tsjinner foar ynformaasje oer de fuortgong
Index: kio/misc/fileshareset
===================================================================
---- kio/misc/fileshareset (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/misc/fileshareset (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/misc/fileshareset (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/misc/fileshareset (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -118,7 +118,7 @@
local ($_) = @_;
my $ok = 1;
$ok &&= own($_);
Index: kio/tests/ktartest.cpp
===================================================================
---- kio/tests/ktartest.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/tests/ktartest.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/tests/ktartest.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/tests/ktartest.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -30,7 +30,9 @@
for( ; it != l.end(); ++it )
{
}
Index: kio/tests/dummymeta.desktop
===================================================================
---- kio/tests/dummymeta.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/tests/dummymeta.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/tests/dummymeta.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/tests/dummymeta.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -11,7 +11,7 @@
Name[el]=Εικονικό Meta
Name[eo]=Stulta Meto
Name[ga]=Meitea Caoch
Index: kio/kurifilterplugin.desktop
===================================================================
---- kio/kurifilterplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kurifilterplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kurifilterplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kurifilterplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Plugin de Navegación Mejorada
Name[et]=Täiustatud brausimise plugin
Name[fy]=Plugin foar effisjinter browsen
Index: kio/kcomprfilter.desktop
===================================================================
---- kio/kcomprfilter.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kcomprfilter.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kcomprfilter.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kcomprfilter.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Name[es]=Filtro de compresión de KDE
Name[et]=KDE pakkimise filter
Name[fy]=KDE kompresjefilter
Index: kio/data.protocol
===================================================================
---- kio/data.protocol (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/data.protocol (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/data.protocol (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/data.protocol (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,6 +17,7 @@
Description[es]=Un kioslave para datos URIs (rfc2397)
Description[et]=Andme-URI-de I/O-moodul (rfc2397)
Description[fy]=In kioslave foar data-URI-adresse (rfc2397)
Index: kio/kcmodule.desktop
===================================================================
---- kio/kcmodule.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kcmodule.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kcmodule.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kcmodule.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Name[es]=Módulo de control de KDE
Name[et]=KDE juhtimismoodul
Name[fy]=KDE konfiguraasjemodule
Index: kio/application.desktop
===================================================================
---- kio/application.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/application.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/application.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/application.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Name[es]=Aplicación
Name[et]=Rakendus
Name[ga]=Feidhmchlár
Index: kio/kpasswdserver.desktop
===================================================================
---- kio/kpasswdserver.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kpasswdserver.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kpasswdserver.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kpasswdserver.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Módulo de contraseña de KDED
Name[et]=KDED parooli moodul
Comment[fy]=Wachtwurd caching stype
Index: kio/kssl/kssl.cc
===================================================================
---- kio/kssl/kssl.cc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kssl/kssl.cc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kssl/kssl.cc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kssl/kssl.cc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -129,7 +129,7 @@
return false;
// else if (err == SSL_ERROR_ZERO_RETURN)
Index: kio/kssl/kssl/caroot/ca-bundle.crt
===================================================================
---- kio/kssl/kssl/caroot/ca-bundle.crt (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kssl/kssl/caroot/ca-bundle.crt (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kssl/kssl/caroot/ca-bundle.crt (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kssl/kssl/caroot/ca-bundle.crt (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2591,3 +2591,38 @@
00UOpO6wNnQt8M2YI3s3S9r+UZjEHjQ8iP2ZO1CnwYszx8JSFhKVU2Ui77qLzmLb
cCOxgN8aIDjnfg==
+-----END CERTIFICATE-----
Index: kio/kssl/kssl/localcerts
===================================================================
---- kio/kssl/kssl/localcerts (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kssl/kssl/localcerts (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kssl/kssl/localcerts (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kssl/kssl/localcerts (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -32,3 +32,5 @@
geotrust-global-2.pem
GeoTrust_Universal_CA.pem
Index: kio/kssl/kssl/quovadis.pem
===================================================================
--- kio/kssl/kssl/quovadis.pem (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ kio/kssl/kssl/quovadis.pem (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ kio/kssl/kssl/quovadis.pem (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----\r
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC\r
+-----END CERTIFICATE-----\r
Index: kio/kssl/kssl/ksslcalist
===================================================================
---- kio/kssl/kssl/ksslcalist (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kio/kssl/kssl/ksslcalist (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kio/kssl/kssl/ksslcalist (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kio/kssl/kssl/ksslcalist (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -713,3 +713,9 @@
site=true
email=true
+code=false
Index: kstyles/riscos/riscos.themerc
===================================================================
---- kstyles/riscos/riscos.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/riscos/riscos.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/riscos/riscos.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/riscos/riscos.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -234,7 +234,7 @@
Name[de]=RISC-OS
Name[eo]=Risc-OS
Comment[fy]=RISC OS-eftich tema
Index: kstyles/themes/light-v2.themerc
===================================================================
---- kstyles/themes/light-v2.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/light-v2.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/light-v2.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/light-v2.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Name[es]=Estilo ligero, 2nda revisión
Name[et]=Light Style, 2. versioon
Comment[nso]=Ponoleswa ya bobedi ya mokgwa wa widget wo bonolo wo botsana ebile wo 'Bofefo'.
Index: kstyles/themes/light-v3.themerc
===================================================================
---- kstyles/themes/light-v3.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/light-v3.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/light-v3.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/light-v3.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Name[es]=Estilo Ligero, 3era revisión
Name[et]=Light Style, 3. versioon
Comment[nso]=Ponoleswa ya boraro ya mokgwa wa widget wo bonolo wo mmotsana ebile wo 'Bofefo'.
Index: kstyles/themes/qtplatinum.themerc
===================================================================
---- kstyles/themes/qtplatinum.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/qtplatinum.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/qtplatinum.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/qtplatinum.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -4,7 +4,7 @@
Name[bn]=প্ল্যাটিনাম
Name[cy]=Platinwm
Comment[fy]=Ynboude, temaleaze Platinum-styl
Index: kstyles/themes/qtwindows.themerc
===================================================================
---- kstyles/themes/qtwindows.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/qtwindows.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/qtwindows.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/qtwindows.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2,7 +2,6 @@
Name=MS Windows 9x
Name[bn]=এম-এস উইন্ডোস ৯x
Comment[fy]=Ynboude, temaleaze Windows 9x-styl
Index: kstyles/themes/qtcde.themerc
===================================================================
---- kstyles/themes/qtcde.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/qtcde.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/qtcde.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/qtcde.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Estilo incorporado CDE sin tema
Comment[et]=Qt CDE-laadne teemata stiil
Comment[fy]=Ynboude, temaleaze CDE-styl
Index: kstyles/themes/b3.themerc
===================================================================
---- kstyles/themes/b3.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/b3.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/b3.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/b3.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -23,7 +23,7 @@
Comment[es]=B3/Modificación de B2
Comment[et]=B3 - muudatustega B2
Comment[fy]=B3/modifikaasje fan B2
Index: kstyles/themes/mega.themerc
===================================================================
---- kstyles/themes/mega.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/mega.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/mega.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/mega.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -13,7 +13,7 @@
Name[es]=Estilo MegaDegradado de alta profundidad
Name[et]=MegaGradient paljuvärviline stiil
Name[fy]=MegaGradiënt hege-kleurenstyl
Index: kstyles/themes/highcolor.themerc
===================================================================
---- kstyles/themes/highcolor.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/highcolor.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/highcolor.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/highcolor.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Name[es]=Alta profundidad de color clásico
Name[et]=Paljuvärviline vaikestiil
Comment[fy]=Hege kleuren ferzje fan de klassyke styl
Index: kstyles/themes/qtmotif.themerc
===================================================================
---- kstyles/themes/qtmotif.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/qtmotif.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/qtmotif.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/qtmotif.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -26,7 +26,7 @@
Comment[es]=Estilo incorporado Motif sin tema
Comment[et]=Qt Motif'i-laadne teemata stiil
Comment[fy]=Ynboude, temaleaze Motif-styl
Index: kstyles/themes/keramik.themerc
===================================================================
---- kstyles/themes/keramik.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/keramik.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/keramik.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/keramik.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -37,6 +37,7 @@
Comment[es]=Un estilo que utiliza mezcla alfa
Comment[et]=Alfablendingut kasutav stiil
Comment[fy]=In styl dy brûk makket fan alfaminging
Index: kstyles/themes/kstep.themerc
===================================================================
---- kstyles/themes/kstep.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/kstep.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/kstep.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/kstep.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -5,7 +5,7 @@
Name[bn]=কে.ডি.ই. স্টেপ
Name[de]=KDE-Step
Comment[fy]=Temaleaze Next-styl
Index: kstyles/themes/qtmotifplus.themerc
===================================================================
---- kstyles/themes/qtmotifplus.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/qtmotifplus.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/qtmotifplus.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/qtmotifplus.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -33,7 +33,7 @@
Comment[es]=Estilo incorporado Motif mejorado
Comment[et]=Qt täiustatud Motif'i-laadne stiil
Comment[fy]=Ynboude, ferbettere Motif-styl
Index: kstyles/themes/beos.themerc
===================================================================
---- kstyles/themes/beos.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/themes/beos.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/themes/beos.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/themes/beos.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Estilo tipo BeOS sin tema
Comment[et]=BeOS'i-laadne teemata stiil
Comment[fy]=Temaleaze BeOs eftich slyl
Index: kstyles/plastik/plastik.cpp
===================================================================
---- kstyles/plastik/plastik.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/plastik/plastik.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/plastik/plastik.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/plastik/plastik.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -159,8 +159,6 @@
hoverWidget = 0;
hoverTab = 0;
}
Index: kstyles/plastik/plastik.h
===================================================================
---- kstyles/plastik/plastik.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/plastik/plastik.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/plastik/plastik.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/plastik/plastik.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -351,10 +351,6 @@
};
QIntCache<CacheEntry> *pixmapCache;
mutable QBitmap *horizontalLine;
Index: kstyles/plastik/plastik.themerc
===================================================================
---- kstyles/plastik/plastik.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/plastik/plastik.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/plastik/plastik.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/plastik/plastik.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2,6 +2,7 @@
Name=Plastik
Name[af]=Plastiek
Comment[fy]=In ienfâldich en skjinne styl
Index: kstyles/highcontrast/highcontrast.themerc
===================================================================
---- kstyles/highcontrast/highcontrast.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/highcontrast/highcontrast.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/highcontrast/highcontrast.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/highcontrast/highcontrast.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -11,6 +11,7 @@
Name[es]=ContrasteAlto
Name[et]=Tugev kontrast
Comment[fy]=In styl dy goed wurket mei hege kontrast kleureskema’s
Index: kstyles/web/web.themerc
===================================================================
---- kstyles/web/web.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kstyles/web/web.themerc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kstyles/web/web.themerc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kstyles/web/web.themerc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -90,7 +90,7 @@
Comment[es]=Estilo objeto visual Web
Comment[et]=Veebi elementide sarnane stiil
Index: COPYING-DOCS
===================================================================
--- COPYING-DOCS (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ COPYING-DOCS (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ COPYING-DOCS (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,397 @@
+ GNU Free Documentation License
+ Version 1.2, November 2002
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+Index: configure.in.mid
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = audio/midi
+
+Property changes on: configure.in.mid
+___________________________________________________________________
+Name: svn:mime-type
+ - audio/midi
+Name: svn:keywords
+ - Author Date Id Revision
+
Index: kabc/plugins/evolution/evolution.desktop
===================================================================
---- kabc/plugins/evolution/evolution.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kabc/plugins/evolution/evolution.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kabc/plugins/evolution/evolution.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kabc/plugins/evolution/evolution.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -4,6 +4,7 @@
Name[be]=Эвалюцыя
Name[bn]=ইভোলিউশন
Name[mn]=Хөгжил
Index: kabc/plugins/dir/dir.desktop
===================================================================
---- kabc/plugins/dir/dir.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kabc/plugins/dir/dir.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kabc/plugins/dir/dir.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kabc/plugins/dir/dir.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Name[es]=Directorio
Name[et]=Kataloog
Name[fr]=Dossier
Index: kabc/kabc_manager.desktop
===================================================================
---- kabc/kabc_manager.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kabc/kabc_manager.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kabc/kabc_manager.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kabc/kabc_manager.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Name[es]=Contactos
Name[et]=Kontaktid
Name[ga]=Teagmhálacha
Index: kabc/kab2kabc.desktop
===================================================================
---- kabc/kab2kabc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kabc/kab2kabc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kabc/kab2kabc.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kabc/kab2kabc.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -34,7 +34,7 @@
Comment[es]=Conversor libkab a libkabc.
Comment[et]=libkab -> libkabc teisendamine
Comment[fy]=Konversjeprogramma fan libkab nei libkabc.
Index: kabc/lock.cpp
===================================================================
---- kabc/lock.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kabc/lock.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kabc/lock.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kabc/lock.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -57,7 +57,8 @@
if ( !file.open( IO_ReadOnly ) ) return false;
}
Index: kabc/formats/binary.desktop
===================================================================
---- kabc/formats/binary.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kabc/formats/binary.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kabc/formats/binary.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kabc/formats/binary.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Name[es]=Binario
Name[et]=Binaar
Name[fy]=Binêr
Index: kcert/kcertpart.desktop
===================================================================
---- kcert/kcertpart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kcert/kcertpart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kcert/kcertpart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kcert/kcertpart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Administrador empotrable de certificados personales
Comment[et]=Põimitav personaalsete sertifikaatide haldur
Comment[fy]=Yn te sluten Persoanlik-sertifikaatbehearder
Index: kutils/kplugininfo.desktop
===================================================================
---- kutils/kplugininfo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kutils/kplugininfo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kutils/kplugininfo.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kutils/kplugininfo.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Name[es]=Información de los plugin de KDE
Name[et]=KDE plugina info
Name[nn]=Informasjon om KDE-programtillegg
Index: kutils/kcmultidialog.cpp
===================================================================
---- kutils/kcmultidialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kutils/kcmultidialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kutils/kcmultidialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kutils/kcmultidialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -104,6 +104,7 @@
OrphanMap::Iterator end2 = m_orphanModules.end();
for( OrphanMap::Iterator it = m_orphanModules.begin(); it != end2; ++it )
void KCMultiDialog::slotDefault()
Index: kdesu/configure.in.in
===================================================================
---- kdesu/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdesu/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdesu/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdesu/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -6,6 +6,14 @@
AC_DEFINE_UNQUOTED(__PATH_SU, "$path_su", [path to su])
fi
AC_TRY_LINK([
Index: kdesu/process.cpp
===================================================================
---- kdesu/process.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdesu/process.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdesu/process.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdesu/process.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -48,6 +48,7 @@
#include <qcstring.h>
#include <qfile.h>
/*
Index: kdesu/su.cpp
===================================================================
---- kdesu/su.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdesu/su.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdesu/su.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdesu/su.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -5,6 +5,9 @@
* This file is part of the KDE project, module kdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
//////////////////////////////////////////////////////////////////////////
Index: kdesu/su.h
===================================================================
---- kdesu/su.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdesu/su.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdesu/su.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdesu/su.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -57,6 +57,7 @@
private:
class SuProcessPrivate;
#endif
Index: kspell2/kspellclient.desktop
===================================================================
---- kspell2/kspellclient.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kspell2/kspellclient.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kspell2/kspellclient.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kspell2/kspellclient.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,6 +19,7 @@
Comment[es]=Cliente KSpell
Comment[et]=KSpelli klient
Comment[fy]=KSpell Klant
Index: knewstuff/downloaddialog.h
===================================================================
---- knewstuff/downloaddialog.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ knewstuff/downloaddialog.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- knewstuff/downloaddialog.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ knewstuff/downloaddialog.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -216,7 +216,7 @@
void slotInstall();
void slotDetails();
void slotFinish();
Index: knewstuff/entry.cpp
===================================================================
---- knewstuff/entry.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ knewstuff/entry.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- knewstuff/entry.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ knewstuff/entry.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -40,18 +40,12 @@
static QPtrDict<EntryPrivate> *d_ptr = 0;
Index: knewstuff/engine.cpp
===================================================================
---- knewstuff/engine.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ knewstuff/engine.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- knewstuff/engine.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ knewstuff/engine.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -52,9 +52,8 @@
d(new Private), mType( type )
{
Index: knewstuff/downloaddialog.cpp
===================================================================
---- knewstuff/downloaddialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ knewstuff/downloaddialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- knewstuff/downloaddialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ knewstuff/downloaddialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -149,10 +149,16 @@
m_loader = new ProviderLoader(this);
connect(m_loader, SIGNAL(providersLoaded(Provider::List*)), SLOT(slotProviders(Provider::List*)));
Entry *eold = getEntry();
Index: knewstuff/provider.cpp
===================================================================
---- knewstuff/provider.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ knewstuff/provider.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- knewstuff/provider.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ knewstuff/provider.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -46,18 +46,12 @@
static QPtrDict<ProviderPrivate> *d_ptr_prov = 0;
Index: kdecore/netwm.h
===================================================================
---- kdecore/netwm.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/netwm.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/netwm.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/netwm.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1269,7 +1269,7 @@
/**
Returns an icon. If width and height are passed, the icon returned will be
Index: kdecore/svgicons/ksvgiconpainter.cpp
===================================================================
---- kdecore/svgicons/ksvgiconpainter.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/svgicons/ksvgiconpainter.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/svgicons/ksvgiconpainter.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/svgicons/ksvgiconpainter.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -106,10 +106,16 @@
for(QMap<QString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it)
}
Index: kdecore/svgicons/ksvgiconengine.cpp
===================================================================
---- kdecore/svgicons/ksvgiconengine.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/svgicons/ksvgiconengine.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/svgicons/ksvgiconengine.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/svgicons/ksvgiconengine.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -50,8 +50,11 @@
ArtGradientStop *parseGradientStops(QDomElement element, int &offsets)
QPointArray parsePoints(QString points)
Index: kdecore/ktimezones.cpp
===================================================================
---- kdecore/ktimezones.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/ktimezones.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/ktimezones.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/ktimezones.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -237,12 +237,12 @@
char *originalZone = ::getenv("TZ");
return offset;
Index: kdecore/kicontheme.h
===================================================================
---- kdecore/kicontheme.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kicontheme.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kicontheme.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kicontheme.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -51,7 +51,14 @@
Application, ///< An icon that represents an application.
Device, ///< An icon that represents a device.
* List all icon themes installed on the system, global and local.
Index: kdecore/kstandarddirs.cpp
===================================================================
---- kdecore/kstandarddirs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kstandarddirs.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kstandarddirs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kstandarddirs.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -100,6 +100,7 @@
"wallpaper", "lib", "pixmap", "templates",
"module", "qtplugins",
if (!strcmp(type, "xdgconf-menu"))
Index: kdecore/kaboutdata.h
===================================================================
---- kdecore/kaboutdata.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kaboutdata.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kaboutdata.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kaboutdata.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -359,6 +359,7 @@
* @param programName The program name. This string should be
* marked for translation.
Index: kdecore/kaccelmanager.cpp
===================================================================
---- kdecore/kaccelmanager.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kaccelmanager.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kaccelmanager.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kaccelmanager.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -167,7 +167,7 @@
{
if (!widget)
Index: kdecore/kiconloader_p.h
===================================================================
--- kdecore/kiconloader_p.h (.../tags/KDE/3.5.4/kdelibs) (revision 0)
-+++ kdecore/kiconloader_p.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
++++ kdecore/kiconloader_p.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -0,0 +1,60 @@
+/* vi: ts=8 sts=4 sw=4
+ *
+#endif // __KIconLoader_p_h_Included__
Index: kdecore/kconfig.cpp
===================================================================
---- kdecore/kconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -331,7 +331,7 @@
static KStaticDeleter< QValueList<KSharedConfig*> > sd;
QValueList<KSharedConfig*> *KSharedConfig::s_list = 0;
KSharedConfig::KSharedConfig( const QString& fileName, bool readonly, bool usekdeglobals)
Index: kdecore/Makefile.am
===================================================================
---- kdecore/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -81,7 +81,7 @@
kregpriv.h kshortcutmenu.h ksycocadict.h ksycocafactory.h netsupp.h \
kcheckaccelerators.h kcalendarsystemgregorian.h \
kdebug.cpp netwm.cpp kconfigbase.cpp kconfig.cpp ksimpleconfig.cpp \
Index: kdecore/kdebug.cpp
===================================================================
---- kdecore/kdebug.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kdebug.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kdebug.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kdebug.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -582,8 +582,10 @@
void kdClearDebugConfig()
Index: kdecore/kglobalaccel_x11.h
===================================================================
---- kdecore/kglobalaccel_x11.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kglobalaccel_x11.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kglobalaccel_x11.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kglobalaccel_x11.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -96,12 +96,14 @@
virtual bool isEnabledInternal() const;
static void blockShortcuts( bool block );
#endif // _KGLOBALACCEL_X11_H
Index: kdecore/eventsrc
===================================================================
---- kdecore/eventsrc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/eventsrc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/eventsrc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/eventsrc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Notificaciones del sistema de KDE
Comment[et]=KDE süsteemi märguanded
Comment[fy]=In fraach is stelt
Index: kdecore/kconfig.h
===================================================================
---- kdecore/kconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kconfig.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kconfig.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -280,14 +280,14 @@
/**
* Returns a ref-counted pointer to a shared read-write config object.
static QValueList<KSharedConfig*> *s_list;
Index: kdecore/kicontheme.cpp
===================================================================
---- kdecore/kicontheme.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kicontheme.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kicontheme.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kicontheme.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -106,6 +106,8 @@
// Find the theme description file. These are always global.
return;
Index: kdecore/kiconloader.cpp
===================================================================
---- kdecore/kiconloader.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kiconloader.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kiconloader.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kiconloader.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -26,6 +26,8 @@
#include <qmovie.h>
#include <qbitmap.h>
+}
Index: kdecore/kglobalaccel_x11.cpp
===================================================================
---- kdecore/kglobalaccel_x11.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kglobalaccel_x11.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kglobalaccel_x11.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kglobalaccel_x11.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -82,6 +82,7 @@
: KAccelBase( KAccelBase::NATIVE_KEYS )
, m_blocked( false )
if( !pAction ) {
Index: kdecore/kiconloader.h
===================================================================
---- kdecore/kiconloader.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kiconloader.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kiconloader.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kiconloader.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -262,6 +262,11 @@
KIcon::Context context=KIcon::Any) const;
* @param iconsDir the directory to search in
Index: kdecore/all_languages.desktop
===================================================================
---- kdecore/all_languages.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/all_languages.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/all_languages.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/all_languages.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -5,7 +5,7 @@
Name[bn]=আফার
Name[cy]=Afareg
Name[nl]=Roma
+Name[nn]=Romani
Name[pl]=Romski
- Name[pt]=Romeno
- Name[pt_BR]=Romeno
+-Name[pt]=Romeno
+-Name[pt_BR]=Romeno
++Name[pt]=Romani
++Name[pt_BR]=Romani
Name[ro]=Ţigănească
Name[ru]=Цыганский
+Name[se]=Románigiella
Name[he]=זולו
Index: kdecore/kwin.h
===================================================================
---- kdecore/kwin.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kwin.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kwin.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kwin.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -179,7 +179,8 @@
* enum for details) - passing 0 means all properties. Unlisted properties
* cause related information to be invalid in the returned data, but
Index: kdecore/kdebug.areas
===================================================================
---- kdecore/kdebug.areas (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kdebug.areas (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kdebug.areas (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kdebug.areas (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -11,6 +11,7 @@
128 kdecore (KRegExp)
129 kdecore (KAction)
170 kdecore (KNetwork socket)
Index: kdecore/kstartupinfo.cpp
===================================================================
---- kdecore/kstartupinfo.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kstartupinfo.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kstartupinfo.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kstartupinfo.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -84,7 +84,7 @@
: public KStartupInfoData
{
else
Index: kdecore/kglobalaccel.h
===================================================================
---- kdecore/kglobalaccel.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kglobalaccel.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kglobalaccel.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kglobalaccel.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -215,6 +215,12 @@
* @internal
*/
Index: kdecore/kglobalaccel.cpp
===================================================================
---- kdecore/kglobalaccel.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kglobalaccel.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kglobalaccel.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kglobalaccel.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -65,6 +65,9 @@
void KGlobalAccel::setEnabled( bool bEnabled )
{ d->setEnabled( bEnabled ); }
Index: kdecore/netwm_def.h
===================================================================
---- kdecore/netwm_def.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/netwm_def.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/netwm_def.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/netwm_def.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -270,10 +270,7 @@
@li Dialog indicates that this is a dialog window. If _NET_WM_WINDOW_TYPE is
not set, then windows with WM_TRANSIENT_FOR set must be taken as this type.
Utility = 8, ///< @since 3.2
Index: kdecore/netwm.cpp
===================================================================
---- kdecore/netwm.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/netwm.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/netwm.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/netwm.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -3467,14 +3467,19 @@
return result;
}
(icons[i].size.height >= height &&
Index: kdecore/kdebugrc
===================================================================
---- kdecore/kdebugrc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdecore/kdebugrc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdecore/kdebugrc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdecore/kdebugrc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -36,6 +36,10 @@
[125]
InfoOutput=4
InfoOutput=4
Index: khtml/khtml_ext.cpp
===================================================================
---- khtml/khtml_ext.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/khtml_ext.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/khtml_ext.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/khtml_ext.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -38,6 +38,7 @@
#include <qclipboard.h>
#include <qfileinfo.h>
for ( ; it != favoriteEngines.end(); ++it ) {
Index: khtml/khtml_settings.cc
===================================================================
---- khtml/khtml_settings.cc (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/khtml_settings.cc (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/khtml_settings.cc (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/khtml_settings.cc (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -724,8 +724,9 @@
{
if (!url.startsWith("data:"))
{
Index: khtml/khtml.desktop
===================================================================
---- khtml/khtml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/khtml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/khtml.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/khtml.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Componente incrustable para visualizar HTML
Comment[et]=Põimitav HTML-i näitamise komponent
Comment[fy]=Yn te sluten HTML-werjeftekomponint
Index: khtml/khtmlimage.desktop
===================================================================
---- khtml/khtmlimage.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/khtmlimage.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/khtmlimage.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/khtmlimage.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -19,7 +19,7 @@
Comment[es]=Componente incrustable para visualizar imágenes
Comment[et]=Põimitav pildifailide näitamise komponent
Name[fy]=Yn te sluten byldwerjefte
Index: khtml/khtmlview.cpp
===================================================================
---- khtml/khtmlview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/khtmlview.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/khtmlview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/khtmlview.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -391,8 +391,8 @@
QWidget* cursor_icon_widget;
d->scrollBarMoved = true;
Index: khtml/kmultipart/kmultipart.desktop
===================================================================
---- khtml/kmultipart/kmultipart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/kmultipart/kmultipart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/kmultipart/kmultipart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/kmultipart/kmultipart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Name[es]=Componente empotrado para multiparte/mezcla
Name[et]=Multipart/mixed põimitav komponent
Name[fy]=Yn te sluten komponint foar mulipart/mixed
Index: khtml/html/htmltokenizer.cpp
===================================================================
---- khtml/html/htmltokenizer.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/htmltokenizer.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/htmltokenizer.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/htmltokenizer.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -904,8 +904,16 @@
unsigned int a;
cBuffer[cBufferPos] = '\0';
break;
Index: khtml/html/html_formimpl.cpp
===================================================================
---- khtml/html/html_formimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/html_formimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1917,10 +1917,10 @@
if (act) {
static_cast<HTMLOptionElementImpl*>(items[i])->setSelected(true);
Index: khtml/html/html_baseimpl.cpp
===================================================================
---- khtml/html/html_baseimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/html_baseimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/html_baseimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/html_baseimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -624,6 +624,9 @@
else
removeCSSProperty(CSS_PROP_HEIGHT);
HTMLFrameElementImpl::parseAttribute( attr );
Index: khtml/html/html_elementimpl.cpp
===================================================================
---- khtml/html/html_elementimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/html_elementimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/html_elementimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/html_elementimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -530,28 +530,26 @@
// we need to pop <html> and <body> elements and remove <head> to
// accomadate folks passing complete HTML documents to make the
node = node->nextSibling();
Index: khtml/html/html_tableimpl.h
===================================================================
---- khtml/html/html_tableimpl.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/html_tableimpl.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/html_tableimpl.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/html_tableimpl.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -277,8 +277,8 @@
// overrides
virtual NodeImpl *addChild(NodeImpl *child);
virtual void parseAttribute(AttributeImpl *attr);
Index: khtml/html/html_formimpl.h
===================================================================
---- khtml/html/html_formimpl.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/html_formimpl.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/html_formimpl.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/html_formimpl.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -413,8 +413,8 @@
virtual void restoreState(const QString &);
Index: khtml/html/htmlparser.cpp
===================================================================
---- khtml/html/htmlparser.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/htmlparser.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/htmlparser.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/htmlparser.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1408,6 +1408,7 @@
// The end result will be: <b>...</b><p><b>Foo</b>Goo</p>
//
currNode = nextNode;
Index: khtml/html/html_inlineimpl.cpp
===================================================================
---- khtml/html/html_inlineimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/html_inlineimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/html_inlineimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/html_inlineimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -175,8 +175,13 @@
switch(attr->id())
{
m_hasTarget = attr->val() != 0;
Index: khtml/html/html_tableimpl.cpp
===================================================================
---- khtml/html/html_tableimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/html/html_tableimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/html/html_tableimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/html/html_tableimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -389,21 +389,18 @@
return retval;
}
if (!attr->value().isEmpty())
Index: khtml/ecma/kjs_dom.cpp
===================================================================
---- khtml/ecma/kjs_dom.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/ecma/kjs_dom.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/ecma/kjs_dom.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/ecma/kjs_dom.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1198,9 +1198,9 @@
case DOMElement::GetAttributeNode:
return getDOMNode(exec,element.getAttributeNode(args[0].toString(exec).string()));
case DOMNamedNodeMap::Item:
Index: khtml/ecma/xmlhttprequest.cpp
===================================================================
---- khtml/ecma/xmlhttprequest.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/ecma/xmlhttprequest.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/ecma/xmlhttprequest.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/ecma/xmlhttprequest.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -335,7 +335,8 @@
// FIXME: determine post encoding correctly by looking in headers
// for charset.
if(contentType.isNull())
Index: khtml/rendering/render_flow.cpp
===================================================================
---- khtml/rendering/render_flow.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_flow.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_flow.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_flow.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -4,7 +4,7 @@
* Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
}
Index: khtml/rendering/render_object.h
===================================================================
---- khtml/rendering/render_object.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_object.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_object.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_object.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -361,10 +361,12 @@
*/
struct PaintInfo {
virtual void setStyle(RenderStyle *style);
Index: khtml/rendering/render_inline.cpp
===================================================================
---- khtml/rendering/render_inline.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_inline.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_inline.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_inline.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -248,33 +248,9 @@
block->setNeedsLayoutAndMinMaxRecalc();
}
if (inside && element()) {
Index: khtml/rendering/render_layer.h
===================================================================
---- khtml/rendering/render_layer.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_layer.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_layer.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_layer.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -153,6 +153,8 @@
Marquee* marquee() const { return m_marquee; }
void suspendMarquees();
Marquee* m_marquee; // Used by layers with overflow:marquee
Index: khtml/rendering/render_line.cpp
===================================================================
---- khtml/rendering/render_line.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_line.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_line.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_line.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,7 +1,8 @@
/**
* This file is part of the html renderer for KDE.
}
Index: khtml/rendering/render_text.h
===================================================================
---- khtml/rendering/render_text.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_text.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_text.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_text.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -73,9 +73,13 @@
virtual bool isInlineTextBox() const { return true; }
FindSelectionResult checkSelectionPoint(int _x, int _y, int _tx, int _ty, const Font *f, RenderText *text, int & offset, short lineheight);
Index: khtml/rendering/render_table.h
===================================================================
---- khtml/rendering/render_table.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_table.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_table.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_table.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -306,6 +306,8 @@
virtual void layout();
virtual void paint(PaintInfo& i, int tx, int ty);
Index: khtml/rendering/render_style.h
===================================================================
---- khtml/rendering/render_style.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_style.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_style.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_style.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -332,6 +332,9 @@
bool operator!=(const StyleSurroundData& o) const {
return !(*this == o);
LengthBox margin;
Index: khtml/rendering/render_object.cpp
===================================================================
---- khtml/rendering/render_object.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_object.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_object.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_object.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1057,8 +1057,7 @@
const QColor& oc = style->outlineColor();
short vpos = m_verticalPosition;
Index: khtml/rendering/render_flow.h
===================================================================
---- khtml/rendering/render_flow.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_flow.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_flow.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_flow.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -66,8 +66,8 @@
virtual InlineBox* createInlineBox(bool makePlaceHolderBox, bool isRootLineBox);
Index: khtml/rendering/render_layer.cpp
===================================================================
---- khtml/rendering/render_layer.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_layer.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_layer.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_layer.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -97,7 +97,10 @@
m_scrollMediator( 0 ),
m_posZOrderList( 0 ),
m_marquee = new Marquee(this);
Index: khtml/rendering/render_inline.h
===================================================================
---- khtml/rendering/render_inline.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_inline.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_inline.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_inline.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -77,11 +77,11 @@
virtual int offsetTop() const;
bool m_isContinuation : 1; // Whether or not we're a continuation of an inline.
Index: khtml/rendering/render_text.cpp
===================================================================
---- khtml/rendering/render_text.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_text.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_text.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_text.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -92,6 +92,99 @@
*(size_t *)ptr = sz;
}
}
Index: khtml/rendering/render_table.cpp
===================================================================
---- khtml/rendering/render_table.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_table.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_table.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_table.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -283,9 +283,12 @@
m_height = 0;
initMaxMarginValues();
// See if nowrap was set.
Index: khtml/rendering/render_box.cpp
===================================================================
---- khtml/rendering/render_box.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_box.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_box.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_box.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -171,9 +171,8 @@
if (m_layer)
m_layer->styleChanged();
if (affectsParent)
restructureParentFlow();
}
-@@ -737,7 +736,7 @@
+@@ -504,37 +503,32 @@
+ calculateBackgroundSize(bgLayer, scaledImageWidth, scaledImageHeight);
+
+ EBackgroundRepeat bgr = bgLayer->backgroundRepeat();
+- if ((bgr == NO_REPEAT || bgr == REPEAT_Y) && w > scaledImageWidth) {
++ if (bgr == NO_REPEAT || bgr == REPEAT_Y) {
+ cw = scaledImageWidth;
+ int xPosition = bgLayer->backgroundXPosition().minWidth(pw-scaledImageWidth);
+ if ( xPosition >= 0 ) {
+ cx = _tx + xPosition;
+- cw = kMin(cw, pw - xPosition);
++ cw = kMin(scaledImageWidth, pw - xPosition);
+ }
+ else {
+ cx = _tx;
+ if (scaledImageWidth > 0) {
+ sx = -xPosition;
+- cw += xPosition;
++ cw = kMin(scaledImageWidth+xPosition, pw);
+ }
+ }
+ cx += left;
+ } else {
+- // repeat over x or background is wider than box
++ // repeat over x
+ cw = w;
+ cx = _tx;
+ if (scaledImageWidth > 0) {
+ int xPosition = bgLayer->backgroundXPosition().minWidth(pw-scaledImageWidth);
+- if ((xPosition > 0) && (bgr == NO_REPEAT)) {
+- cx += xPosition;
+- cw -= xPosition;
+- } else {
+- sx = scaledImageWidth - (xPosition % scaledImageWidth);
+- sx -= left % scaledImageWidth;
+- }
++ sx = scaledImageWidth - (xPosition % scaledImageWidth);
++ sx -= left % scaledImageWidth;
+ }
+ }
+- if( (bgr == NO_REPEAT || bgr == REPEAT_X) && ph > scaledImageHeight ) {
++ if (bgr == NO_REPEAT || bgr == REPEAT_X) {
+ ch = scaledImageHeight;
+ int yPosition = bgLayer->backgroundYPosition().minWidth(ph - scaledImageHeight);
+ if ( yPosition >= 0 ) {
+@@ -545,24 +539,19 @@
+ cy = _ty;
+ if (scaledImageHeight > 0) {
+ sy = -yPosition;
+- ch += yPosition;
++ ch = kMin(scaledImageHeight+yPosition, ph);
+ }
+ }
+
+ cy += top;
+ } else {
+- // repeat over y or background is taller than box
++ // repeat over y
+ ch = h;
+ cy = _ty;
+ if (scaledImageHeight > 0) {
+ int yPosition = bgLayer->backgroundYPosition().minWidth(ph - scaledImageHeight);
+- if ((yPosition > 0) && (bgr == NO_REPEAT)) {
+- cy += yPosition;
+- ch -= yPosition;
+- } else {
+- sy = scaledImageHeight - (yPosition % scaledImageHeight);
+- sy -= top % scaledImageHeight;
+- }
++ sy = scaledImageHeight - (yPosition % scaledImageHeight);
++ sy -= top % scaledImageHeight;
+ }
+ }
+ if (layer())
+@@ -737,7 +726,7 @@
}
if(!isInline() || isReplaced()) {
_yPos += yPos();
}
-@@ -779,7 +778,7 @@
+@@ -779,7 +768,7 @@
void RenderBox::repaint(bool immediate)
{
if( isInline() && !isReplaced() )
{
RenderObject* p = parent();
-@@ -1106,6 +1105,7 @@
+@@ -1106,6 +1095,7 @@
if (cb->isTableCell() && style()->htmlHacks()) {
result = static_cast<RenderTableCell*>(cb)->cellPercentageHeight();
}
// Otherwise we only use our percentage height if our containing block had a specified
// height.
else if (cb->style()->height().isFixed())
-@@ -1133,6 +1133,12 @@
+@@ -1133,6 +1123,12 @@
p->borderTop() + p->borderBottom() +
p->paddingTop() + p->paddingBottom());
}
result = cb->calcPercentageHeight(cb->style()->height(), treatAsReplaced);
Index: khtml/rendering/render_block.cpp
===================================================================
---- khtml/rendering/render_block.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_block.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
-@@ -1597,7 +1597,7 @@
+--- khtml/rendering/render_block.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_block.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -711,8 +711,13 @@
+ calcHeight();
+ if (oldHeight != m_height) {
+ // If the block got expanded in size, then increase our overflowheight to match.
+- if (m_overflowHeight > m_height)
+- m_overflowHeight -= (borderBottom()+paddingBottom());
++ if (m_overflowHeight > m_height) {
++ if (style()->scrollsOverflow())
++ // overflow-height only includes padding-bottom when it scrolls
++ m_overflowHeight -= borderBottom();
++ else
++ m_overflowHeight -= (borderBottom()+paddingBottom());
++ }
+ if (m_overflowHeight < m_height)
+ m_overflowHeight = m_height;
+ }
+@@ -1597,7 +1602,7 @@
yPos += overflowTop();
if( (yPos > pI.r.bottom() + os) || (_ty + h <= pI.r.y() - os))
return;
}
-@@ -1625,21 +1625,20 @@
+@@ -1625,21 +1630,20 @@
if ( pI.phase == PaintActionChildBackgrounds )
pI.phase = PaintActionChildBackground;
- child->paint(pI, scrolledX, scrolledY);
+ if (childrenInline())
+ paintLines(pI, scrolledX, scrolledY);
-+ else {
++ else {
+ for(RenderObject *child = firstChild(); child; child = child->nextSibling())
+ if(!child->layer() && !child->isFloating())
+ child->paint(pI, scrolledX, scrolledY);
// 3. paint floats.
if (!inlineFlow && (pI.phase == PaintActionFloat || pI.phase == PaintActionSelection))
paintFloats(pI, scrolledX, scrolledY, pI.phase == PaintActionSelection);
-@@ -2413,6 +2412,9 @@
+@@ -2413,6 +2417,9 @@
int RenderBlock::getClearDelta(RenderObject *child)
{
int bottom = 0;
Index: khtml/rendering/render_line.h
===================================================================
---- khtml/rendering/render_line.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/rendering/render_line.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/rendering/render_line.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/rendering/render_line.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -45,6 +45,9 @@
void detach(RenderArena* renderArena);
Index: khtml/dom/dom_node.cpp
===================================================================
---- khtml/dom/dom_node.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/dom/dom_node.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/dom/dom_node.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/dom/dom_node.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -270,21 +270,23 @@
{
if (!impl) throw DOMException(DOMException::NOT_FOUND_ERR);
Node Node::appendChild( const Node &newChild )
Index: khtml/java/kjavaappletviewer.desktop
===================================================================
---- khtml/java/kjavaappletviewer.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/java/kjavaappletviewer.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/java/kjavaappletviewer.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/java/kjavaappletviewer.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Name[es]=Visor de applets de Java empotrables
Name[et]=Põimitav Java apleti näitaja
Name[fy]=yn sluten Java Applet Werjefte
Index: khtml/css/html4.css
===================================================================
---- khtml/css/html4.css (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/css/html4.css (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/css/html4.css (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/css/html4.css (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -170,7 +170,6 @@
table {
display: table;
box-sizing: border-box;
Index: khtml/css/cssparser.cpp
===================================================================
---- khtml/css/cssparser.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/css/cssparser.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/css/cssparser.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/css/cssparser.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1316,9 +1316,11 @@
{
CSSValueListImpl* values = new CSSValueListImpl();
Index: khtml/css/cssstyleselector.h
===================================================================
---- khtml/css/cssstyleselector.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/css/cssstyleselector.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/css/cssstyleselector.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/css/cssstyleselector.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -28,6 +28,7 @@
#include "rendering/render_style.h"
current generic font family has changed. -dwh */
Index: khtml/css/quirks.css
===================================================================
---- khtml/css/quirks.css (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/css/quirks.css (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/css/quirks.css (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/css/quirks.css (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,6 +24,7 @@
color: -khtml-text;
font-size: medium;
LAYER {
Index: khtml/css/cssstyleselector.cpp
===================================================================
---- khtml/css/cssstyleselector.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/css/cssstyleselector.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/css/cssstyleselector.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/css/cssstyleselector.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -700,7 +700,7 @@
// Table rows, sections and the table itself will support overflow:hidden and will ignore scroll/auto.
return false;
Index: khtml/css/cssparser.h
===================================================================
---- khtml/css/cssparser.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/css/cssparser.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/css/cssparser.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/css/cssparser.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -137,6 +137,9 @@
bool parseFont(bool important);
bool parseCounter(int propId, bool increment, bool important);
// @param forward if true, it parses the next in the list
Index: khtml/misc/helper.cpp
===================================================================
---- khtml/misc/helper.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/misc/helper.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/misc/helper.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/misc/helper.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2,6 +2,7 @@
* This file is part of the CSS implementation for KDE.
*
* @return the background color. It is guaranteed that a valid color is returned.
Index: khtml/misc/loader.cpp
===================================================================
---- khtml/misc/loader.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/misc/loader.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/misc/loader.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/misc/loader.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -527,6 +527,13 @@
const QPixmap &CachedImage::tiled_pixmap(const QColor& newc, int xWidth, int xHeight)
{
bg = new QPixmap(xWidth, xHeight, r.depth());
Index: khtml/misc/helper.h
===================================================================
---- khtml/misc/helper.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/misc/helper.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/misc/helper.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/misc/helper.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -40,6 +40,7 @@
bool hasSufficientContrast(const QColor &c1, const QColor &c2);
enum FindSelectionResult { SelectionPointBefore,
Index: khtml/test_regression.cpp
===================================================================
---- khtml/test_regression.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/test_regression.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -107,8 +107,8 @@
using namespace DOM;
using namespace KJS;
setenv( "DISPLAY", ":47", 1 );
Index: khtml/xml/dom_nodeimpl.cpp
===================================================================
---- khtml/xml/dom_nodeimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/xml/dom_nodeimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/xml/dom_nodeimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/xml/dom_nodeimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -137,16 +137,14 @@
return 0;
}
if (exceptioncode)
Index: khtml/xml/dom2_traversalimpl.cpp
===================================================================
---- khtml/xml/dom2_traversalimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/xml/dom2_traversalimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/xml/dom2_traversalimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/xml/dom2_traversalimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -113,22 +113,22 @@
if( n->hasChildNodes() )
return n->firstChild();
void NodeIteratorImpl::detach(int &/*exceptioncode*/)
Index: khtml/xml/dom_elementimpl.cpp
===================================================================
---- khtml/xml/dom_elementimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/xml/dom_elementimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/xml/dom_elementimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/xml/dom_elementimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -175,8 +175,10 @@
m_value = v.implementation();
m_value->ref();
Index: khtml/xml/dom_nodeimpl.h
===================================================================
---- khtml/xml/dom_nodeimpl.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/xml/dom_nodeimpl.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/xml/dom_nodeimpl.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/xml/dom_nodeimpl.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -131,8 +131,10 @@
// insertBefore, replaceChild and appendChild also close newChild
// unlike the speed optimized addChild (which is used by the parser)
Index: khtml/xml/dom_docimpl.cpp
===================================================================
---- khtml/xml/dom_docimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ khtml/xml/dom_docimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- khtml/xml/dom_docimpl.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ khtml/xml/dom_docimpl.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -224,7 +224,9 @@
{
Index: kresources/kresources_manager.desktop
===================================================================
---- kresources/kresources_manager.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kresources/kresources_manager.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kresources/kresources_manager.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kresources/kresources_manager.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,6 +16,7 @@
Comment[es]=Administrador de KResource
Comment[et]=KResource'i haldur
Comment[fy]=KResource-behearder
Index: kresources/kresources.desktop
===================================================================
---- kresources/kresources.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kresources/kresources.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kresources/kresources.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kresources/kresources.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -24,6 +24,7 @@
Name[es]=Recursos de KDE
Name[et]=KDE ressursid
Keywords[fy]=helpboarne,ferbinings-helpboarne,kontakt-helpboarne,kalinder-helpboarne,notysje-helpboarne,imap,kontakt,kalinder,notysje,ferbining
Index: kresources/kresources_plugin.desktop
===================================================================
---- kresources/kresources_plugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kresources/kresources_plugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kresources/kresources_plugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kresources/kresources_plugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Plugin del entorno de KResource
Comment[et]=KResource'i raamistiku plugin
Comment[nn]=Programtillegg for KResource-rammeverket
Index: kjs/lexer.cpp
===================================================================
---- kjs/lexer.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kjs/lexer.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kjs/lexer.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kjs/lexer.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -39,6 +39,7 @@
#include "identifier.h"
#include "lookup.h"
if (buffer8[0] == '0' && (buffer8[1] == 'x' || buffer8[1] == 'X')) {
Index: kjs/date_object.cpp
===================================================================
---- kjs/date_object.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kjs/date_object.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kjs/date_object.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kjs/date_object.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -417,6 +417,14 @@
case GetSeconds:
case GetMilliSeconds:
}
Index: pics/hicolor/index.theme
===================================================================
---- pics/hicolor/index.theme (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ pics/hicolor/index.theme (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- pics/hicolor/index.theme (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ pics/hicolor/index.theme (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -8,7 +8,7 @@
Name[el]=KDE-Πολλά χρώματα
Name[eo]=KDE-multkolora
Comment[fy]=Standert Ikoan tema
Index: pics/crystalsvg/index.theme
===================================================================
---- pics/crystalsvg/index.theme (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ pics/crystalsvg/index.theme (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- pics/crystalsvg/index.theme (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ pics/crystalsvg/index.theme (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -4,6 +4,7 @@
Name[bn]=কৃস্টাল এস-ভি-জি
Name[br]=Strink SVG
Comment[fy]=ikoan tema makke troch Everaldo.com Design Studio
Index: kdoctools/customization/fr/user.entities
===================================================================
---- kdoctools/customization/fr/user.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/fr/user.entities (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/fr/user.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/fr/user.entities (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,6 +20,8 @@
<!ENTITY traducteurAdrienBoillot '<othercredit role="translator"><firstname>Adrien</firstname><surname>Boillot</surname><affiliation><address><email>bec.bunsen@laposte.net</email></address> </affiliation><contrib>Traduction française</contrib></othercredit>'>
<!ENTITY relecteurAdrienBoillot '<othercredit role="reviewer"><firstname>Adrien</firstname><surname>Boillot</surname><affiliation><address><email>bec.bunsen@laposte.net</email></address> </affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
<!ENTITY PatrickChavas 'Patrick Chavas <email>pachavas@sun.cpe.fr</email>'>
Index: kdoctools/customization/pt/user.entities
===================================================================
---- kdoctools/customization/pt/user.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/pt/user.entities (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/pt/user.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/pt/user.entities (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -40,3 +40,4 @@
<!ENTITY kinfocenter "<application>Centro de Informação do KDE</application>" >
<!ENTITY ksystemlog "<application>KSystemLog</application>" >
+<!ENTITY qt "<trademark>Qt</trademark>" >
Index: kdoctools/customization/entities/contributor.entities
===================================================================
---- kdoctools/customization/entities/contributor.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/entities/contributor.entities (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/entities/contributor.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/entities/contributor.entities (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -443,3 +443,5 @@
<!ENTITY Alex.Zepeda.mail '<email>zipzippy@sonic.net</email>'>
<!ENTITY Nikolas.Zimmermann '<personname><firstname>Nikolas</firstname><surname>Zimmermann</surname></personname>'>
+<!ENTITY Danny.Allen.mail '<email>danny@dannyallen.co.uk</email>'>
Index: kdoctools/customization/pt-BR/entities/underFDL.docbook
===================================================================
---- kdoctools/customization/pt-BR/entities/underFDL.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/pt-BR/entities/underFDL.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/pt-BR/entities/underFDL.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/pt-BR/entities/underFDL.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,3 +1,3 @@
-<para id="gnu-fdl" xreflabel="the section entitled "GNU Free Documentation License"">Esta documentação é licenciada sob os termos da <ulink
-url="common/fdl-license.html">Licença de Documentação Livre
GNU</ulink>.</para>
Index: kdoctools/customization/pt-BR/entities/fdl-notice.docbook
===================================================================
---- kdoctools/customization/pt-BR/entities/fdl-notice.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/pt-BR/entities/fdl-notice.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/pt-BR/entities/fdl-notice.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/pt-BR/entities/fdl-notice.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -2,7 +2,7 @@
documento sob os termos da Licença de Documentação Livre GNU,
Versão 1.1 ou qualquer versão posterior publicada pela Fundação do Software
mode: sgml
Index: kdoctools/customization/pt-BR/strings.entities
===================================================================
---- kdoctools/customization/pt-BR/strings.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/pt-BR/strings.entities (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/pt-BR/strings.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/pt-BR/strings.entities (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -8,17 +8,17 @@
The default values of the parameter entities is IGNORE. -->
<![%FDLIS;[
Index: kdoctools/customization/zh-TW/user.entities
===================================================================
---- kdoctools/customization/zh-TW/user.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/zh-TW/user.entities (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/zh-TW/user.entities (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/zh-TW/user.entities (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -6,3 +6,33 @@
names (which if they occur will cost you a _lot_ of time)
-->
+<!ENTITY Tab "<keycap>Tab</keycap>">
Index: kdoctools/customization/zh-TW/entities/underGPL.docbook
===================================================================
---- kdoctools/customization/zh-TW/entities/underGPL.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/zh-TW/entities/underGPL.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/zh-TW/entities/underGPL.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/zh-TW/entities/underGPL.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,3 +1,3 @@
<para>
-¥»µ{¦¡ªº±ÂÅv¤è¦¡±Ä¥Î <ulink url="common/gpl-translated.html">GNU ³q¥Î¤½¦@³\¥iÃÒ</ulink>¡C
</para>
Index: kdoctools/customization/zh-TW/entities/underArtisticLicense.docbook
===================================================================
---- kdoctools/customization/zh-TW/entities/underArtisticLicense.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/zh-TW/entities/underArtisticLicense.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/zh-TW/entities/underArtisticLicense.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/zh-TW/entities/underArtisticLicense.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,2 +1,2 @@
-<para>¥»µ{¦¡ªº±ÂÅv¤è¦¡±Ä¥Î <ulink
-url="common/artistic-license.html">Artistic ³\¥iÃÒ(Artistic License)</ulink>¡C</para>
+url="common/artistic-license.html">Artistic 許可證(Artistic License)</ulink>。</para>
Index: kdoctools/customization/zh-TW/entities/underFDL.docbook
===================================================================
---- kdoctools/customization/zh-TW/entities/underFDL.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/zh-TW/entities/underFDL.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/zh-TW/entities/underFDL.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/zh-TW/entities/underFDL.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1 +1 @@
-<para id="gnu-fdl" xreflabel="the section entitled "GNU Free Documentation License"">¥»¤å¥óªº±ÂÅv¤è¦¡±Ä¥Î <ulink url="common/fdl-translated.html">GNU ¦Û¥Ñ¤å¥ó³\¥iÃÒ</ulink>¡C</para>
+<para id="gnu-fdl" xreflabel="the section entitled "GNU Free Documentation License"">本文件的授權方式採用 <ulink url="common/fdl-translated.html">GNU 自由文件許可證</ulink>。</para>
Index: kdoctools/customization/zh-TW/entities/underBSDLicense.docbook
===================================================================
---- kdoctools/customization/zh-TW/entities/underBSDLicense.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/zh-TW/entities/underBSDLicense.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/zh-TW/entities/underBSDLicense.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/zh-TW/entities/underBSDLicense.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,2 +1,2 @@
-<para>¥»µ{¦¡ªº±ÂÅv¤è¦¡±Ä¥Î <ulink
-url="common/bsd-license.html">BSD ³\¥iÃÒ(BSD License)</ulink>¡C</para>
+url="common/bsd-license.html">BSD 許可證(BSD License)</ulink>。</para>
Index: kdoctools/customization/zh-TW/entities/underX11License.docbook
===================================================================
---- kdoctools/customization/zh-TW/entities/underX11License.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdoctools/customization/zh-TW/entities/underX11License.docbook (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdoctools/customization/zh-TW/entities/underX11License.docbook (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdoctools/customization/zh-TW/entities/underX11License.docbook (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -1,2 +1,2 @@
-<para>¥»µ{¦¡ªº±ÂÅv¤è¦¡±Ä¥Î <ulink
-url="common/x11-license.html">X11 ³\¥iÃÒ(X11 License)</ulink>¡C</para>
+url="common/x11-license.html">X11 許可證(X11 License)</ulink>。</para>
Index: kparts/krop.desktop
===================================================================
---- kparts/krop.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kparts/krop.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kparts/krop.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kparts/krop.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Componente de KDE
Comment[et]=KDE komponent
Comment[fy]=KDE-komponint
Index: kparts/krwp.desktop
===================================================================
---- kparts/krwp.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kparts/krwp.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kparts/krwp.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kparts/krwp.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Componente de KDE
Comment[et]=KDE komponent
Comment[fy]=KDE-komponint
Index: kparts/browserrun.h
===================================================================
---- kparts/browserrun.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kparts/browserrun.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kparts/browserrun.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kparts/browserrun.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -63,9 +63,10 @@
* @param part the part going to open this URL - can be 0L if not created yet
* @param window the mainwindow - passed to KIO::Job::setWindow()
KParts::ReadOnlyPart *part, QWidget *window,
Index: kparts/tests/notepad.desktop
===================================================================
---- kparts/tests/notepad.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kparts/tests/notepad.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kparts/tests/notepad.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kparts/tests/notepad.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Name[es]=Bloc de notas (ejemplo)
Name[et]=Notepad (näidis)
Name[fy]=Skriuwboekje (foarbyld)
Index: kparts/browserextension.h
===================================================================
---- kparts/browserextension.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kparts/browserextension.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kparts/browserextension.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kparts/browserextension.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -686,6 +686,13 @@
*/
void setPageSecurity( int );
void slotOpenURLRequest( const KURL &url, const KParts::URLArgs &args );
Index: kparts/browserview.desktop
===================================================================
---- kparts/browserview.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kparts/browserview.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kparts/browserview.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kparts/browserview.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Name[es]=Vista de navegador
Name[et]=Brauseri vaade
Name[fy]=Browserwerjefte
Index: kparts/kpart.desktop
===================================================================
---- kparts/kpart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kparts/kpart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kparts/kpart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kparts/kpart.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Componente de KDE
Comment[et]=KDE komponent
Comment[fy]=KDE-komponint
Index: kded/test/test.desktop
===================================================================
---- kded/test/test.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kded/test/test.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kded/test/test.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kded/test/test.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -26,7 +26,7 @@
Name[es]=Módulo de prueba de KDED
Name[et]=KDED testmoodul
Comment[fy]=In testmodule foar KDED
Index: kded/kdedmodule.desktop
===================================================================
---- kded/kdedmodule.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kded/kdedmodule.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kded/kdedmodule.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kded/kdedmodule.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -20,7 +20,7 @@
Comment[es]=Módulo de KDED
Comment[et]=KDED moodul
Comment[fy]=KDED-module
Index: kded/kded.cpp
===================================================================
---- kded/kded.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kded/kded.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kded/kded.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kded/kded.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -129,7 +129,11 @@
delete m_pTimer;
delete m_pDirWatch;
bool Kded::process(const QCString &obj, const QCString &fun,
Index: kded/vfolder_menu.cpp
===================================================================
---- kded/vfolder_menu.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kded/vfolder_menu.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kded/vfolder_menu.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kded/vfolder_menu.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -747,7 +747,7 @@
while( !result.isEmpty() && (result[0] != basePath))
}
Index: Makefile.am.in
===================================================================
---- Makefile.am.in (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ Makefile.am.in (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- Makefile.am.in (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ Makefile.am.in (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -33,7 +33,7 @@
$(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
pot_DATA = kde.pot
Index: kdeprint/tools/escputil/escputil.desktop
===================================================================
---- kdeprint/tools/escputil/escputil.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/tools/escputil/escputil.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/tools/escputil/escputil.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/tools/escputil/escputil.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -8,7 +8,7 @@
Name[bn]=এপসন ইঙ্কজেট
Name[de]=Epson InkJet
Name[hi]=एप्सन इंकजेट
Index: kdeprint/filters/poster.desktop
===================================================================
---- kdeprint/filters/poster.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/poster.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/poster.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/poster.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -90,7 +90,6 @@
Description[es]=Aplicación para imprimir posters grandes en varias hojas de papel. Para usar el comando, el ejecutable <b>poster</b> debe estar accesible en su <tt>PATH</tt>. El código fuente de esta utilidad puede encontrarse en la <a href="http://printing.kde.org/downloads">página web de KDEPrint</a>. <p><b><u>AVISO:</u></b> el paquete en la página web KDEPrint es una versión modificada de la original que se puede encontrar en cualquier réplica de archivos de CTAN. Pero el paquete original <b>no</b> funciona con KDE,. Usted <b>debe</b> usar el paquete que se encuentra en <a href="http://printing.kde.org/downloads">el servidor web de KDEPrint</a>.
Description[et]=Vahend suurte postrite trükkimiseks mitmele väikesele paberilehele. Käsu kasutamiseks peab <b>postri</b> käivitusfail asuma sinu otsingurajal. Rakenduse lähtekoodi leiab <a href="http://printing.kde.org/downloads">KDEPrinti veebileheküljel</a>. <p><b><u>HOIATUS</u></b> KDEPrinti veebileheküljel olev pakett on muudetud võrreldes algsega, mille leiab suvaliselt CTAN-i arhiivi peeglilt, kuid originaalpakett <b>ei</b> toimi KDE-s. Sa lihtsalt <b>pead</b> kasutama paketti, mis asub <a href="http://printing.kde.org/downloads">KDEPrinti veebileheküljel</a>.
Description[ru]=Утилита печати больших плакатов на бумаге небольшого размера. Чтобы она работала, нужно чтобы программа <b>poster</b> была доступна в вашем <tt>PATH</tt>. Исходники этой утилиты можно найти на сайте <a href="http://printing.kde.org/downloads">KDEPrint</a>. <p><b><u>ВНИМАНИЕ:</u></b> Пакеты на сайте KDEPrint отличаются от тех, которые можно скачать с зеркала CTAN, но оригинальные пакеты <b>не будут</b> работать в KDE. Вам <b>необходимо</b> использовать пакеты с сайта <a href="http://printing.kde.org/downloads">KDEPrint</a>.
Index: kdeprint/filters/psbook1.desktop
===================================================================
---- kdeprint/filters/psbook1.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/psbook1.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/psbook1.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/psbook1.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -3,7 +3,6 @@
Name[af]=psboek1
Name[de]=PS-Book 1
Comment[fy]=Pamflet printsje - even bledsiden (stap 1)
Index: kdeprint/filters/psbook2.desktop
===================================================================
---- kdeprint/filters/psbook2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/psbook2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/psbook2.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/psbook2.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -3,7 +3,6 @@
Name[af]=psboek2
Name[de]=PS-Book 2
Comment[fy]=Pamflet printsje - ûneven bledsiden (stap 2)
Index: kdeprint/filters/psselect.desktop
===================================================================
---- kdeprint/filters/psselect.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/psselect.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/psselect.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/psselect.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -26,7 +26,7 @@
Comment[es]=Filtro de ordenamiento/selección de página
Comment[et]=Lehekülgede valimise/järjestamise filter
Comment[fy]=Bledsiden selektearje/op oarder bringe
Index: kdeprint/filters/pdfwrite.desktop
===================================================================
---- kdeprint/filters/pdfwrite.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/pdfwrite.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/pdfwrite.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/pdfwrite.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -31,7 +31,7 @@
Comment[es]=Escritor de PDF (requiere Ghostscript)
Comment[et]=PDF-i kirjutaja (vajab Ghostscripti)
Comment[fy]=PDF Writer (hat Ghostskript nedich)
Index: kdeprint/filters/enscript.desktop
===================================================================
---- kdeprint/filters/enscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/enscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/enscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/enscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -33,7 +33,7 @@
Comment[es]=Filtro de textos Enscript
Comment[et]=Enscript tekstifilter
Comment[fy]=Enscript-tekstfilter
Index: kdeprint/filters/imagetops.desktop
===================================================================
---- kdeprint/filters/imagetops.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/imagetops.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/imagetops.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/imagetops.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -4,6 +4,7 @@
Name[az]=rəsmlər
Name[da]=billedtoppe
Comment[fy]=Algemiene ôfbylding nei PS-filter
Index: kdeprint/filters/psbook.desktop
===================================================================
---- kdeprint/filters/psbook.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/psbook.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/psbook.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/psbook.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -27,7 +27,7 @@
Comment[es]=Impresión de folleto (usar con impresión de doble cara pequeña)
Comment[et]=Brošüüri trükkimine - (kasutatakse duplekstrükkimisel)
Comment[fy]=Pamflet printsje(te brûken mei smelle kant fan dupleksôfdruk)
Index: kdeprint/filters/ps2pdf.desktop
===================================================================
---- kdeprint/filters/ps2pdf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/ps2pdf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/ps2pdf.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/ps2pdf.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Comment[es]=Conversor de PostScript a PDF
Comment[et]=PostScript->PDF teisendamine
Comment[fy]=Konversje fan PostSkript nei PDF
Index: kdeprint/filters/psresize.desktop
===================================================================
---- kdeprint/filters/psresize.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/psresize.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/psresize.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/psresize.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -28,7 +28,7 @@
Comment[es]=Escalar el contenido de la impresión para ajustar en otro tamaño del papel
Comment[et]=Sisu suuruse muutmine mahutamaks teise suurusega paberile
Comment[fy]=Pas de ôfdruk oan oan in oar formaat papier
Index: kdeprint/filters/psnup.desktop
===================================================================
---- kdeprint/filters/psnup.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/filters/psnup.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/filters/psnup.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/filters/psnup.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=Filtro para múltiples páginas por hoja
Comment[et]=Mitme lehekülje ühele lehele trükkimise filter
Comment[fi]=Useita sivuja samalle arkille
Comment[fr]=Plusieurs pages par feuille
Comment[fy]=Mear as ien side op in bôge
+Index: kdeprint/cups/cupsinfos.h
+===================================================================
+--- kdeprint/cups/cupsinfos.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/cupsinfos.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -32,6 +32,7 @@
+ ~CupsInfos();
+
+ const QString& host() const;
++ QString hostaddr() const;
+ int port() const;
+ const QString& login() const;
+ const QString& password() const;
+Index: kdeprint/cups/cupsinfos.cpp
+===================================================================
+--- kdeprint/cups/cupsinfos.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/cupsinfos.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -69,6 +69,13 @@
+ {
+ }
+
++QString CupsInfos::hostaddr() const
++{
++ if (host_[0] != '/')
++ return host_ + ":" + port_;
++ return host_;
++}
++
+ void CupsInfos::setHost(const QString& s)
+ {
+ host_ = s;
Index: kdeprint/cups/cups.print
===================================================================
---- kdeprint/cups/cups.print (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/cups/cups.print (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/cups/cups.print (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/cups.print (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,7 +14,7 @@
Comment[eo]=CUPS (Kapabla Uniks-pressistemo)
Comment[es]=CUPS (sistema de impresión común para Unix)
Comment[fr]=CUPS (Common Unix Print System)
Comment[fy]=CUPS (Common Unix Print System)
Comment[gl]=CUPS (Sistema Comun de Impresión para UNIX)
+Index: kdeprint/cups/kmcupsmanager.h
+===================================================================
+--- kdeprint/cups/kmcupsmanager.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/kmcupsmanager.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -25,8 +25,11 @@
+ class IppRequest;
+ class KLibrary;
+ class KExtendedSocket;
+-class QSocket;
+
++namespace KNetwork {
++ class KStreamSocket;
++}
++
+ class KMCupsManager : public KMManager
+ {
+ friend class KMWIppPrinter;
+@@ -95,7 +98,7 @@
+ private:
+ KLibrary *m_cupsdconf;
+ KMPrinter *m_currentprinter;
+- QSocket *m_socket;
++ KNetwork::KStreamSocket *m_socket;
+ bool m_hostSuccess;
+ bool m_lookupDone;
+ };
+Index: kdeprint/cups/kmcupsuimanager.cpp
+===================================================================
+--- kdeprint/cups/kmcupsuimanager.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/kmcupsuimanager.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -135,7 +135,7 @@
+ QString uri;
+
+ req.setOperation(CUPS_GET_DEVICES);
+- uri = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
++ uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
+ req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
+
+ if (req.doRequest("/"))
+Index: kdeprint/cups/kmcupsmanager.cpp
+===================================================================
+--- kdeprint/cups/kmcupsmanager.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/kmcupsmanager.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -45,12 +45,14 @@
+ #include <klocale.h>
+ #include <kconfig.h>
+ #include <kstandarddirs.h>
++#include <ksocketbase.h>
+ #include <klibloader.h>
+ #include <kmessagebox.h>
+ #include <kaction.h>
+ #include <kdialogbase.h>
+ #include <kextendedsocket.h>
+ #include <kprocess.h>
++#include <kbufferedsocket.h>
+ #include <kfilterdev.h>
+ #include <cups/cups.h>
+ #include <cups/ppd.h>
+@@ -88,7 +90,7 @@
+
+ KMCupsManager::~KMCupsManager()
+ {
+- //delete m_socket;
++ delete m_socket;
+ }
+
+ QString KMCupsManager::driverDbCreationProgram()
+@@ -135,7 +137,8 @@
+ {
+ req.setOperation(CUPS_ADD_CLASS);
+ QStringList members = p->members(), uris;
+- QString s = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
++ QString s;
++ s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
+ for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
+ uris.append(s+(*it));
+ req.addURI(IPP_TAG_PRINTER,"member-uris",uris);
+@@ -907,25 +910,23 @@
+
+ QString KMCupsManager::stateInformation()
+ {
+- return QString("%1: %2:%3")
++ return QString("%1: %2")
+ .arg(i18n("Server"))
+- .arg(CupsInfos::self()->host())
+- .arg(CupsInfos::self()->port());
++ .arg(CupsInfos::self()->hostaddr());
+ }
+
+ void KMCupsManager::checkUpdatePossibleInternal()
+ {
+ kdDebug(500) << "Checking for update possible" << endl;
+ delete m_socket;
+- /*m_socket = new KExtendedSocket( CupsInfos::self()->host(), CupsInfos::self()->port() );
+- connect( m_socket, SIGNAL( connectionSuccess() ), SLOT( slotConnectionSuccess() ) );
+- connect( m_socket, SIGNAL( connectionFailed( int ) ), SLOT( slotConnectionFailed( int ) ) );
+- m_socket->setTimeout( 1 );*/
+- m_socket = new QSocket( this );
+- connect( m_socket, SIGNAL( connected() ), SLOT( slotConnectionSuccess() ) );
+- connect( m_socket, SIGNAL( error( int ) ), SLOT( slotConnectionFailed( int ) ) );
+- trials = 5;
+- QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) );
++ m_socket = new KNetwork::KBufferedSocket;
++ m_socket->setTimeout( 1 );
++ connect( m_socket, SIGNAL( connected(const KResolverEntry&) ),
++ SLOT( slotConnectionSuccess() ) );
++ connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
++
++ trials = 5;
++ QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) );
+ }
+
+ void KMCupsManager::slotConnectionSuccess()
+@@ -959,7 +960,10 @@
+ {
+ kdDebug(500) << "Starting async connect" << endl;
+ //m_socket->startAsyncConnect();
+- m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() );
++ if (CupsInfos::self()->host().startsWith("/"))
++ m_socket->connect( QString(), CupsInfos::self()->host());
++ else
++ m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() );
+ }
+
+ void KMCupsManager::slotConnectionFailed( int errcode )
+@@ -975,9 +979,25 @@
+ return;
+ }
+
+- setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
+- "Error: %1." ).arg( errcode == QSocket::ErrConnectionRefused ? i18n( "connection refused" ) : i18n( "host not found" ) ) );
+- setUpdatePossible( false );
++ QString einfo;
++
++ switch (errcode) {
++ case KNetwork::KSocketBase::ConnectionRefused:
++ case KNetwork::KSocketBase::ConnectionTimedOut:
++ einfo = i18n("connection refused") + QString(" (%1)").arg(errcode);
++ break;
++ case KNetwork::KSocketBase::LookupFailure:
++ einfo = i18n("host not found") + QString(" (%1)").arg(errcode);
++ break;
++ case KNetwork::KSocketBase::WouldBlock:
++ default:
++ einfo = i18n("read failed (%1)").arg(errcode);
++ break;
++ }
++
++ setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
++ "Error: %2: %1." ).arg( einfo, CupsInfos::self()->host()));
++ setUpdatePossible( false );
+ }
+
+ void KMCupsManager::hostPingSlot() {
+@@ -1014,7 +1034,7 @@
+ if (use && !p->uri().isEmpty())
+ uri = p->uri().prettyURL();
+ else
+- uri = QString("ipp://%1:%2/%4/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"));
++ uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"));
+ return uri;
+ }
+
+Index: kdeprint/cups/cupsdoprint.c
+===================================================================
+--- kdeprint/cups/cupsdoprint.c (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/cupsdoprint.c (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -41,7 +41,7 @@
+ #endif
+
+ /* utility functions */
+-void error(const char* msg)
++static void error(const char* msg)
+ {
+ fprintf(stderr, "%s\n", msg);
+ #if USE_LOG
+@@ -50,7 +50,7 @@
+ exit(-1);
+ }
+
+-void usage()
++static void usage()
+ {
+ error("usage: cupsdoprint [-H host[:port]][-P dest][-J name][-o opt=value[,...]][-U login[:password]] files...");
+ }
+@@ -81,7 +81,7 @@
+ return result;
+ }
+
+-const char* getPasswordCB(const char* prompt)
++static const char* getPasswordCB(const char* prompt)
+ {
+ char buf[ 256 ] = {0}, *c;
+ char *_user = shell_quote( cupsUser() ), *_passwd = NULL;
Index: kdeprint/cups/cupsdconf2/cups-util.c
===================================================================
---- kdeprint/cups/cupsdconf2/cups-util.c (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/cups/cupsdconf2/cups-util.c (.../branches/KDE/3.5/kdelibs) (revision 586512)
-@@ -443,8 +443,7 @@
+--- kdeprint/cups/cupsdconf2/cups-util.c (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/cupsdconf2/cups-util.c (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -14,7 +14,7 @@
+ static int cups_local_auth(http_t *http);
+
+ const char * /* O - Filename for PPD file */
+-cupsGetConf()
++cupsGetConf(void)
+ {
+ int fd; /* PPD file */
+ int bytes; /* Number of bytes read */
+@@ -142,7 +142,11 @@
+ */
+
+ snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
+- httpEncode64(encode, plain);
++#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
++ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
++#else
++ httpEncode64(encode, plain);
++#endif
+ snprintf(authstring, sizeof(authstring), "Basic %s", encode);
+ }
+ else
+@@ -364,7 +368,11 @@
+ */
+
+ snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
+- httpEncode64(encode, plain);
++#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
++ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
++#else
++ httpEncode64(encode, plain);
++#endif
+ snprintf(authstring, sizeof(authstring), "Basic %s", encode);
+ }
+ else
+@@ -443,8 +451,7 @@
the struct has changed in newer versions - PiggZ (adam@piggz.co.uk)
*/
#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
#else
if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
strcasecmp(http->hostname, "localhost") != 0)
+Index: kdeprint/cups/cupsdconf2/cups-util.h
+===================================================================
+--- kdeprint/cups/cupsdconf2/cups-util.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/cups/cupsdconf2/cups-util.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -20,7 +20,7 @@
+ #ifndef CUPS_UTIL_H
+ #define CUPS_UTIL_H
+
+-const char* cupsGetConf();
++const char* cupsGetConf(void);
+ int cupsPutConf(const char *filename);
+
+ #endif
Index: kdeprint/foomatic/foomatic.print
===================================================================
---- kdeprint/foomatic/foomatic.print (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/foomatic/foomatic.print (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/foomatic/foomatic.print (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/foomatic/foomatic.print (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -6,7 +6,7 @@
Comment[bn]=ফুম্যাটিক (CUPS, LPRng, PDQ)
Comment[cy]=Foomatic (CUPS, LPRng, PDQ)
Comment[sq]=Foomatik (CUPS, LPRng, PDQ)
Index: kdeprint/lpd/lpd.print
===================================================================
---- kdeprint/lpd/lpd.print (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/lpd/lpd.print (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/lpd/lpd.print (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/lpd/lpd.print (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -18,7 +18,7 @@
Comment[es]=LPR (sistema de impresión estándar de BSD)
Comment[et]=LPR (standardne BSD trükkimise süsteem)
Comment[fy]=LPR (standert BSD-ôfdruksysteem)
Index: kdeprint/kdeprintd.desktop
===================================================================
---- kdeprint/kdeprintd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/kdeprintd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/kdeprintd.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/kdeprintd.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -27,7 +27,7 @@
Name[es]=Demonio de impresión de KDE
Name[et]=KDE trükkimise deemon
Comment[fi]=KDE:n tulostuspalvelin
Comment[fr]=Un démon d'impression pour KDE
Comment[fy]=ôfdruk deamon foar KDE
+Index: kdeprint/management/kmpropbackend.cpp
+===================================================================
+--- kdeprint/management/kmpropbackend.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/management/kmpropbackend.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -57,7 +57,7 @@
+ {
+ if (p && p->isPrinter())
+ {
+- m_uri->setText(p->device());
++ m_uri->setText(KURL(p->device()).prettyURL());
+ QString prot = p->deviceProtocol();
+ if (prot == "ipp" || prot == "http") m_type->setText(i18n("IPP Printer"));
+ else if (prot == "usb") m_type->setText(i18n("Local USB Printer"));
Index: kdeprint/management/kminfopage.cpp
===================================================================
---- kdeprint/management/kminfopage.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/management/kminfopage.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/management/kminfopage.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/management/kminfopage.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -127,7 +127,7 @@
+ {
+ QString s;
+ for (QStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it)
+- s.append((*it) + ", ");
++ s.append(KURL(*it).prettyURL() + ", ");
+ s.truncate(s.length()-2);
+ m_device->setText(s);
+ }
@@ -135,7 +135,8 @@
{
// double decoding in case printer name contains
}
m_model->setText(p->driverInfo());
}
+Index: kdeprint/management/kmwend.cpp
+===================================================================
+--- kdeprint/management/kmwend.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/management/kmwend.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
+@@ -93,7 +93,7 @@
+ default:
+ // double decoding in case the printer name contains chars like '#' that are
+ // not decoded by "prettyURL".
+- txt.append(s.arg(i18n("URI")).arg(shadowPassword( p->device() )));
++ txt.append(s.arg(i18n("URI")).arg(KURL( p->device()).prettyURL()));
+ break;
+ }
+ txt.append("</ul><br>");
Index: kdeprint/rlpr/rlpr.print
===================================================================
---- kdeprint/rlpr/rlpr.print (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/rlpr/rlpr.print (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/rlpr/rlpr.print (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/rlpr/rlpr.print (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -15,7 +15,7 @@
Comment[es]=Entorno RLPR (servidores LPD remotos)
Comment[et]=RLPR keskkond (LPD võrguserverid)
Comment[fy]=RLPR-fermidden (LPD-tsjinners op ôfstân)
Index: kdeprint/lpdunix/lpdunix.print
===================================================================
---- kdeprint/lpdunix/lpdunix.print (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/lpdunix/lpdunix.print (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/lpdunix/lpdunix.print (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/lpdunix/lpdunix.print (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -17,7 +17,7 @@
Comment[es]=Sistema de impresión genérico LPD de Unix (predeterminado)
Comment[et]=Tavaline UNIX-i LPD trükkimise süsteem (vaikimisi)
Comment[fy]=Algemiene UNIX LPD-ôfdruksysteem (standert)
Index: kdeprint/ext/ext.print
===================================================================
---- kdeprint/ext/ext.print (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/ext/ext.print (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/ext/ext.print (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/ext/ext.print (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -16,7 +16,7 @@
Comment[es]=Imprime a través de un programa externo (genérico)
Comment[et]=Trükkimine läbi välise rakenduse (üldine)
Comment[fy]=Printsje mei help fan een ekstern programma (algemien)
Index: kdeprint/specials.desktop
===================================================================
---- kdeprint/specials.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeprint/specials.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeprint/specials.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeprint/specials.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -21,7 +21,7 @@
Name[es]=Imprimir en archivo (PostScript)
Name[et]=Faili trükkimine (Postscript)
Name[fy]=Avansearre faksprogramma (ksendfax)
Index: kdeui/ksyntaxhighlighter.cpp
===================================================================
---- kdeui/ksyntaxhighlighter.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/ksyntaxhighlighter.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/ksyntaxhighlighter.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/ksyntaxhighlighter.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -507,7 +507,9 @@
int para, index;
textEdit()->getCursorPosition( ¶, &index );
d->completeRehighlightRequired = false;
Index: kdeui/kpopupmenu.cpp
===================================================================
---- kdeui/kpopupmenu.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/kpopupmenu.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/kpopupmenu.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/kpopupmenu.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -108,9 +108,6 @@
AlignCenter | SingleLine, titleStr);
}
QSize KPopupTitle::sizeHint() const
Index: kdeui/kkeydialog.cpp
===================================================================
---- kdeui/kkeydialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/kkeydialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/kkeydialog.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/kkeydialog.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -888,8 +888,11 @@
KStdAccel::ShortcutList std_list;
KShortcut newCut = origCut;
Index: kdeui/ktoolbar.cpp
===================================================================
---- kdeui/ktoolbar.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/ktoolbar.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/ktoolbar.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/ktoolbar.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -769,7 +769,7 @@
KToolBar::BarPosition KToolBar::barPos() const
{
bool dm3;
Index: kdeui/kdetrayproxy/kdetrayproxy.desktop
===================================================================
---- kdeui/kdetrayproxy/kdetrayproxy.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/kdetrayproxy/kdetrayproxy.desktop (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/kdetrayproxy/kdetrayproxy.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/kdetrayproxy/kdetrayproxy.desktop (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -14,6 +14,7 @@
Name[es]=Módulo Proxy de bandeja de KDE
Name[et]=KDE süsteemse salve proxy moodul
Comment[fy]=Troch Proxy kinne KDE systeemfak applikaasjes wurkje sûnder KWin
Index: kdeui/kdatepicker.cpp
===================================================================
---- kdeui/kdatepicker.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/kdatepicker.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/kdatepicker.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/kdatepicker.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -370,10 +370,8 @@
int day = calendar->day(date);
}
Index: kdeui/kwindowlistmenu.cpp
===================================================================
---- kdeui/kwindowlistmenu.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/kwindowlistmenu.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/kwindowlistmenu.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/kwindowlistmenu.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -45,6 +45,16 @@
#include "kwindowlistmenu.h"
#include "kwindowlistmenu.moc"
void KWindowListMenu::virtual_hook( int id, void* data )
Index: kdeui/klistviewsearchline.h
===================================================================
---- kdeui/klistviewsearchline.h (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/klistviewsearchline.h (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/klistviewsearchline.h (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/klistviewsearchline.h (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -33,6 +33,9 @@
* No changes to the application other than instantiating this class with an
* appropriate KListView should be needed.
* QListViewItemIterator::Visible to the iterator flags). Otherwise,
Index: kdeui/tests/kmainwindowtest.cpp
===================================================================
---- kdeui/tests/kmainwindowtest.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/tests/kmainwindowtest.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/tests/kmainwindowtest.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/tests/kmainwindowtest.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -26,10 +26,9 @@
{
KApplication app( argc, argv, "kmainwindowtest" );
Index: kdeui/keditlistbox.cpp
===================================================================
---- kdeui/keditlistbox.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586512)
-+++ kdeui/keditlistbox.cpp (.../branches/KDE/3.5/kdelibs) (revision 586512)
+--- kdeui/keditlistbox.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 586795)
++++ kdeui/keditlistbox.cpp (.../branches/KDE/3.5/kdelibs) (revision 586795)
@@ -102,6 +102,7 @@
grid->addMultiCellWidget(editingWidget,1,1,0,1);
grid->addMultiCellWidget(m_listBox, 2, 6, 0, 0);
projects / packages / kdelibs.git / commitdiff