SOURCES: kdewebdev-branch.diff - update from upstream

arekm Sat, 31 Dec 2005 03:34:15 -0800

Author: arekm                        Date: Sat Dec 31 11:21:45 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update from upstream


---- Files affected:
SOURCES:
   kdewebdev-branch.diff (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kdewebdev-branch.diff
diff -u SOURCES/kdewebdev-branch.diff:1.2 SOURCES/kdewebdev-branch.diff:1.3
--- SOURCES/kdewebdev-branch.diff:1.2   Tue Mar 29 20:34:40 2005
+++ SOURCES/kdewebdev-branch.diff       Sat Dec 31 12:21:40 2005
@@ -1,179 +1,16 @@
-diff -urN -x CVS kdewebdev.orig/admin/acinclude.m4.in 
kdewebdev/admin/acinclude.m4.in
---- kdewebdev.orig/admin/acinclude.m4.in       2005-02-09 23:21:09.000000000 
+0100
-+++ kdewebdev/admin/acinclude.m4.in    2005-03-24 20:18:09.000000000 +0100
-@@ -1644,7 +1644,15 @@
- 
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
--      AC_MSG_ERROR([you need to install kdelibs first.])
-+      AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs. 
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the 
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -3104,8 +3112,8 @@
-         fi
-         rm -f conftest.h conftest.h.gch
-     fi
--    AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test 
"$kde_gcc_supports_pch" = "yes")
-   fi
-+  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test 
"$kde_gcc_supports_pch" = "yes")
-   if test "$CXX" = "KCC"; then
-     dnl unfortunately we currently cannot disable exception support in KCC
-     dnl because doing so is binary incompatible and Qt by default links with 
exceptions :-(
-@@ -3194,6 +3202,51 @@
-   ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
- 
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+  [
-+    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], 
kde_cv_val_gcc_visibility_bug,
-+      [
-+        AC_LANG_SAVE
-+        AC_LANG_CPLUSPLUS
-+
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+        AC_TRY_LINK(
-+        [
-+          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+          template<typename CharT>
-+          struct VisTest
-+          {
-+            inline VisTest ();
-+          };
-+          template<typename CharT>
-+          inline VisTest<CharT>::VisTest()
-+          {}
-+          extern template class VisTest<char>;  // It works if we drop that 
line
-+          int some_function( int do_something ) __attribute__ 
((visibility("default")));
-+          int some_function( int )
-+          {
-+            VisTest<char> a;
-+            return 0;
-+          }
-+        ], [/* elvis is alive */],
-+        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+        CXXFLAGS=$safe_CXXFLAGS
-+        LDFLAGS=$safe_LDFLAGS
-+        AC_LANG_RESTORE
-+      ]
-+    )
-+
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
-+  ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
-   if test "$GXX" = "yes"; then
-@@ -3202,7 +3255,9 @@
-     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-     KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-     [
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        KDE_CHECK_VISIBILITY_GCC_BUG
-+
-         HAVE_GCC_VISIBILITY=1
-         AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", 
[define to 1 if -fvisibility is supported])
-     ])
-diff -urN -x CVS kdewebdev.orig/admin/am_edit kdewebdev/admin/am_edit
---- kdewebdev.orig/admin/am_edit       2004-12-17 21:18:28.000000000 +0100
-+++ kdewebdev/admin/am_edit    2005-03-29 11:15:16.000000000 +0200
-@@ -483,6 +483,7 @@
-             $MakefileData =~ s/$lookup/$replacement/;
-             $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
-             $replacement = "$stuff_before\$(KCXXFLAGS) 
\$(KDE_CXXFLAGS)$stuff_after";
-+            next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ 
/\$\(KDE_CXXFLAGS\)/);
-             substituteLine($lookup, $replacement);
-         } else {
-             $found = 0;
-@@ -634,7 +635,7 @@
-               if ($pre eq '' && exists($varcontent{$variable})) {
-                   my @addlist = split(/[\034\s]+/, $varcontent{$variable});
-                   push(@objlist, @addlist);
--                } elsif ($variable !~ 'OBJEXT') {
-+                } elsif ($variable !~ 'OBJEXT' && $variable !~ 
/am__objects_\d+/ ) {
-                     $ocv = 1;
-               }
-             }
-@@ -2276,7 +2277,7 @@
-            "\t        echo \"\$\$i\"; \\\n" . 
-            "\t        if ! ";
-     $t .=  $cxxsuffix eq "KKK" ?
--           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) 
\$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-+           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) 
\$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
-            "\$(CXXCOMPILE) ";
-     $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
-            "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
-@@ -2352,7 +2353,7 @@
-     $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
-     # Append our $progId line, _below_ the "generated by automake" line
-     # because automake-1.6 relies on the first line to be his own.
--    my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-+    my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-     if ( !( $MakefileData =~ s/^(.*generated .*by 
automake.*\n)/$1$progIdLine/ ) ) {
-         warn "automake line not found in $makefile\n";
-       # Fallback: first line
-diff -urN -x CVS kdewebdev.orig/kfilereplace/kfilereplace.desktop 
kdewebdev/kfilereplace/kfilereplace.desktop
---- kdewebdev.orig/kfilereplace/kfilereplace.desktop   2005-02-23 
06:08:40.000000000 +0100
-+++ kdewebdev/kfilereplace/kfilereplace.desktop        2005-03-28 
09:03:55.000000000 +0200
-@@ -6,7 +6,6 @@
- Name[ta]=KŕŽŕŻŕŽŞŕŻŕŽŞŕŻ ŕŽŕŽŕŽŽŕŽžŕŽąŕŻŕŽąŕŻ
- Name[tg]=KĐ¤Đ°ĐšĐťŃĐž ŇˇĐžĐšĐłŃĐˇĐžŃ ĐşĐ°ŃĐ´Đ°Đ˝
- Name[tr]=K Dosya DeÄiĹtirme
--Name[xx]=xxKFileReplacexx
- Exec=kfilereplace %i %m -caption "%c"
- Icon=kfilereplace
- Type=Application
-@@ -22,15 +21,18 @@
- GenericName[fi]=Etsi & korvaa tyĂśkalu
- GenericName[fr]=Outil de recherche et de remplacement
- GenericName[hu]=FĂĄjlkeresĹ
-+GenericName[is]=TĂłl til aĂ° leita aĂ° texta og skipta Ăşt
- GenericName[it]=Strumento di ricerca e sostituzione
- GenericName[ja]=ć¤ç´˘ĺăłç˝ŽćăăźăŤ
- GenericName[nl]=Gereedschap voor zoeken en vervangen
- GenericName[pl]=NarzÄdzie do wyszukiwania i zamiany
- GenericName[pt]=Ferramenta de Procura e SubstituiĂ§ĂŁo
--GenericName[pt_BR]=Ferramenta de Procura e SubstituiĂ§ĂŁo
-+GenericName[pt_BR]=Ferramenta de Procura & SubstituiĂ§ĂŁo
- GenericName[ru]=ĐĐžĐ¸ŃĐş Đ¸ ĐˇĐ°ĐźĐľĐ˝Đ°
-+GenericName[sl]=Orodje za iskanje in zamenjavo
-+GenericName[sr]=ĐĐťĐ°Ń ĐˇĐ° ĐżŃĐľŃŃĐ°ĐłŃ Đ¸ ĐˇĐ°ĐźĐľĐ˝Ń
[EMAIL PROTECTED] za pretragu i zamenu
- GenericName[sv]=SĂśk- och ersĂ¤ttningsverktyg
- GenericName[uk]=ĐĐ°ŃŃĐą ĐżĐžŃŃĐşŃ ŃĐ° ĐˇĐ°ĐźŃĐ˝Đ¸
--GenericName[xx]=xxSearch & Replace Toolxx
- GenericName[zh_CN]=ćç´˘ćżć˘ĺˇĽĺˇ
- Categories=Qt;KDE;Utility;
-diff -urN -x CVS kdewebdev.orig/kfilereplace/kfilereplacepart.desktop 
kdewebdev/kfilereplace/kfilereplacepart.desktop
---- kdewebdev.orig/kfilereplace/kfilereplacepart.desktop       2005-02-23 
06:08:40.000000000 +0100
-+++ kdewebdev/kfilereplace/kfilereplacepart.desktop    2005-03-28 
09:03:55.000000000 +0200
-@@ -28,14 +28,14 @@
- Comment[pt]=Uma ferramenta de procura e substituiĂ§ĂŁo por atacado
- Comment[pt_BR]=Uma ferramenta de substituiĂ§ĂŁo e pesquisa batch
- Comment[ru]=ĐĐ°ĐşĐľŃĐ˝ŃĐš ĐżĐžĐ¸ŃĐş Đ¸ ĐˇĐ°ĐźĐľĐ˝Đ°
-+Comment[sl]=Orodje serijskega iskanja in zamenjevanja
- Comment[sr]=ĐĐťĐ°Ń ĐˇĐ° ĐżĐ°ĐşĐľŃĐ˝Ń ĐżŃĐľŃŃĐ°ĐłŃ Đ¸ ĐˇĐ°ĐźĐľĐ˝Ń
[EMAIL PROTECTED] za paketno traĹženje i zamenu
[EMAIL PROTECTED] za paketnu pretragu i zamenu
- Comment[sv]=Ett sĂśk- och ersĂ¤ttningsverktyg
- Comment[ta]=ŕŽ¤ŕŻŕŽŕŻŕŽ¤ŕŽż ŕŽ¤ŕŻŕŽŕŽ˛ŕŻ ŕŽŽŕŽąŕŻŕŽąŕŻŕŽŽŕŻ 
ŕŽŕŽ°ŕŻŕŽľŕŽż ŕŽŕŽŕŽŽŕŽžŕŽąŕŻŕŽąŕŽ˛ŕŻ
+Index: kfilereplace/kfilereplacepart.desktop
+===================================================================
+--- kfilereplace/kfilereplacepart.desktop      (.../tags/KDE/3.5.0/kdewebdev)  
(revision 492851)
++++ kfilereplace/kfilereplacepart.desktop      
(.../branches/KDE/3.5/kdewebdev)        (revision 492851)
+@@ -24,6 +24,7 @@
+ Comment[is]=TĂłl til aĂ° leita aĂ° texta og skipta Ăşt
+ Comment[it]=Uno strumento per la ricerca e la sostituzione in sequenza
+ Comment[ja]=ăăăć¤ç´˘ĺăłç˝ŽćăăźăŤ
++Comment[lt]=Paketinis paieĹĄkos ir keitimo ÄŻrankis
+ Comment[ms]=Gugusan alatan cari dan ganti
+ Comment[nl]=Een gereedschap voor zoeken en vervangen
+ Comment[pl]=NarzÄdzie do wyszukiwania i zamiany
+@@ -38,7 +39,6 @@
  Comment[tg]=ŇśŃŃŃŃŇˇÓŻĐ¸ ĐżĐ°ĐşĐľŃ Đ˛Đ° Đ¸Đ˛Đ°ĐˇĐ¸ Đ°ŃĐąĐžĐą
  Comment[tr]=Bir toplu arama ve deÄiĹtirme aracÄą
  Comment[uk]=ĐĐ°ŃŃĐą ĐżĐ°ĐşĐľŃĐ˝ĐžĐłĐž ĐżĐžŃŃĐşŃ ŃĐ° ĐˇĐ°ĐźŃĐ˝Đ¸
@@ -181,18717 +18,1103 @@
  Comment[zh_CN]=ćšéćç´˘ćżć˘ĺˇĽĺˇ
  Name=KFileReplace
  Name[hi]=ŕ¤ŕĽ-ŕ¤Ťŕ¤źŕ¤žŕ¤ŕ¤˛-ŕ¤°ŕ¤żŕ¤ŞŕĽŕ¤˛ŕĽŕ¤¸
-@@ -43,7 +43,6 @@
+@@ -46,7 +46,6 @@
  Name[ta]=KŕŽŕŻŕŽŞŕŻŕŽŞŕŻ ŕŽŕŽŕŽŽŕŽžŕŽąŕŻŕŽąŕŻ
  Name[tg]=KĐ¤Đ°ĐšĐťŃĐž ŇˇĐžĐšĐłŃĐˇĐžŃ ĐşĐ°ŃĐ´Đ°Đ˝
  Name[tr]=K Dosya DeÄiĹtirme
 -Name[xx]=xxKFileReplacexx
  GenericName=File Replace View
  GenericName[bg]=ĐŃĐľĐłĐťĐľĐ´ Đ˝Đ° ŃĐ°ĐšĐťĐžĐ˛ĐľŃĐľ ĐˇĐ° ĐˇĐ°ĐźŃĐ˝Đ°
- GenericName[ca]=Vista per substituir fitxers
-@@ -61,10 +60,12 @@
+ GenericName[ca]=Vista per a substituir fitxers
+@@ -63,6 +62,7 @@
+ GenericName[is]=Texta ĂştskiptingarsĂ˝n
+ GenericName[it]=Vista di sostituzione file
+ GenericName[ja]=ăăĄă¤ăŤç˝ŽćăăĽăź
++GenericName[lt]=KeitimĹł bylose vaizdas
+ GenericName[ms]=Paparan Ganti Fail
  GenericName[nl]=Weergave van bestanden vervangen
  GenericName[pl]=Widok zamiany w plikach
- GenericName[pt]=Vista de SubstituiĂ§ĂŁo de Ficheiros
--GenericName[pt_BR]=Vista de SubstituiĂ§ĂŁo de Ficheiros
-+GenericName[pt_BR]=VisĂ§ai de SubstituiĂ§ĂŁo de Arquivos
- GenericName[ru]=ĐĄŃĐľĐ´ŃŃĐ˛Đž ĐżĐžĐ¸ŃĐşĐ° Đ¸ ĐˇĐ°ĐźĐľĐ˝Ń Đ˛ ŃĐ°ĐšĐťĐ°Ń
-+GenericName[sl]=Prikaz zamenjave datotek
-+GenericName[sr]=ĐŃĐ¸ĐşĐ°Đˇ ĐˇĐ°ĐźĐľĐ˝Đ° Ń ŃĐ°ŃĐťĐžĐ˛Đ¸ĐźĐ°
[EMAIL PROTECTED] zamena u fajlovima
+@@ -75,5 +75,4 @@
  GenericName[sv]=FilersĂ¤ttningsvy
  GenericName[ta]=ŕŽŕŻŕŽŞŕŻŕŽŞŕŻ ŕŽŕŽŕŽŽŕŽžŕŽąŕŻŕŽąŕŻ ŕŽŕŽžŕŽŕŻŕŽŕŽż
  GenericName[uk]=ĐĐľŃĐľĐłĐťŃĐ´ ĐˇĐ°ĐźŃĐ˝Đ¸ Đ˛ ŃĐ°ĐšĐťĐ°Ń
 -GenericName[xx]=xxFile Replace Viewxx
  GenericName[zh_CN]=ćäťśćżć˘č§ĺž
-diff -urN -x CVS kdewebdev.orig/kimagemapeditor/kimagemapeditor.desktop 
kdewebdev/kimagemapeditor/kimagemapeditor.desktop
---- kdewebdev.orig/kimagemapeditor/kimagemapeditor.desktop     2005-02-23 
06:08:41.000000000 +0100
-+++ kdewebdev/kimagemapeditor/kimagemapeditor.desktop  2005-03-07 
15:23:32.000000000 +0100
-@@ -11,7 +11,6 @@
- Name[ta]=KŕŽľŕŽŕŽżŕŽľŕŽŽŕŻ ŕŽľŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŽŕŽŽŕŻ 
ŕŽ¤ŕŽżŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŽż
- Name[tg]=KĐŃŇłĐ°ŃŃĐ¸ŃĐ¸ ŃĐ°ŃĐ˛Đ¸ŃĐ¸ ŇłĐ°ŃĐ¸ŃĐ°
- Name[tr]=K Resim HaritasÄą DĂźzenleyicisi
--Name[xx]=xxKImageMapEditorxx
- GenericName=HTML Image Map Editor
- GenericName[ca]=Un editor de mapes d'imatges HTML
- GenericName[da]=HTML editor af kortbilleder
-@@ -31,12 +30,11 @@
- GenericName[pt_BR]=Editor de Mapeamento de Imagem HTML
- GenericName[sl]=Urejevalnik slikovnih zemljevidov v HTML
- GenericName[sr]=ĐŁŃĐľŃĐ¸Đ˛Đ°Ń HTML ŃĐťĐ¸ĐşĐžĐ˛Đ˝Đľ ĐźĐ°ĐżĐľ
[EMAIL PROTECTED] HTML ŃĐťĐ¸ĐşĐžĐ˛Đ˝Đľ ĐźĐ°ĐżĐľ
[EMAIL PROTECTED] HTML slikovne mape
- GenericName[sv]=Redigering av HTML-bildkartor
- GenericName[ta]=HTML ŕŽľŕŽŕŽżŕŽľŕŽŽŕŻ ŕŽľŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŽŕŽŽŕŻ 
ŕŽ¤ŕŽżŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŽż
- GenericName[tg]=ĐŃŇłĐ°ŃŃĐ¸ŃĐ¸ ŃĐ°ŃĐ˛Đ¸ŃĐ¸ ŇłĐ°ŃĐ¸ŃĐ°Đ¸ HTML
- GenericName[tr]=HTML Resim HaritasÄą DĂźzenleyicisi
- GenericName[uk]=Đ ĐľĐ´Đ°ĐşŃĐžŃ ĐşĐ°ŃŃ ĐˇĐžĐąŃĐ°ĐśĐľĐ˝Ń HTML
--GenericName[xx]=xxHTML Image Map Editorxx
- GenericName[zh_CN]=HTML ĺžĺć ĺ°çźčžĺ¨
- Categories=Qt;KDE;Development;
-diff -urN -x CVS kdewebdev.orig/kimagemapeditor/kimagemapeditorpart.desktop 
kdewebdev/kimagemapeditor/kimagemapeditorpart.desktop
---- kdewebdev.orig/kimagemapeditor/kimagemapeditorpart.desktop 2005-02-23 
06:08:41.000000000 +0100
-+++ kdewebdev/kimagemapeditor/kimagemapeditorpart.desktop      2005-03-07 
15:23:32.000000000 +0100
-@@ -26,13 +26,12 @@
- Comment[ru]=Đ ĐľĐ´Đ°ĐşŃĐžŃ HTML imagemap
- Comment[sl]=Urejevalnik slikovnih zemljevidov v HTML
- Comment[sr]=ĐŁŃĐľŃĐ¸Đ˛Đ°Ń HTML ŃĐťĐ¸ĐşĐžĐ˛Đ˝Đľ ĐźĐ°ĐżĐľ
[EMAIL PROTECTED] HTML ŃĐťĐ¸ĐşĐžĐ˛Đ˝Đľ ĐźĐ°ĐżĐľ
[EMAIL PROTECTED] HTML slikovne mape
- Comment[sv]=En editor fĂśr HTML-bildkartor
- Comment[ta]=An HTML ŕŽľŕŽŕŽżŕŽľŕŽŽŕŻ ŕŽľŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŽŕŽŽŕŻ 
ŕŽ¤ŕŽżŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŽż
- Comment[tg]=ĐŃŇłĐ°ŃŃĐ¸ŃĐ¸ ŃĐ°ŃĐ˛Đ¸ŃĐ¸ ŇłĐ°ŃĐ¸ŃĐ°Đ¸ HTML
- Comment[tr]=Bir HTML resim_haritasÄą dĂźzenleyicisi
- Comment[uk]=Đ ĐľĐ´Đ°ĐşŃĐžŃ imagemap HTML
--Comment[xx]=xxAn HTML imagemap editorxx
- Comment[zh_CN]=HTML ĺžĺć ĺ°çźčžĺ¨
- Name=KImageMapEditor
- Name[pt_BR]=KEditor de Mapeamento de Imagem
-@@ -40,4 +39,3 @@
- Name[ta]=KŕŽľŕŽŕŽżŕŽľŕŽŽŕŻ ŕŽľŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŽŕŽŽŕŻ 
ŕŽ¤ŕŽżŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŽż
- Name[tg]=KĐŃŇłĐ°ŃŃĐ¸ŃĐ¸ ŃĐ°ŃĐ˛Đ¸ŃĐ¸ ŇłĐ°ŃĐ¸ŃĐ°
- Name[tr]=K Resim HaritasÄą DĂźzenleyicisi
--Name[xx]=xxKImageMapEditorxx
-diff -urN -x CVS kdewebdev.orig/klinkstatus/src/klinkstatus.desktop 
kdewebdev/klinkstatus/src/klinkstatus.desktop
---- kdewebdev.orig/klinkstatus/src/klinkstatus.desktop 2005-02-03 
10:57:31.000000000 +0100
-+++ kdewebdev/klinkstatus/src/klinkstatus.desktop      2005-03-07 
15:23:32.000000000 +0100
-@@ -4,7 +4,6 @@
- Name[sv]=Klinkstatus
- Name[ta]=KŕŽ¤ŕŻŕŽŕŻŕŽ¤ŕŽż ŕŽ¨ŕŽżŕŽ˛ŕŻŕŽŽŕŻ
- Name[tr]=K KĂśprĂź Durumu
--Name[xx]=xxKLinkStatusxx
- Exec=klinkstatus %i %m -caption "%c"
- Icon=klinkstatus
+Index: kfilereplace/kfilereplace.desktop
+===================================================================
+--- kfilereplace/kfilereplace.desktop  (.../tags/KDE/3.5.0/kdewebdev)  
(revision 492851)
++++ kfilereplace/kfilereplace.desktop  (.../branches/KDE/3.5/kdewebdev)        
(revision 492851)
+@@ -6,7 +6,6 @@
+ Name[ta]=KŕŽŕŻŕŽŞŕŻŕŽŞŕŻ ŕŽŕŽŕŽŽŕŽžŕŽąŕŻŕŽąŕŻ
+ Name[tg]=KĐ¤Đ°ĐšĐťŃĐž ŇˇĐžĐšĐłŃĐˇĐžŃ ĐşĐ°ŃĐ´Đ°Đ˝
+ Name[tr]=K Dosya DeÄiĹtirme
+-Name[xx]=xxKFileReplacexx
+ Exec=kfilereplace %i %m -caption "%c"
+ Icon=kfilereplace
  Type=Application
-@@ -31,12 +30,11 @@
- GenericName[ru]=ĐŃĐžĐ˛ĐľŃĐşĐ° ŃŃŃĐťĐžĐş
- GenericName[sl]=Preverjalnik povezav
- GenericName[sr]=ĐŃĐžĐ˛ĐľŃĐ° Đ˛ĐľĐˇĐľ
[EMAIL PROTECTED] Đ˛ĐľĐˇĐľ
[EMAIL PROTECTED] veze
- GenericName[sv]=LĂ¤nkkontroll
- GenericName[ta]=ŕŽŕŽŁŕŻŕŽŞŕŻŕŽŞŕŻ ŕŽŕŽ°ŕŽżŕŽŞŕŽžŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŽžŕŽŠŕŻ
- GenericName[tg]=Đ˘Đ°ŃŃĐ¸ŃĐ¸ Đ¸ŃŃĐ¸Đ˝ĐžĐ´
- GenericName[tr]=BaÄlantÄą KontrolcĂźsĂź
- GenericName[uk]=ĐĐľŃĐľĐ˛ŃŃĐşĐ° ĐżĐžŃĐ¸ĐťĐ°Đ˝Ń
--GenericName[xx]=xxLink Checkerxx
- GenericName[zh_CN]=éžćĽćŁćĽĺ¨
- Categories=Qt;KDE;Utility;
-diff -urN -x CVS kdewebdev.orig/klinkstatus/src/klinkstatus_part.desktop 
kdewebdev/klinkstatus/src/klinkstatus_part.desktop
---- kdewebdev.orig/klinkstatus/src/klinkstatus_part.desktop    2005-02-16 
05:33:23.000000000 +0100
-+++ kdewebdev/klinkstatus/src/klinkstatus_part.desktop 2005-03-07 
15:23:32.000000000 +0100
-@@ -8,7 +8,6 @@
- Name[sv]=Klinkstatus-delprogram
- Name[ta]=KŕŽ¤ŕŻŕŽŕŻŕŽ¤ŕŽż ŕŽ¨ŕŽżŕŽ˛ŕŻŕŽŽŕŻ ŕŽŞŕŽŕŻŕŽ¤ŕŽż
- Name[tg]=ŇĐ¸ŃĐźĐ¸ KLinkStatus
--Name[xx]=xxKLinkStatusPartxx
- 
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
- ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
- X-KDE-Library=libklinkstatuspart
-diff -urN -x CVS kdewebdev.orig/kommander/editor/kmdr-editor.desktop 
kdewebdev/kommander/editor/kmdr-editor.desktop
---- kdewebdev.orig/kommander/editor/kmdr-editor.desktop        2005-02-11 
05:54:20.000000000 +0100
-+++ kdewebdev/kommander/editor/kmdr-editor.desktop     2005-03-28 
09:03:55.000000000 +0200
-@@ -26,13 +26,12 @@
- GenericName[ru]=ĐĐ¸Đ˝Đ°ĐźĐ¸ŃĐľŃĐşĐ¸Đš ŃĐľĐ´Đ°ĐşŃĐžŃ Đ´Đ¸Đ°ĐťĐžĐłĐžĐ˛
- GenericName[sl]=Urejevalnik dinamiÄnih pogovornih oken
- GenericName[sr]=ĐŁŃĐľŃĐ¸Đ˛Đ°Ń Đ´Đ¸Đ˝Đ°ĐźĐ¸ŃĐşĐ¸Ń Đ´Đ¸ŃĐ°ĐťĐžĐłĐ°
[EMAIL PROTECTED] ureÄivaÄ dijaloga
[EMAIL PROTECTED] dinamiÄkih dijaloga
- GenericName[sv]=Editor fĂśr dynamiska dialogrutor
- GenericName[ta]=ŕŽ¨ŕŽżŕŽŕŽ´ŕŻŕŽŽŕŻ ŕŽŕŽ°ŕŻŕŽŻŕŽžŕŽŕŽ˛ŕŻ 
ŕŽ¤ŕŽżŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŽż
- GenericName[tg]=ĐŃŇłĐ°ŃŃĐ¸ŃĐ¸ Đ´Đ¸Đ°ĐťĐžĐłĐ¸ Đ´Đ¸Đ˝Đ°ĐźĐ¸ĐşĐ°
- GenericName[tr]=Dinamik Diyalog DĂźzenleyicisi
- GenericName[uk]=ĐĐ¸Đ˝Đ°ĐźŃŃĐ˝Đ¸Đš ŃĐľĐ´Đ°ĐşŃĐžŃ Đ˛ŃĐşĐžĐ˝
--GenericName[xx]=xxDynamic Dialog Editorxx
- GenericName[zh_CN]=ĺ¨ćĺŻščŻćĄçźčžĺ¨
- Name=Kommander Editor
- Name[br]=Aozer Kommander
-@@ -59,14 +58,13 @@
- Name[pt_BR]=Editor Kommander
- Name[ru]=Đ ĐľĐ´Đ°ĐşŃĐžŃ Kommander
- Name[sl]=Urejevalnik Kommander
--Name[sr]=ĐŁŃĐľŃĐ¸Đ˛Đ°Ń Kommander
[EMAIL PROTECTED] ureÄivaÄ
-+Name[sr]=Kommander ŃŃĐľŃĐ¸Đ˛Đ°Ń
[EMAIL PROTECTED] ureÄivaÄ
- Name[sv]=Kommander editor
- Name[ta]=KŕŽŕŽŕŻŕŽŕŽłŕŻŕŽ¤ŕŻ ŕŽ¤ŕŽżŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŽż
- Name[tg]=ĐŃŇłĐ°ŃŃĐ¸ŃĐ¸ Kommander
- Name[tr]=Kommander DĂźzenleyici
- Name[uk]=Đ ĐľĐ´Đ°ĐşŃĐžŃ Kommander
--Name[xx]=xxKommander Editorxx
- Name[zh_CN]=Kommander çźčžĺ¨
- Exec=kmdr-editor %F
- Icon=kmdr-editor
-@@ -98,13 +96,12 @@
- Comment[ru]=ĐĐ¸Đ˝Đ°ĐźĐ¸ŃĐľŃĐşĐ¸Đš ŃĐľĐ´Đ°ĐşŃĐžŃ Đ´Đ¸Đ°ĐťĐžĐłĐžĐ˛
- Comment[sl]=Urejevalnik dinamiÄnih pogovornih oken
- Comment[sr]=ĐŁŃĐľŃĐ¸Đ˛Đ°Ń Đ´Đ¸Đ˝Đ°ĐźĐ¸ŃĐşĐ¸Ń Đ´Đ¸ŃĐ°ĐťĐžĐłĐ°
[EMAIL PROTECTED] ureÄivaÄ dijaloga
[EMAIL PROTECTED] dinamiÄkih dijaloga
- Comment[sv]=Editor fĂśr dynamiska dialogrutor
- Comment[ta]=ŕŽ¨ŕŽżŕŽŕŽ´ŕŻŕŽŽŕŻ ŕŽŕŽ°ŕŻŕŽŻŕŽžŕŽŕŽ˛ŕŻ 
ŕŽ¤ŕŽżŕŽ°ŕŻŕŽ¤ŕŻŕŽ¤ŕŽż
- Comment[tg]=ĐŃŇłĐ°ŃŃĐ¸ŃĐ¸ Đ´Đ¸Đ°ĐťĐžĐłĐ¸ Đ´Đ¸Đ˝Đ°ĐźĐ¸ĐşĐ°
- Comment[tr]=Dinamik Diyalog DĂźzenleyicisi
- Comment[uk]=ĐĐ¸Đ˝Đ°ĐźŃŃĐ˝Đ¸Đš ŃĐľĐ´Đ°ĐşŃĐžŃ Đ˛ŃĐşĐžĐ˝
--Comment[xx]=xxDynamic Dialog Editorxx
- Comment[zh_CN]=ĺ¨ćĺŻščŻćĄçźčžĺ¨
- MimeType=application/x-kommander
- DocPath=kommander/index.html
-diff -urN -x CVS kdewebdev.orig/kommander/editor/main.cpp 
kdewebdev/kommander/editor/main.cpp
---- kdewebdev.orig/kommander/editor/main.cpp   2005-01-11 14:09:17.000000000 
+0100
-+++ kdewebdev/kommander/editor/main.cpp        2005-03-10 23:41:22.000000000 
+0100
-@@ -14,10 +14,13 @@
+@@ -29,6 +28,7 @@
+ GenericName[is]=TĂłl til aĂ° leita aĂ° texta og skipta Ăşt
+ GenericName[it]=Strumento di ricerca e sostituzione
+ GenericName[ja]=ć¤ç´˘ĺăłç˝ŽćăăźăŤ
++GenericName[lt]=PaieĹĄkos ir keitimo ÄŻrankis
+ GenericName[nl]=Gereedschap voor zoeken en vervangen
+ GenericName[pl]=NarzÄdzie do wyszukiwania i zamiany
+ GenericName[pt]=Ferramenta de Procura e SubstituiĂ§ĂŁo
+@@ -39,6 +39,5 @@
+ [EMAIL PROTECTED] za pretragu i zamenu
+ GenericName[sv]=SĂśk- och ersĂ¤ttningsverktyg
+ GenericName[uk]=ĐĐ°ŃŃĐą ĐżĐžŃŃĐşŃ ŃĐ° ĐˇĐ°ĐźŃĐ˝Đ¸
+-GenericName[xx]=xxSearch & Replace Toolxx
+ GenericName[zh_CN]=ćç´˘ćżć˘ĺˇĽĺˇ
+ Categories=Qt;KDE;Utility;X-KDE-Utilities-File;
+Index: quanta/parsers/parser.h
+===================================================================
+--- quanta/parsers/parser.h    (.../tags/KDE/3.5.0/kdewebdev)  (revision 
492851)
++++ quanta/parsers/parser.h    (.../branches/KDE/3.5/kdewebdev)        
(revision 492851)
+@@ -83,9 +83,6 @@
+    * Crash errors of Parser::nodeAt is a good sign of a missing setRootNode
+    */
+   void setRootNode(Node* node) {m_node = node;} //TODO: check if m_saParser 
should be updated or not!
+-  /** Print the doc structure tree to the standard output.
+-      Only for debugging purposes. */
+-  void coutTree(Node *node, int indent);
+   void synchParseInDetail();
+ 
+   IncludedGroupElementsMap includedMap;
+Index: quanta/parsers/parsercommon.cpp
+===================================================================
+--- quanta/parsers/parsercommon.cpp    (.../tags/KDE/3.5.0/kdewebdev)  
(revision 492851)
++++ quanta/parsers/parsercommon.cpp    (.../branches/KDE/3.5/kdewebdev)        
(revision 492851)
+@@ -15,10 +15,11 @@
   ***************************************************************************/
  
- // KDE includes
--#include <klocale.h>
- #include <kaboutdata.h>
--#include <kcmdlineargs.h>
- #include <kapplication.h>
-+#include <kcmdlineargs.h>
-+#include <kconfig.h>
-+#include <kiconloader.h>
+ //qt includes
+-#include "qstring.h"
++#include <qstring.h>
+ 
+ //kde includes
+-#include "klocale.h"
++#include <kdebug.h>
 +#include <klocale.h>
-+#include <ksplashscreen.h>
- 
- // Other includes
- #include "mainwindow.h"
-@@ -37,7 +40,7 @@
+ #include <ktexteditor/editinterface.h>
  
- int main( int argc, char *argv[] )
- {
--  KAboutData aboutData( "Kommander", I18N_NOOP("Kommander"),
-+  KAboutData aboutData( "kmdr-editor", I18N_NOOP("Kommander"),
-                         KOMMANDER_VERSION, description, 
KAboutData::License_GPL,
-                         "(C) 2002-2004 Kommander authors", text);
-   aboutData.addAuthor("Marc Britton", "Original author", "[EMAIL PROTECTED]");
-@@ -52,10 +55,25 @@
- 
-   KLocale::setMainCatalogue("kommander");
-   KApplication a(true, true);
-+  
-+  KConfig *config = kapp->config();
-+  config->setGroup("General");
-+  bool splashScreen = config->readBoolEntry("SplashScreen", true);
-+  KSplashScreen* splash = 0;
-+  if (splashScreen) {
-+     splash = new KSplashScreen(UserIcon("kommandersplash"));
-+    splash->show();
-+  }
-+  
-   MainWindow *mw = new MainWindow(false);
-   a.setMainWidget(mw);
-   mw->setCaption(i18n("Kommander Dialog Editor"));
-   mw->show();
-+  
-+  if (splashScreen) {
-+    splash->finish(mw);
-+    delete splash;
-+  }
+ //own includes
+@@ -202,4 +203,37 @@
+   return node;
+ }
  
-   return a.exec();
++void coutTree(Node *node, int indent)
++{
++    QString output;
++    int bLine, bCol, eLine, eCol;
++    if (!node)
++        kdDebug(24000)<< "undoRedo::coutTree() - bad node!" << endl;
++    while (node)
++    {
++            output = "";
++            output.fill('.', indent);
++            node->tag->beginPos(bLine, bCol);
++            node->tag->endPos(eLine, eCol);
++            if (node->tag->type != Tag::Text)
++                    output += node->tag->name.replace('\n'," ");
++            else
++                    output+= node->tag->tagStr().replace('\n'," ");
++            kdDebug(24000) << output <<" (" << node->tag->type << ") at pos " 
<<
++                    bLine << ":" << bCol << " - " << eLine << ":" << eCol << 
" This: "<< node << " Parent: " << node->parent << " Prev: " << node->prev << " 
Next: " << node->next << " Child: " << node->child << endl;
++ /*           for(j = 0; j < node->tag->attrCount(); j++)
++            {
++                    kdDebug(24000)<< " attr" << j << " " <<
++                            node->tag->getAttribute(j).nameLine << ":" <<
++                            node->tag->getAttribute(j).nameCol << " - " <<
++                            node->tag->getAttribute(j).valueLine << ":" <<
++                            node->tag->getAttribute(j).valueCol << endl;
++            }
++*/
++            if (node->child)
++                    coutTree(node->child, indent + 4);
++            node = node->next;
++    }
+ }
++
++}
+Index: quanta/parsers/parsercommon.h
+===================================================================
+--- quanta/parsers/parsercommon.h      (.../tags/KDE/3.5.0/kdewebdev)  
(revision 492851)
++++ quanta/parsers/parsercommon.h      (.../branches/KDE/3.5/kdewebdev)        
(revision 492851)
+@@ -49,6 +49,10 @@
+   */
+   Node* createScriptTagNode(Document *write, const AreaStruct &area, const 
QString &areaName,
+                             const DTDStruct *dtd, Node *parentNode, Node 
*currentNode);
++
++/** Print the doc structure tree to the standard output.
++    Only for debugging purposes. */
++  void coutTree(Node *node, int indent);
+ }
+  
+ #endif
+Index: quanta/parsers/saparser.cpp
+===================================================================
+--- quanta/parsers/saparser.cpp        (.../tags/KDE/3.5.0/kdewebdev)  
(revision 492851)
++++ quanta/parsers/saparser.cpp        (.../branches/KDE/3.5/kdewebdev)        
(revision 492851)
+@@ -900,7 +900,11 @@
+         if (m_currentNode->next->closesPrevious)
+         {
+           m_currentNode->next->removeAll = false;
++          Node *secondNext = m_currentNode->next->next;
++          if (secondNext)
++            secondNext->prev = m_currentNode;
+           delete m_currentNode->next;
++          m_currentNode->next = secondNext;
+           m_useNext = true;
+         }
+       } else
+Index: quanta/parsers/parser.cpp
+===================================================================
+--- quanta/parsers/parser.cpp  (.../tags/KDE/3.5.0/kdewebdev)  (revision 
492851)
++++ quanta/parsers/parser.cpp  (.../branches/KDE/3.5/kdewebdev)        
(revision 492851)
+@@ -535,12 +535,12 @@
+     m_node = ParserCommon::createTextNode(w, 0L, maxLines, 
w->editIf->lineLength(maxLines), 0L);
+   }
+   m_parsingNeeded = false;
+-/*
+- treeSize = 0;
+- kdDebug(24000) << "Basenode : " << m_node << endl;
+- coutTree(m_node, 2);
+- kdDebug(24000) << "Size of tree: " << treeSize << endl;
+-*/
++
++//  treeSize = 0;
++//  kdDebug(24000) << "Basenode : " << m_node << endl;
++//  ParserCommon::coutTree(m_node, 2);
++//  kdDebug(24000) << "Size of tree: " << treeSize << endl;
++
+ //FIXME: What is the use of two pointer to the same Node???
+  baseNode = m_node;
+  m_saParser->init(m_node, w);
+@@ -556,41 +556,7 @@
+  return m_node;
  }
-diff -urN -x CVS kdewebdev.orig/kommander/editor/Makefile.am 
kdewebdev/kommander/editor/Makefile.am
---- kdewebdev.orig/kommander/editor/Makefile.am        2005-01-16 
00:43:57.000000000 +0100
-+++ kdewebdev/kommander/editor/Makefile.am     2005-03-11 00:46:45.000000000 
+0100
-@@ -12,7 +12,7 @@
- # the libraries to link against.
- kmdr_editor_LDADD = $(top_builddir)/kommander/widget/libkommanderwidget.la \
-       $(top_builddir)/kommander/widgets/libkommanderwidgets.la 
$(top_builddir)/kommander/plugin/libkommanderplugin.la \
--      $(top_builddir)/kommander/factory/libkommanderfactory.la 
$(top_builddir)/kommander/editor/pics/libsplash.la
-+      $(top_builddir)/kommander/factory/libkommanderfactory.la
  
- # which sources should be compiled for kmdr_editor
- kmdr_editor_SOURCES = actiondnd.cpp actioneditorimpl.cpp \
-Pliki kdewebdev.orig/kommander/editor/pics/background.png i 
kdewebdev/kommander/editor/pics/background.png różnią się
-Pliki kdewebdev.orig/kommander/editor/pics/kommandersplash.png i 
kdewebdev/kommander/editor/pics/kommandersplash.png różnią się
-diff -urN -x CVS kdewebdev.orig/kommander/editor/pics/Makefile.am 
kdewebdev/kommander/editor/pics/Makefile.am
---- kdewebdev.orig/kommander/editor/pics/Makefile.am   2003-11-26 
18:20:31.000000000 +0100
-+++ kdewebdev/kommander/editor/pics/Makefile.am        2005-03-07 
13:15:41.000000000 +0100
-@@ -1,13 +1,3 @@
--noinst_LTLIBRARIES = libsplash.la
-+kmdr_editordir = ${kde_datadir}/kmdr-editor/pics
+-/** Print the doc structure tree to the standard output.
+-    Only for debugging purposes. */
  
--# set the include path for X, qt and KDE
--AM_CPPFLAGS = $(all_includes)
--
--# the library search path. 
--libsplash_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdewebdev-branch.diff?r1=1.2&r2=1.3&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: kdewebdev-branch.diff - update from upstream

Reply via email to