Index: kde.pot =================================================================== RCS file: /home/kde/kdelibs/kde.pot,v retrieving revision 1.1319.2.17 retrieving revision 1.1319.2.40 diff -u -3 -p -r1.1319.2.17 -r1.1319.2.40 --- kde.pot 28 Feb 2004 07:39:26 -0000 1.1319.2.17 +++ kde.pot 22 Mar 2004 08:22:21 -0000 1.1319.2.40 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-02-28 08:39+0100\n" +"POT-Creation-Date: 2004-03-22 09:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" Index: admin/acinclude.m4.in =================================================================== RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v retrieving revision 2.437.2.1 retrieving revision 2.437.2.3 diff -u -3 -p -r2.437.2.1 -r2.437.2.3 --- admin/acinclude.m4.in 23 Feb 2004 21:23:06 -0000 2.437.2.1 +++ admin/acinclude.m4.in 15 Mar 2004 15:51:32 -0000 2.437.2.3 @@ -4354,7 +4354,7 @@ for i in $ac_topsubdirs; do install_it="no" fi AC_MSG_RESULT($install_it) - vari=`echo $i | sed -e 's,[[-+.]],_,g'` + vari=`echo $i | sed -e 's,[[-+.@]],_,g'` if test $install_it = "yes"; then TOPSUBDIRS="$TOPSUBDIRS $i" eval "$vari""_SUBDIR_included=yes" Index: admin/am_edit =================================================================== RCS file: /home/kde/kde-common/admin/am_edit,v retrieving revision 1.406 retrieving revision 1.406.6.1 diff -u -3 -p -r1.406 -r1.406.6.1 --- admin/am_edit 29 Oct 2003 22:45:50 -0000 1.406 +++ admin/am_edit 21 Mar 2004 13:55:53 -0000 1.406.6.1 @@ -269,7 +269,7 @@ sub processMakefile ($) tag_CLOSURE(); tag_NMCHECK(); tag_UIFILES(); # Sorts out ui rules - tag_KCFGFILES(); # Sourt out kcfg rules + tag_KCFGFILES(); # Sorts out kcfg rules tag_METASOURCES (); # Sorts out the moc rules if ($sources_changed{$program}) { my $lookup = $program . '_SOURCES\s*=[ \t]*(.*)'; @@ -892,7 +892,7 @@ sub tag_KDEINIT() substituteLine($lookup, "${kdeinit}_la_LIBADD = libkdeinit_${kdeinit}.la"); appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n"); } - appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -avoid-version \$(all_libraries)\n"); + appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n"); # add library dependencies $lookup = $kdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)'; @@ -1147,6 +1147,9 @@ sub tag_AUTOMAKE () print STDOUT "AUTOMAKE processing <$1>\n" if ($verbose); my $newLine = $1."\n\tcd \$(top_srcdir) && perl $thisProg $printname"; + + # automake 1.8.x adds another automake call. *sigh* + $newLine =~ s/;([\034\s]+cd\s+\$\(srcdir\)\s+&&[\034\s]+\$\(AUTOMAKE\).*)[\034\s]+\&\&[\034\s]+exit[\034\s]+0;([\034\s]+exit\s+1)/; \034 ( $1 ) || exit 1; echo \' cd \$(top_srcdir) && perl $thisProg \'; cd \$(top_srcdir) && perl $thisProg && exit 0; $2/; substituteLine ($lookup, $newLine); $automkCall = $1; @@ -1360,7 +1363,8 @@ sub tag_UIFILES () my $dep_lines = "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n"; $dep_lines .= "\trm -f $source.$cxxsuffix\n"; if (!$kdeopts{"qtonly"}) { - $dep_lines .= "\techo '#include ' > $source.$cxxsuffix\n"; + $dep_lines .= "\techo '#include ' > $source.$cxxsuffix\n"; + $dep_lines .= "\techo '#include ' >> $source.$cxxsuffix\n"; my ($mangled_source) = $source; $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; @@ -1425,10 +1429,14 @@ sub tag_KCFGFILES () $kcfg = "$program.kcfg"; findKcfgFile("$source.kcfgc"); + my $fixsuffix = ""; + $fixsuffix = "else mv $source.cpp $source.$cxxsuffix ; " + unless "cpp" eq $cxxsuffix; + my $dep_lines = "$source.$cxxsuffix: $source.h\n"; $dep_lines .= "$source.h: $sourcedir$kcfg $sourcedir$source.kcfgc \$(KCFG_DEPENDENCIES)\n"; $dep_lines .= "\t\$(KCONFIG_COMPILER) $sourcedir$kcfg $sourcedir$source.kcfgc; ret=\$\$?; \\\n"; - $dep_lines .= "\tif test \"\$\$ret\" != 0; then rm -f $source.h ; exit \$\$ret ; fi\n\n"; + $dep_lines .= "\tif test \"\$\$ret\" != 0; then rm -f $source.h ; exit \$\$ret ; $fixsuffix fi\n\n"; $rule_adds{"$source.$cxxsuffix"} = $dep_lines; @@ -2342,7 +2350,7 @@ sub updateMakefile () $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: 1.406 $ '."\n"; + my $progIdLine = "\# $progId - " . '$Revision: 1.406.6.1 $ '."\n"; if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) { warn "automake line not found in $makefile\n"; # Fallback: first line Index: admin/cvs.sh =================================================================== RCS file: /home/kde/kde-common/admin/cvs.sh,v retrieving revision 1.118.2.2 retrieving revision 1.118.2.3 diff -u -3 -p -r1.118.2.2 -r1.118.2.3 --- admin/cvs.sh 28 Feb 2004 08:34:06 -0000 1.118.2.2 +++ admin/cvs.sh 15 Mar 2004 10:41:05 -0000 1.118.2.3 @@ -233,10 +233,10 @@ echo "KDE_CREATE_SUBDIRSLIST" >> configu if test -f Makefile.am.in; then subdirs=`cat subdirs` for dir in $subdirs; do - dir=`echo $dir | sed -e "s,[-+.],_,g"` - echo "AM_CONDITIONAL($dir""_SUBDIR_included, test \"x\$$dir""_SUBDIR_included\" = xyes)" >> configure.in.new - if test -f $dir/configure.in; then - echo "if test \"x\$$dir""_SUBDIR_included\" = xyes; then " >> configure.in.new + vdir=`echo $dir | sed -e 's,[-+.@],_,g'` + echo "AM_CONDITIONAL($vdir""_SUBDIR_included, test \"x\$$vdir""_SUBDIR_included\" = xyes)" >> configure.in.new + if test -f "$dir/configure.in"; then + echo "if test \"x\$$vdir""_SUBDIR_included\" = xyes; then " >> configure.in.new echo " AC_CONFIG_SUBDIRS($dir)" >> configure.in.new echo "fi" >> configure.in.new fi Index: arts/kde/mcop-dcop/kmcop.desktop =================================================================== RCS file: /home/kde/kdelibs/arts/kde/mcop-dcop/kmcop.desktop,v retrieving revision 1.80.2.1 retrieving revision 1.80.2.2 diff -u -3 -p -r1.80.2.1 -r1.80.2.2 --- arts/kde/mcop-dcop/kmcop.desktop 30 Jan 2004 18:03:46 -0000 1.80.2.1 +++ arts/kde/mcop-dcop/kmcop.desktop 29 Feb 2004 15:28:49 -0000 1.80.2.2 @@ -55,6 +55,7 @@ Comment[se]=KDE MCOP-DCOP šaldi Comment[sk]=Most KDE MCOP-DCOP Comment[sl]=Premostitelj MCOP-DCOP za KDE Comment[sr]=KDED MCOP-DCOP Мост +Comment[sr@Latn]=KDED MCOP-DCOP Most Comment[ss]=Libhuloho le MCOP-DCOP ku KDE Comment[sv]=KDE MCOP-DCOP-brygga Comment[ta]=KDE MCOP-DCOP பாலம் Index: arts/knotify/knotify.desktop =================================================================== RCS file: /home/kde/kdelibs/arts/knotify/knotify.desktop,v retrieving revision 1.186.2.1 retrieving revision 1.186.2.2 diff -u -3 -p -r1.186.2.1 -r1.186.2.2 --- arts/knotify/knotify.desktop 11 Feb 2004 16:58:38 -0000 1.186.2.1 +++ arts/knotify/knotify.desktop 29 Feb 2004 15:28:51 -0000 1.186.2.2 @@ -76,6 +76,7 @@ Comment[se]=KDE dieđihanbálvá Comment[sk]=KDE Oznamovací démon Comment[sl]=Sistemska obvestila KDE Comment[sr]=KDE Демон за обавештавање +Comment[sr@Latn]=KDE Demon za obaveštavanje Comment[ss]=I-daemon yekwatisa ku KDE Comment[sv]=KDE:s underrättelsedemon Comment[ta]=KDE அறிவிப்பு டேமன் Index: dcop/dcopclient.cpp =================================================================== RCS file: /home/kde/kdelibs/dcop/dcopclient.cpp,v retrieving revision 1.175 retrieving revision 1.175.2.2 diff -u -3 -p -r1.175 -r1.175.2.2 --- dcop/dcopclient.cpp 15 Jan 2004 14:12:12 -0000 1.175 +++ dcop/dcopclient.cpp 21 Mar 2004 13:19:06 -0000 1.175.2.2 @@ -50,6 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE #ifndef QT_CLEAN_NAMESPACE #define QT_CLEAN_NAMESPACE #endif +#include #include #include #include @@ -141,7 +142,7 @@ public: int replyId; Q_INT32 transactionId; QCString calledApp; - QObject *replyObject; + QGuardedPtr replyObject; QCString replySlot; }; Index: dcop/KDE-ICE/accept.c =================================================================== RCS file: /home/kde/kdelibs/dcop/KDE-ICE/accept.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- dcop/KDE-ICE/accept.c 6 Mar 2003 18:02:05 -0000 1.3 +++ dcop/KDE-ICE/accept.c 21 Mar 2004 09:18:00 -0000 1.3.2.1 @@ -28,6 +28,8 @@ in this Software without prior written a Author: Ralph Mor, X Consortium ******************************************************************************/ +#include + #include "KDE-ICE/ICElib.h" #include "KDE-ICE/ICElibint.h" #include "KDE-ICE/Xtrans.h" Index: interfaces/kscript/scriptinterface.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/kscript/scriptinterface.desktop,v retrieving revision 1.85.2.1 retrieving revision 1.85.2.3 diff -u -3 -p -r1.85.2.1 -r1.85.2.3 --- interfaces/kscript/scriptinterface.desktop 11 Feb 2004 16:58:40 -0000 1.85.2.1 +++ interfaces/kscript/scriptinterface.desktop 3 Mar 2004 13:51:39 -0000 1.85.2.3 @@ -22,6 +22,7 @@ Comment[fa]=این موتور نویسه Comment[fi]=Tämä on yleinen skriptitestimoottori skriptin käyttöliittymän testaamiseen Comment[fo]=Hetta er ein almen royndarforritsskipan til at nároyna fjølvisforritsmarkamótið. Comment[fr]=Ceci est un moteur de script de test générique pour expérimenter l'interface de script. +Comment[ga]=Is inneall tastála cineálach scripteanna é seo a úsáidtear chun an comhéadan scripte a thástáil. Comment[gl]=Ésta é unha ferramenta para proba-la interface dos guións. Comment[he]=זהו מנוע תסריטים כללי לבדיקת ממשק התסריטים Comment[hi]= स्क्रिप्ट इंटरफेस जांचने हेतु यह एक जेनरिक टेस्ट स्क्रिप्ट इंजन है. @@ -48,6 +49,7 @@ Comment[se]=Dát lea oppalaš geahččal Comment[sk]=Toto je generický testovací skript pre testovanie skriptovacieho rozhrania. Comment[sl]=To je generični poskusni skriptni pogon za preizkušanje skriptnega vmesnika. Comment[sr]=Ово је генерички програм за тестирање интерфејса скрипти. +Comment[sr@Latn]=Ovo je generički program za testiranje interfejsa skripti. Comment[ss]=Lena yinjini yelibhuku leluhlolo lolubanti lekuhlola sichumanisi selibhuku. Comment[sv]=Det här är ett generellt skripttestprogram för att testa skriptgränssnittet Comment[ta]=கிறுவல் இடைமுகத்தைச் சோதிக்க உதவும் ஒரு பொதுவான சோதனை இயந்திரம். Index: interfaces/kscript/sample/shellscript.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/kscript/sample/shellscript.desktop,v retrieving revision 1.48.2.1 retrieving revision 1.48.2.3 diff -u -3 -p -r1.48.2.1 -r1.48.2.3 --- interfaces/kscript/sample/shellscript.desktop 30 Jan 2004 18:03:48 -0000 1.48.2.1 +++ interfaces/kscript/sample/shellscript.desktop 3 Mar 2004 13:51:37 -0000 1.48.2.3 @@ -16,11 +16,13 @@ Name[eu]=Bash Shell Script Eragikatzaile Name[fa]=مجری نویسه‌ی پوسته‌ی بش Name[fi]=Komentotulkkiohjelmien käynnistäjä Name[fr]=Lanceur de scripts shell Bash +Name[ga]=Reathaí Script Bhlaoisce bash Name[gl]=Guión Executábel da Shell Bash Name[hi]=बैश शैल स्क्रिप्ट चालक Name[hu]=Bash parancsfájl futtatása Name[is]=Keyrsluforrit bash skeljaforrita Name[it]=Esecutore script bash +Name[ja]=Bash シェルスクリプト 実行 Name[lt]=Bash apvalkalo skriptų paleidėjas Name[mn]=Bash-Shell-Скрипт ажиллуулагч Name[ms]=Pelaksana Skrip Cengkerang Bash @@ -36,6 +38,7 @@ Name[se]=Skálžu skripta Name[sk]=Spustenie Bash shell skriptu Name[sl]=Zaganjalnik lupinski skriptov Name[sr]=Извршавач скрипти Bash шкољке +Name[sr@Latn]=Izvršavač skripti Bash školjke Name[sv]=Kör Bash-skalskript Name[ta]=பேஷ் ஓட்டுக் குறுநிரல் இயக்கி Name[tg]= Скриптҳои bash ба кор андохтан @@ -65,6 +68,7 @@ Comment[et]=Käivitab bash shelli skript Comment[fa]=نویسه‌‌های پوسته‌ی بش را از داخل یک برنامه اجرا می‌کند. Comment[fi]=Suorittaa Bash-komentotulkkiohjelmia ohjelman sisästä Comment[fr]=Exécute des scripts shell Bash depuis l'intérieur de l'application. +Comment[ga]=Ritheann seo scripteanna blaoisce bash ó thaobh istigh an fheidhmchlair. Comment[gl]=Executa guións da shell bash dende dentro da aplicación. Comment[he]=מריץ תסריטי Bash מתוך היישום Comment[hi]=अनुप्रयोगों के भीतर से ही बैश शेल स्क्रिप्ट चलाता है. @@ -73,6 +77,7 @@ Comment[hu]=Bash parancsfájlok futtatá Comment[id]=Menjalankan skrip bash dari aplikasi Comment[is]=Keyrir bash skeljaforrit innan forritsins Comment[it]=Esegue gli script bash all'interno dell'applicazione. +Comment[ja]=アプリケーション内部からの Bash シェルスクリプトを実行します Comment[lt]=Paleidžia bash apvalkalo skriptus iš taikomosios programos Comment[mn]=Програм дотроос Bash-Shell-Скрипт ажиллуулах. Comment[ms]=Laksanakan skrip cengkerang bash di dalam aplikasi. @@ -89,6 +94,7 @@ Comment[se]=Vuodjá bash-skálzoskriptai Comment[sk]=Spustí bash shell skript z aplikácie. Comment[sl]=Požene lupinske skripte znotraj programa. Comment[sr]=Покреће скриптре bash шкољке унутар програма. +Comment[sr@Latn]=Pokreće skriptre bash školjke unutar programa. Comment[sv]=Kör Bash-skalskript inifrån programmet. Comment[ta]=Ãிரலிக்குள்ளிருந்து பேஷ் ஓட்டுகுறுநிரலை இயக்கும். Comment[tg]=Скриптҳои bash аз илова ба кор андохтан Index: interfaces/ktexteditor/kcm_ktexteditor.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/kcm_ktexteditor.desktop,v retrieving revision 1.93.2.2 retrieving revision 1.93.2.3 diff -u -3 -p -r1.93.2.2 -r1.93.2.3 --- interfaces/ktexteditor/kcm_ktexteditor.desktop 11 Feb 2004 16:58:42 -0000 1.93.2.2 +++ interfaces/ktexteditor/kcm_ktexteditor.desktop 29 Feb 2004 15:28:57 -0000 1.93.2.3 @@ -42,6 +42,7 @@ Name[se]=Vuojuhahtti čállinprográmma Name[sk]=Vložiteľný textový editor Name[sl]=Vključeni urejevalnik besedil Name[sr]=Уграђени уређивач текста +Name[sr@Latn]=Ugrađeni uređivač teksta Name[ss]=Sihleli sembhalo lesilele Name[sv]=Inbäddad texteditor Name[ta]=உட்பொதிந்த தொகுப்பி @@ -102,6 +103,7 @@ Comment[se]=Čállinprográmmabálvalus Comment[sk]=Služba textového editora poskytuje aplikáciám prehliadač a editor textových súborov. Aplikácie KDE, ktoré podporujú úpravu textu, by mali používať túto službu. Comment[sl]=Storitev urejevalnika besedila omogoča programom dostop do pregledovalnika in urejevalnika besedil. Programi za KDE, ki omogočajo urejanje besedila, naj bi uporabljali to storitev. Comment[sr]= Сервис уређивача текста обезбеђује програмима преглед и измене текстова. KDE програми који обезбеђују могућност обраде текста требало би да користе овај сервис. +Comment[sr@Latn]= Servis uređivača teksta obezbeđuje programima pregled i izmene tekstova. KDE programi koji obezbeđuju mogućnost obrade teksta trebalo bi da koriste ovaj servis. Comment[ss]=Lusito lwekuhleal umbhalo luniketa ticelo letinesibuki sembhalo kanye nesihleli. Ticelo te KDe letiniketa tinsita tekuhlelwa kwembhalo kufanele tisebentise lolusito. Comment[sv]=Texteditortjänsten ger program en textvisare och editor. KDE-program som tillhandahåller textredigeringsfunktioner bör använda denna tjänst. Comment[ta]=தொகுப்பிச் சேவை நிரலிகளுக்கு உரை காட்டி மற்றும் தொகுப்பியை வழங்கும். தொகுப்பு வசதிகளை வழங்கும் கேடிஈ நிரல்கள் இச் சேவையைப் பயன்படுத்தலாம். Index: interfaces/ktexteditor/ktexteditor.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/ktexteditor.desktop,v retrieving revision 1.97.2.1 retrieving revision 1.97.2.2 diff -u -3 -p -r1.97.2.1 -r1.97.2.2 --- interfaces/ktexteditor/ktexteditor.desktop 11 Feb 2004 16:58:44 -0000 1.97.2.1 +++ interfaces/ktexteditor/ktexteditor.desktop 29 Feb 2004 15:28:59 -0000 1.97.2.2 @@ -50,6 +50,7 @@ Comment[se]=Vuojuhanláhkái čállinpro Comment[sk]=Vložiteľný komponent textového editora (s oddelením Doc/View) Comment[sl]=Vgradljiva komponenta urejevalnika besedil (z ločevanjem pogleda in dokumenta) Comment[sr]=Уградива компонента за уређивање текста (са „документ/приказ“ одвајањем) +Comment[sr@Latn]=Ugradiva komponenta za uređivanje teksta (sa „dokument/prikaz“ odvajanjem) Comment[ss]=Incenye yesihleli sembhalo lenamatselekako (ne Doc/Bona kwehlukana) Comment[sv]=Inbäddningsbar texteditor (med dok/vyseparation) Comment[ta]=உட்பொதிந்த உரை தொகுப்பிக் கூறு (ஆவண/காட்சி பிரிவுகளுடன்) Index: interfaces/ktexteditor/ktexteditoreditor.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/ktexteditoreditor.desktop,v retrieving revision 1.90.2.1 retrieving revision 1.90.2.2 diff -u -3 -p -r1.90.2.1 -r1.90.2.2 --- interfaces/ktexteditor/ktexteditoreditor.desktop 11 Feb 2004 16:58:46 -0000 1.90.2.1 +++ interfaces/ktexteditor/ktexteditoreditor.desktop 29 Feb 2004 15:29:01 -0000 1.90.2.2 @@ -50,6 +50,7 @@ Comment[se]=Vuojuhanláhkái čállinpro Comment[sk]=Vložiteľný komponent textového editora (bez oddelenia Doc/View) Comment[sl]=Vgradljiva komponenta urejevalnika besedil (brez ločevanja pogleda in dokumenta) Comment[sr]=Уградива компонента за уређивање текста (без „документ/приказ“ одвајања) +Comment[sr@Latn]=Ugradiva komponenta za uređivanje teksta (bez „dokument/prikaz“ odvajanja) Comment[ss]=Incenye yesihleli sembhalo lenamatselekako (ngaphandle kwe Doc/Bona kwehlukana) Comment[sv]=Inbäddningsbar texteditor (utan dok/vyseparation) Comment[ta]=உட்பொதிந்த உரை தொகுப்பிக் கூறு (ஆவண/காட்சி பிரிவுகளற்ற) Index: interfaces/ktexteditor/ktexteditorplugin.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/ktexteditorplugin.desktop,v retrieving revision 1.68 retrieving revision 1.68.2.1 diff -u -3 -p -r1.68 -r1.68.2.1 --- interfaces/ktexteditor/ktexteditorplugin.desktop 11 Jan 2004 07:55:03 -0000 1.68 +++ interfaces/ktexteditor/ktexteditorplugin.desktop 29 Feb 2004 15:29:03 -0000 1.68.2.1 @@ -49,7 +49,8 @@ Comment[ru]=Модуль KTextEditor Comment[se]=KDE-čállinprográmma lassemoduvla Comment[sk]=Modul KTextEditor Comment[sl]=Vstavek KTextEditor -Comment[sr]=KTextEditor додатак +Comment[sr]=KTextEditor прикључак +Comment[sr@Latn]=KTextEditor priključak Comment[ss]=I-plugini ye KTextEditor Comment[sv]=Insticksprogram för texteditor Comment[ta]=KTextEditor செருகல் Index: kabc/kab2kabc.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/kab2kabc.desktop,v retrieving revision 1.81.2.2 retrieving revision 1.81.2.3 diff -u -3 -p -r1.81.2.2 -r1.81.2.3 --- kabc/kab2kabc.desktop 11 Feb 2004 16:58:48 -0000 1.81.2.2 +++ kabc/kab2kabc.desktop 29 Feb 2004 15:29:07 -0000 1.81.2.3 @@ -68,6 +68,7 @@ Comment[se]=konverterenneavvu libkab:as Comment[sk]=Prevod dát z libkab do libkabc. Comment[sl]=Orodje za pretvorbo iz libkab v libkabc Comment[sr]=Алат за конверзију из libkab-а у libkabc. +Comment[sr@Latn]=Alat za konverziju iz libkab-a u libkabc. Comment[ss]=Lithulusi lekutjintja le-libkab kuya ku-libkabc. Comment[sv]=Konverteringsverktyg från libkab till libkabc Comment[ta]=libkab இலிருந்து libkabc க்கு மாற்றும் கருவி. Index: kabc/formats/binary.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/formats/binary.desktop,v retrieving revision 1.57.2.1 retrieving revision 1.57.2.2 diff -u -3 -p -r1.57.2.1 -r1.57.2.2 --- kabc/formats/binary.desktop 30 Jan 2004 18:03:52 -0000 1.57.2.1 +++ kabc/formats/binary.desktop 29 Feb 2004 15:29:05 -0000 1.57.2.2 @@ -47,6 +47,7 @@ Name[se]=Binára Name[sk]=Binárny Name[sl]=Dvojiško Name[sr]=Бинарни +Name[sr@Latn]=Binarni Name[ss]=Lokuhamab ngakubili Name[sv]=Binär Name[ta]=இருமம் Index: kabc/plugins/dir/dir.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/dir/dir.desktop,v retrieving revision 1.37.2.2 retrieving revision 1.37.2.3 diff -u -3 -p -r1.37.2.2 -r1.37.2.3 --- kabc/plugins/dir/dir.desktop 11 Feb 2004 16:58:50 -0000 1.37.2.2 +++ kabc/plugins/dir/dir.desktop 29 Feb 2004 15:29:09 -0000 1.37.2.3 @@ -54,6 +54,7 @@ Name[se]=Ohcu Name[sk]=Priečinok Name[sl]=Imenik Name[sr]=Директоријум +Name[sr@Latn]=Direktorijum Name[ss]=I-directory Name[sv]=Katalog Name[ta]=அடைவு Index: kabc/plugins/evolution/evolution.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/evolution/evolution.desktop,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -3 -p -r1.12 -r1.12.2.1 --- kabc/plugins/evolution/evolution.desktop 16 Jan 2004 07:01:56 -0000 1.12 +++ kabc/plugins/evolution/evolution.desktop 29 Feb 2004 15:29:11 -0000 1.12.2.1 @@ -8,6 +8,7 @@ Name[hi]=एवॉल्यूशन Name[lv]=Evolūcija Name[mn]=Хөгжил Name[sr]=Еволуција +Name[sr@Latn]=Evolucija Name[tg]=Тараққиёт Name[ven]=Tsikoni Name[wa]=Evolucion Index: kabc/plugins/file/file.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/file/file.desktop,v retrieving revision 1.49.2.1 retrieving revision 1.49.2.2 diff -u -3 -p -r1.49.2.1 -r1.49.2.2 --- kabc/plugins/file/file.desktop 30 Jan 2004 18:03:58 -0000 1.49.2.1 +++ kabc/plugins/file/file.desktop 29 Feb 2004 15:29:13 -0000 1.49.2.2 @@ -26,6 +26,7 @@ Name[hi]=फाइल Name[hu]=Fájl Name[id]=Berkas Name[is]=Skrá +Name[ja]=ファイル Name[lt]=Byla Name[mn]=Файл Name[ms]=Fail @@ -42,6 +43,7 @@ Name[se]=Fiila Name[sk]=Súbor Name[sl]=Datoteka Name[sr]=Фајл +Name[sr@Latn]=Fajl Name[sv]=Fil Name[ta]=கோப்பு Name[tg]=Файл Index: kabc/plugins/ldap/configure.in.in =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/ldap/configure.in.in,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kabc/plugins/ldap/configure.in.in 4 Jan 2004 04:31:53 -0000 1.8 +++ kabc/plugins/ldap/configure.in.in 13 Mar 2004 04:12:04 -0000 1.8.2.1 @@ -1,4 +1,4 @@ -AC_DEFUN(KABC_CHECK_LDAP, +AC_DEFUN([KABC_CHECK_LDAP], [ AC_REQUIRE([KDE_CHECK_LIB64]) Index: kabc/plugins/net/net.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/net/net.desktop,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -u -3 -p -r1.32.2.1 -r1.32.2.2 --- kabc/plugins/net/net.desktop 30 Jan 2004 18:04:00 -0000 1.32.2.1 +++ kabc/plugins/net/net.desktop 29 Feb 2004 15:29:15 -0000 1.32.2.2 @@ -50,6 +50,7 @@ Name[se]=Fierbmi Name[sk]=Sieť Name[sl]=Omrežje Name[sr]=Мрежа +Name[sr@Latn]=Mreža Name[ss]=Luchungechunge Name[sv]=Nätverk Name[ta]=வலை Index: kabc/scripts/field.src.cpp =================================================================== RCS file: /home/kde/kdelibs/kabc/scripts/field.src.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kabc/scripts/field.src.cpp 28 Jul 2003 21:33:57 -0000 1.10 +++ kabc/scripts/field.src.cpp 7 Mar 2004 11:36:07 -0000 1.10.2.1 @@ -126,9 +126,23 @@ QString Field::value( const KABC::Addres case FieldImpl::Url: return a.url().prettyURL(); case FieldImpl::HomePhone: - return a.phoneNumber( PhoneNumber::Home ).number(); + { + PhoneNumber::List list = a.phoneNumbers( PhoneNumber::Home ); + PhoneNumber::List::Iterator it; + for ( it = list.begin(); it != list.end(); ++it ) + if ( ((*it).type() & ~(PhoneNumber::Pref)) == PhoneNumber::Home ) + return (*it).number(); + return QString::null; + } case FieldImpl::BusinessPhone: - return a.phoneNumber( PhoneNumber::Work ).number(); + { + PhoneNumber::List list = a.phoneNumbers( PhoneNumber::Work ); + PhoneNumber::List::Iterator it; + for ( it = list.begin(); it != list.end(); ++it ) + if ( ((*it).type() & ~(PhoneNumber::Pref)) == PhoneNumber::Work ) + return (*it).number(); + return QString::null; + } case FieldImpl::MobilePhone: return a.phoneNumber( PhoneNumber::Cell ).number(); case FieldImpl::HomeFax: Index: kcert/kcertpart.desktop =================================================================== RCS file: /home/kde/kdelibs/kcert/kcertpart.desktop,v retrieving revision 1.90.2.1 retrieving revision 1.90.2.2 diff -u -3 -p -r1.90.2.1 -r1.90.2.2 --- kcert/kcertpart.desktop 11 Feb 2004 16:58:56 -0000 1.90.2.1 +++ kcert/kcertpart.desktop 29 Feb 2004 15:29:25 -0000 1.90.2.2 @@ -48,6 +48,7 @@ Comment[se]=Vuojuhanláhkái persuvnnala Comment[sk]=Vložiteľný osobný správca certifikátorv Comment[sl]=Vgradljivi osebni upravljalnik certifikatov Comment[sr]=Уградиви менаџер личних сертификата. +Comment[sr@Latn]=Ugradivi menadžer ličnih sertifikata. Comment[ss]=Siphatsi sesithifikethi samuntfu sicu lesinamatselekako Comment[sv]=Inbäddningsbar personlig certifikatshanterare Comment[ta]=உட்பொதிந்த சொந்தச் சான்றிதழ் மேலாளர் Index: kdecore/README.kiosk =================================================================== RCS file: /home/kde/kdelibs/kdecore/README.kiosk,v retrieving revision 1.45 retrieving revision 1.45.2.2 diff -u -3 -p -r1.45 -r1.45.2.2 --- kdecore/README.kiosk 29 Dec 2003 16:59:52 -0000 1.45 +++ kdecore/README.kiosk 15 Mar 2004 17:14:22 -0000 1.45.2.2 @@ -102,7 +102,7 @@ the warning, add the following two lines file (or to kdeglobals to disable the warning for all applications): [KDE Action Restrictions] -warn_config_unwritable=false +warn_unwritable_config=false Example: chown root.root /home/user/.kde/share/config/kickerrc @@ -206,7 +206,6 @@ action/editfiletype action/properties action/openwith action/openintab -action/openintabfront action/kdesktop_rmb // RMB menu Kicker related: Index: kdecore/all_languages.desktop =================================================================== RCS file: /home/kde/kdelibs/kdecore/all_languages.desktop,v retrieving revision 1.123.2.3 retrieving revision 1.123.2.4 diff -u -3 -p -r1.123.2.3 -r1.123.2.4 --- kdecore/all_languages.desktop 11 Feb 2004 16:59:03 -0000 1.123.2.3 +++ kdecore/all_languages.desktop 29 Feb 2004 15:29:27 -0000 1.123.2.4 @@ -20,6 +20,7 @@ Name[ru]=Афарский Name[se]=Afárgiella Name[sl]=afarsko Name[sr]=Афарски +Name[sr@Latn]=Afarski Name[ss]=Si-Afar Name[ta]=அஃபார் Name[tg]=Афар @@ -47,6 +48,7 @@ Name[et]=Abhaasia Name[fa]=آبخازیان Name[fi]=Abhaasi Name[fr]=Abkhaze +Name[ga]=Abcáisis Name[he]=אבחזית Name[hi]=अबकाजियन Name[hu]=abház @@ -67,6 +69,7 @@ Name[ru]=Абхазский Name[se]=Abhásiagiella Name[sl]=abkazijansko Name[sr]=Абхазијски +Name[sr@Latn]=Abhazijski Name[ss]=Si-Abkhazian Name[sv]=Abkhasiska Name[ta]=அப்காசியன் @@ -115,6 +118,7 @@ Name[se]=Afrikánsgiella Name[sk]=Afrikaansky Name[sl]=afrikansko Name[sr]=Африканерски +Name[sr@Latn]=Afrikanerski Name[ss]=Sibhunu Name[sv]=Sydafrikansk holländska Name[ta]=ஆஃபரிகான்ஸ் @@ -177,6 +181,7 @@ Name[se]=Albániagiella Name[sk]=Albánsky Name[sl]=albansko Name[sr]=Албански +Name[sr@Latn]=Albanski Name[ss]=Si-Albanian Name[sv]=Albanska Name[ta]=அல்பேனியன் @@ -228,6 +233,7 @@ Name[se]=Ambháriagiella Name[sk]=Amharský Name[sl]=amharik Name[sr]=Амарски +Name[sr@Latn]=Amarski Name[ss]=Si-Amharic Name[sv]=Amarinja Name[ta]=அம்ஹாரிக் @@ -293,6 +299,7 @@ Name[se]=Arábiagiella Name[sk]=Arabský Name[sl]=arabsko Name[sr]=Арапски +Name[sr@Latn]=Arapski Name[ss]=Si-Arabhu Name[sv]=Arabiska Name[ta]=அராபிக் @@ -357,6 +364,7 @@ Name[se]=Armeniagiella Name[sk]=Arménsky Name[sl]=armensko Name[sr]=Јерменски +Name[sr@Latn]=Jermenski Name[ss]=Si-Armenian Name[sv]=Armenska Name[ta]=ஆர்மீனியன் @@ -383,6 +391,7 @@ Name[et]=Assami Name[fa]=آسامی Name[fi]=Assami Name[fr]=Assamais +Name[ga]=Asamais Name[he]=אסמית Name[hi]=असमी Name[hu]=asszámi @@ -402,6 +411,7 @@ Name[se]=Assamesegiella Name[sk]=Assamský Name[sl]=asamese Name[sr]=Асамски +Name[sr@Latn]=Asamski Name[ss]=Si-Assamese Name[sv]=Assamesiska Name[ta]=அஸ்ஸாமிய @@ -440,6 +450,7 @@ Name[ru]=Авестийский Name[se]=Avestánagiella Name[sl]=avestansko Name[sr]=Авестански +Name[sr@Latn]=Avestanski Name[ss]=Si-Avestan Name[sv]=Avestiska Name[ta]=அவெஸ்தன் @@ -474,6 +485,7 @@ Name[ru]=Аймарский Name[se]=Aimáragiella Name[sl]=ajmarsko Name[sr]=Ајмарски +Name[sr@Latn]=Ajmarski Name[ss]=Si-Aymara Name[ta]=அய்மாரா Name[tg]=Ямарагӣ @@ -534,6 +546,7 @@ Name[se]=Azerbaižánagiella Name[sk]=Ázerbajdžánsky Name[sl]=azerbajdžansko Name[sr]=Азербејџански +Name[sr@Latn]=Azerbejdžanski Name[ss]=Si-Azerbaijani Name[sv]=Azerbajdzjanska Name[ta]=அசர்பைசானி @@ -564,6 +577,7 @@ Name[et]=Baškiiri Name[fa]=بشکیر Name[fi]=Baškiiri Name[fr]=Bachkir +Name[ga]=Baisciris Name[gl]=Bashquir Name[he]=בשקירית Name[hi]=बाशकिर @@ -582,6 +596,7 @@ Name[se]=Baškiriagiella Name[sk]=Baškirský Name[sl]=baškirsko Name[sr]=Башкирски +Name[sr@Latn]=Baškirski Name[ss]=Si-Bashkir Name[ta]=பாக்ஷீர் Name[tg]=Бошқирдӣ @@ -641,6 +656,7 @@ Name[se]=Baskalašgiella Name[sk]=Baskitský Name[sl]=baskovsko Name[sr]=Баскијски +Name[sr@Latn]=Baskijski Name[ss]=Si-Basque Name[sv]=Baskiska Name[ta]=பாஸ்க் @@ -706,6 +722,7 @@ Name[se]=Vilgesruoššagiella Name[sk]=Bieloruský Name[sl]=belorusko Name[sr]=Белоруски +Name[sr@Latn]=Beloruski Name[ss]=Si-Belarusian Name[sv]=Vitryska Name[ta]=பெலாரூசியன் @@ -752,6 +769,7 @@ Name[se]=Bengalagiella Name[sk]=Bengálsky Name[sl]=bengalsko Name[sr]=Бенгалски +Name[sr@Latn]=Bengalski Name[ss]=Si-Bengali Name[ta]=பெங்காலி Name[tg]=Банголӣ @@ -783,6 +801,7 @@ Name[ru]=Бихарский Name[se]=Biháragiella Name[sl]=bihari Name[sr]=Бихарски +Name[sr@Latn]=Biharski Name[ss]=Si-Bihari Name[ta]=பீகாரி Name[tg]=Бихарӣ @@ -811,6 +830,7 @@ Name[ru]=Бислама Name[se]=Bislamagiella Name[sl]=bislama Name[sr]=Бисламски +Name[sr@Latn]=Bislamski Name[ss]=Si-Bislama Name[ta]=பிஸ்லாமா Name[tg]=Бислама @@ -872,6 +892,7 @@ Name[se]=Bosniagiella Name[sk]=Bosniacky Name[sl]=bosansko Name[sr]=Бошњачки +Name[sr@Latn]=Bošnjački Name[ss]=Si-Bosnian Name[sv]=Bosniska Name[ta]=பொஸ்னியன் @@ -936,6 +957,7 @@ Name[se]=Bretonagiella Name[sk]=Bretoňský Name[sl]=bretonsko Name[sr]=Бретонски +Name[sr@Latn]=Bretonski Name[ss]=Si-Breton Name[sv]=Bretonska Name[ta]=பிரெடான் @@ -1004,6 +1026,7 @@ Name[se]=Bulgáriagiella Name[sk]=Bulharský Name[sl]=bolgarsko Name[sr]=Бугарски +Name[sr@Latn]=Bugarski Name[ss]=Si-Bulgarian Name[sv]=Bulgariska Name[ta]=பல்கேரியன் @@ -1062,6 +1085,7 @@ Name[se]=Burmagiella Name[sk]=Barmský Name[sl]=burmansko Name[sr]=Бурмански +Name[sr@Latn]=Burmanski Name[ss]=Si-Burmese Name[sv]=Burmesiska Name[ta]=பர்மிய @@ -1123,6 +1147,7 @@ Name[se]=Katalánagiella Name[sk]=Katalánsky Name[sl]=katalonsko Name[sr]=Каталонски +Name[sr@Latn]=Katalonski Name[ss]=Si-Catalan Name[sv]=Katalanska Name[ta]=கடலான் @@ -1158,6 +1183,7 @@ Name[ru]=Чаморро Name[se]=Chamorrogiella Name[sl]=chamorro Name[sr]=Чаморски +Name[sr@Latn]=Čamorski Name[ss]=Si-Chamorro Name[ta]=சமாரோ Name[tg]=Чаморро @@ -1209,6 +1235,7 @@ Name[se]=Čečeniagiella Name[sk]=Čečenský Name[sl]=čečensko Name[sr]=Чеченски +Name[sr@Latn]=Čečenski Name[ss]=Si-Chechen Name[sv]=Tjetjenska Name[ta]=செச்சென் @@ -1276,6 +1303,7 @@ Name[se]=Kiinnágiella Name[sk]=Čínsky Name[sl]=kitajsko Name[sr]=Кинески +Name[sr@Latn]=Kineski Name[ss]=SiShayina Name[sv]=Kinesiska Name[ta]=சீன @@ -1335,6 +1363,7 @@ Name[ru]=Церковнославянс Name[se]=Slávagiella Name[sl]=cerkvena slovanščina Name[sr]=Црквени православни +Name[sr@Latn]=Crkveni pravoslavni Name[ss]=Si-Church Slavic Name[sv]=Kyrkoslaviska Name[ta]=சர்ச் ஸ்லாவிக் @@ -1378,6 +1407,7 @@ Name[se]=Chuvashgiella Name[sk]=Čuvašský Name[sl]=chuvash Name[sr]=Чувашки +Name[sr@Latn]=Čuvaški Name[ss]=Si-Chuvash Name[sv]=Tjuvasjiska Name[ta]=சுவாஷ் @@ -1427,6 +1457,7 @@ Name[se]=Kornagiella Name[sk]=Kornšský Name[sl]=cornish Name[sr]=Корнски +Name[sr@Latn]=Kornski Name[ss]=Si-Cornish Name[sv]=Korniska Name[ta]=கோர்னிஷ் @@ -1483,6 +1514,7 @@ Name[se]=Korsikagiella Name[sk]=Korzický Name[sl]=korzijško Name[sr]=Корзикански +Name[sr@Latn]=Korzikanski Name[ss]=Si-Corsican Name[sv]=Korsikanska Name[ta]=கோர்சிகன் @@ -1547,6 +1579,7 @@ Name[se]=Čehkagiella Name[sk]=Český Name[sl]=češko Name[sr]=Чешки +Name[sr@Latn]=Češki Name[ss]=Si-Czech Name[sv]=Tjeckiska Name[ta]=செக் @@ -1615,6 +1648,7 @@ Name[se]=Dánskkagiella Name[sk]=Dánsky Name[sl]=dansko Name[sr]=Дански +Name[sr@Latn]=Danski Name[ss]=Si-Danish Name[sv]=Danska Name[ta]=டேனிஷ் @@ -1684,6 +1718,7 @@ Name[se]=Hollánddagiella Name[sk]=Holandský Name[sl]=nizozemsko Name[sr]=Холандски +Name[sr@Latn]=Holandski Name[ss]=SiDatji Name[sv]=Holländska Name[ta]=டச்சு @@ -1718,6 +1753,7 @@ Name[ru]=Дзонка (бутански Name[se]=Dzongkhagiella Name[sl]=dzonkha Name[sr]=Џонка +Name[sr@Latn]=Džonka Name[ss]=Si-Dzongkha Name[ta]=ட்சொங்க்ஹா Name[tg]=Жонгхагӣ @@ -1783,6 +1819,7 @@ Name[se]=Eŋgelasgiella Name[sk]=Anglický Name[sl]=angleška Name[sr]=Енглески +Name[sr@Latn]=Engleski Name[ss]=SiNgisi Name[sv]=Engelska Name[ta]=ஆங்கிலம் @@ -1885,6 +1922,7 @@ Name[se]=Esttegiella Name[sk]=Estónsky Name[sl]=estonsko Name[sr]=Естонски +Name[sr@Latn]=Estonski Name[ss]=Si-Estonian Name[sv]=Estniska Name[ta]=எஸ்டோனியன் @@ -1940,6 +1978,7 @@ Name[se]=Fearagiella Name[sk]=Faorský Name[sl]=fersko Name[sr]=Фарски +Name[sr@Latn]=Farski Name[ss]=Si-Faroese Name[sv]=Färöiska Name[ta]=ஃபாரோவீஸ் @@ -1992,6 +2031,7 @@ Name[se]=Fižigiella Name[sk]=Fidžský Name[sl]=fidžijsko Name[sr]=Фиџијски +Name[sr@Latn]=Fidžijski Name[ss]=Si-Fijian Name[sv]=Fijianska Name[ta]=ஃபிஜியன் @@ -2057,6 +2097,7 @@ Name[se]=Suomagiella Name[sk]=Fínsky Name[sl]=finsko Name[sr]=Фински +Name[sr@Latn]=Finski Name[ss]=Si-Finnish Name[sv]=Finska Name[ta]=ஃபின்னிஷ் @@ -2126,6 +2167,7 @@ Name[se]=Fránskkagiella Name[sk]=Francúzsky Name[sl]=francosko Name[sr]=Француски +Name[sr@Latn]=Francuski Name[ss]=SiFrentji Name[sv]=Franska Name[ta]=பிரென்ச் @@ -2185,6 +2227,7 @@ Name[se]=Frisagiella Name[sk]=Frízsky Name[sl]=frizijsko Name[sr]=Фризијски +Name[sr@Latn]=Frizijski Name[ss]=Si-Frisian Name[sv]=Frisiska Name[ta]=ஃபரீசியன் @@ -2243,6 +2286,7 @@ Name[se]=Grusiagiella Name[sk]=Gruzínsky Name[sl]=gruzijsko Name[sr]=Грузијски +Name[sr@Latn]=Gruzijski Name[ss]=Si-Georgian Name[sv]=Georgiska Name[ta]=ஜார்ஜியன் @@ -2310,6 +2354,7 @@ Name[se]=Duiskkagiella Name[sk]=Nemecký Name[sl]=nemško Name[sr]=Немачки +Name[sr@Latn]=Nemački Name[ss]=SiJalimani Name[sv]=Tyska Name[ta]=ேஜர்மன் @@ -2369,6 +2414,7 @@ Name[se]=Gaelagiella Name[sk]=Galský Name[sl]=galsko Name[sr]=Галски +Name[sr@Latn]=Galski Name[ss]=Si-Gaelic Name[sv]=Galiciska Name[ta]=கேலிக் @@ -2435,6 +2481,7 @@ Name[se]=Irlánddagiella Name[sk]=Írsky Name[sl]=irsko Name[sr]=Ирски +Name[sr@Latn]=Irski Name[ss]=Si-Irish Name[sv]=Irländska Name[ta]=ஐரிஷ் @@ -2485,6 +2532,7 @@ Name[se]=Gallegagiella Name[sk]=Galleganský Name[sl]=gallegan Name[sr]=Галегански +Name[sr@Latn]=Galeganski Name[ss]=Si-Gallegan Name[sv]=Galiciska Name[ta]=கலெகன் @@ -2521,6 +2569,7 @@ Name[ru]=Манкс Name[se]=Mánksagiella Name[sl]=manx Name[sr]=Манкски +Name[sr@Latn]=Mankski Name[ss]=Si-Manx Name[ta]=மான்க்ஸ் Name[tg]=Манқсӣ @@ -2585,6 +2634,7 @@ Name[se]=Greikkagiella Name[sk]=Grécky Name[sl]=grško Name[sr]=Грчки +Name[sr@Latn]=Grčki Name[ss]=SiGriki Name[sv]=Grekiska Name[ta]=கிரேக்க @@ -2627,6 +2677,7 @@ Name[ru]=Гуарани Name[se]=Guaránagiella Name[sl]=guarani Name[sr]=Гварански +Name[sr@Latn]=Gvaranski Name[ss]=Si-Guarani Name[sv]=Gujarati Name[ta]=குவரானி @@ -2646,6 +2697,7 @@ Name[bn]=গুজরাতী Name[eo]= Guĝarata Name[eu]=Gujeratiera Name[fa]=گوراجاتی +Name[ga]=Gúisearáitis Name[gl]=Guxarati Name[he]=גוג'רטית Name[hi]=गुजराती @@ -2660,6 +2712,7 @@ Name[ru]=Гуджарати Name[se]=Gujaratigiella Name[sl]=gujarati Name[sr]=Гујаратски +Name[sr@Latn]=Gujaratski Name[ss]=Si-Gujarati Name[ta]=குஜராத்தி Name[tg]=Гӯҷаратӣ @@ -2753,6 +2806,7 @@ Name[se]=Hebreagiella Name[sk]=Hebrejský Name[sl]=hebrejsko Name[sr]=Хебрејски +Name[sr@Latn]=Hebrejski Name[ss]=SiHebheru Name[sv]=Hebreiska Name[ta]=ஹீப்றூ @@ -2787,6 +2841,7 @@ Name[ru]=Эреро Name[se]=Hererogiella Name[sl]=herero Name[sr]=Херерски +Name[sr@Latn]=Hererski Name[ss]=Si-Herero Name[ta]=ெஹரேரோ Name[tg]=Херэро @@ -2823,6 +2878,7 @@ Name[se]=Hindigiella Name[sk]=Hindský Name[sl]=hindujsko Name[sr]=Хинду +Name[sr@Latn]=Hindu Name[ss]=Si-Hindi Name[ta]=ஹிந்தி Name[tg]=Ҳиндӣ @@ -2854,6 +2910,7 @@ Name[ru]=Хири Моту Name[se]=Hiri Motu-giella Name[sl]=hiri motu Name[sr]=Хиримотски +Name[sr@Latn]=Hirimotski Name[ss]=Si-Hiri Motu Name[sv]=Hirimotu Name[ta]=ஹிரி மொட்டு @@ -2919,6 +2976,7 @@ Name[se]=Ungárgiella Name[sk]=Maďarský Name[sl]=madžarsko Name[sr]=Мађарски +Name[sr@Latn]=Mađarski Name[ss]=Si-Hungarian Name[sv]=Ungerska Name[ta]=ஹங்கேரியன் @@ -2987,6 +3045,7 @@ Name[se]=Islánddagiella Name[sk]=Islandský Name[sl]=islandsko Name[sr]=Исландски +Name[sr@Latn]=Islandski Name[ss]=Si-Icelandic Name[sv]=Isländska Name[ta]=ஐஸ்லாந்திக் @@ -3017,6 +3076,7 @@ Name[ru]=Идо Name[se]=Idogiella Name[sl]=ido Name[sr]=Идоски +Name[sr@Latn]=Idoski Name[ss]=Si-Ido Name[ta]=ஈடோ Name[tg]=Идо @@ -3044,6 +3104,7 @@ Name[ru]=Инуктитут Name[se]=Inuhkagiella Name[sl]=inuktitut Name[sr]=Инуктитутски +Name[sr@Latn]=Inuktitutski Name[ss]=Si-Inuktitut Name[ta]=இனுக்டிடுட் Name[tg]=Инук‚итут @@ -3069,6 +3130,7 @@ Name[mn]=Интерлингуе Name[nso]=Se-Interlingue Name[sl]=interlingue Name[sr]=Интерлингвијски +Name[sr@Latn]=Interlingvijski Name[ss]=Si-Interlingue Name[sv]=Interlingua Name[ta]=இன்டெர்லிங்கு @@ -3097,6 +3159,7 @@ Name[pt_BR]=Interlíngua Name[ru]=Интерлингва Name[sl]=interlingua Name[sr]=Интерлингвански +Name[sr@Latn]=Interlingvanski Name[ss]=Si-Interlingua Name[ta]=இன்டெர்லிங்குவா Name[tg]=Интерлингӣ @@ -3161,6 +3224,7 @@ Name[se]=Indonesiagiella Name[sk]=Indonézsky Name[sl]=indonezijsko Name[sr]=Индонезијски +Name[sr@Latn]=Indonezijski Name[ss]=Si-Indonesian Name[sv]=Indonesiska Name[ta]=இந்தோனீசியன் @@ -3197,6 +3261,7 @@ Name[ru]=Инупиак Name[se]=Inupiaqgiella Name[sl]=inupiaq Name[sr]=Инупиакски +Name[sr@Latn]=Inupiakski Name[ss]=Si-Inupiaq Name[ta]=இனுபியாக் Name[tg]=Инупайқӣ @@ -3261,6 +3326,7 @@ Name[se]=Itáliagiella Name[sk]=Talianský Name[sl]=italijansko Name[sr]=Италијански +Name[sr@Latn]=Italijanski Name[ss]=Sitaliyani Name[sv]=Italienska Name[ta]=இத்தாலியன் @@ -3295,6 +3361,7 @@ Name[fa]=جاوانی Name[fi]=Jaava Name[fr]=Javanais Name[ga]=Iávais +Name[gl]=Xavanés Name[he]=יאווה Name[hi]=जावानी (Javanese) Name[hu]=jávai @@ -3319,6 +3386,7 @@ Name[se]=Jávagiella Name[sk]=Jávanský Name[sl]=javansko Name[sr]=Јавански +Name[sr@Latn]=Javanski Name[ss]=Si-Javanese Name[sv]=Javanska Name[ta]=ஜாவானீஸ் @@ -3384,6 +3452,7 @@ Name[se]=Jáhpangiella Name[sk]=Japonský Name[sl]=japonsko Name[sr]=Јапански +Name[sr@Latn]=Japanski Name[ss]=Si-Japanese Name[sv]=Japanska Name[ta]=ஜப்பானிய @@ -3419,6 +3488,7 @@ Name[ru]=Калаалисут Name[se]=Kalállisutgiella Name[sl]=kalaallisut Name[sr]=Калалисутски +Name[sr@Latn]=Kalalisutski Name[ss]=Si-Kalaallisut Name[sv]=Grönländska Name[ta]=கலாலிசுட் @@ -3436,6 +3506,7 @@ Name[be]=Каннада Name[bg]=Каннада Name[bn]=কন্নাডা Name[fa]=کانادا +Name[ga]=Cannadais Name[he]=קנאדה Name[hi]=कन्नड़ Name[hu]=kannada @@ -3449,6 +3520,7 @@ Name[ru]=Каннада Name[se]=Kannadagiella Name[sl]=kannada Name[sr]=Канадски +Name[sr@Latn]=Kanadski Name[ss]=Si-Kannada Name[sv]=Kanaresiska Name[ta]=கன்னடா @@ -3493,6 +3565,7 @@ Name[se]=Kašmirgiella Name[sk]=Kašmírsky Name[sl]=kašmirsko Name[sr]=Кашмирски +Name[sr@Latn]=Kašmirski Name[ss]=Si-Kashmiri Name[ta]=காஷ்மீரி Name[tg]=Кашмирӣ @@ -3519,6 +3592,7 @@ Name[es]=Kazajo Name[et]=Kasahhi Name[fa]=قزاق Name[fi]=Kazakki +Name[ga]=Casacais Name[he]=קזחית Name[hi]=कज़ाख Name[hu]=kazah @@ -3537,6 +3611,7 @@ Name[se]=Kazakhagiella Name[sk]=Kazašský Name[sl]=kazaško Name[sr]=Казачки +Name[sr@Latn]=Kazački Name[ss]=Si-Kazakh Name[sv]=Kazakiska Name[ta]=கசாக் @@ -3574,6 +3649,7 @@ Name[se]=Khmeragiella Name[sk]=Khmersky Name[sl]=kmersko Name[sr]=Кмерски +Name[sr@Latn]=Kmerski Name[ss]=Si-Khmer Name[sv]=Kambodjanska Name[ta]=கெமர் @@ -3605,6 +3681,7 @@ Name[ru]=Кикую Name[se]=Kikujugiella Name[sl]=kikuyu Name[sr]=Кикујски +Name[sr@Latn]=Kikujski Name[ss]=Si-Kikuyu Name[ta]=கியுகு Name[tg]=Кикуягӣ @@ -3634,6 +3711,7 @@ Name[ru]=Киньяруанда Name[se]=Kinyarwandagiella Name[sl]=kinyarwanda Name[sr]=Кинијарвандаски +Name[sr@Latn]=Kinijarvandaski Name[ss]=Si-Kinyarwanda Name[sv]=Rwanda Name[ta]=கின்யார்வாண்டா @@ -3683,6 +3761,7 @@ Name[se]=Kirgisiagiella Name[sk]=Kyrghyzský Name[sl]=kirgizijsko Name[sr]=Киргиски +Name[sr@Latn]=Kirgiski Name[ss]=Si-Kirghiz Name[sv]=Kirghiziska Name[ta]=கிர்கிஸ் @@ -3716,6 +3795,7 @@ Name[ru]=Коми Name[se]=Komigiella Name[sl]=komi Name[sr]=Комски +Name[sr@Latn]=Komski Name[ss]=Si-Komi Name[ta]=கோமி Name[tg]=Коми @@ -3778,6 +3858,7 @@ Name[se]=Koreagiella Name[sk]=Kórejský Name[sl]=korejsko Name[sr]=Корејски +Name[sr@Latn]=Korejski Name[ss]=SiKoriya Name[sv]=Koreanska Name[ta]=கொரியன் @@ -3844,6 +3925,7 @@ Name[se]=Kurdigiella Name[sk]=Kurdský Name[sl]=kurdsko Name[sr]=Курдски +Name[sr@Latn]=Kurdski Name[ss]=Si-Kurdish Name[sv]=Kurdiska Name[ta]=குர்திஷ் @@ -3938,6 +4020,7 @@ Name[se]=Láhtengiella Name[sk]=Latinský Name[sl]=latinsko Name[sr]=Латински +Name[sr@Latn]=Latinski Name[ss]=Si-Latin Name[ta]=இலத்தீன் Name[tg]=Лотинӣ @@ -3970,6 +4053,7 @@ Name[fa]=لاتویایی Name[fi]=Latvia Name[fr]=Letton Name[ga]=Laitvis +Name[gl]=Letonio Name[he]=לטבית Name[hi]=लाटवियन Name[hr]=Latvijski @@ -3998,6 +4082,7 @@ Name[se]=Látviagiella Name[sk]=Lotyšský Name[sl]=latvijsko Name[sr]=Латвијски +Name[sr@Latn]=Latvijski Name[ss]=Si-Latvian Name[sv]=Lettiska Name[ta]=இலட்வியன் @@ -4049,6 +4134,7 @@ Name[ru]=Лимбуржский Name[se]=Limburggagiella Name[sl]=limburgan Name[sr]=Лимбуршки +Name[sr@Latn]=Limburški Name[ss]=Si-Limburgan Name[sv]=Limburgiska Name[ta]=லக்சம்பேர்க் @@ -4078,6 +4164,7 @@ Name[ru]=Лингала Name[se]=Lingalagiella Name[sl]=lingala Name[sr]=Лингалски +Name[sr@Latn]=Lingalski Name[ss]=Si-Lingala Name[ta]=லிங்காலா Name[tg]=Лингалӣ @@ -4141,6 +4228,7 @@ Name[se]=Lietuvagiella Name[sk]=Litovský Name[sl]=litvansko Name[sr]=Литвански +Name[sr@Latn]=Litvanski Name[ss]=Si-Lithuanian Name[sv]=Litauiska Name[ta]=லிதுவேனியன் @@ -4201,6 +4289,7 @@ Name[se]=Luksenburggagiella Name[sk]=Luxemburgský Name[sl]=luksemburško Name[sr]=Луксембуршки +Name[sr@Latn]=Luksemburški Name[ss]=Si-Luxembourgish Name[sv]=Luxemburgiska Name[ta]=லக்சம்போர்கிஷ் @@ -4266,6 +4355,7 @@ Name[se]=Makedoniagiella Name[sk]=Makedónsky Name[sl]=makedonsko Name[sr]=Македонски +Name[sr@Latn]=Makedonski Name[ss]=Si-Macedonian Name[sv]=Makedonska Name[ta]=மாசிடோனியன் @@ -4319,6 +4409,7 @@ Name[se]=Marshallagiella Name[sk]=Marshallský Name[sl]=maršalsko Name[sr]=Маршалески +Name[sr@Latn]=Maršaleski Name[ss]=Si-Marshallese Name[sv]=Marshall Name[ta]=மார்ஷலீஸ் @@ -4357,6 +4448,7 @@ Name[se]=Malajalamagiella Name[sk]=Malajalámsky Name[sl]=malayalam Name[sr]=Малајамски +Name[sr@Latn]=Malajamski Name[ss]=Si-Malayalam Name[ta]=மலையாளம் Name[tg]=Малаямӣ @@ -4402,6 +4494,7 @@ Name[se]=Maoragiella Name[sk]=Maorský Name[sl]=maorsko Name[sr]=Маорски +Name[sr@Latn]=Maorski Name[ss]=Si-Maori Name[sv]=Maoriska Name[ta]=மாவோரி @@ -4437,6 +4530,7 @@ Name[ru]=Марати Name[se]=Marathagiella Name[sl]=marathi Name[sr]=Маратски +Name[sr@Latn]=Maratski Name[ss]=Si-Marathi Name[ta]=மராத்தி Name[tg]=Маравӣ @@ -4466,6 +4560,7 @@ Name[fa]=مالایی Name[fi]=Malaiji Name[fr]=Malais Name[ga]=Malaeis +Name[gl]=Malaio Name[he]=מלאית Name[hi]=मलय Name[hu]=maláj @@ -4488,6 +4583,7 @@ Name[se]=Malaigiella Name[sk]=Malajský Name[sl]=malajsko Name[sr]=Малајски +Name[sr@Latn]=Malajski Name[ss]=Si-Malay Name[sv]=Malajiska Name[ta]=மலே @@ -4532,6 +4628,7 @@ Name[se]=Malagasigiella Name[sk]=Malagašský Name[sl]=malagaško Name[sr]=Малагаски +Name[sr@Latn]=Malagaski Name[ss]=Si-Malagasy Name[sv]=Malagassiska Name[ta]=மலகாசி @@ -4593,6 +4690,7 @@ Name[se]=Maltagiella Name[sk]=Maltský Name[sl]=maltežansko Name[sr]=Малтешки +Name[sr@Latn]=Malteški Name[ss]=Si-Maltese Name[sv]=Maltesiska Name[ta]=மால்டீசிய @@ -4655,6 +4753,7 @@ Name[se]=Moldáviagiella Name[sk]=Moldávsky Name[sl]=moldavsko Name[sr]=Молдавски +Name[sr@Latn]=Moldavski Name[ss]=Si-Moldavian Name[sv]=Moldaviska Name[ta]=மோல்டோவியன் @@ -4716,6 +4815,7 @@ Name[se]=Mongoliagiella Name[sk]=Mongolský Name[sl]=mongolsko Name[sr]=Монголски +Name[sr@Latn]=Mongolski Name[ss]=Si-Mongolian Name[sv]=Mongoliska Name[ta]=மொங்கோலியன் @@ -4751,6 +4851,7 @@ Name[ru]=Науру Name[se]=Naurugiella Name[sl]=nauru Name[sr]=Наурски +Name[sr@Latn]=Naurski Name[ss]=Si-Nauru Name[ta]=நவுரு Name[tg]=Науру @@ -4778,9 +4879,11 @@ Name[eu]=Iparraldeko Sotho Name[fa]=سوتوی شمالی Name[fi]=Pohjoissotho Name[fr]=Sotho du Nord +Name[gl]=Sotho do Norte Name[hu]=északi sotho Name[is]=Norður Sotho Name[it]=Sotho settentrionale +Name[ja]=北ソト語 Name[lt]=Šiaurės Sotho Name[mn]=Умард Сото Name[nb]=Nord-Sotho @@ -4796,6 +4899,7 @@ Name[se]=Davvi-sothogiella Name[sk]=Severný Sotho Name[sl]=severni sotho Name[sr]=Северни сото +Name[sr@Latn]=Severni soto Name[sv]=Nordsotho Name[ta]=வட சோத்தோ Name[tg]=Сотои Шимолӣ @@ -4815,6 +4919,7 @@ Name[et]=Navaho Name[fa]=ناواجویی Name[fi]=Navaho Name[fr]=Navaho +Name[ga]=Navachóis Name[gl]=Navaxo Name[he]=נבאחו Name[hi]=नवाजो @@ -4827,6 +4932,7 @@ Name[ru]=Навахо Name[se]=Naváhogiella Name[sl]=navajo Name[sr]=Навахо +Name[sr@Latn]=Navaho Name[ss]=Si-Navajo Name[sv]=Navaho Name[ta]=நவாேஜா @@ -4856,6 +4962,7 @@ Name[fa]=ان‌دبله، جنوب Name[fi]=Ndebele, Etelä Name[fr]=Ndébélé du Sud Name[ga]=Ndebele, Theas +Name[gl]=Ndebele, Sur Name[he]=נדבלה דרומית Name[hi]=नेदेबेले,दक्षिण Name[hu]=ndebele (déli) @@ -4879,6 +4986,7 @@ Name[se]=Ndebelegiella, lulli Name[sk]=Ndebele, južný Name[sl]=ndebele, južno Name[sr]=Ндебеле, Јужни +Name[sr@Latn]=Ndebele, Južni Name[ss]=SiNdebele, saseningizimu Name[sv]=Sydndebele Name[ta]=டெபெலே, தென் @@ -4910,6 +5018,7 @@ Name[fa]=ان‌دبله، شمال Name[fi]=Ndebele, Pohjoinen Name[fr]=Ndébélé du Nord Name[ga]=Ndebele, Thuaidh +Name[gl]=Ndebele do Norte Name[he]=נדבלה צפונית Name[hi]=नेदेबेले, उत्तर Name[hu]=ndebele (északi) @@ -4933,6 +5042,7 @@ Name[se]=Ndebelegiella, davvi Name[sk]=Ndebele, severný Name[sl]=ndebele, severno Name[sr]=Ндебеле, Северни +Name[sr@Latn]=Ndebele, Severni Name[ss]=SiNdebele, sasenyakatfo Name[sv]=Nordndebele Name[ta]=டெபெலே, வட @@ -5010,6 +5120,7 @@ Name[se]=Nepálagiella Name[sk]=Nepálsky Name[sl]=nepalsko Name[sr]=Непалски +Name[sr@Latn]=Nepalski Name[ss]=SiNepali Name[ta]=நேபாளி Name[tg]=Непалӣ @@ -5075,6 +5186,7 @@ Name[se]=Dárogiella Name[sk]=Nórsky Name[sl]=norveška Name[sr]=Норвешки +Name[sr@Latn]=Norveški Name[ss]=Si-Norwegian Name[sv]=Norska Name[ta]=நார்வீஜியன் @@ -5112,6 +5224,7 @@ Name[fa]=نروژی نینورسک Name[fi]=Uusnorja Name[fr]=Norvégien Nynorsk Name[ga]=Ioruais (Nynorsk) +Name[gl]=Noruegués Nynorsk Name[he]=נורבגית Nynorsk Name[hi]=नार्वेजियन नायनोरस्क Name[hu]=norvég (nynorsk) @@ -5135,6 +5248,7 @@ Name[se]=Ođđadárogiella Name[sk]=Nórsky Nynorsk Name[sl]=norveško (nyorsk) Name[sr]=Норвешки (Ниноршки) +Name[sr@Latn]=Norveški (Ninorški) Name[ss]=Si-Norwegian Nynorsk Name[sv]=Nynorska Name[ta]=நார்வீஜியன் (நையோர்ஸ்க்) @@ -5169,6 +5283,7 @@ Name[fa]=نروژی بکمال Name[fi]=Kirjanorja Name[fr]=Norvégien Bokmaal Name[ga]=Ioruais (Bokmål) +Name[gl]=Noruegués Bokmaal Name[he]=נורבגית Bokmål Name[hi]=नार्वेजियन बोकमॉल Name[hu]=norvég (bokmal) @@ -5192,6 +5307,7 @@ Name[se]=Girjedárogiella Name[sk]=Nórsky Bokmål Name[sl]=norveško (bokmaal) Name[sr]=Норвешки (Бокмалски) +Name[sr@Latn]=Norveški (Bokmalski) Name[ss]=Si-Norwegian Bokmål Name[sv]=Norskt bokmål Name[ta]=நார்வீஜியன் பொக்மால் @@ -5224,6 +5340,7 @@ Name[ru]=Чичева Name[se]=Chichevagiella Name[sl]=chichewa Name[sr]=Чичевски +Name[sr@Latn]=Čičevski Name[ss]=Si-Chichewa Name[sv]=Chewa Name[ta]=சிச்செவா @@ -5278,6 +5395,7 @@ Name[se]=Oksitánagiella Name[sk]=Okitánsky Name[sl]=očitansko Name[sr]=Оцитански +Name[sr@Latn]=Ocitanski Name[ss]=Si-Occitan Name[sv]=Occitanska Name[ta]=ஒக்சிட்டான் @@ -5300,6 +5418,7 @@ Name[eo]=Orijo Name[et]=Orija Name[fa]=اوریایی Name[fi]=Orija +Name[gl]=Orilla Name[he]=אוריה Name[hi]=ओरिया Name[hu]=orija @@ -5312,6 +5431,7 @@ Name[ru]=Ория Name[se]=Orijagiella Name[sl]=oriya Name[sr]=Оријски +Name[sr@Latn]=Orijski Name[ss]=Si-Oriya Name[ta]=ஒரியா Name[tg]=Ориёӣ @@ -5340,6 +5460,7 @@ Name[ru]=Оромо Name[se]=Oromogiella Name[sl]=oromo Name[sr]=Оромски +Name[sr@Latn]=Oromski Name[ss]=Si-Oromo Name[ta]=ஒரோமோ Name[tg]=Оромо @@ -5386,6 +5507,7 @@ Name[se]=Ossetiagiella Name[sk]=Osetský Name[sl]=osetijsko Name[sr]=Осетски +Name[sr@Latn]=Osetski Name[ss]=Si-Ossetian Name[sv]=Ossetsiska Name[ta]=ஒசெட்டியன் @@ -5411,6 +5533,7 @@ Name[et]=Pandžabi Name[fa]=پنجابی Name[fi]=Pandžabi Name[fr]=Pendjabi +Name[gl]=Panxabi Name[he]=פנג'בית Name[hi]=पंजाबी Name[hu]=pandzsabi @@ -5427,6 +5550,7 @@ Name[se]=Panjabigiella Name[sk]=Pandžábsky Name[sl]=pandžabsko Name[sr]=Пенџабски +Name[sr@Latn]=Pendžabski Name[ss]=Si-Panjabi Name[ta]=பஞ்சாபி Name[tg]=Панҷабӣ @@ -5447,15 +5571,19 @@ Name[cs]=Farsi (Perský) Name[cy]=Farsi (Perseg) Name[da]=Farsi (Persisk) Name[de]=Farsi (Persisch) +Name[el]=Farsi (Περσικά) Name[es]=Persa Name[et]=Farsi (pärsia) Name[eu]=Farsiera (Persiera) Name[fa]=فارسی Name[fi]=Farsi (Persia) Name[fr]=Persan +Name[ga]=Fairsis (Peirsis) +Name[gl]=Iraní (Persa) Name[hu]=fárszi (perzsa) Name[is]=Farsi (Persneska) Name[it]=Farsi (Persiano) +Name[ja]=ファルシ語(ペルシア語) Name[lt]=Farsi (Persų) Name[mn]=Фарси (Перс) Name[nb]=Farsi (Persisk) @@ -5470,6 +5598,7 @@ Name[se]=Farsigiella (Persialaš) Name[sk]=Farsí (Persky) Name[sl]=Farsi (perzijsko) Name[sr]=Фарси (Персијски) +Name[sr@Latn]=Farsi (Persijski) Name[sv]=Persiska Name[tg]=Фрисианӣ Name[uk]=Фризійська (Перська) @@ -5496,6 +5625,7 @@ Name[ru]=Пали Name[se]=Páligiella Name[sl]=pali Name[sr]=Палијски +Name[sr@Latn]=Palijski Name[ss]=Si-Pali Name[ta]=பாலி Name[tg]=Пали @@ -5560,6 +5690,7 @@ Name[se]=Polskkagiella Name[sk]=Poľský Name[sl]=poljsko Name[sr]=Пољски +Name[sr@Latn]=Poljski Name[ss]=Si-Polish Name[sv]=Polska Name[ta]=போலிஷ் @@ -5629,6 +5760,7 @@ Name[se]=Portugálagiella Name[sk]=Portugalský Name[sl]=portugalsko Name[sr]=Португалски +Name[sr@Latn]=Portugalski Name[ss]=SiPutukezi Name[sv]=Portugisiska Name[ta]=போர்த்துக்கீசிய @@ -5663,6 +5795,7 @@ Name[eu]=Brasileko Portugesa Name[fa]=پرتغالی برزیلی Name[fi]=Brasilian Portugali Name[fr]=Portugais Brésilien +Name[ga]=Portaingéilis na Brasaíle Name[gl]=Portugués Do Brasil Name[he]=פורטוגזית ברזילאית Name[hi]=ब्राजिलियन पुर्तगाली @@ -5670,6 +5803,7 @@ Name[hu]=portugál (brazil) Name[id]=Portugis Brazil Name[is]=Brasílísk Portúgalska Name[it]=Portoghese brasiliano +Name[ja]=ブラジル ポルトガル語 Name[lt]=Brazilijos portugalų Name[mn]=Бразилын португал Name[nb]=Brasil-portugisisk @@ -5685,6 +5819,7 @@ Name[se]=Brasilialaš portugálagiella Name[sk]=Portugalský (Brazília) Name[sl]=brazilska portugalščina Name[sr]=Бразилско португалски +Name[sr@Latn]=Brazilsko portugalski Name[sv]=Brasiliansk portugisiska Name[ta]=பிரேஸிலிய போர்த்துக்கீசிய Name[tg]=Бразилияӣ Португалӣ @@ -5720,6 +5855,7 @@ Name[ru]=Пуштунский Name[se]=Puštugiella Name[sl]=pushto Name[sr]=Пушто +Name[sr@Latn]=Pušto Name[ss]=Si-Pushto Name[sv]=Pashto Name[ta]=பாஷ்டுன் @@ -5753,6 +5889,7 @@ Name[ru]=Кечуа Name[se]=Keččuagiella Name[sl]=quechua Name[sr]=Квечва +Name[sr@Latn]=Kvečva Name[ss]=Si-Quechua Name[ta]=குவெச்சா Name[tg]=Квечуа @@ -5817,6 +5954,7 @@ Name[se]=Romániagiella Name[sk]=Rumunský Name[sl]=romunsko Name[sr]=Румунски +Name[sr@Latn]=Rumunski Name[ss]=SiRoma Name[sv]=Rumänska Name[ta]=உருமேனியன் @@ -5917,6 +6055,7 @@ Name[se]=Ruoššagiella Name[sk]=Ruský Name[sl]=rusko Name[sr]=Руски +Name[sr@Latn]=Ruski Name[ss]=SiRashiya Name[sv]=Ryska Name[ta]=உருசியன் @@ -6054,6 +6193,7 @@ Name[se]=Serbiagiella Name[sk]=Srbský Name[sl]=srbsko Name[sr]=Српски +Name[sr@Latn]=Srpski Name[ss]=Si-Serbian Name[sv]=Serbiska Name[ta]=செர்பியன் @@ -6123,6 +6263,7 @@ Name[se]=Kroatiagiella Name[sk]=Chorvátsky Name[sl]=hrvaško Name[sr]=Хрватски +Name[sr@Latn]=Hrvatski Name[ss]=Si-Croatian Name[sv]=Kroatiska Name[ta]=குரொவேசியன் @@ -6175,6 +6316,7 @@ Name[se]=Singalesagiella Name[sk]=Sinhálsky Name[sl]=sinhalese Name[sr]=Синхалски +Name[sr@Latn]=Sinhalski Name[ss]=Si-Sinhalese Name[sv]=Singalesiska Name[ta]=சிங்கள @@ -6240,6 +6382,7 @@ Name[se]=Slovenagiella Name[sk]=Slovinský Name[sl]=slovensko Name[sr]=Словеначки +Name[sr@Latn]=Slovenački Name[ss]=Si-Slovenian Name[sv]=Slovenska Name[ta]=சுலோவீனியன் @@ -6273,6 +6416,7 @@ Name[fa]=سامی شمالی Name[fi]=Pohjoissaame Name[fr]=Sami du Nord Name[ga]=Samaí Thuaidh +Name[gl]=Sami do Norte Name[he]=סאמית צפונית Name[hi]=नार्दर्न सामी Name[hu]=északi szami @@ -6297,6 +6441,7 @@ Name[se]=Davvisámegiella Name[sk]=Severný Sami Name[sl]=severno sami Name[sr]=Северносамски +Name[sr@Latn]=Severnosamski Name[ss]=SiSami sasenyakatfo Name[sv]=Samiska Name[ta]=வட சாமி @@ -6331,6 +6476,7 @@ Name[eu]=Eslovakiera Name[fa]=اسلواکی Name[fi]=Slovakki Name[fr]=Slovaque +Name[ga]=Slóvaicis Name[gl]=Eslovaco Name[hr]=Slovački Name[hu]=szlovák @@ -6356,6 +6502,7 @@ Name[se]=Slovákagiella Name[sk]=Slovenský Name[sl]=slovaško Name[sr]=Словачки +Name[sr@Latn]=Slovački Name[sv]=Slovakiska Name[ta]=சுலோவாக் Name[tg]=Словакӣ @@ -6388,6 +6535,7 @@ Name[eu]=Samoera Name[fa]=ساموایی Name[fi]=Samoa Name[ga]=Samóis +Name[gl]=Samoano Name[he]=סמואית Name[hi]=सामोन Name[hu]=szamoai @@ -6411,6 +6559,7 @@ Name[se]=Samoagiella Name[sk]=Samojský Name[sl]=samojsko Name[sr]=Самоански +Name[sr@Latn]=Samoanski Name[ss]=Si-Samoan Name[sv]=Samoanska Name[ta]=சமோவன் @@ -6440,6 +6589,7 @@ Name[ru]=Схона Name[se]=Šonagiella Name[sl]=shona Name[sr]=Шонски +Name[sr@Latn]=Šonski Name[ss]=SiShona Name[ta]=ேஷானா Name[tg]=Шонӣ @@ -6471,6 +6621,7 @@ Name[ru]=Синдхи Name[se]=Sindhigiella Name[sl]=sindijsko Name[sr]=Синдиски +Name[sr@Latn]=Sindiski Name[ss]=Si-Sindhi Name[ta]=சிந்தி Name[tg]=Синдхӣ @@ -6497,6 +6648,7 @@ Name[et]=Somaali Name[eu]=Somaliera Name[fa]=سومالیایی Name[ga]=Somálais +Name[gl]=Somalí Name[he]=סומלית Name[hi]=सोमाली Name[hu]=szomáli @@ -6517,6 +6669,7 @@ Name[se]=Somálagiella Name[sk]=Somálsky Name[sl]=somalsko Name[sr]=Сомалијски +Name[sr@Latn]=Somalijski Name[ss]=Si-Somali Name[ta]=சோமாலி Name[tg]=Сомалӣ @@ -6570,6 +6723,7 @@ Name[se]=Sothogiella, lulli Name[sk]=Sotho, južný Name[sl]=sotho, južni Name[sr]=Сото, јужни +Name[sr@Latn]=Soto, južni Name[ss]=SiSotho, saseningizimo Name[sv]=Sydsotho Name[ta]=சோத்தோ, தென் @@ -6637,6 +6791,7 @@ Name[se]=Spánskkagiella Name[sk]=Španielsky Name[sl]=špansko Name[sr]=Шпански +Name[sr@Latn]=Španski Name[ss]=SiSpanishi Name[sv]=Spanska Name[ta]=ஸ்பானிய @@ -6671,6 +6826,7 @@ Name[fa]=ساردینیایی Name[fi]=Sardi Name[fr]=Sarde Name[ga]=Sairdínis +Name[gl]=Sardo Name[he]=סרדינית Name[hi]=सारदिनी Name[hu]=szardíniai @@ -6693,6 +6849,7 @@ Name[se]=Sardiniagiella Name[sk]=Sardinský Name[sl]=sardinsko Name[sr]=Сардинијски +Name[sr@Latn]=Sardinijski Name[ss]=Si-Sardinian Name[sv]=Sardiska Name[ta]=சார்டீனியன் @@ -6724,6 +6881,7 @@ Name[ru]=Свати Name[se]=Svatigiella Name[sl]=swati Name[sr]=Свати +Name[sr@Latn]=Svati Name[ss]=SiSwati Name[sv]=Swazi Name[ta]=சுவாதி @@ -6777,6 +6935,7 @@ Name[se]=Sundanesagiella Name[sk]=Sundanésky Name[sl]=sudansko Name[sr]=Сундански +Name[sr@Latn]=Sundanski Name[ss]=Si-Sundanese Name[sv]=Sundanesiska Name[ta]=சூடானீஸ் @@ -6817,6 +6976,7 @@ Name[se]=Svahilagiella Name[sk]=Swahilský Name[sl]=svahili Name[sr]=Свахили +Name[sr@Latn]=Svahili Name[ss]=SiSwahili Name[ta]=ஸ்வாஹிலி Name[tg]=Свахили @@ -6881,6 +7041,7 @@ Name[se]=Ruoŧagiella Name[sk]=Švédsky Name[sl]=švedsko Name[sr]=Шведски +Name[sr@Latn]=Švedski Name[ss]=SiSwidi Name[sv]=Svenska Name[ta]=சுவீடிஷ் @@ -6938,6 +7099,7 @@ Name[se]=Tahitigiella Name[sk]=Tahitský Name[sl]=tahitijsko Name[sr]=Тахићански +Name[sr@Latn]=Tahićanski Name[ss]=Si-Tahitian Name[sv]=Tahitiska Name[ta]=தஹிடியன் @@ -6988,6 +7150,7 @@ Name[se]=Tamilgiella Name[sk]=Tamilský Name[sl]=tamilsko Name[sr]=Тамилски +Name[sr@Latn]=Tamilski Name[ss]=Si-Tamil Name[ta]=தமிழ் Name[tg]=Тамилӣ @@ -7034,6 +7197,7 @@ Name[se]=Tatáragiella Name[sk]=Tatarský Name[sl]=tatarsko Name[sr]=Татарски +Name[sr@Latn]=Tatarski Name[ss]=Si-Tatar Name[sv]=Tatariska Name[ta]=டாடார் @@ -7066,6 +7230,7 @@ Name[ru]=Телугу Name[se]=Telugugiella Name[sl]=telugu Name[sr]=Телугски +Name[sr@Latn]=Telugski Name[ss]=Si-Telugu Name[ta]=தெலுங்கு Name[tg]=Телугуягӣ @@ -7094,6 +7259,7 @@ Name[et]=Tadžiki Name[fa]=تاجیک Name[fi]=Tadžikki Name[fr]=Tadjik +Name[gl]=Taxik Name[he]=טג'יקית Name[hi]=ताजिक Name[hu]=tadzsik @@ -7114,6 +7280,7 @@ Name[se]=Tažihkagiella Name[sk]=Tadžitský Name[sl]=tadžiško Name[sr]=Таџикистански +Name[sr@Latn]=Tadžikistanski Name[ss]=Si-Tajik Name[sv]=Tadzjikiska Name[ta]=தஜிக் @@ -7168,6 +7335,7 @@ Name[se]=Thaigiella Name[sk]=Thajský Name[sl]=tajsko Name[sr]=Тајландски +Name[sr@Latn]=Tajlandski Name[ss]=Si-Thai Name[sv]=Thailändska Name[ta]=தாய் @@ -7203,6 +7371,7 @@ Name[fa]=تبتی Name[fi]=Tiibet Name[fr]=Tibétain Name[ga]=Tibéadais +Name[gl]=Tibetán Name[he]=טיבטית Name[hi]=तिब्ती Name[hu]=tibeti @@ -7228,6 +7397,7 @@ Name[se]=Tibehtagiella Name[sk]=Tibetský Name[sl]=tibetansko Name[sr]=Тибетански +Name[sr@Latn]=Tibetanski Name[ss]=Si-Tibetan Name[sv]=Tibetanska Name[ta]=திபெத்தியன் @@ -7263,6 +7433,7 @@ Name[ru]=Тигринья Name[se]=Tigrinjágiella Name[sl]=tigrinya Name[sr]=Тигрински +Name[sr@Latn]=Tigrinski Name[ss]=Si-Tigrinya Name[sv]=Tigrinja Name[ta]=திகிரின்யா @@ -7328,6 +7499,7 @@ Name[ru]=Тсвана Name[se]=Tswanagiella Name[sl]=tswana Name[sr]=Цвана +Name[sr@Latn]=Cvana Name[ss]=SiTswana Name[ta]=ஸ்வானா Name[tg]=Сванавӣ @@ -7358,6 +7530,7 @@ Name[ru]=Тсонга Name[se]=Tsongagiella Name[sl]=tsonga Name[sr]=Цонга +Name[sr@Latn]=Conga Name[ss]=SiTsonga Name[ta]=ெஸாங்கா Name[tg]=Сонгавӣ @@ -7408,6 +7581,7 @@ Name[se]=Turkmenagiella Name[sk]=Turkménsky Name[sl]=turkmensko Name[sr]=Туркменистански +Name[sr@Latn]=Turkmenistanski Name[ss]=Si-Turkmen Name[sv]=Turkmenska Name[ta]=துருக்மென் @@ -7475,6 +7649,7 @@ Name[se]=Turkiijagiella Name[sk]=Turecký Name[sl]=turško Name[sr]=Турски +Name[sr@Latn]=Turski Name[ss]=Si-Turkish Name[sv]=Turkiska Name[ta]=துருக்கிய @@ -7506,6 +7681,7 @@ Name[ru]=Тви Name[se]=Twigiella Name[sl]=twi Name[sr]=Твиски +Name[sr@Latn]=Tviski Name[ss]=Si-Twi Name[ta]=த்வீ Name[tg]=Твиягӣ @@ -7542,6 +7718,7 @@ Name[ru]=Уйгурский Name[se]=Uiguragiella Name[sl]=ujgursko Name[sr]=Ујгурски +Name[sr@Latn]=Ujgurski Name[ss]=Si-Uighur Name[sv]=Uiguriska Name[ta]=உயிகூர் @@ -7608,6 +7785,7 @@ Name[se]=Ukrainagiella Name[sk]=Ukrajinský Name[sl]=ukrajinsko Name[sr]=Украјински +Name[sr@Latn]=Ukrajinski Name[ss]=Si-Ukrainian Name[sv]=Ukrainska Name[ta]=உக்ரேனியன் @@ -7673,6 +7851,7 @@ Name[es]=Uzbeko Name[et]=Usbeki Name[fa]=ازبک Name[fi]=Uzbekki +Name[ga]=Úsbaecais Name[he]=אוזבקית Name[hi]=उज्ब़ेक Name[hu]=üzbég @@ -7694,6 +7873,7 @@ Name[se]=Uzbehkagiella Name[sk]=Uzbecký Name[sl]=uzbeško Name[sr]=Узбечки +Name[sr@Latn]=Uzbečki Name[ss]=Si-Uzbek Name[sv]=Uzbekiska Name[ta]=உஸ்பெக் @@ -7750,6 +7930,7 @@ Name[fa]=ویتنامی Name[fi]=Vietnam Name[fr]=Vietnamien Name[ga]=Vítneaimis +Name[gl]=Vietnamita Name[he]=וייטנאמית Name[hi]=वियतनामी Name[hr]=Vijetnamski @@ -7778,6 +7959,7 @@ Name[se]=Vietnamagiella Name[sk]=Vietnamský Name[sl]=vietnamsko Name[sr]=Вијетнамски +Name[sr@Latn]=Vijetnamski Name[ss]=Si-Vietnamese Name[sv]=Vietnamesiska Name[ta]=வியட்னாமிய @@ -7814,6 +7996,7 @@ Name[ru]=Волапюк Name[se]=Volapükgiella Name[sl]=volapük Name[sr]=Волапикски +Name[sr@Latn]=Volapikski Name[ss]=Si-Volapük Name[ta]=வொல்பாக் Name[tg]=Волапёкӣ @@ -7845,6 +8028,7 @@ Name[fa]=ولزی Name[fi]=Wales Name[fr]=Gallois Name[ga]=Breatnais +Name[gl]=Galés Name[he]=וולשית Name[hi]=वेल्श Name[hr]=Velški @@ -7872,6 +8056,7 @@ Name[se]=Walesagiella Name[sk]=Welšský Name[sl]=valižansko Name[sr]=Велшански +Name[sr@Latn]=Velšanski Name[ss]=Si-Welsh Name[sv]=Walesiska Name[ta]=வெல்ஷ் @@ -7931,6 +8116,7 @@ Name[se]=Vallonagiella Name[sk]=Walónsky Name[sl]=walloonsko Name[sr]=Валонски +Name[sr@Latn]=Valonski Name[ss]=Si-Walloon Name[sv]=Vallonska Name[ta]=வாலூன் @@ -7967,6 +8153,7 @@ Name[ru]=Уолоф Name[se]=Volofagiella Name[sl]=wolof Name[sr]=Волофски +Name[sr@Latn]=Volofski Name[ss]=Si-Wolof Name[ta]=வொலொஃப் Name[tg]=Волофӣ @@ -7995,6 +8182,7 @@ Name[ru]=Кшоса Name[se]=Xhosagiella Name[sl]=xhosa Name[sr]=Зоса +Name[sr@Latn]=Zosa Name[ss]=SiXhosa Name[ta]=சோசா Name[tg]=Хоса @@ -8024,6 +8212,7 @@ Name[et]=Jidiš Name[fa]=ییدی Name[fi]=Jiddi Name[ga]=Giúdais +Name[gl]=LLiddish Name[he]=יידיש Name[hi]=यिदिश Name[hu]=jiddis @@ -8042,6 +8231,7 @@ Name[ru]=Идиш Name[se]=Jiddišgiella Name[sl]=yiddish Name[sr]=Јидијски +Name[sr@Latn]=Jidijski Name[ss]=Si-Yiddish Name[ta]=யிட்டிஷ் Name[tg]=Йидишӣ @@ -8062,6 +8252,7 @@ Name[eo]=Joruba Name[et]=Joruba Name[fa]=یروبایی Name[fi]=Joruba +Name[gl]=Ioruba Name[he]=יורובה Name[hi]=योरुबा Name[hu]=joruba @@ -8075,6 +8266,7 @@ Name[ru]=Йоруба Name[se]=Jorubagiella Name[sl]=yoruba Name[sr]=Јорубски +Name[sr@Latn]=Jorubski Name[ss]=Si-Yoruba Name[ta]=யொரூபா Name[tg]=Ёруба @@ -8103,6 +8295,7 @@ Name[ru]=Чжуанг Name[se]=Zhuangagiella Name[sl]=zhuang Name[sr]=Цуанг +Name[sr@Latn]=Cuang Name[ss]=Si-Zhuang Name[ta]=சுவாங் Name[tg]=Жуанг Index: kdecore/eventsrc =================================================================== RCS file: /home/kde/kdelibs/kdecore/eventsrc,v retrieving revision 1.347.2.3 retrieving revision 1.347.2.4 diff -u -3 -p -r1.347.2.3 -r1.347.2.4 --- kdecore/eventsrc 11 Feb 2004 16:59:06 -0000 1.347.2.3 +++ kdecore/eventsrc 29 Feb 2004 15:29:29 -0000 1.347.2.4 @@ -21,7 +21,7 @@ Comment[eu]=KDE Sistemaren Oharpenak Comment[fa]=اعلامیه‌های سیستم KDE Comment[fi]=KDE:n järjestelmähuomautukset Comment[fr]=Notifications du système KDE -Comment[ga]=Fógairt Chóras KDE +Comment[ga]=Fógairt Chórais KDE Comment[gl]=Notificacións do Sistema de KDE Comment[he]=הודעות מערכת של KDE Comment[hi]=केडीई सिस्टम सूचना @@ -53,6 +53,7 @@ Comment[se]=KDE vuogádatdieđáhusat Comment[sk]=KDE Systémové správy Comment[sl]=Sistemska obvestila KDE Comment[sr]=KDE-ова системска обавештења +Comment[sr@Latn]=KDE-ova sistemska obaveštenja Comment[ss]=Tatiso temshini we KDE Comment[sv]=KDE:s systemunderrättelser Comment[ta]=KDE கணினி அறிவிப்புகள் @@ -123,6 +124,7 @@ Name[se]=Teakstaollašuhttin: joraheapmi Name[sk]=Doplnenie textu:rotácia Name[sl]=Dopolnjevanje: vrtenje Name[sr]=Допуњавање текста: ротација +Name[sr@Latn]=Dopunjavanje teksta: rotacija Name[ss]=Kucedzelwa kwembhalo:kujikeleta Name[sv]=Textkomplettering: rotation Name[ta]=உரைநிறைவு: சுழற்சி @@ -191,6 +193,7 @@ Comment[se]=Ollen gávdnosiid listtu loh Comment[sk]=Bol dosiahnutý koniec zoznamu nájdených položiek Comment[sl]=To je konec seznama zadetkov. Comment[sr]=Крај листе подударања. +Comment[sr@Latn]=Kraj liste podudaranja. Comment[ss]=Sigcino seluhlu loluhambelanako sifinyelelwe. Comment[sv]=Slutet på listan med träffar har nåtts Comment[ta]=பொருத்தப் பட்டியலின் முடிவை அடைந்தாயிற்று. @@ -262,6 +265,7 @@ Name[se]=Teakstaollašuhttin: ii gávdno Name[sk]=Doplnenie textu: žiadna zhoda Name[sl]=Dopolnjevanje: ni ujemanja Name[sr]=Допуњавање текста: нема поклапања +Name[sr@Latn]=Dopunjavanje teksta: nema poklapanja Name[ss]=Kucedzelwa kwembhalo:akukho kuhambelana Name[sv]=Textkomplettering: ingen träff Name[ta]=உரைநிறைவு: பொருத்தமில்லை @@ -330,6 +334,7 @@ Comment[se]=Heivvolaš ollašuhttin ii g Comment[sk]=Žiadna zhoda nebola nájdená. Comment[sl]=Ni najti ujemajočih se zadetkov. Comment[sr]=Подударна допуна није пронађена. +Comment[sr@Latn]=Podudarna dopuna nije pronađena. Comment[ss]=Akukho kuhambelana kwekucatsanisa lokutfoliwe. Comment[sv]=Ingen matchande komplettering hittades Comment[ta]=பொருத்தமான நிறைவு ஏதுமில்லை. @@ -401,6 +406,7 @@ Name[se]=Taekstaollašuhttin: oasil gáv Name[sk]=Doplnenie textu: čiastočná zhoda Name[sl]=Dopolnjevanje: delno ujemanje Name[sr]=Допуњавање текста: делимично поклапање +Name[sr@Latn]=Dopunjavanje teksta: delimično poklapanje Name[ss]=Kucedzelwa kwembhalo:kuhambelana lokungakapheleli Name[sv]=Textkomplettering: delvis träff Name[ta]=உரைநிறைவு: குறைப் பொருத்தம் @@ -469,6 +475,7 @@ Comment[se]=Leat eanet go ovtta vejolaš Comment[sk]=Existuje viac ako jedna zhoda. Comment[sl]=Mogoč je več kakor en zadetek. Comment[sr]=Постоји више од једног могућег подударања. +Comment[sr@Latn]=Postoji više od jednog mogućeg podudaranja. Comment[ss]=Kukhona kuhambelana lokukhona lokungetulu kwakunye. Comment[sv]=Det finns mer än en möjlig träff Comment[ta]=ஒன்றுக்கு மேற்பட்ட பொருத்தங்கள் உள்ளன. @@ -543,6 +550,7 @@ Name[se]=Ii sáhte rahpat filla Name[sk]=Nemôžem otvoriť súbor Name[sl]=Ni moč odpreti datoteke Name[sr]=Није могуће отворити фајл +Name[sr@Latn]=Nije moguće otvoriti fajl Name[ss]=Akukhonakali kuvula lifayela Name[sv]=Kan inte öppna fil Name[ta]=கோப்பைத் திறக்க முடியவில்லை @@ -612,6 +620,7 @@ Comment[se]=Válljejuvvon fiilla ii sáh Comment[sk]=Vybraný súbor nemôžem otvoriť na čítanie alebo zápis Comment[sl]=Izbrane datoteke ni bilo moč odpreti za branje ali pisanje. Comment[sr]=Изабрани фајл је немогуће отворити ради читања или писања. +Comment[sr@Latn]=Izabrani fajl je nemoguće otvoriti radi čitanja ili pisanja. Comment[ss]=lifayela lelikhetsiwe akukhonakali kutsi livulwe kutsi lifundvwe kumbe libhalwe Comment[sv]=Den valda filen kan inte öppnas för läsning eller skrivning Comment[ta]=தெரிவு செய்த கோப்பை வாசிக்கவோ எழுதவோ திறக்க முடியாது @@ -684,6 +693,7 @@ Name[se]=Váralaš meattáhus Name[sk]=Fatálna chyba Name[sl]=Usodna napaka Name[sr]=Фатална грешка +Name[sr@Latn]=Fatalna greška Name[ss]=Liphutsa lelibi Name[sv]=Allvarligt fel Name[ta]=மீளமுடியாத் தவறு @@ -753,6 +763,7 @@ Comment[se]=Vearrás meattáhusa geažil Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukončenie programu Comment[sl]=Program se je prekinil zaradi resne napake. Comment[sr]=Десила се озбиљна грешка, која је изазвала да се програм затвори. +Comment[sr@Latn]=Desila se ozbiljna greška, koja je izazvala da se program zatvori. Comment[ss]=Bekuneliphutsa lilibi lelibangela luhlelo kutsi luphume. Comment[sv]=Ett allvarligt fel uppstod vilket fick programmet att avslutas Comment[ta]=நிரலை வெளியேறச் செய்கிற அளவில் ஒரு பாரிய தவறுண்டு. @@ -825,6 +836,7 @@ Name[se]=Dieđáhus Name[sk]=Upozornenie Name[sl]=Obvestilo Name[sr]=Обавештење +Name[sr@Latn]=Obaveštenje Name[ss]=Satiso Name[sv]=Underrättelse Name[ta]=அறிவிப்பு @@ -894,6 +906,7 @@ Comment[se]=Juoga erenoamáš dáhpáhuv Comment[sk]=V programe sa udialo niečo neočakávané Comment[sl]=V programu se je zgodilo nekaj izrednega Comment[sr]=Нешто посебно се десило у програму +Comment[sr@Latn]=Nešto posebno se desilo u programu Comment[ss]=Lokutsite lokusipesheli kwentekile eluhlelweni Comment[sv]=Någonting speciellt inträffade i programmet Comment[ta]=நிரலில் ஏதோ விசேடம் நிகழ்ந்துள்ளது @@ -970,6 +983,7 @@ Name[se]=Váruhus Name[sk]=Varovanie Name[sl]=Opozorilo Name[sr]=Упозорење +Name[sr@Latn]=Upozorenje Name[ss]=Secwayiso Name[sv]=Varning Name[ta]=எச்சரிக்கை @@ -1039,6 +1053,7 @@ Comment[se]=Prográmmas lei meattáhus m Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiť problémy Comment[sl]=V programu je nastala napaka, ki lahko povzroči težave. Comment[sr]=Десила се грешка у програму која може правити проблеме. +Comment[sr@Latn]=Desila se greška u programu koja može praviti probleme. Comment[ss]=Bekuneliphutsa eluhlelweni lelingabangela tinkhinga. Comment[sv]=Det uppstod ett fel i programmet vilket kan orsaka problem Comment[ta]=பிரச்சனைகளை ஏற்படுத்தும் அளவிற்கு நிரலில் ஒரு தவறுஇருந்தது. @@ -1110,6 +1125,7 @@ Name[se]=Katastrofa Name[sk]=Katastrofa Name[sl]=Katastrofa Name[sr]=Катастрофа +Name[sr@Latn]=Katastrofa Name[ss]=Inhlekelele Name[sv]=Katastrof Name[ta]=பிரளயம் @@ -1142,6 +1158,7 @@ Comment[eu]=Oso errore serio bat gertatu Comment[fa]=خطایی جدی رخ داد، که حداقل باعث خروج برنامه شد Comment[fi]=Tapahtui vakava virhe, jonka takia ohjelma ainakin lopetetaan. Comment[fr]=Un problème très grave s'est produit, provoquant au moins l'arrêt du programme +Comment[ga]=Tharla droch-earráid, agus ara laghad tá an clár tar éis stopadh Comment[gl]=Ocorreu un erro moi serio, causando polo menos o remate da execución do programa Comment[he]=אירעה שגיאה חמורה מאוד, שלפחות גרמה לתוכנית לצאת Comment[hi]=एक अति गंभीर त्रुटि हुई, जिससे प्रोग्राम बाहर हो गया @@ -1149,6 +1166,7 @@ Comment[hu]=Súlyos programhiba történ Comment[id]=Ada kesalahan serius muncul, menyebabkan program harus diakhiri Comment[is]=Mjög alvarleg villa kom upp, sem hefur stöðvað keyrslu forritsins Comment[it]=Si è verificato un errore molto grave, che come minimo ha causato la fine del programma +Comment[ja]=少なくともプログラムを終了時に、非常に重大なエラーが生じました。 Comment[lt]=Įvyko labai rimta klaida, privertusi programą bent jau baigti darbą. Comment[mn]=Дор хаяж программыг таслан гарах ноцтой алдаа гарлаа. Comment[ms]=Ada ralat sangat serius di dalam program yang menyebabkan program keluar @@ -1165,6 +1183,7 @@ Comment[se]=Hui vearrás meattáhus dáh Comment[sk]=Vyskytla sa veľmi vážna chyba, ktorá minimálne ukončí program Comment[sl]=Nastala je tako resna napaka, da se bo končal program. Comment[sr]=Десила се веома озбиљна грешка, која ће у најмању руку проузроковати затварање програма. +Comment[sr@Latn]=Desila se veoma ozbiljna greška, koja će u najmanju ruku prouzrokovati zatvaranje programa. Comment[sv]=Ett väldigt allvarligt fel uppstod som åtminstone fick programmet att avslutas Comment[ta]=நிரலை வெளியேறச் செய்யும் அளவில் ஒரு பெரிய தவறு ஏற்பட்டது Comment[tg]=Хатои хеле ҷиддӣ воқеъ шудан, дар охир нақшаи баромадан таъсир кардан @@ -1224,6 +1243,7 @@ Name[se]=Sisačáliheapmi Name[sk]=Prihlásenie Name[sl]=Prijava Name[sr]=Пријава +Name[sr@Latn]=Prijava Name[ss]=Kungena Name[sv]=Logga in Name[ta]=நுழைவு @@ -1292,6 +1312,7 @@ Comment[se]=KDE vuolgigoahtá johtui Comment[sk]=KDE sa spúšťa Comment[sl]=KDE se zaganja Comment[sr]=KDE се покреће +Comment[sr@Latn]=KDE se pokreće Comment[ss]=I-KDE iyacala Comment[sv]=KDE startas Comment[ta]=KDE ஆரம்பிக்கிறது @@ -1362,6 +1383,7 @@ Name[se]=Olggosčáliheapmi Name[sk]=Odhlásenie Name[sl]=Odjava Name[sr]=Одјављивање +Name[sr@Latn]=Odjavljivanje Name[ss]=Phuma Name[sv]=Logga ut Name[ta]=முடித்தல் @@ -1429,6 +1451,7 @@ Comment[se]=KDE heaitigođii Comment[sk]=KDE sa ukončuje Comment[sl]=KDE se končuje Comment[sr]=KDE се завршава +Comment[sr@Latn]=KDE se završava Comment[ss]=I-KDE yikhona Comment[sv]=KDE avslutas Comment[ta]=KDE வெளிச்செல்கிறது @@ -1501,6 +1524,7 @@ Name[se]=Čálihanmeattáhus Name[sk]=Chyba tlače Name[sl]=Napaka pri tiskanju Name[sr]=Грешка у штампању +Name[sr@Latn]=Greška u štampanju Name[ss]=Liphutsa lekushicelela Name[sv]=Skrivarfel Name[ta]=அச்சுத் தவறு @@ -1535,6 +1559,7 @@ Comment[eu]=Inprimaketa errore bat gerta Comment[fa]=خطای چاپی رخ داد Comment[fi]=Tapahtui tulostusvirhe Comment[fr]=Un problème d'impression est survenu +Comment[ga]=Tharla earráid priontála Comment[gl]=Ocorreu un erro de impresión Comment[he]=אירעה שגיאת הדפסה Comment[hi]=छापने में एक त्रुटि हुई @@ -1542,6 +1567,7 @@ Comment[hu]=Hiba történt nyomtatás k Comment[id]=Telah terjadi kesalahan pencetakan Comment[is]=Prentunarvilla átti sér stað Comment[it]=Si è verificato un errore di stampa +Comment[ja]=印刷エラーが発生しました Comment[lt]=Įvyko spausdinimo klaida Comment[mn]=Хэвлэхэд алдаа гарлаа Comment[ms]=Ralat cetak berlaku @@ -1558,6 +1584,7 @@ Comment[se]=Čálihanmeattáhus dáhpáh Comment[sk]=Nastala chyba tlače Comment[sl]=Nastala je napaka pri tiskanju Comment[sr]=Догодила се грешка током штампања +Comment[sr@Latn]=Dogodila se greška tokom štampanja Comment[sv]=Utskriftsfel har inträffat Comment[ta]=அச்சுத் தவறொன்று நேர்ந்திருக்கிறது Comment[tg]=Хато ин чоп кардани @@ -1591,12 +1618,14 @@ Name[eu]=Informazio mezua Name[fa]=پیام اطلاعاتی Name[fi]=Tiedoitusviesti Name[fr]=Message d'information +Name[ga]=Teachtaireacht Eolais Name[gl]=Mensaxe de información Name[hi]=सूचनात्मक संदेश Name[hu]=Tájékoztató üzenet Name[id]=Pesan informasi Name[is]=Til fróðleiks Name[it]=Messaggio informativo +Name[ja]=情報メッセージ Name[lt]=Informacinis pranešimas Name[mn]=Мэдээллийн мэдээ Name[ms]=Mesej maklumat @@ -1613,6 +1642,7 @@ Name[se]=Diehtu Name[sk]=Informácia Name[sl]=Informativno sporočilo Name[sr]=Информациона порука +Name[sr@Latn]=Informaciona poruka Name[sv]=Informationsmeddelande Name[ta]=தகவல் செய்தி Name[tg]=Пайғоми ахборот @@ -1640,6 +1670,7 @@ Comment[eu]=Informazio mezu bat erakuste Comment[fa]=یک پیام اطلاعاتی نمایش داده می‌شود Comment[fi]=Näytetään tiedotusviesti Comment[fr]=Un message d'information est affiché actuellement +Comment[ga]=Tá teachtaireacht eolais á taispeáint Comment[gl]=Estase a amosar unha mensaxe de información Comment[he]=מוצגת הדעת מידע Comment[hi]=¤• जानकारी परक सूचना दिखाई जा रही है @@ -1647,6 +1678,7 @@ Comment[hu]=Tájékoztató üzenet láts Comment[id]=Pesan informasi sedang ditampilkan Comment[is]=Skilaboð notandanum til fróðleiks Comment[it]=Viene mostrato un messaggio informativo +Comment[ja]=情報メッセージを表示します Comment[lt]=Rodomas informacinis pranešimas Comment[mn]=Харуулж байхад мэдээллийн мэдээ Comment[ms]=Mesej yang dipaparkan @@ -1663,6 +1695,7 @@ Comment[se]=Diehtu čájehuvvo Comment[sk]=Je zobrazená informácia Comment[sl]=Prikazano je informativno sporočilo Comment[sr]=Приказана је информативна порука +Comment[sr@Latn]=Prikazana je informativna poruka Comment[sv]=Informationsmeddelande visas Comment[ta]=ஒரு தகவல் செய்தி காண்பிக்கப்படுகிறது Comment[tg]=Пайгоми хабарнома нишон додан @@ -1695,6 +1728,7 @@ Name[eu]=Abisu mezua Name[fa]=پیام اخطاری Name[fi]=Varoitusviesti Name[fr]=Message d'avertissement +Name[ga]=Teachtaireacht Rabhaidh Name[gl]=Mensaxe de aviso Name[he]=הודעת הזהרה Name[hi]=चेतावनी संदेश @@ -1702,6 +1736,7 @@ Name[hu]=Figyelmeztető üzenet Name[id]=Pesan peringatan Name[is]=Aðvörun Name[it]=Messaggio di avvertimento +Name[ja]=警告メッセージ Name[lt]=Perspėjantis pranešimas Name[mn]=Сануулга мэдээ Name[ms]=Mesej amaran @@ -1718,6 +1753,7 @@ Name[se]=Váruhus Name[sk]=Varovanie Name[sl]=Opozorilno sporočilo Name[sr]=Упозоравајућа порука +Name[sr@Latn]=Upozoravajuća poruka Name[sv]=Varningsmeddelande Name[ta]=எச்சரிக்கைச் செய்தி Name[tg]=Пайғоми огоҳонанда @@ -1752,6 +1788,7 @@ Comment[hu]=Figyelmeztető üzenet láts Comment[id]=Pesan peringatan sedang ditampilkan Comment[is]=Aðvörun til notanda Comment[it]=Viene mostrato un messaggio di avvertimento +Comment[ja]=警告メッセージを表示します Comment[lt]=Rodomas perspėjantis pranešimas Comment[mn]=Харуулж байхад сануулга Comment[ms]=Mesej amaran yang dipaparkan @@ -1768,6 +1805,7 @@ Comment[se]=Váruhus čájehuvvo Comment[sk]=Je zobrazené varovanie Comment[sl]=Prikazano je opozorilno sporočilo Comment[sr]=Приказана је упозоравајућа порука +Comment[sr@Latn]=Prikazana je upozoravajuća poruka Comment[sv]=Varningsmeddelande visas Comment[ta]=ஒரு எச்சரிக்கை செய்தி காண்பிக்கப்படுகிறது Comment[tg]=Пешгирӣ кардани пайғом нишон додан @@ -1807,6 +1845,7 @@ Name[hu]=Kritikus hibaüzenet Name[id]=Pesan kritis Name[is]=Alvarleg aðvörun Name[it]=Messaggio critico +Name[ja]=クリティカルメッセージ Name[lt]=Kritinis pranešimas Name[mn]=Шүүмжлэлт мэдээ Name[ms]=Mesej Kritikal @@ -1822,6 +1861,7 @@ Name[ru]=Критическая ошиб Name[sk]=Kritická správa Name[sl]=Kritično sporočilo Name[sr]=Критична порука +Name[sr@Latn]=Kritična poruka Name[sv]=Kritiskt meddelande Name[ta]=இன்றியமையாத செய்தி Name[tg]=Пайғоми танқидӣ @@ -1856,6 +1896,7 @@ Comment[hu]=Kritikus hibaüzenet látszi Comment[id]=Pesan kritis sedang ditampilkan Comment[is]=Alvarleg skilaboð Comment[it]=Viene mostrato un messaggio critico +Comment[ja]=クリティカルメッセージを表示します Comment[lt]=Rodomas kritinis pranešimas Comment[mn]=Харуулж байхад шүүмжилэлт сануулга Comment[ms]=Mesej kritikal yang dipaparkan @@ -1871,6 +1912,7 @@ Comment[ru]=Вывод критичес Comment[sk]=Je zobrazená kritická správa Comment[sl]=Prikazano je kritično sporočilo Comment[sr]=Приказана је критична порука +Comment[sr@Latn]=Prikazana je kritična poruka Comment[sv]=Kritiskt meddelande visas Comment[ta]=ஒரு இன்றியமையாத செய்தி காண்பிக்கப்படுகிறது Comment[tg]=Пайғоми хатарнок нишон додан @@ -1904,6 +1946,7 @@ Name[et]=Küsimus Name[eu]=Galdera Name[fa]=سوال Name[fi]=Kysymys +Name[ga]=Ceist Name[gl]=Pregunta Name[he]=שאלה Name[hi]=प्रश्न @@ -1911,6 +1954,7 @@ Name[hu]=Kérdés Name[id]=Pertanyaan Name[is]=Spurning Name[it]=Domanda +Name[ja]=質問 Name[lt]=Klausimas Name[mn]=Асуулт Name[ms]=Soalan @@ -1927,6 +1971,7 @@ Name[se]=Gažaldat Name[sk]=Otázka Name[sl]=Vprašanje Name[sr]=Питање +Name[sr@Latn]=Pitanje Name[sv]=Fråga Name[ta]=கேள்வி Name[tg]=Пурсиш @@ -1961,6 +2006,7 @@ Comment[hu]=Kérdés a felhasználóhoz Comment[id]=Pertanyaan sedang diajukan Comment[is]=Spurt er Comment[it]=Viene posta una domanda +Comment[ja]=質問が出されています Comment[lt]=Užduodamas klausimas Comment[mn]=Асуулт тавигдаж байна Comment[ms]=Soalan yang ditanya @@ -1977,6 +2023,7 @@ Comment[se]=Gažaldat jearahuvvo Comment[sk]=Je zobrazená otázka Comment[sl]=Postavljeno je vprašanje Comment[sr]=Постављено је питање +Comment[sr@Latn]=Postavljeno je pitanje Comment[sv]=Fråga ställs Comment[ta]=ஒரு கேள்வி கேட்கப்படுகிறது Comment[tg]=Суол додан Index: kdecore/kapplication.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kapplication.cpp,v retrieving revision 1.637.2.3 retrieving revision 1.637.2.5 diff -u -3 -p -r1.637.2.3 -r1.637.2.5 --- kdecore/kapplication.cpp 25 Feb 2004 12:17:00 -0000 1.637.2.3 +++ kdecore/kapplication.cpp 18 Mar 2004 21:21:01 -0000 1.637.2.5 @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ -// $Id: kapplication.cpp,v 1.637.2.3 2004/02/25 12:17:00 lunakl Exp $ +// $Id: kapplication.cpp,v 1.637.2.5 2004/03/18 21:21:01 waba Exp $ #include "config.h" @@ -132,6 +132,7 @@ #include "kappdcopiface.h" bool kde_have_kipc = true; // magic hook to disable kipc in kdm +bool kde_kiosk_exception = false; // flag to disable kiosk restrictions KApplication* KApplication::KApp = 0L; bool KApplication::loadedByKdeinit = false; @@ -748,7 +749,7 @@ void KApplication::init(bool GUIenabled) (void) KGlobal::locale(); KConfig* config = KGlobal::config(); - d->actionRestrictions = config->hasGroup("KDE Action Restrictions" ); + d->actionRestrictions = config->hasGroup("KDE Action Restrictions" ) && !kde_kiosk_exception; // For brain-dead configurations where the user's local config file is not writable. // * We use kdialog to warn the user, so we better not generate warnings from // kdialog itself. @@ -2669,14 +2670,27 @@ bool KApplication::authorizeKAction(cons return authorize(action_prefix + action); } -bool KApplication::authorizeControlModule(const QString &/*menuId*/) +bool KApplication::authorizeControlModule(const QString &menuId) { - return true; + if (menuId.isEmpty()) + return true; + KConfig *config = KGlobal::config(); + KConfigGroupSaver saver( config, "KDE Control Module Restrictions" ); + return config->readBoolEntry(menuId, true); } QStringList KApplication::authorizeControlModules(const QStringList &menuIds) { - return menuIds; + KConfig *config = KGlobal::config(); + KConfigGroupSaver saver( config, "KDE Control Module Restrictions" ); + QStringList result; + for(QStringList::ConstIterator it = menuIds.begin(); + it != menuIds.end(); ++it) + { + if (config->readBoolEntry(*it, true)) + result.append(*it); + } + return result; } void KApplication::initUrlActionRestrictions() Index: kdecore/kcharsets.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kcharsets.cpp,v retrieving revision 1.144 retrieving revision 1.144.2.1 diff -u -3 -p -r1.144 -r1.144.2.1 --- kdecore/kcharsets.cpp 6 Sep 2003 19:06:29 -0000 1.144 +++ kdecore/kcharsets.cpp 12 Mar 2004 09:18:03 -0000 1.144.2.1 @@ -1,6 +1,6 @@ /* This file is part of the KDE libraries Copyright (C) 1999 Lars Knoll (knoll@kde.org) - $Id: kcharsets.cpp,v 1.144 2003/09/06 19:06:29 binner Exp $ + $Id: kcharsets.cpp,v 1.144.2.1 2004/03/12 09:18:03 kalass Exp $ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -497,19 +497,19 @@ QString KCharsets::languageForEncoding( QString KCharsets::encodingForName( const QString &descriptiveName ) { - const int left = descriptiveName.find( '(' ); + const int left = descriptiveName.findRev( '(' ); if (left<0) // No parenthesis, so assume it is a normal encoding name - return descriptiveName; + return descriptiveName.stripWhiteSpace(); - QString name(descriptiveName.mid(left+2)); + QString name(descriptiveName.mid(left+1)); - const int right = name.find( ')' ); + const int right = name.findRev( ')' ); if (right<0) return name; - - return name.left(right-1); + + return name.left(right).stripWhiteSpace(); } QStringList KCharsets::descriptiveEncodingNames() Index: kdecore/kconfigbackend.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kconfigbackend.cpp,v retrieving revision 1.89.2.3 retrieving revision 1.89.2.4 diff -u -3 -p -r1.89.2.3 -r1.89.2.4 --- kdecore/kconfigbackend.cpp 27 Jan 2004 14:00:53 -0000 1.89.2.3 +++ kdecore/kconfigbackend.cpp 17 Mar 2004 10:42:12 -0000 1.89.2.4 @@ -383,6 +383,8 @@ extern "C" { #endif #endif +extern bool kde_kiosk_exception; + void KConfigINIBackEnd::parseSingleConfigFile(QFile &rFile, KEntryMap *pWriteBackMap, bool bGlobal, bool bDefault) @@ -491,7 +493,8 @@ void KConfigINIBackEnd::parseSingleConfi (startLine[1] == '$') && (startLine[2] == 'i')) { - fileOptionImmutable = true; + if (!kde_kiosk_exception) + fileOptionImmutable = true; continue; } @@ -507,7 +510,7 @@ void KConfigINIBackEnd::parseSingleConfi e++; if ((e+2 < eof) && (*e++ == '[') && (*e++ == '$')) // Option follows { - if (*e == 'i') + if ((*e == 'i') && !kde_kiosk_exception) { groupOptionImmutable = true; } @@ -578,7 +581,7 @@ void KConfigINIBackEnd::parseSingleConfi while (option < eoption) { option++; - if (*option == 'i') + if ((*option == 'i') && !kde_kiosk_exception) optionImmutable = true; else if (*option == 'e') optionExpand = true; Index: kdecore/kdebug.areas =================================================================== RCS file: /home/kde/kdelibs/kdecore/kdebug.areas,v retrieving revision 1.292.2.2 retrieving revision 1.292.2.3 diff -u -3 -p -r1.292.2.2 -r1.292.2.3 --- kdecore/kdebug.areas 21 Feb 2004 10:16:56 -0000 1.292.2.2 +++ kdecore/kdebug.areas 4 Mar 2004 10:43:46 -0000 1.292.2.3 @@ -388,8 +388,7 @@ # Quanta 24000 Quanta - - +24001 Quanta (parser) # kafka 25000 Kafka (kafkapp) Index: kdecore/kextsock.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kextsock.cpp,v retrieving revision 1.67.2.1 retrieving revision 1.67.2.2 diff -u -3 -p -r1.67.2.1 -r1.67.2.2 --- kdecore/kextsock.cpp 24 Feb 2004 08:33:33 -0000 1.67.2.1 +++ kdecore/kextsock.cpp 1 Mar 2004 13:18:40 -0000 1.67.2.2 @@ -2,7 +2,7 @@ * This file is part of the KDE libraries * Copyright (C) 2000-2002 Thiago Macieira * - * $Id: kextsock.cpp,v 1.67.2.1 2004/02/24 08:33:33 adridg Exp $ + * $Id: kextsock.cpp,v 1.67.2.2 2004/03/01 13:18:40 waba Exp $ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -1152,6 +1152,8 @@ int KExtendedSocket::listen(int N) kdDebug(170) << "Failed to create: " << perror << endl; continue; } + + fcntl(sockfd, F_SETFD, FD_CLOEXEC); if (d->addressReusable) setAddressReusable(sockfd, true); @@ -1247,6 +1249,8 @@ int KExtendedSocket::accept(KExtendedSoc return -1; } + fcntl(newfd, F_SETFD, FD_CLOEXEC); + //kdDebug(170).form("Socket %d accepted socket %d\n", sockfd, newfd); setBlockingMode(block); // restore blocking mode @@ -1333,6 +1337,7 @@ int KExtendedSocket::connect() setError(IO_ConnectError, errno); if (sockfd == -1) continue; // cannot create this socket + fcntl(sockfd, F_SETFD, FD_CLOEXEC); if (d->addressReusable) setAddressReusable(sockfd, true); setIPv6Only(d->ipv6only); @@ -1354,6 +1359,7 @@ int KExtendedSocket::connect() setError(IO_ConnectError, errno); continue; } + fcntl(sockfd, F_SETFD, FD_CLOEXEC); if (d->addressReusable) setAddressReusable(sockfd, true); setIPv6Only(d->ipv6only); @@ -2169,6 +2175,7 @@ void KExtendedSocket::connectionEvent() errcode = errno; if (sockfd == -1) continue; // cannot create this socket + fcntl(sockfd, F_SETFD, FD_CLOEXEC); if (d->addressReusable) setAddressReusable(sockfd, true); setIPv6Only(d->ipv6only); @@ -2190,6 +2197,7 @@ void KExtendedSocket::connectionEvent() errcode = errno; continue; } + fcntl(sockfd, F_SETFD, FD_CLOEXEC); if (d->addressReusable) setAddressReusable(sockfd, true); setIPv6Only(d->ipv6only); Index: kdecore/kinstance.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kinstance.cpp,v retrieving revision 1.41 retrieving revision 1.41.2.1 diff -u -3 -p -r1.41 -r1.41.2.1 --- kdecore/kinstance.cpp 9 Oct 2003 21:16:45 -0000 1.41 +++ kdecore/kinstance.cpp 17 Mar 2004 10:42:12 -0000 1.41.2.1 @@ -17,12 +17,15 @@ */ #include "kinstance.h" +#include + #include "kconfig.h" #include "klocale.h" #include "kcharsets.h" #include "kiconloader.h" #include "kaboutdata.h" #include "kstandarddirs.h" +#include "kuser.h" #include "kdebug.h" #include "kglobal.h" #include "kmimesourcefactory.h" @@ -166,6 +169,8 @@ KStandardDirs *KInstance::dirs() const return _dirs; } +extern bool kde_kiosk_exception; + KConfig *KInstance::config() const { DEBUG_CHECK_ALIVE @@ -176,6 +181,7 @@ KConfig *KInstance::config() const // Check whether custom config files are allowed. d->sharedConfig->setGroup( "KDE Action Restrictions" ); + QString kioskException = d->sharedConfig->readEntry("kiosk_exception"); if (d->sharedConfig->readBoolEntry( "custom_config", true)) { d->sharedConfig->setGroup(QString::null); @@ -194,6 +200,30 @@ KConfig *KInstance::config() const else d->sharedConfig = KSharedConfig::openConfig( QString::null ); } + d->sharedConfig->setGroup( "KDE Action Restrictions" ); + QString kioskException = d->sharedConfig->readEntry("kiosk_exception"); + d->sharedConfig->setGroup( QString::null ); + if (!kioskException.isEmpty() && !kde_kiosk_exception) + { + int i = kioskException.find(':'); + QString user = kioskException.left(i); + QString host = kioskException.mid(i+1); + + KUser thisUser; + char hostname[ 256 ]; + hostname[ 0 ] = '\0'; + if (!gethostname( hostname, 255 )) + hostname[sizeof(hostname)-1] = '\0'; + + if ((user == thisUser.loginName()) && + (host.isEmpty() || (host == hostname))) + { + kde_kiosk_exception = true; + d->sharedConfig = 0; + return config(); // Reread... + } + } + _config = d->sharedConfig; if (_dirs) if (_dirs->addCustomized(_config)) Index: kdecore/kstartupinfo.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kstartupinfo.cpp,v retrieving revision 1.50.2.1 retrieving revision 1.50.2.2 diff -u -3 -p -r1.50.2.1 -r1.50.2.2 --- kdecore/kstartupinfo.cpp 25 Feb 2004 09:13:36 -0000 1.50.2.1 +++ kdecore/kstartupinfo.cpp 11 Mar 2004 12:10:32 -0000 1.50.2.2 @@ -1,6 +1,6 @@ /**************************************************************************** - $Id: kstartupinfo.cpp,v 1.50.2.1 2004/02/25 09:13:36 lunakl Exp $ + $Id: kstartupinfo.cpp,v 1.50.2.2 2004/03/11 12:10:32 lunakl Exp $ Copyright (C) 2001-2003 Lubos Lunak @@ -521,21 +521,24 @@ void KStartupInfo::setNewStartupId( QWid { long activate = true; kapp->setStartupId( startup_id ); - if( !startup_id.isEmpty() && startup_id != "0" ) + if( window != NULL ) { - NETRootInfo i( qt_xdisplay(), NET::Supported ); - if( i.isSupported( NET::WM2StartupId )) + if( !startup_id.isEmpty() && startup_id != "0" ) { - KStartupInfo::setWindowStartupId( window->winId(), startup_id ); - activate = false; // WM will take care of it + NETRootInfo i( qt_xdisplay(), NET::Supported ); + if( i.isSupported( NET::WM2StartupId )) + { + KStartupInfo::setWindowStartupId( window->winId(), startup_id ); + activate = false; // WM will take care of it + } } + if( activate ) + // This is not very nice, but there's no way how to get any + // usable timestamp without ASN, so force activating the window. + // And even with ASN, it's not possible to get the timestamp here, + // so if the WM doesn't have support for ASN, it can't be used either. + KWin::forceActiveWindow( window->winId()); } - if( activate ) - // This is not very nice, but there's no way how to get any - // usable timestamp without ASN, so force activating the window. - // And even with ASN, it's not possible to get the timestamp here, - // so if the WM doesn't have support for ASN, it can't be used either. - KWin::forceActiveWindow( window->winId()); KStartupInfo::handleAutoAppStartedSending(); } Index: kdecore/ktempfile.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/ktempfile.cpp,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -u -3 -p -r1.28.2.1 -r1.28.2.2 --- kdecore/ktempfile.cpp 22 Feb 2004 21:10:58 -0000 1.28.2.1 +++ kdecore/ktempfile.cpp 1 Mar 2004 12:34:52 -0000 1.28.2.2 @@ -3,7 +3,7 @@ * This file is part of the KDE libraries * Copyright (c) 1999 Waldo Bastian * - * $Id: ktempfile.cpp,v 1.28.2.1 2004/02/22 21:10:58 jrockey Exp $ + * $Id: ktempfile.cpp,v 1.28.2.2 2004/03/01 12:34:52 waba Exp $ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -118,6 +118,10 @@ KTempFile::create(const QString &filePre // Set uid/gid (necessary for SUID programs) fchown(mFd, getuid(), getgid()); + + // Set close on exec + fcntl(mFd, F_SETFD, FD_CLOEXEC); + return true; } Index: kdecore/kurl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kurl.cpp,v retrieving revision 1.265.2.2 retrieving revision 1.265.2.10 diff -u -3 -p -r1.265.2.2 -r1.265.2.10 --- kdecore/kurl.cpp 22 Jan 2004 13:31:35 -0000 1.265.2.2 +++ kdecore/kurl.cpp 22 Mar 2004 20:13:07 -0000 1.265.2.10 @@ -48,13 +48,14 @@ static QTextCodec * codecForHint( int en return QTextCodec::codecForMib( encoding_hint ); } -static QString encode( const QString& segment, bool encode_slash, int encoding_hint ) +// encoding_offset: +// 0 encode both @ and / +// 1 encode @ but not / +// 2 encode neither @ or / +static QString encode( const QString& segment, int encoding_offset, int encoding_hint ) { - const char *encode_string; - if (encode_slash) - encode_string = "<>#@\"&%?={}|^~[]\'`\\:+/"; - else - encode_string = "<>#@\"&%?={}|^~[]\'`\\:+"; + const char *encode_string = "/@<>#\"&%?={}|^~[]\'`\\:+"; + encode_string += encoding_offset; QCString local; if (encoding_hint==0) @@ -118,7 +119,7 @@ static QString encodeHost( const QString Q_UNUSED( encoding_hint ); return KIDNA::toAscii(segment); #else - return encode(segment, encode_slash, encoding_hint); + return encode(segment, encode_slash ? 0 : 1, encoding_hint); #endif } @@ -143,7 +144,7 @@ static int hex2int( unsigned int _char ) // KURL(url.prettyURL()).url() -static QString lazy_encode( const QString& segment ) +static QString lazy_encode( const QString& segment, bool encodeAt=true ) { int old_length = segment.length(); @@ -165,7 +166,7 @@ static QString lazy_encode( const QStrin (hex2int(segment[i+1].unicode())!= -1) && (hex2int(segment[i+2].unicode())!= -1)) || (character == '?') || // Start of query delimiter - (character == '@') || // Username delimiter + ((character == '@') && encodeAt) || // Username delimiter (character == '#') || // Start of reference delimiter ((character == 32) && (i+1 == old_length))) // A trailing space { @@ -477,8 +478,10 @@ QDataStream & operator>> (QDataStream & >> malf >> a.m_iPort; a.m_bIsMalformed = (malf != 0); - if ( QueryFromWire.isEmpty() ) + if ( QueryFromWire.isNull() ) a.m_strQuery_encoded = QString::null; + else if ( QueryFromWire.length() == 1 ) // empty query + a.m_strQuery_encoded = ""; else a.m_strQuery_encoded = QueryFromWire.mid(1); @@ -834,7 +837,7 @@ void KURL::parseURL( const QString& _url (buf[pos] != '#')) goto NodeErr; - start = pos++; + start = pos; goto Node9; } m_strPass = decode(QString( buf + start, pos - start), encoding_hint); @@ -856,7 +859,7 @@ void KURL::parseURL( const QString& _url badHostName = true; goto NodeErr; } - // Node 8b: Read everything until ] or terminate + // Node 8a: Read everything until ] or terminate badHostName = false; x = buf[pos]; while( (x != ']') ) @@ -879,7 +882,7 @@ void KURL::parseURL( const QString& _url } else { - // Non IPv6 address + // Non IPv6 address, with a user start = pos; // Node 8b: Read everything until / : or terminate @@ -903,36 +906,36 @@ void KURL::parseURL( const QString& _url setHost(decode(QString( buf + start, pos - start ), encoding_hint)); } x = buf[pos]; - if ( x == '/' ) + if ( x == '/' || x == '#' || x == '?' ) { - start = pos++; + start = pos; goto Node9; } else if ( x != ':' ) goto NodeErr; pos++; - // Node 8a: Accept at least one digit + // Node 8c: Accept at least one digit if ( pos == len ) goto NodeErr; start = pos; if ( !isdigit( buf[pos++] ) ) goto NodeErr; - // Node 8b: Accept any amount of digits + // Node 8d: Accept any amount of digits while( pos < len && isdigit( buf[pos] ) ) pos++; port = QString( buf + start, pos - start ); m_iPort = port.toUShort(); if ( pos == len ) goto NodeOk; - start = pos++; + start = pos; Node9: // parse path until query or reference reached while( pos < len && buf[pos] != '#' && buf[pos]!='?' ) pos++; tmp = QString( buf + start, pos - start ); - //kdDebug(126)<<" setting encoded path&query to:"<modules = modules; + for ( QPtrListIterator mit( modules ); mit.current(); ++mit ) + (*mit)->d = static_d; } d = static_d; Index: kdecore/kconfig_compiler/kconfig_compiler.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -u -3 -p -r1.36.2.1 -r1.36.2.2 --- kdecore/kconfig_compiler/kconfig_compiler.cpp 3 Feb 2004 08:00:50 -0000 1.36.2.1 +++ kdecore/kconfig_compiler/kconfig_compiler.cpp 14 Mar 2004 12:05:00 -0000 1.36.2.2 @@ -1071,7 +1071,7 @@ int main( int argc, char **argv ) if ( !nameSpace.isEmpty() ) h << "}" << endl << endl; - h << "#endif" << endl; + h << "#endif" << endl << endl; header.close(); Index: kdecore/tests/kurltest.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/tests/kurltest.cpp,v retrieving revision 1.86 retrieving revision 1.86.2.1 diff -u -3 -p -r1.86 -r1.86.2.1 --- kdecore/tests/kurltest.cpp 16 Jan 2004 15:27:13 -0000 1.86 +++ kdecore/tests/kurltest.cpp 18 Mar 2004 16:26:19 -0000 1.86.2.1 @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) check( "KURL::isEmpty()", fileURL.isEmpty() ? "TRUE":"FALSE", "FALSE"); KURL baseURL ("hTTp://www.foo.bar:80" ); - check( "KURL::isMalformed()", baseURL.isMalformed() ? "TRUE":"FALSE", "FALSE"); + check( "KURL::isValid()", baseURL.isValid() ? "TRUE":"FALSE", "TRUE"); check( "KURL::protocol()", baseURL.protocol(), "http"); // lowercase KURL url1 ( baseURL, "//www1.foo.bar" ); check( "KURL::url()", url1.url(), "http://www1.foo.bar"); @@ -84,13 +84,13 @@ int main(int argc, char *argv[]) check("KURL::upURL()", url1.upURL().url(), "file:/home/dfaure/"); url1 = "gg:www.kde.org"; - check("KURL::isMalformed()", url1.isMalformed()?"TRUE":"FALSE", "FALSE" ); + check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "TRUE" ); url1= "KDE"; - check("KURL::isMalformed()", url1.isMalformed()?"TRUE":"FALSE", "TRUE" ); + check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" ); url1= "$HOME/.kde/share/config"; - check("KURL::isMalformed()", url1.isMalformed()?"TRUE":"FALSE", "TRUE" ); + check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" ); u1 = "file:/opt/kde2/qt2/doc/html/showimg-main-cpp.html#QObject::connect"; url1 = u1; @@ -163,6 +163,8 @@ int main(int argc, char *argv[]) check("KURL::prettyURL()", notPretty.prettyURL(), "http://ferret.lmh.ox.ac.uk/~kdecvs/"); KURL notPretty2("file:/home/test/directory%20with%20spaces"); check("KURL::prettyURL()", notPretty2.prettyURL(), "file:/home/test/directory with spaces"); + KURL notPretty3("fish://foo/%23README%23"); + check("KURL::prettyURL()", notPretty3.prettyURL(), "fish://foo/%23README%23"); KURL url15581("http://alain.knaff.linux.lu/bug-reports/kde/spaces in url.html"); check("KURL::prettyURL()", url15581.prettyURL(), "http://alain.knaff.linux.lu/bug-reports/kde/spaces in url.html"); check("KURL::url()", url15581.url(), "http://alain.knaff.linux.lu/bug-reports/kde/spaces%20in%20url.html"); @@ -184,7 +186,7 @@ int main(int argc, char *argv[]) printf("\n* Empty URL\n"); check("KURL::url()", udir.url(), QString::null); check("KURL::isEmpty()", udir.isEmpty() ? "ok" : "ko", "ok"); - check("KURL::isMalformed()", udir.isMalformed() ? "ok" : "ko", "ok"); + check("KURL::isValid()", udir.isValid() ? "ok" : "ko", "ko"); udir = udir.upURL(); check("KURL::upURL()", udir.upURL().isEmpty() ? "ok" : "ko", "ok"); @@ -398,9 +400,16 @@ int main(int argc, char *argv[]) "http://meine.db24.de?link=home_c_login_login"); check("http: URL with empty path string path", waba1.path(), ""); - check("http: URL with empty path string path", waba1.query(), + check("http: URL with empty path string query", waba1.query(), "?link=home_c_login_login"); + waba1 = "http://a:389?b=c"; + check( "http: URL with port, query, and empty path; url", waba1.url(), "http://a:389?b=c" ); + check( "http: URL with port, query, and empty path; host", waba1.host(), "a" ); + check( "http: URL with port, query, and empty path; port", QString::number( waba1.port() ), "389" ); + check( "http: URL with port, query, and empty path; path", waba1.path(), "" ); + check( "http: URL with port, query, and empty path; query", waba1.query(), "?b=c" ); + // Urls without path (BR21387) waba1 = "http://meine.db24.de#link=home_c_login_login"; check("http: URL with empty path string", waba1.url(), @@ -408,6 +417,14 @@ int main(int argc, char *argv[]) check("http: URL with empty path string path", waba1.path(), ""); + waba1 = "http://a:389#b=c"; + check( "http: URL with port, ref, and empty path; url", waba1.url(), "http://a:389#b=c" ); + check( "http: URL with port, ref, and empty path; host", waba1.host(), "a" ); + check( "http: URL with port, ref, and empty path; port", QString::number( waba1.port() ), "389" ); + check( "http: URL with port, ref, and empty path; path", waba1.path(), "" ); + check( "http: URL with port, ref, and empty path; ref", waba1.ref(), "b=c" ); + check( "http: URL with port, ref, and empty path; query", waba1.query(), "" ); + // IPV6 waba1 = "http://[::FFFF:129.144.52.38]:81/index.html"; check("http: IPV6 host", waba1.host(), @@ -431,6 +448,35 @@ int main(int argc, char *argv[]) waba1.setHost("::ffff:129.144.52.38"); check("http: IPV6 host", waba1.url(), "http://[::ffff:129.144.52.38]/cgi/test.cgi"); + waba1 = "http://[::ffff:129.144.52.38]/cgi/test.cgi"; + assert( waba1.isValid() ); + + // IPV6 without path + waba1 = "http://[::ffff:129.144.52.38]?query"; + assert( waba1.isValid() ); + check("http: IPV6 without path", waba1.url(), + "http://[::ffff:129.144.52.38]?query"); + check("http: IPV6 without path; query", waba1.query(), + "?query"); + waba1 = "http://[::ffff:129.144.52.38]#ref"; + assert( waba1.isValid() ); + check("http: IPV6 without path", waba1.url(), + "http://[::ffff:129.144.52.38]#ref"); + check("http: IPV6 without path; ref", waba1.ref(), + "ref"); + // IPV6 without path but with a port + waba1 = "http://[::ffff:129.144.52.38]:81?query"; + assert( waba1.isValid() ); + check("http: IPV6 without path", waba1.url(), + "http://[::ffff:129.144.52.38]:81?query"); + check("http: IPV6 without path; port", QString::number( waba1.port() ), "81" ); + check("http: IPV6 without path; query", waba1.query(), "?query"); + waba1 = "http://[::ffff:129.144.52.38]:81#ref"; + assert( waba1.isValid() ); + check("http: IPV6 without path", waba1.url(), + "http://[::ffff:129.144.52.38]:81#ref"); + check("http: IPV6 without path; port", QString::number( waba1.port() ), "81" ); + check("http: IPV6 without path; ref", waba1.ref(), "ref"); // Broken stuff waba1 = "file:a"; @@ -469,25 +515,29 @@ int main(int argc, char *argv[]) check("Broken stuff #5 valid", broken.isValid()?"VALID":"MALFORMED", "MALFORMED"); check("Broken stuff #5 path", broken.path(), ""); -#if 0 +#if 0 // BROKEN? // UNC like names KURL unc1("FILE://localhost/home/root"); check("UNC, with localhost", unc1.path(), "/home/root"); check("UNC, with localhost", unc1.url(), "file:/home/root"); +#endif KURL unc2("file:///home/root"); check("UNC, with empty host", unc2.path(), "/home/root"); check("UNC, with empty host", unc2.url(), "file:/home/root"); { KURL unc3("FILE://remotehost/home/root"); +#if 0 // BROKEN? check("UNC, with remote host", unc3.path(), "//remotehost/home/root"); +#endif check("UNC, with remote host", unc3.url(), "file://remotehost/home/root"); KURL url2("file://atlas/dfaure"); - check("KURL::host()", url2.path(), "//atlas/dfaure"); // says Waba - KURL url3("file:////atlas/dfaure"); - check("KURL::host()", url3.path(), "//atlas/dfaure"); // says Waba + check("KURL::host()", url2.host(), "atlas"); + check("KURL::path()", url2.path(), "/dfaure"); + //check("KURL::path()", url3.path(), "//atlas/dfaure"); // says Waba + //KURL url3("file:////atlas/dfaure"); + //check("KURL::path()", url3.path(), "//atlas/dfaure"); // says Waba } -#endif KURL umail1 ( "mailto:faure@kde.org" ); check("mailto: URL, general form", umail1.protocol(), "mailto"); @@ -509,6 +559,7 @@ int main(int argc, char *argv[]) KURL ulong("https://swww.gad.de:443/servlet/CookieAccepted?MAIL=s@gad.de&VER=25901"); check("host",ulong.host(),"swww.gad.de"); + check("path",ulong.path(),"/servlet/CookieAccepted"); #if QT_VERSION < 300 qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); @@ -694,15 +745,16 @@ int main(int argc, char *argv[]) check("relativeURL(\"http://www.kde.org/info/index.html\", \"http://www.kde.org/bugs/contact.html\")", KURL::relativeURL(baseURL, "http://www.kde.org/bugs/contact.html"), "../bugs/contact.html"); baseURL = "ptal://mlc:usb:PC_970"; - check("isMalformed()?", baseURL.isMalformed() ? "true" : "false", "true"); + check("isValid()?", baseURL.isValid() ? "true" : "false", "false"); check("url()", baseURL.url(), "ptal://mlc:usb:PC_970"); baseURL = "http://mlc:80/"; - check("isMalformed()?", baseURL.isMalformed() ? "true" : "false", "false"); - check("port()?", QString("%1").arg(baseURL.port()), "80"); + check("isValid()?", baseURL.isValid() ? "true" : "false", "true"); + check("port()?", QString::number(baseURL.port()), "80"); + check("path()?", baseURL.path(), "/"); baseURL = "ptal://mlc:usb@PC_970"; // User=mlc, password=usb, host=PC_970 - check("isMalformed()?", baseURL.isMalformed() ? "true" : "false", "false"); + check("isValid()?", baseURL.isValid() ? "true" : "false", "true"); check("host()?", baseURL.host(), "pc_970"); check("user()?", baseURL.user(), "mlc"); check("pass()?", baseURL.pass(), "usb"); Index: kded/applications.menu =================================================================== RCS file: /home/kde/kdelibs/kded/applications.menu,v retrieving revision 1.16 retrieving revision 1.16.2.2 diff -u -3 -p -r1.16 -r1.16.2.2 --- kded/applications.menu 5 Jan 2004 17:50:51 -0000 1.16 +++ kded/applications.menu 21 Mar 2004 14:45:29 -0000 1.16.2.2 @@ -25,11 +25,15 @@ kde-unknown.directory - - - Core - KDE - + + + + Core + KDE + + + X-SuSE-YaST + @@ -55,7 +59,10 @@ Education + + Languages X-KDE-Edu-Language + @@ -76,9 +83,11 @@ Education + Languages X-KDE-Edu-Language Math Science + Teaching X-KDE-Edu-Teaching @@ -100,7 +109,10 @@ Education + + Teaching X-KDE-Edu-Teaching + Index: kded/kbuildsycoca.cpp =================================================================== RCS file: /home/kde/kdelibs/kded/kbuildsycoca.cpp,v retrieving revision 1.93 retrieving revision 1.93.2.1 diff -u -3 -p -r1.93 -r1.93.2.1 --- kded/kbuildsycoca.cpp 24 Dec 2003 14:37:04 -0000 1.93 +++ kded/kbuildsycoca.cpp 29 Feb 2004 15:31:35 -0000 1.93.2.1 @@ -793,25 +793,36 @@ extern "C" int kdemain(int argc, char ** if( checkstamps && incremental ) { QString path = sycocaPath()+"stamp"; + QCString qPath = QFile::encodeName(path); + cSycocaPath = qPath.data(); // Delete timestamps on crash QFile ksycocastamp(path); if( ksycocastamp.open( IO_ReadOnly )) { QDataStream str( &ksycocastamp ); - str >> filestamp; - str >> oldresourcedirs; - if( oldresourcedirs != KBuildSycoca::existingResourceDirs()) + if (!str.atEnd()) + str >> filestamp; + if (!str.atEnd()) + { + str >> oldresourcedirs; + if( oldresourcedirs != KBuildSycoca::existingResourceDirs()) + checkstamps = false; + } + else + { checkstamps = false; + } if (!str.atEnd()) { - QStringList extraResourceDirs; - str >> extraResourceDirs; - oldresourcedirs += extraResourceDirs; + QStringList extraResourceDirs; + str >> extraResourceDirs; + oldresourcedirs += extraResourceDirs; } } else { checkstamps = false; } + cSycocaPath = 0; } newTimestamp = (Q_UINT32) time(0); Index: kded/kdedmodule.desktop =================================================================== RCS file: /home/kde/kdelibs/kded/kdedmodule.desktop,v retrieving revision 1.89.2.2 retrieving revision 1.89.2.3 diff -u -3 -p -r1.89.2.2 -r1.89.2.3 --- kded/kdedmodule.desktop 11 Feb 2004 16:59:09 -0000 1.89.2.2 +++ kded/kdedmodule.desktop 29 Feb 2004 15:29:31 -0000 1.89.2.3 @@ -53,6 +53,7 @@ Comment[se]=KDED-moduvla Comment[sk]=KDED modul Comment[sl]=Modul KDED Comment[sr]=KDED модул +Comment[sr@Latn]=KDED modul Comment[ss]=Sahluko se KDED Comment[sv]=KDED-modul Comment[ta]=KDED கூறு Index: kded/vfolder_menu.cpp =================================================================== RCS file: /home/kde/kdelibs/kded/vfolder_menu.cpp,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -3 -p -r1.19 -r1.19.2.1 --- kded/vfolder_menu.cpp 22 Nov 2003 12:17:16 -0000 1.19 +++ kded/vfolder_menu.cpp 4 Mar 2004 21:16:18 -0000 1.19.2.1 @@ -1445,6 +1445,13 @@ VFolderMenu::parseMenu(const QString &fi m_legacyLoaded = false; m_appsInfo = 0; + QStringList dirs = KGlobal::dirs()->resourceDirs("xdgconf-menu"); + for(QStringList::ConstIterator it=dirs.begin(); + it != dirs.end(); ++it) + { + registerDirectory(*it); + } + loadMenu(file); delete m_rootMenu; Index: kded/test/test.desktop =================================================================== RCS file: /home/kde/kdelibs/kded/test/test.desktop,v retrieving revision 1.105.2.2 retrieving revision 1.105.2.3 diff -u -3 -p -r1.105.2.2 -r1.105.2.3 --- kded/test/test.desktop 11 Feb 2004 16:59:11 -0000 1.105.2.2 +++ kded/test/test.desktop 29 Feb 2004 15:29:33 -0000 1.105.2.3 @@ -58,6 +58,7 @@ Name[se]=KDED-geahččalanmoduvla Name[sk]=Testovací modul KDED Name[sl]=Preizkusni modul KDED Name[sr]=KDED пробни модул +Name[sr@Latn]=KDED probni modul Name[ss]=Sahluko seluhlolo ku KDE Name[sv]=KDED-testmodul Name[ta]=KDED சோதனைக் கூறு @@ -124,6 +125,7 @@ Comment[se]=Geahččalanmoduvla KDED:a v Comment[sk]=Testovací modul pre KDED Comment[sl]=Preizkusni modul za KDED Comment[sr]=Пробни модул за KDED +Comment[sr@Latn]=Probni modul za KDED Comment[ss]=Sahluko seluhlolo se KDED Comment[sv]=Testmodul för KDED Comment[ta]=KDED சோதனைக் கூறொன்று Index: kdefx/kstyle.cpp =================================================================== RCS file: /home/kde/kdelibs/kdefx/kstyle.cpp,v retrieving revision 1.46.2.1 retrieving revision 1.46.2.2 diff -u -3 -p -r1.46.2.1 -r1.46.2.2 --- kdefx/kstyle.cpp 28 Feb 2004 15:00:22 -0000 1.46.2.1 +++ kdefx/kstyle.cpp 11 Mar 2004 12:28:27 -0000 1.46.2.2 @@ -1182,7 +1182,7 @@ void KStyle::drawComplexControl( Complex while ( child && y + child->height() <= 0 ) { y += child->totalHeight(); - child = child->nextSibling(); + child = nextVisibleSibling(child); } int bx = r.width() / 2; Index: kdeprint/ChangeLog =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ChangeLog,v retrieving revision 1.68 retrieving revision 1.68.2.1 diff -u -3 -p -r1.68 -r1.68.2.1 --- kdeprint/ChangeLog 13 Aug 2003 19:47:40 -0000 1.68 +++ kdeprint/ChangeLog 15 Mar 2004 10:30:19 -0000 1.68.2.1 @@ -1,4 +1,4 @@ -Since 2.2 release, Michael Goffioul +Since 2.2 release, Michael Goffioul * automatic filtering: if the input file format is not directly supported by the print spooler, kdeprint will try to convert the file to the primary supported input format (usually PostScript). To achieve this, @@ -20,7 +20,7 @@ Since 2.2 release, Michael Goffioul +27/08/2001 Michael Goffioul * implementation of "Schedule" tab in print dialog for the CUPS plugin (job-hold-until attribute). * Printer aliases are now handled gracefully in the LPR plugin (they @@ -29,30 +29,30 @@ Since 2.2 release, Michael Goffioul +28/08/2001 Michael Goffioul * implementation of KPrintAction, which provides a quick access to a class of printers (special, regular or both). An application just needs to create a KPrintAction anc connect to print(KPrinter*). -31/08/2001 Michael Goffioul +31/08/2001 Michael Goffioul * CUPS plugin: fix crash for Qt3 port, must check if attr->name is NULL before comparing it with strcmp or strncmp. -12/09/2001 Michael Goffioul +12/09/2001 Michael Goffioul * Management library: set all toolbars non movable to avoid move handles -13/09/2001 Michael Goffioul +13/09/2001 Michael Goffioul * CUPS plugin: fix multiple showing of password dialog for password- protected printers (timer is now blocked when the password dialog is shown) -14/09/2001 Michael Goffioul +14/09/2001 Michael Goffioul * CUPS plugin: configuration wizard rewritten using the structure of ESP PrintPro: more consistent, less pages and widgets. Not used as default config wizard yet. * QList -> QPtrList -25/09/2001 Michael Goffioul +25/09/2001 Michael Goffioul * CUPS plugin: made the new configuration wizard as default one. * other QList -> QPtrList fixes (committed to CVS) * Avoid to call plugin functions "completePrinter" for pseudo @@ -64,21 +64,21 @@ Since 2.2 release, Michael Goffioul +03/10/2001 Michael Goffioul * CUPS plugin: make use of GET/PUT request to handle configuration file. Possibility to admin a remote CUPS server (if allowed) * CUPS plugin: added "/jobs" in the available resources list -09/10/2001 Michael Goffioul +09/10/2001 Michael Goffioul * CUPS plugin: added 2 missing pages in stand-alone mode, "Image" and "Text". -10/10/2001 Michael Goffioul +10/10/2001 Michael Goffioul * CUPS plugin: "HP-GL/2" page added * General: added a GUI to configure the preview program, into the config dialog of the print manager -12/10/2001 Michael Goffioul +12/10/2001 Michael Goffioul * general: added the possibility for a plugin to add new actions to the toolbar and context menu (main use = export driver in CUPS). @@ -86,16 +86,16 @@ Since 2.2 release, Michael Goffioul +16/10/2001 Michael Goffioul * CUPS plugin: removed the "file" backend as it doesn't seem to be available since a couple of releases, and added a "Other" page to the wizard for any third-party backend (like pdf). -18/10/2001 Michael Goffioul +18/10/2001 Michael Goffioul * kdeprintfax: don't hardcode program path, use the $PATH variable first to find the program. Default to /usr/bin if not found. -02/11/2001 Michael Goffioul +02/11/2001 Michael Goffioul * CUPS plugin: . fix for remote printers when there's also a local printer with the same name: the printer-uri-supported @@ -104,13 +104,13 @@ Since 2.2 release, Michael Goffioul +05/11/2001 Michael Goffioul * kdeprintfax: added possibility to view files being faxed and file action (remove and view) are enabled only when needed. * KPrinter: when printing to a file, support encoding and spaces in file names + system --> KProcess. -07/11/2001 Michael Goffioul +07/11/2001 Michael Goffioul * kdeprint: fixed some problems: . collate entirely handled by kdeprint, even in the case of page selection on application-side. @@ -119,7 +119,7 @@ Since 2.2 release, Michael Goffioul +08/11/2001 Michael Goffioul * CUPS plugin: . complete IPP report for job added . implementation of dynamically added plugin menus for @@ -132,19 +132,19 @@ Since 2.2 release, Michael Goffioul +09/11/2001 Michael Goffioul * CUPS plugin: added the possibility to list jobs on remote printers. No management is allowed on remote jobs (yet?). -10/11/2001 Michael Goffioul +10/11/2001 Michael Goffioul * general: use KShellProcess::quote() for any quoting. Normally, all quoting problem should be fixed now. -12/11/2001 Michael Goffioul +12/11/2001 Michael Goffioul * CUPS: redesigned the "cups-add-smb" dialog to make it more user-driendly. -13/11/2001 Michael GOffioul +13/11/2001 Michael GOffioul * general: implementation of a KActiveLabel class to embed active links in labels. Clicking on it "exec" the associated URL. * general: make use of KActiveLabel in the first page of the @@ -154,7 +154,7 @@ Since 2.2 release, Michael Goffioul +14/11/2001 Michael Goffioul * ioslave: uploaded new templates from Chris (which adds support for pseudo printers * manager: modified RootOnly message for better consistency between @@ -168,13 +168,13 @@ Since 2.2 release, Michael Goffioul +15/11/2001 Michael Goffioul * CUPS: drivers are now downloaded from the actual server for remote printers. This allows to have access to all options set for any printer (even remote ones). However remote printer's drivers are kept read-only. -16/11/2001 Michael Goffioul +16/11/2001 Michael Goffioul * print dialog: instances are now presented in a tree structure in the combo box -> cleaner view. * general: ported the use of a global instance file to 2.2 branch @@ -185,7 +185,7 @@ Since 2.2 release, Michael Goffioul +21/11/2001 Michael Goffioul * job viewer: clicking on 'x' button only hide the job viewer but doesn't quit the app. To quit, either use menu item (from window or system tray) or accel when job viewer is visible. @@ -193,13 +193,13 @@ Since 2.2 release, Michael Goffioul +23/11/2001 Michael Goffioul * job management: the job management has been re-engineered to follow the paradigm "1 window == 1 queue". There's still the possibility to view jobs for all printers within a single window. This should enhance the usability of job management tools (I hope). -26/11/2001 Michael Goffioul +26/11/2001 Michael Goffioul * job management: job type (active/completed) is now handled on a printer basis instead of a global property of the manager. This allows different windows to show different job type, and also ease the @@ -214,21 +214,21 @@ Since 2.2 release, Michael Goffioul +28/11/2001 Michael Goffioul * special printers: added the possibility to have configurable options in pseudo-printers. Options are described in an additional XML file (like filters) and configured through an "Advanced" tab in the property dialog. TODO: graphical configuration widget + apply KXmlCommand to normal filters. -29/11/2001 Michael Goffioul +29/11/2001 Michael Goffioul * general: fixed sorting of options in driver view. They should be shown in order of appearance now. * general: make use of the new KXmlCommand class for filters too. * filters: removed the "Page Size" from the options of enscript filter, this is taken from the KPrinter object now. -04/12/2001 Michael Goffioul +04/12/2001 Michael Goffioul * general: finalized the new XML command mechanism: . graphical command builder . pseudo-printers and filters are completely based on new XML @@ -239,11 +239,11 @@ Since 2.2 release, Michael Goffioul +10/12/2001 Michael Goffioul * general: make use of "Detail" mechanism of KDialogBase in XML command editor. -11/12/2001 Michael Goffioul +11/12/2001 Michael Goffioul * instances: for root, instances are saved in global file /etc/cups/lpoptions. This allows to easily create global instances (just be root and create the instance). @@ -251,17 +251,17 @@ Since 2.2 release, Michael Goffioul +12/12/2001 Michael Goffioul * general: added error messages when the printer list cannot be retrieved in print manager and print dialog. With CUPS, if the server is not running, an error message is shown to the user. * CUPS: disabled all backends if no server is running. -13/12/2001 Michael Goffioul +13/12/2001 Michael Goffioul * general: preleminary support for external printer tool. Only escputil at this moment. -03/01/2002 Michael Goffioul +03/01/2002 Michael Goffioul * general: . added a "ID name" label to the first dialog for command editing . put "View Printer Infos" in front of orientation and view type @@ -273,7 +273,7 @@ Since 2.2 release, Michael Goffioul +09/01/2002 Michael Goffioul * general: when filtering, the file type is checked against supported formats. If the format is not supported, a warning is issued and the user has the possibility to auto-convert the file to a supported @@ -296,7 +296,7 @@ Since 2.2 release, Michael Goffioul +10/01/2002 Michael Goffioul * general: added (temporary) workaround for drawing problems in fixed toolbars, until a real fix gets implemented: static_cast(tb)->layout()->setMargin(1); @@ -304,18 +304,18 @@ Since 2.2 release, Michael Goffioul +14/01/2002 Michael Goffioul * slave: made case-insensitive for backward compatibility (old URLs may come from history). Now print:/Classes should work OK. * CUPS: moved the IPP report to an separate dialog and added the possibility to print the result. -15/01/2002 Michael Goffioul +15/01/2002 Michael Goffioul * started the implementation of a new LPR/LPRng plugin: this implementation is designed to be modular to provide support for various systems like Foomatic, APSFilter, GNUlpr or Printtool(RH). -17/01/2002 Michael Goffioul +17/01/2002 Michael Goffioul * LPR: first implementation of a job manager. Make use of asynchronous lpc and lpq processes. Major problem: delay between new state and screen update due to the fact that data are started to be updated when @@ -326,22 +326,22 @@ Since 2.2 release, Michael Goffioul +21/01/2002 Michael Goffioul * LPR: added basic implementation of a KPrinterImpl object -> plugin is functional (though far from complete...) -22/01/2002 Michael Goffioul +22/01/2002 Michael Goffioul * kdeprintfax: make use of new address book (libkabc) instead of the old one (libkab). -29/01/2002 Michael Goffioul +29/01/2002 Michael Goffioul * LPR: enhancement of the APSFilter handler. Still missing: setup the options in the print command line * wizard: removed the garbage '&' in last page * general: added SMB util functions -> to be used whenever it's possible (CUPS plugin, Foomatic handler => TO BE DONE) -30/01/2002 Michael Goffioul +30/01/2002 Michael Goffioul * general: use QGuardedPtr to keep KPrinterImpl object in KPrinter, this should avoid some crashes. * LPR: @@ -350,7 +350,7 @@ Since 2.2 release, Michael Goffioul in printcap entry -07/02/2002 Michael Goffioul +07/02/2002 Michael Goffioul * job viewer: fix crash when switching the print plugin elsewhere and there's some jobs shown + fix refresh problem when switching plugin * general: fix small bug when removing a filter in "Filters" page @@ -358,11 +358,11 @@ Since 2.2 release, Michael Goffioul +11/02/2002 Michael Goffioul * LPR: added support for LPRngTool+IFHP (not complete yet though) * general: various fixes for crashes, inconsistencies, ... -12/02/2002 Michael Goffioul +12/02/2002 Michael Goffioul * kdeprintfax: added %email to possible command tags. The e-mail address is retrieved from standard settings in KControl module. The tag can also be used in the "Name" field of the options dialog @@ -375,7 +375,7 @@ Since 2.2 release, Michael Goffioul +13/02/2002 Michael Goffioul * CUPS: added support for job-billing and page-label, and put them along with the scredule option into a single "Advanced" tab. * CUPS: added job billing info to the job viewer @@ -383,23 +383,23 @@ Since 2.2 release, Michael Goffioul +14/02/2002 Michael Goffioul * CUPS: added the possibility to edit job attributes on-the-fly using a dialog similar to the printer properties dialog. Still the be fixed: page ranges (problem with option encoding in CUPS). -15/02/2002 Michael Goffioul +15/02/2002 Michael Goffioul * general: fixed infinite recursion bug in KIconSelectAction * CUPS: temporarily disabled edition of page-ranges as it seems CUPS is buggy. I should find a workaround. * general (CUPS): enable some actions for jobs on remote hosts. It seems to work OK between my local LM-8.1 and a remote LM-7.2. -16/02/2002 Michael Goffioul +16/02/2002 Michael Goffioul * CUPS: added direct Foomatic driver support (no need the all PPD package from foomatic anymore, driver are loaded directly from Foomatic) -17/02/2002 Michael GOffioul +17/02/2002 Michael GOffioul * preview: . better algorithm to find a preview object . more comprehensive error report @@ -407,11 +407,11 @@ Since 2.2 release, Michael Goffioul allows to only show a selected set of printers -18/02/2002 Michael Goffioul +18/02/2002 Michael Goffioul * general: simple printer filtering mechanism based on printer name and location regexp. Graphical configuration for printer name. -19/02/2002 Michael Goffioul +19/02/2002 Michael Goffioul * general: . completion of the printer filtering mechanism (added location string filter) @@ -422,14 +422,14 @@ Since 2.2 release, Michael Goffioul +20/02/2002 Michael Goffioul * slave: prevent konqueror to consider a trailing slash as a directory specification (simply add a config entry in protocol file) * general: large UI standardization by making use of KDialogBase along with KGuiItem * kicker menu: possibility to open main Options Dialog from the menu -21/02/2002 Michael Goffioul +21/02/2002 Michael Goffioul * general: splitted the printer state into enable/disable and start/stop and modified the GUI to reflect this * general: removed the KMManager::configure(), obsoleted by the complete @@ -437,22 +437,22 @@ Since 2.2 release, Michael Goffioul +25/02/2002 Michael Goffioul * LPR: added printer testing support -26/02/2002 Michael Goffioul +26/02/2002 Michael Goffioul * general: printer filtering specs are now ORed instead of ANDed * general: changed "Advanced" to "Driver Settings" * CUPS: fixed RIPCache problem, added support for possible suffixes -27/02/2002 Michael Goffioul +27/02/2002 Michael Goffioul * CUPS: workaround to allow special characters in login/password without breaking security. Possible now to use safely chars like '@' and '/' in login. * general: added a check box in the config dialog to enable/disable font embedding into PS data (compatible with Qt settings). -28/02/2002 Michael Goffioul +28/02/2002 Michael Goffioul * general: job viewer updated correctly on plugin reload -> additional columns and "history" action state * general: internal *Settings objects are synchonized on config changes @@ -464,7 +464,7 @@ Since 2.2 release, Michael Goffioul +02/03/2002 Michael Goffioul * general: modified the driver structure to support dynamic options as in SuSE * LPR: more management support for SuSE handler -> drver settings can @@ -472,7 +472,7 @@ Since 2.2 release, Michael Goffioul +10/03/2002 Michael Goffioul * CUPS: allow any integer value for RIPCache + don't upload the cupsd.conf with wrong settings @@ -480,7 +480,7 @@ Since 2.2 release, Michael Goffioul +(CeBIT) Michael Goffioul * Fix various crashes: . when changing the CUPS server (notify registered object before reloading) @@ -491,7 +491,7 @@ Since 2.2 release, Michael Goffioul +25/03/2002 Michael Goffioul * general: do not use pointers in various views, to avoid dangling pointers (and crashes) when changing something (plugin, config file, ...). This makes the aboutToReload functions quite useless, but it has to @@ -507,7 +507,7 @@ Since 2.2 release, Michael Goffioul +26/03/2002 Michael Goffioul * kdeprintfax: . added support for Mgetty-sendfax . added support for page size in filters @@ -518,19 +518,19 @@ Since 2.2 release, Michael Goffioul +27/03/2002 Michael Goffioul * general: created a separate "Fonts" section in the KDEPrint settings dialog and removed the "Embed Fonts" option from the general section (moved to the new section). * kdeprintfax: fixed disabled background for "Comment" widget, use QBrush instead of QColor. OK with styles like Liquid. -28/03/2002 Michael Goffioul +28/03/2002 Michael Goffioul * general: added a user feedback mechanism in the form of a dialog showgin status messages, including initialization, number of the page currently generated, filtering and sending to the printer. -29/03/2002 Michael Goffioul +29/03/2002 Michael Goffioul * general: enhanced the status feedback mechanism . possibility to have multiple status boxes (one for each app) . added an icon (eye-candy) and the document name being printed @@ -545,7 +545,7 @@ Since 2.2 release, Michael Goffioul +02/04/2002 Michael Goffioul * general: . fixed various conflicting shortcuts . made KMVirtualManager inherit from KPReloadObject to force instance @@ -555,14 +555,14 @@ Since 2.2 release, Michael Goffioul +03/04/2002 Michael Goffioul * manager: show instances as children of the real printer in the tree view. No instance management is possible from the tree view itself. The user still has to use the "Instances" tab. * ioslave: added support for print jobs browsing, per printer or for all printers together (-> print:/jobs) -04/04/2002 Michael Goffioul +04/04/2002 Michael Goffioul * ioslave: added support to view the driver of a printer in HTML form (print:/printers/lp1?driver) * CUPS: allows editing of page-ranges for pending jobs, work around @@ -573,11 +573,11 @@ Since 2.2 release, Michael Goffioul +23/05/2002 Michael Goffioul * job manager: added the possibility to control the username for jobs filtering, and the possibility to limit the number of jobs shown. -16/08/2002 Michael Goffioul +16/08/2002 Michael Goffioul * filters/command: added the possibility to have comments about a specific command, including clickable URL's. Modified the command selector to use those comments. @@ -589,31 +589,31 @@ Since 2.2 release, Michael Goffioul +20/08/2002 Michael Goffioul * print dialog: . added a method to disable a page in the main dialog . make the filename persistent in the SaveFile dialog . use a rename dialog if the output file already exists -26/08/2002 Michael Goffioul +26/08/2002 Michael Goffioul * general: added a generic PS driver to (missing for too long) -02/09/2002 Michael Goffioul +02/09/2002 Michael Goffioul * print dialog: added graphical interface to the poster XML command (still to be committed) * manager: added a condensed toolbar with actions grouped by topics in sub-menus. -03/09/2002 Michael Goffioul +03/09/2002 Michael Goffioul * print dialog: enabled preview even in standalone mode, either the internal PS viewer or any other registered app will be used, according to the user preferences. -04/09/2002 Michael Goffioul +04/09/2002 Michael Goffioul * commands: make unavailability of a command more visual by showing a red text, and disabling the OK button of the current dialog (only if needed). -05/09/2002 Michael Goffioul +05/09/2002 Michael Goffioul * CUPS: shows all possible URI detected by CUPS when selecting the "Others" printer type in the wizard, like the web interface is doing. Index: kdeprint/configure.in.in =================================================================== RCS file: /home/kde/kdelibs/kdeprint/configure.in.in,v retrieving revision 1.18 retrieving revision 1.18.2.2 diff -u -3 -p -r1.18 -r1.18.2.2 --- kdeprint/configure.in.in 19 Dec 2003 10:57:53 -0000 1.18 +++ kdeprint/configure.in.in 13 Mar 2004 13:13:41 -0000 1.18.2.2 @@ -1,4 +1,4 @@ -AC_DEFUN(AC_CHECK_CUPS_VERSION, +AC_DEFUN([AC_CHECK_CUPS_VERSION], [ kde_save_cflags="$CFLAGS" kde_save_libs="$LIBS" @@ -76,6 +76,13 @@ if test "$ac_use_cups" = "yes"; then AC_MSG_WARN(CUPS version too old. You should upgrade to version >= 1.1.9) ac_use_cups="no" fi + + dnl check if CUPS is at least 1.1.20 + ac_have_new_cups="no" + AC_CHECK_CUPS_VERSION(1.0120) + if test "$ac_have_new_cups" = "yes"; then + AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching) + fi fi fi LDFLAGS="$ac_LDFLAGS_save" Index: kdeprint/driver.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/driver.cpp,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -3 -p -r1.11 -r1.11.2.1 --- kdeprint/driver.cpp 4 Jan 2004 17:52:27 -0000 1.11 +++ kdeprint/driver.cpp 15 Mar 2004 10:30:19 -0000 1.11.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/driver.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/driver.h,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/driver.h 4 Jan 2004 17:52:27 -0000 1.10 +++ kdeprint/driver.h 15 Mar 2004 10:30:19 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/driveritem.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/driveritem.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/driveritem.cpp 4 Jan 2004 17:52:27 -0000 1.8 +++ kdeprint/driveritem.cpp 15 Mar 2004 10:30:19 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/driveritem.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/driveritem.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/driveritem.h 4 Jan 2004 17:52:27 -0000 1.5 +++ kdeprint/driveritem.h 15 Mar 2004 10:30:19 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/driverparse.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/driverparse.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/driverparse.h 1 Mar 2002 01:24:35 -0000 1.2 +++ kdeprint/driverparse.h 15 Mar 2004 10:30:19 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/driverview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/driverview.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/driverview.cpp 4 Jan 2004 17:52:27 -0000 1.5 +++ kdeprint/driverview.cpp 15 Mar 2004 10:30:19 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/driverview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/driverview.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/driverview.h 4 Jan 2004 17:52:27 -0000 1.3 +++ kdeprint/driverview.h 15 Mar 2004 10:30:19 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/droptionview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/droptionview.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/droptionview.cpp 4 Jan 2004 17:52:27 -0000 1.8 +++ kdeprint/droptionview.cpp 15 Mar 2004 10:30:19 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/droptionview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/droptionview.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/droptionview.h 4 Jan 2004 17:52:27 -0000 1.5 +++ kdeprint/droptionview.h 15 Mar 2004 10:30:19 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/foomatic2loader.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic2loader.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/foomatic2loader.cpp 19 Dec 2003 12:35:57 -0000 1.2 +++ kdeprint/foomatic2loader.cpp 15 Mar 2004 10:30:19 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/foomatic2loader.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic2loader.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -p -r1.1 -r1.1.2.1 --- kdeprint/foomatic2loader.h 4 Jun 2003 09:23:40 -0000 1.1 +++ kdeprint/foomatic2loader.h 15 Mar 2004 10:30:19 -0000 1.1.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/fooparser.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/fooparser.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -p -r1.1 -r1.1.2.1 --- kdeprint/fooparser.cpp 4 Jun 2003 09:23:40 -0000 1.1 +++ kdeprint/fooparser.cpp 15 Mar 2004 10:30:19 -0000 1.1.2.1 @@ -22,7 +22,7 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/fooparser.y =================================================================== RCS file: /home/kde/kdelibs/kdeprint/fooparser.y,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -p -r1.1 -r1.1.2.1 --- kdeprint/fooparser.y 4 Jun 2003 09:23:40 -0000 1.1 +++ kdeprint/fooparser.y 15 Mar 2004 10:30:19 -0000 1.1.2.1 @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/fooscanner.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/fooscanner.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -p -r1.1 -r1.1.2.1 --- kdeprint/fooscanner.cpp 4 Jun 2003 09:23:40 -0000 1.1 +++ kdeprint/fooscanner.cpp 15 Mar 2004 10:30:19 -0000 1.1.2.1 @@ -19,7 +19,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/kde/kdelibs/kdeprint/fooscanner.cpp,v 1.1 2003/06/04 09:23:40 goffioul Exp $ + * $Header: /home/kde/kdelibs/kdeprint/fooscanner.cpp,v 1.1.2.1 2004/03/15 10:30:19 goffioul Exp $ */ #define FLEX_SCANNER @@ -427,7 +427,7 @@ char *yytext; #line 2 "./fooscanner.l" /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/fooscanner.l =================================================================== RCS file: /home/kde/kdelibs/kdeprint/fooscanner.l,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -p -r1.1 -r1.1.2.1 --- kdeprint/fooscanner.l 4 Jun 2003 09:23:40 -0000 1.1 +++ kdeprint/fooscanner.l 15 Mar 2004 10:30:19 -0000 1.1.2.1 @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kdeprintcheck.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kdeprintcheck.cpp,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -3 -p -r1.4 -r1.4.6.1 --- kdeprint/kdeprintcheck.cpp 25 Feb 2002 13:48:01 -0000 1.4 +++ kdeprint/kdeprintcheck.cpp 15 Mar 2004 10:30:19 -0000 1.4.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kdeprintcheck.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kdeprintcheck.h,v retrieving revision 1.2 retrieving revision 1.2.8.1 diff -u -3 -p -r1.2 -r1.2.8.1 --- kdeprint/kdeprintcheck.h 13 Jul 2001 17:45:00 -0000 1.2 +++ kdeprint/kdeprintcheck.h 15 Mar 2004 10:30:19 -0000 1.2.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kdeprintd.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kdeprintd.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.2 diff -u -3 -p -r1.17 -r1.17.2.2 --- kdeprint/kdeprintd.cpp 25 May 2003 23:33:06 -0000 1.17 +++ kdeprint/kdeprintd.cpp 15 Mar 2004 10:30:19 -0000 1.17.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -124,12 +124,12 @@ int KDEPrintd::print(const QString& cmd, if ( !url.isLocalFile() ) { QString tmpFilename = locateLocal( "tmp", "kdeprint_" + kapp->randomString( 8 ) ); - command.replace( re.pos( 0 ), re.matchedLength(), KProcess::quote( tmpFilename ) ); + command.replace( re, KProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); } else - command.replace( re.pos( 0 ), re.matchedLength(), KProcess::quote( re.cap( 1 ) ) ); + command.replace( re, KProcess::quote( re.cap( 1 ) ) ); } if ( checkFiles( command, files ) ) Index: kdeprint/kdeprintd.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kdeprintd.h,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -3 -p -r1.11 -r1.11.2.1 --- kdeprint/kdeprintd.h 22 May 2003 14:15:09 -0000 1.11 +++ kdeprint/kdeprintd.h 15 Mar 2004 10:30:19 -0000 1.11.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kfilelist.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kfilelist.cpp,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -3 -p -r1.15.2.1 -r1.15.2.2 --- kdeprint/kfilelist.cpp 23 Feb 2004 16:41:10 -0000 1.15.2.1 +++ kdeprint/kfilelist.cpp 15 Mar 2004 10:30:19 -0000 1.15.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kfilelist.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kfilelist.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/kfilelist.h 13 May 2003 14:09:45 -0000 1.6 +++ kdeprint/kfilelist.h 15 Mar 2004 10:30:19 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmdbentry.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmdbentry.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/kmdbentry.cpp 4 Jan 2004 17:52:27 -0000 1.7 +++ kdeprint/kmdbentry.cpp 15 Mar 2004 10:30:19 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmdbentry.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmdbentry.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/kmdbentry.h 4 Jan 2004 17:52:27 -0000 1.9 +++ kdeprint/kmdbentry.h 15 Mar 2004 10:30:19 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmfactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmfactory.cpp,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -u -3 -p -r1.42 -r1.42.2.1 --- kdeprint/kmfactory.cpp 4 Jan 2004 17:52:27 -0000 1.42 +++ kdeprint/kmfactory.cpp 15 Mar 2004 10:30:19 -0000 1.42.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmfactory.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmfactory.h,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- kdeprint/kmfactory.h 4 Jan 2004 17:52:27 -0000 1.21 +++ kdeprint/kmfactory.h 15 Mar 2004 10:30:19 -0000 1.21.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kmjob.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmjob.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/kmjob.cpp 4 Jan 2004 17:52:27 -0000 1.10 +++ kdeprint/kmjob.cpp 15 Mar 2004 10:30:19 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmjob.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmjob.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/kmjob.h 4 Jan 2004 17:52:27 -0000 1.9 +++ kdeprint/kmjob.h 15 Mar 2004 10:30:19 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kmjobmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmjobmanager.cpp,v retrieving revision 1.15 retrieving revision 1.15.2.2 diff -u -3 -p -r1.15 -r1.15.2.2 --- kdeprint/kmjobmanager.cpp 4 Jan 2004 17:52:27 -0000 1.15 +++ kdeprint/kmjobmanager.cpp 15 Mar 2004 10:30:19 -0000 1.15.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -173,12 +173,24 @@ const QPtrList& KMJobManager::job discardAllJobs(); QDictIterator it(m_filter); int joblimit = limit(); + bool threadjobs_updated = false; for (; it.current(); ++it) { - if (it.current()->m_type[ActiveJobs] > 0) - listJobs(it.currentKey(), ActiveJobs, joblimit); - if (it.current()->m_type[CompletedJobs] > 0) - listJobs(it.currentKey(), CompletedJobs, joblimit); + if ( it.current()->m_isspecial ) + { + if ( !threadjobs_updated ) + { + threadJob()->updateManager( this ); + threadjobs_updated = true; + } + } + else + { + if (it.current()->m_type[ActiveJobs] > 0) + listJobs(it.currentKey(), ActiveJobs, joblimit); + if (it.current()->m_type[CompletedJobs] > 0) + listJobs(it.currentKey(), CompletedJobs, joblimit); + } } m_threadjob->updateManager(this); removeDiscardedJobs(); @@ -200,7 +212,7 @@ void KMJobManager::validatePluginActions { } -void KMJobManager::addPrinter(const QString& pr, KMJobManager::JobType type) +void KMJobManager::addPrinter(const QString& pr, KMJobManager::JobType type, bool isSpecial) { struct JobFilter *jf = m_filter.find(pr); if (!jf) @@ -209,6 +221,7 @@ void KMJobManager::addPrinter(const QStr m_filter.insert(pr, jf); } jf->m_type[type]++; + jf->m_isspecial = isSpecial; } void KMJobManager::removePrinter(const QString& pr, KMJobManager::JobType type) Index: kdeprint/kmjobmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmjobmanager.h,v retrieving revision 1.15 retrieving revision 1.15.2.2 diff -u -3 -p -r1.15 -r1.15.2.2 --- kdeprint/kmjobmanager.h 4 Jan 2004 17:52:27 -0000 1.15 +++ kdeprint/kmjobmanager.h 15 Mar 2004 10:30:20 -0000 1.15.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -49,8 +49,9 @@ public: enum JobType { ActiveJobs = 0, CompletedJobs = 1 }; struct JobFilter { - JobFilter() { m_type[0] = m_type[1] = 0; } + JobFilter() { m_type[0] = m_type[1] = 0; m_isspecial = false; } int m_type[2]; + bool m_isspecial; }; KMJobManager(QObject *parent = 0, const char *name = 0); @@ -58,7 +59,7 @@ public: static KMJobManager* self(); - void addPrinter(const QString& pr, JobType type = ActiveJobs); + void addPrinter(const QString& pr, JobType type = ActiveJobs, bool isSpecial = false); void removePrinter(const QString& pr, JobType type = ActiveJobs); void clearFilter(); QDict* filter(); Index: kdeprint/kmmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmmanager.cpp,v retrieving revision 1.38.2.1 retrieving revision 1.38.2.2 diff -u -3 -p -r1.38.2.1 -r1.38.2.2 --- kdeprint/kmmanager.cpp 15 Feb 2004 20:05:02 -0000 1.38.2.1 +++ kdeprint/kmmanager.cpp 15 Mar 2004 10:30:20 -0000 1.38.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmmanager.h,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -u -3 -p -r1.27 -r1.27.2.1 --- kdeprint/kmmanager.h 4 Jan 2004 17:52:27 -0000 1.27 +++ kdeprint/kmmanager.h 15 Mar 2004 10:30:20 -0000 1.27.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmobject.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmobject.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/kmobject.h 4 Jan 2004 17:52:27 -0000 1.4 +++ kdeprint/kmobject.h 15 Mar 2004 10:30:20 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kmprinter.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmprinter.cpp,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -3 -p -r1.14 -r1.14.2.1 --- kdeprint/kmprinter.cpp 4 Jan 2004 17:52:27 -0000 1.14 +++ kdeprint/kmprinter.cpp 15 Mar 2004 10:30:20 -0000 1.14.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmprinter.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmprinter.h,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kdeprint/kmprinter.h 4 Jan 2004 17:52:27 -0000 1.17 +++ kdeprint/kmprinter.h 15 Mar 2004 10:30:20 -0000 1.17.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmspecialmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmspecialmanager.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kdeprint/kmspecialmanager.cpp 23 Jul 2003 03:25:54 -0000 1.17 +++ kdeprint/kmspecialmanager.cpp 15 Mar 2004 10:30:20 -0000 1.17.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmspecialmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmspecialmanager.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/kmspecialmanager.h 14 Dec 2001 09:41:49 -0000 1.2 +++ kdeprint/kmspecialmanager.h 15 Mar 2004 10:30:20 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmthreadjob.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmthreadjob.cpp,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -3 -p -r1.4 -r1.4.6.1 --- kdeprint/kmthreadjob.cpp 9 Nov 2001 18:31:08 -0000 1.4 +++ kdeprint/kmthreadjob.cpp 15 Mar 2004 10:30:20 -0000 1.4.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmthreadjob.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmthreadjob.h,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/kmthreadjob.h 9 Nov 2001 18:31:08 -0000 1.3 +++ kdeprint/kmthreadjob.h 15 Mar 2004 10:30:20 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmuimanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmuimanager.cpp,v retrieving revision 1.29 retrieving revision 1.29.2.1 diff -u -3 -p -r1.29 -r1.29.2.1 --- kdeprint/kmuimanager.cpp 4 Jan 2004 17:52:27 -0000 1.29 +++ kdeprint/kmuimanager.cpp 15 Mar 2004 10:30:20 -0000 1.29.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmuimanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmuimanager.h,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -3 -p -r1.16 -r1.16.2.1 --- kdeprint/kmuimanager.h 4 Jan 2004 17:52:27 -0000 1.16 +++ kdeprint/kmuimanager.h 15 Mar 2004 10:30:20 -0000 1.16.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmvirtualmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmvirtualmanager.cpp,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -3 -p -r1.15 -r1.15.2.1 --- kdeprint/kmvirtualmanager.cpp 4 Jan 2004 17:52:27 -0000 1.15 +++ kdeprint/kmvirtualmanager.cpp 15 Mar 2004 10:30:20 -0000 1.15.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kmvirtualmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kmvirtualmanager.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/kmvirtualmanager.h 4 Jan 2004 17:52:27 -0000 1.7 +++ kdeprint/kmvirtualmanager.h 15 Mar 2004 10:30:20 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpcopiespage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpcopiespage.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kdeprint/kpcopiespage.cpp 4 Jan 2004 17:52:27 -0000 1.17 +++ kdeprint/kpcopiespage.cpp 15 Mar 2004 10:30:20 -0000 1.17.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpcopiespage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpcopiespage.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/kpcopiespage.h 4 Jan 2004 17:52:27 -0000 1.5 +++ kdeprint/kpcopiespage.h 15 Mar 2004 10:30:20 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpdriverpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpdriverpage.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/kpdriverpage.cpp 4 Jan 2004 17:52:27 -0000 1.7 +++ kdeprint/kpdriverpage.cpp 15 Mar 2004 10:30:20 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpdriverpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpdriverpage.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/kpdriverpage.h 4 Jan 2004 17:52:27 -0000 1.3 +++ kdeprint/kpdriverpage.h 15 Mar 2004 10:30:20 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpfileselectpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpfileselectpage.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/kpfileselectpage.cpp 27 Jan 2003 10:16:57 -0000 1.3 +++ kdeprint/kpfileselectpage.cpp 15 Mar 2004 10:30:20 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpfileselectpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpfileselectpage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/kpfileselectpage.h 14 Nov 2001 18:53:48 -0000 1.1 +++ kdeprint/kpfileselectpage.h 15 Mar 2004 10:30:20 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpfilterpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpfilterpage.cpp,v retrieving revision 1.16 retrieving revision 1.16.2.2 diff -u -3 -p -r1.16 -r1.16.2.2 --- kdeprint/kpfilterpage.cpp 18 May 2003 06:31:42 -0000 1.16 +++ kdeprint/kpfilterpage.cpp 15 Mar 2004 10:30:20 -0000 1.16.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -118,6 +118,7 @@ void KPFilterPage::slotAddClicked() if (ok) { KXmlCommand *cmd = KXmlCommandManager::self()->loadCommand(choice); + if (!cmd) return; // Error QStringList filters = activeList(); int pos = KXmlCommandManager::self()->insertCommand(filters, cmd->name()); QListViewItem *prev(0); Index: kdeprint/kpfilterpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpfilterpage.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/kpfilterpage.h 18 May 2003 06:31:43 -0000 1.8 +++ kdeprint/kpfilterpage.h 15 Mar 2004 10:30:20 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpgeneralpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpgeneralpage.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- kdeprint/kpgeneralpage.cpp 4 Jan 2004 17:52:27 -0000 1.21 +++ kdeprint/kpgeneralpage.cpp 15 Mar 2004 10:30:20 -0000 1.21.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpgeneralpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpgeneralpage.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/kpgeneralpage.h 4 Jan 2004 17:52:27 -0000 1.3 +++ kdeprint/kpgeneralpage.h 15 Mar 2004 10:30:20 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kpipeprocess.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpipeprocess.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/kpipeprocess.cpp 24 Apr 2001 14:52:59 -0000 1.1 +++ kdeprint/kpipeprocess.cpp 15 Mar 2004 10:30:20 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpipeprocess.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpipeprocess.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/kpipeprocess.h 24 Apr 2001 14:52:59 -0000 1.1 +++ kdeprint/kpipeprocess.h 15 Mar 2004 10:30:20 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpmarginpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpmarginpage.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/kpmarginpage.cpp 4 Jan 2004 17:52:27 -0000 1.9 +++ kdeprint/kpmarginpage.cpp 15 Mar 2004 10:30:20 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kpmarginpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpmarginpage.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/kpmarginpage.h 10 Sep 2002 08:39:01 -0000 1.2 +++ kdeprint/kpmarginpage.h 15 Mar 2004 10:30:20 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpposterpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpposterpage.cpp,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -3 -p -r1.3 -r1.3.4.1 --- kdeprint/kpposterpage.cpp 17 Sep 2002 16:15:49 -0000 1.3 +++ kdeprint/kpposterpage.cpp 15 Mar 2004 10:30:20 -0000 1.3.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpposterpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpposterpage.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -3 -p -r1.1 -r1.1.4.1 --- kdeprint/kpposterpage.h 10 Sep 2002 08:39:01 -0000 1.1 +++ kdeprint/kpposterpage.h 15 Mar 2004 10:30:20 -0000 1.1.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpqtpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpqtpage.cpp,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -3 -p -r1.24 -r1.24.2.1 --- kdeprint/kpqtpage.cpp 4 Jan 2004 17:52:27 -0000 1.24 +++ kdeprint/kpqtpage.cpp 15 Mar 2004 10:30:20 -0000 1.24.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kpqtpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpqtpage.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/kpqtpage.h 4 Jan 2004 17:52:27 -0000 1.5 +++ kdeprint/kpqtpage.h 15 Mar 2004 10:30:20 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpreloadobject.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpreloadobject.cpp,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -3 -p -r1.3 -r1.3.4.1 --- kdeprint/kpreloadobject.cpp 18 Jun 2002 10:14:56 -0000 1.3 +++ kdeprint/kpreloadobject.cpp 15 Mar 2004 10:30:20 -0000 1.3.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kpreloadobject.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kpreloadobject.h,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -3 -p -r1.4 -r1.4.6.1 --- kdeprint/kpreloadobject.h 28 Feb 2002 10:35:31 -0000 1.4 +++ kdeprint/kpreloadobject.h 15 Mar 2004 10:30:20 -0000 1.4.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kprintaction.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintaction.cpp,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/kprintaction.cpp 11 Jan 2002 16:17:43 -0000 1.3 +++ kdeprint/kprintaction.cpp 15 Mar 2004 10:30:20 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kprintaction.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintaction.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/kprintaction.h 28 Aug 2001 13:00:48 -0000 1.1 +++ kdeprint/kprintaction.h 15 Mar 2004 10:30:20 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kprintdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintdialog.cpp,v retrieving revision 1.74.2.3 retrieving revision 1.74.2.5 diff -u -3 -p -r1.74.2.3 -r1.74.2.5 --- kdeprint/kprintdialog.cpp 24 Feb 2004 15:46:02 -0000 1.74.2.3 +++ kdeprint/kprintdialog.cpp 15 Mar 2004 10:30:20 -0000 1.74.2.5 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -844,18 +844,24 @@ void KPrintDialog::expandDialog(bool on) if (on) { - sz.setHeight(sz.height()+d->m_dummy->minimumSize().height()+layout()->spacing()); - if (isVisible() || !d->m_dummy->isVisible()) + sz.setHeight(sz.height()+d->m_dummy->minimumSize().height()+d->m_plugin->minimumSize().height()+2*layout()->spacing()); + if (isVisible() || !d->m_dummy->isVisible() || !d->m_plugin->isVisible()) + { d->m_dummy->show(); + d->m_plugin->show(); + } d->m_extbtn->setIconSet(SmallIconSet("up")); d->m_extbtn->setText(i18n("Collaps&e")); d->m_reduced = false; } else { - sz.setHeight(sz.height()-d->m_dummy->height()-layout()->spacing()); - if (!isVisible() || d->m_dummy->isVisible()) + sz.setHeight(sz.height()-d->m_dummy->height()-d->m_plugin->height()-2*layout()->spacing()); + if (!isVisible() || d->m_dummy->isVisible() || d->m_plugin->isVisible()) + { d->m_dummy->hide(); + d->m_plugin->hide(); + } d->m_extbtn->setIconSet(SmallIconSet("down")); d->m_extbtn->setText(i18n("&Expand")); d->m_reduced = true; Index: kdeprint/kprintdialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintdialog.h,v retrieving revision 1.26 retrieving revision 1.26.2.1 diff -u -3 -p -r1.26 -r1.26.2.1 --- kdeprint/kprintdialog.h 4 Jan 2004 17:52:27 -0000 1.26 +++ kdeprint/kprintdialog.h 15 Mar 2004 10:30:20 -0000 1.26.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kprintdialogpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintdialogpage.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/kprintdialogpage.cpp 4 Jan 2004 17:52:27 -0000 1.6 +++ kdeprint/kprintdialogpage.cpp 15 Mar 2004 10:30:20 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kprintdialogpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintdialogpage.h,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -3 -p -r1.11 -r1.11.2.1 --- kdeprint/kprintdialogpage.h 4 Jan 2004 17:52:27 -0000 1.11 +++ kdeprint/kprintdialogpage.h 15 Mar 2004 10:30:20 -0000 1.11.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kprinter.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprinter.cpp,v retrieving revision 1.78 retrieving revision 1.78.2.2 diff -u -3 -p -r1.78 -r1.78.2.2 --- kdeprint/kprinter.cpp 4 Jan 2004 17:52:27 -0000 1.78 +++ kdeprint/kprinter.cpp 15 Mar 2004 10:30:20 -0000 1.78.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -390,7 +390,7 @@ bool KPrinter::printFiles(const QStringL } else { - if (!outputToFile() && startviewer) + if (/* !outputToFile() && */ startviewer) { QStringList args; args << "-d"; Index: kdeprint/kprinter.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprinter.h,v retrieving revision 1.41 retrieving revision 1.41.2.1 diff -u -3 -p -r1.41 -r1.41.2.1 --- kdeprint/kprinter.h 4 Jan 2004 17:52:27 -0000 1.41 +++ kdeprint/kprinter.h 15 Mar 2004 10:30:20 -0000 1.41.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kprinterimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprinterimpl.cpp,v retrieving revision 1.54 retrieving revision 1.54.2.3 diff -u -3 -p -r1.54 -r1.54.2.3 --- kdeprint/kprinterimpl.cpp 4 Jan 2004 17:52:27 -0000 1.54 +++ kdeprint/kprinterimpl.cpp 15 Mar 2004 10:30:20 -0000 1.54.2.3 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or @@ -350,6 +350,12 @@ int KPrinterImpl::doFilterFiles(KPrinter for (uint i=0;iloadCommand(flist[i]); + if (!filter) + { + // TODO: better error message + printer->setErrorMessage(i18n("

Error while reading filter description for %1. Empty command line received.

").arg(flist[i])); + return -1; // Error + } if (i == 0) inputMimeTypes = filter->inputMimeTypes(); @@ -454,7 +460,7 @@ int KPrinterImpl::autoConvertFiles(KPrin { if ( !printer->option( "kde-special-command" ).isEmpty() ) { - KXmlCommand *cmd = KXmlCommandManager::self()->loadCommand( printer->option( "kde-special-command" ) ); + KXmlCommand *cmd = KXmlCommandManager::self()->loadCommand( printer->option( "kde-special-command" ), true ); if ( cmd ) { mimeTypes = cmd->inputMimeTypes(); Index: kdeprint/kprinterimpl.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprinterimpl.h,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -3 -p -r1.15 -r1.15.2.1 --- kdeprint/kprinterimpl.h 4 Jan 2004 17:52:27 -0000 1.15 +++ kdeprint/kprinterimpl.h 15 Mar 2004 10:30:20 -0000 1.15.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kprinterpropertydialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprinterpropertydialog.cpp,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -3 -p -r1.15 -r1.15.2.1 --- kdeprint/kprinterpropertydialog.cpp 4 Jan 2004 17:52:27 -0000 1.15 +++ kdeprint/kprinterpropertydialog.cpp 15 Mar 2004 10:30:20 -0000 1.15.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kprinterpropertydialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprinterpropertydialog.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/kprinterpropertydialog.h 4 Jan 2004 17:52:27 -0000 1.8 +++ kdeprint/kprinterpropertydialog.h 15 Mar 2004 10:30:20 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kprintpreview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintpreview.cpp,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -3 -p -r1.28 -r1.28.2.1 --- kdeprint/kprintpreview.cpp 4 Jan 2004 17:52:27 -0000 1.28 +++ kdeprint/kprintpreview.cpp 15 Mar 2004 10:30:20 -0000 1.28.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kprintpreview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintpreview.h,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/kprintpreview.h 4 Jan 2004 17:52:27 -0000 1.10 +++ kdeprint/kprintpreview.h 15 Mar 2004 10:30:20 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/kprintprocess.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintprocess.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/kprintprocess.cpp 22 May 2003 14:15:09 -0000 1.8 +++ kdeprint/kprintprocess.cpp 15 Mar 2004 10:30:20 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kprintprocess.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kprintprocess.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/kprintprocess.h 22 May 2003 14:15:09 -0000 1.6 +++ kdeprint/kprintprocess.h 15 Mar 2004 10:30:20 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/kxmlcommand.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kxmlcommand.cpp,v retrieving revision 1.17.2.2 retrieving revision 1.17.2.4 diff -u -3 -p -r1.17.2.2 -r1.17.2.4 --- kdeprint/kxmlcommand.cpp 15 Feb 2004 20:05:02 -0000 1.17.2.2 +++ kdeprint/kxmlcommand.cpp 15 Mar 2004 10:30:20 -0000 1.17.2.4 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -608,6 +608,8 @@ void KXmlCommandManager::preload() for (QStringList::Iterator it=d->m_cmdlist.begin(); it!=d->m_cmdlist.end(); ++it) { KXmlCommand *xmlCmd = loadCommand(*it); + if (!xmlCmd) continue; // Error! + QStringList inputMime = xmlCmd->inputMimeTypes(); for (QStringList::ConstIterator mime=inputMime.begin(); mime!=inputMime.end(); ++mime) { @@ -689,6 +691,9 @@ int KXmlCommandManager::insertCommand(QS for (QStringList::Iterator it=list.begin(); it!=list.end(); ++it, pos++) { f2 = command(*it); + if (!f2) + return -1; // Shouldn't happen + if (f2->acceptMimeType(f1->mimeType()) && f1->acceptMimeType(mimetype)) { list.insert(it, filtername); Index: kdeprint/kxmlcommand.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kxmlcommand.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/kxmlcommand.h 26 Aug 2002 16:01:23 -0000 1.2 +++ kdeprint/kxmlcommand.h 15 Mar 2004 10:30:20 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/marginpreview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/marginpreview.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/marginpreview.cpp 25 Jun 2003 22:32:13 -0000 1.6 +++ kdeprint/marginpreview.cpp 15 Mar 2004 10:30:20 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/marginpreview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/marginpreview.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/marginpreview.h 26 May 2003 13:16:41 -0000 1.3 +++ kdeprint/marginpreview.h 15 Mar 2004 10:30:20 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/marginvaluewidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/marginvaluewidget.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/marginvaluewidget.cpp 26 May 2003 13:16:41 -0000 1.3 +++ kdeprint/marginvaluewidget.cpp 15 Mar 2004 10:30:20 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/marginvaluewidget.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/marginvaluewidget.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/marginvaluewidget.h 26 May 2003 13:16:41 -0000 1.3 +++ kdeprint/marginvaluewidget.h 15 Mar 2004 10:30:20 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/marginwidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/marginwidget.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/marginwidget.cpp 29 May 2003 23:19:28 -0000 1.6 +++ kdeprint/marginwidget.cpp 15 Mar 2004 10:30:20 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/marginwidget.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/marginwidget.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/marginwidget.h 26 May 2003 13:16:41 -0000 1.3 +++ kdeprint/marginwidget.h 15 Mar 2004 10:30:20 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/messagewindow.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/messagewindow.cpp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/messagewindow.cpp 8 Oct 2002 16:17:15 -0000 1.2 +++ kdeprint/messagewindow.cpp 15 Mar 2004 10:30:20 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/messagewindow.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/messagewindow.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/messagewindow.h 8 Oct 2002 16:17:15 -0000 1.2 +++ kdeprint/messagewindow.h 15 Mar 2004 10:30:20 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/plugincombobox.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/plugincombobox.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/plugincombobox.cpp 25 Oct 2003 21:18:33 -0000 1.6 +++ kdeprint/plugincombobox.cpp 15 Mar 2004 10:30:20 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/plugincombobox.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/plugincombobox.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -3 -p -r1.3 -r1.3.4.1 --- kdeprint/plugincombobox.h 29 Mar 2002 17:38:10 -0000 1.3 +++ kdeprint/plugincombobox.h 15 Mar 2004 10:30:20 -0000 1.3.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/posterpreview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/posterpreview.cpp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/posterpreview.cpp 11 Sep 2002 12:15:40 -0000 1.2 +++ kdeprint/posterpreview.cpp 15 Mar 2004 10:30:20 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/posterpreview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/posterpreview.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/posterpreview.h 11 Sep 2002 08:30:23 -0000 1.2 +++ kdeprint/posterpreview.h 15 Mar 2004 10:30:20 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ppdloader.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ppdloader.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -3 -p -r1.3.2.1 -r1.3.2.2 --- kdeprint/ppdloader.cpp 28 Jan 2004 08:41:27 -0000 1.3.2.1 +++ kdeprint/ppdloader.cpp 15 Mar 2004 10:30:20 -0000 1.3.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ppdloader.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ppdloader.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/ppdloader.h 6 Jun 2003 17:37:28 -0000 1.2 +++ kdeprint/ppdloader.h 15 Mar 2004 10:30:20 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ppdparser.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ppdparser.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/ppdparser.cpp 6 Jun 2003 17:37:28 -0000 1.2 +++ kdeprint/ppdparser.cpp 15 Mar 2004 10:30:20 -0000 1.2.2.1 @@ -30,7 +30,7 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ppdparser.y =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ppdparser.y,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/ppdparser.y 6 Jun 2003 17:37:28 -0000 1.2 +++ kdeprint/ppdparser.y 15 Mar 2004 10:30:20 -0000 1.2.2.1 @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ppdscanner.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ppdscanner.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/ppdscanner.cpp 6 Jun 2003 17:37:28 -0000 1.2 +++ kdeprint/ppdscanner.cpp 15 Mar 2004 10:30:20 -0000 1.2.2.1 @@ -19,7 +19,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/kde/kdelibs/kdeprint/ppdscanner.cpp,v 1.2 2003/06/06 17:37:28 goffioul Exp $ + * $Header: /home/kde/kdelibs/kdeprint/ppdscanner.cpp,v 1.2.2.1 2004/03/15 10:30:20 goffioul Exp $ */ #define FLEX_SCANNER @@ -521,7 +521,7 @@ char *yytext; #line 2 "./ppdscanner.l" /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ppdscanner.l =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ppdscanner.l,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -p -r1.1 -r1.1.2.1 --- kdeprint/ppdscanner.l 4 Jun 2003 13:59:01 -0000 1.1 +++ kdeprint/ppdscanner.l 15 Mar 2004 10:30:20 -0000 1.1.2.1 @@ -1,7 +1,7 @@ %{ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2003 Michael Goffioul + * Copyright (c) 2001-2003 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/printerfilter.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/printerfilter.cpp,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -3 -p -r1.4 -r1.4.6.1 --- kdeprint/printerfilter.cpp 26 Feb 2002 10:47:48 -0000 1.4 +++ kdeprint/printerfilter.cpp 15 Mar 2004 10:30:20 -0000 1.4.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/printerfilter.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/printerfilter.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/printerfilter.h 18 Feb 2002 17:54:39 -0000 1.2 +++ kdeprint/printerfilter.h 15 Mar 2004 10:30:20 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/specials.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/specials.desktop,v retrieving revision 1.194.2.3 retrieving revision 1.194.2.5 diff -u -3 -p -r1.194.2.3 -r1.194.2.5 --- kdeprint/specials.desktop 11 Feb 2004 16:59:48 -0000 1.194.2.3 +++ kdeprint/specials.desktop 6 Mar 2004 13:02:17 -0000 1.194.2.5 @@ -42,7 +42,7 @@ Name[nds]=In'n Datei drucken (PostScript Name[nl]=Naar bestand afdrukken (PostScript) Name[nn]=Skriv til fil (PostScript) Name[nso]=Gatisetsa go Faele (PostScript) -Name[pl]=Wydruk do pliku (PostScriptu) +Name[pl]=Wydruk do pliku (PostScript) Name[pt]=Imprimir para um Ficheiro (PostScript) Name[pt_BR]=Imprimir para o Arquivo (PostScript) Name[ro]=Tipărire în fişier (PostScript) @@ -51,6 +51,7 @@ Name[se]=Čálit fiilii (PostScript) Name[sk]=Tlačiť do súboru (PostScript) Name[sl]=Tiskanje v datoteko (postscript) Name[sr]=Штампање у фајл (PostScript) +Name[sr@Latn]=Štampanje u fajl (PostScript) Name[ss]=Shicilela kuya fayilini (PostScript) Name[sv]=Skriv ut till fil (Postscript) Name[ta]=கோப்புக்கு அச்சிடு (PostScript) @@ -117,6 +118,7 @@ Description[se]=Čále PostScript fiilla Description[sk]=Zapísať súbor PostScript Description[sl]=Izdela postscriptno datoteko Description[sr]=Записује PostScript фајл +Description[sr@Latn]=Zapisuje PostScript fajl Description[ss]=Bhala lifayela le PostScript Description[sv]=Skriv Postscript-fil Description[ta]=PostScript கோப்பு எழுது @@ -185,6 +187,7 @@ Comment[se]=Báikkálaš fiila Comment[sk]=Lokálny súbor Comment[sl]=Krajevna datoteka Comment[sr]=Локални фајл +Comment[sr@Latn]=Lokalni fajl Comment[ss]=Lifayela langekhatsi Comment[sv]=Lokal fil Comment[ta]=உள்ளமைக் கோப்பு @@ -257,6 +260,7 @@ Name[se]=Čálit fiilii (PDF) Name[sk]=Tlačiť do súboru (PDF) Name[sl]=Tiskanje v datoteko (PDF) Name[sr]=Штампање у фајл (PDF) +Name[sr@Latn]=Štampanje u fajl (PDF) Name[ss]=shicilela kuya efayelini (PDF) Name[sv]=Skriv ut till fil (PDF) Name[ta]=கோப்புக்கு அச்சிடு (PDF) @@ -323,6 +327,7 @@ Description[se]=Čále PDF/Acrobat fiill Description[sk]=Zapísať súbor PDF/Acrobat Description[sl]=Izdela datoteko v PDF/Acrobat Description[sr]=Записује PDF/Acrobat фајл +Description[sr@Latn]=Zapisuje PDF/Acrobat fajl Description[ss]=Bhala i-PDF/lifayela le Acrobat Description[sv]=Skriv PDF/Acrobat-fil Description[ta]=PDF/Acrobat கோப்பு எழுது @@ -391,6 +396,7 @@ Comment[se]=Báikkálaš fiila Comment[sk]=Lokálny súbor Comment[sl]=Krajevna datoteka Comment[sr]=Локални фајл +Comment[sr@Latn]=Lokalni fajl Comment[ss]=Lifayela langekhatsi Comment[sv]=Lokal fil Comment[ta]=உள்ளமைக் கோப்பு @@ -464,6 +470,7 @@ Name[se]=Sádde fáksii Name[sk]=Poslať na fax Name[sl]=Pošlji faks Name[sr]=Слање факсом +Name[sr@Latn]=Slanje faksom Name[ss]=Tfumela ku Fax Name[sv]=Skicka till fax Name[ta]=தொலைநகலிக்கு அனுப்பு @@ -528,6 +535,7 @@ Description[se]=Sádde olggoldas fáksav Description[sk]=Poslať do externého faxového systému Description[sl]=Pošlje faks v zunanji faksirni sistem Description[sr]=Пошаљи на спољни факс систем +Description[sr@Latn]=Pošalji na spoljni faks sistem Description[ss]=Tfumela kumshini we fax wangaphandle Description[sv]=Skicka till externt faxsystem Description[ta]=வெளித் தொலைநகலிக்கு அனுப்பு @@ -595,6 +603,7 @@ Comment[se]=Olggoldas Comment[sk]=Externý Comment[sl]=Zunanji Comment[sr]=Спољни +Comment[sr@Latn]=Spoljni Comment[ss]=Kwangaphandle Comment[sv]=Extern Comment[ta]=வெளி @@ -667,6 +676,7 @@ Comment[se]=KMail Composer mielddus Comment[sk]=Príloha pre composer KMailu Comment[sl]=Pripeta datoteka za sestavljalnik Kmail Comment[sr]=Прилог за KMail-ов састављач +Comment[sr@Latn]=Prilog za KMail-ov sastavljač Comment[ss]=Lokunanyatsiliseliwe kwesisunguli se Kmail Comment[sv]=Bilaga till Kmails e-posteditor Comment[ta]=KMail உருவாக்கியிà் இணைப்பு @@ -733,6 +743,7 @@ Description[se]=Ráhkada PDF/Acrobat-fii Description[sk]=Vytvorí súbor PDF/Acrobat ako prílohu pre KMail Description[sl]=Izdela datoteko v PDF/Acrobat kot prilogo za Kmail Description[sr]=Прави PDF/Acrobat фајл као прилог за KMail +Description[sr@Latn]=Pravi PDF/Acrobat fajl kao prilog za KMail Description[ss]=Calisa lifayela lePDF/Acrobat njengelokunanyatsiselwe ku- KMail Description[sv]=Skapar PDF/Acrobat-fil som en bilaga till Kmail Description[ta]=KMail இணைப்பாக, PDF/Acrobat கோப்பினை உருவாக்கும் @@ -805,6 +816,7 @@ Name[se]=Sádde PDF-fiilla Name[sk]=Poslať súbor PDF Name[sl]=Pošlji PDF po pošti Name[sr]=Слање PDF фајла електронском поштом +Name[sr@Latn]=Slanje PDF fajla elektronskom poštom Name[ss]=lifayela leliposi le PDF Name[sv]=Skicka PDF-fil Name[ta]=PDF ஆவணத்தை அஞ்சலிடு @@ -884,6 +896,7 @@ Description[se]=Geavat ksendfax dálá d Description[sk]=Použite ksendfax pre odfaxovanie aktuálneho dokumentu Description[sl]=Uporabite kdsendfax za faksiranje trenutnega dokumenta Description[sr]=Користи ksendfax да пошаље текући документ на факс. +Description[sr@Latn]=Koristi ksendfax da pošalje tekući dokument na faks. Description[ss]=Sebentisa i-ksendfax kutfumela ngefax kwelidokhumente lanyalo Description[sv]=Använd Ksendfax för att faxa aktuellt dokument Description[ta]=ksendfax மூலம் நடப்பு ஆவணத்தை தொலைநகலிடு @@ -939,7 +952,7 @@ Name[nds]=Fax-Warktüüg (ksendfax) Name[nl]=Geavanceerd faxprogramma (ksendfax) Name[nn]=Avansert faksverktøy (ksendfax) Name[nso]=Sebereka sago Faxa seo se Beetswegopele (kromelafax) -Name[pl]=Zaawansowane narzędzie do faksowania (ksendfax) +Name[pl]=Zaawansowane faksowanie (ksendfax) Name[pt]=Ferramenta Avançada de Fax (ksendfax) Name[pt_BR]=Ferramenta Avançada de Fax (ksendfax) Name[ro]=Utilitar de FAX avansat (ksendfax) @@ -948,6 +961,7 @@ Name[se]=Nana buorre fáksaneavvu (ksend Name[sk]=Pokročilý nástroj pre faxy (ksendfax) Name[sl]=Napredno orodje za faksiranje (ksendfax) Name[sr]=Напредни алат за слање факсова (ksendfax) +Name[sr@Latn]=Napredni alat za slanje faksova (ksendfax) Name[ss]=Lithulusi lekufexa lelisembili (ksendfax) Name[sv]=Avancerat faxverktyg (Ksendfax) Name[ta]=மேம்பட்ட தொலைநகலிக் கருவி (ksendfax) Index: kdeprint/treecombobox.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/treecombobox.cpp,v retrieving revision 1.1.6.1 retrieving revision 1.1.6.2 diff -u -3 -p -r1.1.6.1 -r1.1.6.2 --- kdeprint/treecombobox.cpp 10 Feb 2004 22:48:34 -0000 1.1.6.1 +++ kdeprint/treecombobox.cpp 15 Mar 2004 10:30:20 -0000 1.1.6.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/treecombobox.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/treecombobox.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/treecombobox.h 16 Nov 2001 15:28:22 -0000 1.1 +++ kdeprint/treecombobox.h 15 Mar 2004 10:30:20 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/util.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/util.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/util.cpp 21 May 2003 12:35:06 -0000 1.6 +++ kdeprint/util.cpp 15 Mar 2004 10:30:20 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/util.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/util.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/util.h 21 May 2003 12:35:06 -0000 1.5 +++ kdeprint/util.h 15 Mar 2004 10:30:20 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cups.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cups.print,v retrieving revision 1.90 retrieving revision 1.90.2.1 diff -u -3 -p -r1.90 -r1.90.2.1 --- kdeprint/cups/cups.print 13 Jan 2004 06:51:40 -0000 1.90 +++ kdeprint/cups/cups.print 29 Feb 2004 15:29:35 -0000 1.90.2.1 @@ -33,6 +33,7 @@ Comment[ru]=Система печати Comment[se]=CUPS («Common Unix Print System», čálihanvuogádat) Comment[sl]=CUPS (skupni tiskalniški sistem za Unix) Comment[sr]=CUPS (Common Unix Print System) +Comment[sr@Latn]=CUPS (Common Unix Print System) Comment[ss]=CUPS (Umshini lovamile wekushicelela we UNIX) Comment[sv]=Cups (Common Unix print system) Comment[ta]=CUPS (பொது யுனிக்ஸ் அச்சுத் தொகுதி) Index: kdeprint/cups/cupsaddsmb2.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsaddsmb2.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- kdeprint/cups/cupsaddsmb2.cpp 21 Oct 2003 23:02:59 -0000 1.21 +++ kdeprint/cups/cupsaddsmb2.cpp 15 Mar 2004 10:30:23 -0000 1.21.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsaddsmb2.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsaddsmb2.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/cups/cupsaddsmb2.h 1 Jul 2002 15:11:40 -0000 1.4 +++ kdeprint/cups/cupsaddsmb2.h 15 Mar 2004 10:30:23 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdoprint.c =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdoprint.c,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -3 -p -r1.8.2.1 -r1.8.2.2 --- kdeprint/cups/cupsdoprint.c 23 Feb 2004 15:52:44 -0000 1.8.2.1 +++ kdeprint/cups/cupsdoprint.c 15 Mar 2004 10:30:23 -0000 1.8.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsinfos.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsinfos.cpp,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -3 -p -r1.15 -r1.15.2.1 --- kdeprint/cups/cupsinfos.cpp 4 Jan 2004 17:52:28 -0000 1.15 +++ kdeprint/cups/cupsinfos.cpp 15 Mar 2004 10:30:23 -0000 1.15.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsinfos.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsinfos.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/cups/cupsinfos.h 4 Jan 2004 17:52:28 -0000 1.8 +++ kdeprint/cups/cupsinfos.h 15 Mar 2004 10:30:23 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/image.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/image.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/image.cpp 6 Sep 2003 19:06:31 -0000 1.4 +++ kdeprint/cups/image.cpp 15 Mar 2004 10:30:23 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/imageposition.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/imageposition.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/imageposition.cpp 30 Dec 2002 16:59:51 -0000 1.3 +++ kdeprint/cups/imageposition.cpp 15 Mar 2004 10:30:23 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/imageposition.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/imageposition.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/imageposition.h 9 Oct 2001 16:46:17 -0000 1.1 +++ kdeprint/cups/imageposition.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/imagepreview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/imagepreview.cpp,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/imagepreview.cpp 9 Oct 2001 16:46:17 -0000 1.1 +++ kdeprint/cups/imagepreview.cpp 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/imagepreview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/imagepreview.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/imagepreview.h 9 Oct 2001 16:46:17 -0000 1.1 +++ kdeprint/cups/imagepreview.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/ippreportdlg.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/ippreportdlg.cpp,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -3 -p -r1.3 -r1.3.4.1 --- kdeprint/cups/ippreportdlg.cpp 26 May 2002 13:22:57 -0000 1.3 +++ kdeprint/cups/ippreportdlg.cpp 15 Mar 2004 10:30:23 -0000 1.3.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/ippreportdlg.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/ippreportdlg.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/cups/ippreportdlg.h 26 May 2002 13:22:57 -0000 1.2 +++ kdeprint/cups/ippreportdlg.h 15 Mar 2004 10:30:23 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/ipprequest.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/ipprequest.cpp,v retrieving revision 1.29 retrieving revision 1.29.2.2 diff -u -3 -p -r1.29 -r1.29.2.2 --- kdeprint/cups/ipprequest.cpp 14 Jan 2004 12:58:20 -0000 1.29 +++ kdeprint/cups/ipprequest.cpp 15 Mar 2004 10:30:23 -0000 1.29.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,6 +29,15 @@ #include #include +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_CUPS_NO_PWD_CACHE +#include +static QCString cups_authstring = ""; +#endif + void dumpRequest(ipp_t *req, bool answer = false, const QString& s = QString::null) { kdDebug(500) << "==========" << endl; @@ -300,12 +309,19 @@ bool IppRequest::doFileRequest(const QSt return false; } +#ifdef HAVE_CUPS_NO_PWD_CACHE + strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE ); +#endif + if (dump_ > 0) { dumpRequest(request_, false, "Request to "+myHost+":"+QString::number(myPort)); } request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1())); +#ifdef HAVE_CUPS_NO_PWD_CACHE + cups_authstring = HTTP->authstring; +#endif httpClose(HTTP); if (dump_ > 1) Index: kdeprint/cups/ipprequest.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/ipprequest.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/cups/ipprequest.h 4 Jan 2004 17:52:28 -0000 1.9 +++ kdeprint/cups/ipprequest.h 15 Mar 2004 10:30:23 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kcupsprinterimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kcupsprinterimpl.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- kdeprint/cups/kcupsprinterimpl.cpp 4 Jan 2004 17:52:28 -0000 1.21 +++ kdeprint/cups/kcupsprinterimpl.cpp 15 Mar 2004 10:30:23 -0000 1.21.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kcupsprinterimpl.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kcupsprinterimpl.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/cups/kcupsprinterimpl.h 4 Jan 2004 17:52:28 -0000 1.5 +++ kdeprint/cups/kcupsprinterimpl.h 15 Mar 2004 10:30:23 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmconfigcups.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmconfigcups.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/kmconfigcups.cpp 16 May 2003 11:13:29 -0000 1.4 +++ kdeprint/cups/kmconfigcups.cpp 15 Mar 2004 10:30:23 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmconfigcups.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmconfigcups.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/kmconfigcups.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/kmconfigcups.h 15 Mar 2004 10:30:23 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmconfigcupsdir.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmconfigcupsdir.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/cups/kmconfigcupsdir.cpp 21 Oct 2003 23:02:59 -0000 1.7 +++ kdeprint/cups/kmconfigcupsdir.cpp 15 Mar 2004 10:30:23 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmconfigcupsdir.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmconfigcupsdir.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/kmconfigcupsdir.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/kmconfigcupsdir.h 15 Mar 2004 10:30:23 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsconfigwidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsconfigwidget.cpp,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -3 -p -r1.7.2.1 -r1.7.2.2 --- kdeprint/cups/kmcupsconfigwidget.cpp 23 Feb 2004 15:53:35 -0000 1.7.2.1 +++ kdeprint/cups/kmcupsconfigwidget.cpp 15 Mar 2004 10:30:23 -0000 1.7.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsconfigwidget.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsconfigwidget.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/kmcupsconfigwidget.h 4 Jan 2004 17:52:28 -0000 1.3 +++ kdeprint/cups/kmcupsconfigwidget.h 15 Mar 2004 10:30:23 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsfactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsfactory.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/cups/kmcupsfactory.cpp 4 Jan 2004 17:52:28 -0000 1.7 +++ kdeprint/cups/kmcupsfactory.cpp 15 Mar 2004 10:30:23 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsjobmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsjobmanager.cpp,v retrieving revision 1.41 retrieving revision 1.41.2.1 diff -u -3 -p -r1.41 -r1.41.2.1 --- kdeprint/cups/kmcupsjobmanager.cpp 4 Jan 2004 17:52:28 -0000 1.41 +++ kdeprint/cups/kmcupsjobmanager.cpp 15 Mar 2004 10:30:23 -0000 1.41.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsjobmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsjobmanager.h,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -3 -p -r1.13 -r1.13.2.1 --- kdeprint/cups/kmcupsjobmanager.h 4 Jan 2004 17:52:28 -0000 1.13 +++ kdeprint/cups/kmcupsjobmanager.h 15 Mar 2004 10:30:23 -0000 1.13.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsmanager.cpp,v retrieving revision 1.61.2.1 retrieving revision 1.61.2.2 diff -u -3 -p -r1.61.2.1 -r1.61.2.2 --- kdeprint/cups/kmcupsmanager.cpp 26 Jan 2004 22:06:45 -0000 1.61.2.1 +++ kdeprint/cups/kmcupsmanager.cpp 15 Mar 2004 10:30:23 -0000 1.61.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsmanager.h,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -3 -p -r1.15 -r1.15.2.1 --- kdeprint/cups/kmcupsmanager.h 4 Jan 2004 17:52:28 -0000 1.15 +++ kdeprint/cups/kmcupsmanager.h 15 Mar 2004 10:30:23 -0000 1.15.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsuimanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsuimanager.cpp,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -3 -p -r1.28 -r1.28.2.1 --- kdeprint/cups/kmcupsuimanager.cpp 4 Jan 2004 17:52:28 -0000 1.28 +++ kdeprint/cups/kmcupsuimanager.cpp 15 Mar 2004 10:30:23 -0000 1.28.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmcupsuimanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmcupsuimanager.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/cups/kmcupsuimanager.h 4 Jan 2004 17:52:28 -0000 1.9 +++ kdeprint/cups/kmcupsuimanager.h 15 Mar 2004 10:30:23 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmpropbanners.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmpropbanners.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/cups/kmpropbanners.cpp 4 Jan 2004 17:52:28 -0000 1.8 +++ kdeprint/cups/kmpropbanners.cpp 15 Mar 2004 10:30:23 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmpropbanners.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmpropbanners.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/kmpropbanners.h 4 Jan 2004 17:52:28 -0000 1.3 +++ kdeprint/cups/kmpropbanners.h 15 Mar 2004 10:30:23 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmpropquota.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmpropquota.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/kmpropquota.cpp 14 Aug 2002 12:28:33 -0000 1.5 +++ kdeprint/cups/kmpropquota.cpp 15 Mar 2004 10:30:23 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmpropquota.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmpropquota.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/kmpropquota.h 7 Aug 2001 08:05:50 -0000 1.1 +++ kdeprint/cups/kmpropquota.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmpropusers.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmpropusers.cpp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/cups/kmpropusers.cpp 13 Aug 2002 08:03:13 -0000 1.2 +++ kdeprint/cups/kmpropusers.cpp 15 Mar 2004 10:30:23 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmpropusers.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmpropusers.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/kmpropusers.h 7 Aug 2001 08:05:50 -0000 1.1 +++ kdeprint/cups/kmpropusers.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwbanners.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwbanners.cpp,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -3 -p -r1.12 -r1.12.2.1 --- kdeprint/cups/kmwbanners.cpp 4 Jan 2004 17:52:28 -0000 1.12 +++ kdeprint/cups/kmwbanners.cpp 15 Mar 2004 10:30:23 -0000 1.12.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwbanners.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwbanners.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/kmwbanners.h 4 Jan 2004 17:52:28 -0000 1.4 +++ kdeprint/cups/kmwbanners.h 15 Mar 2004 10:30:23 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwfax.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwfax.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/kmwfax.cpp 21 May 2003 12:35:06 -0000 1.4 +++ kdeprint/cups/kmwfax.cpp 15 Mar 2004 10:30:23 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwfax.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwfax.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/kmwfax.h 5 May 2001 15:13:09 -0000 1.1 +++ kdeprint/cups/kmwfax.h 15 Mar 2004 10:30:23 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwipp.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwipp.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.2 diff -u -3 -p -r1.6 -r1.6.2.2 --- kdeprint/cups/kmwipp.cpp 4 Jan 2004 17:52:28 -0000 1.6 +++ kdeprint/cups/kmwipp.cpp 15 Mar 2004 10:30:23 -0000 1.6.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -33,12 +34,14 @@ KMWIpp::KMWIpp(QWidget *parent, const ch m_ID = KMWizard::IPP; m_title = i18n("Remote IPP server"); m_nextpage = KMWizard::IPPSelect; + lineEdit( 1 )->setValidator( new QIntValidator( this ) ); setInfo(i18n("

Enter the information concerning the remote IPP server " "owning the targeted printer. This wizard will poll the server " "before continuing.

")); setLabel(0,i18n("Host:")); setLabel(1,i18n("Port:")); + setText( 1, QString::fromLatin1( "631" ) ); } bool KMWIpp::isValid(QString& msg) Index: kdeprint/cups/kmwipp.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwipp.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/kmwipp.h 4 Jan 2004 17:52:28 -0000 1.3 +++ kdeprint/cups/kmwipp.h 15 Mar 2004 10:30:23 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwippprinter.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwippprinter.cpp,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -3 -p -r1.18 -r1.18.2.1 --- kdeprint/cups/kmwippprinter.cpp 21 May 2003 12:35:06 -0000 1.18 +++ kdeprint/cups/kmwippprinter.cpp 15 Mar 2004 10:30:23 -0000 1.18.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwippprinter.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwippprinter.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/cups/kmwippprinter.h 20 Jun 2002 11:36:49 -0000 1.4 +++ kdeprint/cups/kmwippprinter.h 15 Mar 2004 10:30:23 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwippselect.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwippselect.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/cups/kmwippselect.cpp 4 Jan 2004 17:52:28 -0000 1.10 +++ kdeprint/cups/kmwippselect.cpp 15 Mar 2004 10:30:23 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwippselect.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwippselect.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/kmwippselect.h 4 Jan 2004 17:52:28 -0000 1.3 +++ kdeprint/cups/kmwippselect.h 15 Mar 2004 10:30:23 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwother.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwother.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/cups/kmwother.cpp 21 May 2003 12:35:06 -0000 1.6 +++ kdeprint/cups/kmwother.cpp 15 Mar 2004 10:30:23 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwother.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwother.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/cups/kmwother.h 5 Sep 2002 09:39:48 -0000 1.2 +++ kdeprint/cups/kmwother.h 15 Mar 2004 10:30:23 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwquota.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwquota.cpp,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -3 -p -r1.6 -r1.6.4.1 --- kdeprint/cups/kmwquota.cpp 12 Aug 2002 19:38:47 -0000 1.6 +++ kdeprint/cups/kmwquota.cpp 15 Mar 2004 10:30:23 -0000 1.6.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwquota.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwquota.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/kmwquota.h 7 Aug 2001 08:05:50 -0000 1.1 +++ kdeprint/cups/kmwquota.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwusers.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwusers.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/kmwusers.cpp 12 Aug 2002 19:38:47 -0000 1.5 +++ kdeprint/cups/kmwusers.cpp 15 Mar 2004 10:30:23 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kmwusers.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kmwusers.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/kmwusers.h 7 Aug 2001 08:05:50 -0000 1.1 +++ kdeprint/cups/kmwusers.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kphpgl2page.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kphpgl2page.cpp,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/cups/kphpgl2page.cpp 13 Feb 2002 22:49:50 -0000 1.3 +++ kdeprint/cups/kphpgl2page.cpp 15 Mar 2004 10:30:23 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kphpgl2page.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kphpgl2page.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/kphpgl2page.h 10 Oct 2001 09:06:05 -0000 1.1 +++ kdeprint/cups/kphpgl2page.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kpimagepage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kpimagepage.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/cups/kpimagepage.cpp 2 Nov 2003 22:54:27 -0000 1.8 +++ kdeprint/cups/kpimagepage.cpp 15 Mar 2004 10:30:23 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kpimagepage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kpimagepage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/kpimagepage.h 9 Oct 2001 16:46:17 -0000 1.1 +++ kdeprint/cups/kpimagepage.h 15 Mar 2004 10:30:23 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kpschedulepage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kpschedulepage.cpp,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -3 -p -r1.12 -r1.12.2.1 --- kdeprint/cups/kpschedulepage.cpp 15 Oct 2003 14:40:42 -0000 1.12 +++ kdeprint/cups/kpschedulepage.cpp 15 Mar 2004 10:30:23 -0000 1.12.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kpschedulepage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kpschedulepage.h,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/cups/kpschedulepage.h 13 Feb 2002 14:51:16 -0000 1.3 +++ kdeprint/cups/kpschedulepage.h 15 Mar 2004 10:30:23 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kptagspage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kptagspage.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/cups/kptagspage.cpp 25 Oct 2003 21:18:33 -0000 1.5 +++ kdeprint/cups/kptagspage.cpp 15 Mar 2004 10:30:23 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kptagspage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kptagspage.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -3 -p -r1.1 -r1.1.4.1 --- kdeprint/cups/kptagspage.h 2 Apr 2002 15:44:06 -0000 1.1 +++ kdeprint/cups/kptagspage.h 15 Mar 2004 10:30:23 -0000 1.1.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kptextpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kptextpage.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/cups/kptextpage.cpp 26 May 2003 13:16:42 -0000 1.9 +++ kdeprint/cups/kptextpage.cpp 15 Mar 2004 10:30:23 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/kptextpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/kptextpage.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -3 -p -r1.3 -r1.3.4.1 --- kdeprint/cups/kptextpage.h 28 Mar 2002 09:21:11 -0000 1.3 +++ kdeprint/cups/kptextpage.h 15 Mar 2004 10:30:23 -0000 1.3.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.cpp 16 May 2003 11:13:29 -0000 1.5 +++ kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.cpp 15 Mar 2004 10:30:25 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.h 21 Aug 2001 12:47:43 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdbrowsingconnpage.h 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.cpp 16 May 2003 11:13:29 -0000 1.3 +++ kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.cpp 15 Mar 2004 10:30:25 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.h 21 Aug 2001 12:47:43 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdbrowsinggeneralpage.h 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdbrowsingmaskspage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdbrowsingrelaypage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.cpp 16 May 2003 11:13:29 -0000 1.4 +++ kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.cpp 15 Mar 2004 10:30:25 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdbrowsingtimeoutpage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdcomment.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdcomment.cpp,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -3 -p -r1.5 -r1.5.6.1 --- kdeprint/cups/cupsdconf/cupsdcomment.cpp 10 Oct 2001 17:40:38 -0000 1.5 +++ kdeprint/cups/cupsdconf/cupsdcomment.cpp 15 Mar 2004 10:30:25 -0000 1.5.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdcomment.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdcomment.h,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/cups/cupsdconf/cupsdcomment.h 25 Sep 2001 09:01:30 -0000 1.3 +++ kdeprint/cups/cupsdconf/cupsdcomment.h 15 Mar 2004 10:30:25 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdconf.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdconf.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/cups/cupsdconf/cupsdconf.cpp 11 Jun 2003 17:28:00 -0000 1.7 +++ kdeprint/cups/cupsdconf/cupsdconf.cpp 15 Mar 2004 10:30:25 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdconf.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdconf.h,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/cups/cupsdconf/cupsdconf.h 25 Sep 2001 09:01:30 -0000 1.3 +++ kdeprint/cups/cupsdconf/cupsdconf.h 15 Mar 2004 10:30:25 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsddialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsddialog.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/cupsdconf/cupsddialog.cpp 8 Jul 2002 21:06:46 -0000 1.5 +++ kdeprint/cups/cupsdconf/cupsddialog.cpp 15 Mar 2004 10:30:25 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsddialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsddialog.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/cupsddialog.h 25 Sep 2001 09:01:30 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsddialog.h 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdnetworkclientspage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdnetworkclientspage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdnetworkclientspage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdnetworkclientspage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdnetworkclientspage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdnetworkclientspage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdnetworkclientspage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdnetworkclientspage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdnetworkgeneralpage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdoption.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdoption.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdoption.cpp 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdoption.cpp 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdoption.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdoption.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdoption.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdoption.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdpage.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdpage.cpp 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdpage.cpp 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdpage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdpage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdpage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverdirpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverdirpage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdserverdirpage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdserverdirpage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverdirpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverdirpage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdserverdirpage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdserverdirpage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverencryptpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverencryptpage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdserverencryptpage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdserverencryptpage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverencryptpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverencryptpage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdserverencryptpage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdserverencryptpage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverhttppage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverhttppage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdserverhttppage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdserverhttppage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverhttppage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverhttppage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdserverhttppage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdserverhttppage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserveridentitypage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserveridentitypage.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/cupsdconf/cupsdserveridentitypage.cpp 16 May 2003 11:13:29 -0000 1.3 +++ kdeprint/cups/cupsdconf/cupsdserveridentitypage.cpp 15 Mar 2004 10:30:25 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserveridentitypage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserveridentitypage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdserveridentitypage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdserveridentitypage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverjobpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverjobpage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdserverjobpage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdserverjobpage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverjobpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverjobpage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf/cupsdserverjobpage.h 21 Aug 2001 12:47:43 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdserverjobpage.h 15 Mar 2004 10:30:25 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverlogpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverlogpage.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupsdserverlogpage.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdserverlogpage.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserverlogpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserverlogpage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdserverlogpage.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdserverlogpage.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdservermiscpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdservermiscpage.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/cups/cupsdconf/cupsdservermiscpage.cpp 16 May 2003 11:13:29 -0000 1.5 +++ kdeprint/cups/cupsdconf/cupsdservermiscpage.cpp 15 Mar 2004 10:30:25 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdservermiscpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdservermiscpage.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/cupsdservermiscpage.h 21 Aug 2001 12:47:43 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdservermiscpage.h 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserversecuritypage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserversecuritypage.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/cupsdconf/cupsdserversecuritypage.cpp 16 May 2003 11:13:29 -0000 1.3 +++ kdeprint/cups/cupsdconf/cupsdserversecuritypage.cpp 15 Mar 2004 10:30:25 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdserversecuritypage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdserversecuritypage.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/cupsdserversecuritypage.h 25 Sep 2001 09:01:30 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdserversecuritypage.h 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdsplash.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdsplash.cpp,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/cupsdsplash.cpp 10 Oct 2001 17:40:38 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupsdsplash.cpp 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsdsplash.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsdsplash.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsdsplash.h 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsdsplash.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslist.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslist.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupslist.cpp 30 Mar 2001 21:48:47 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupslist.cpp 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslist.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslist.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/cupslist.h 19 Aug 2001 12:01:42 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupslist.h 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslocationaccess.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslocationaccess.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupslocationaccess.cpp 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupslocationaccess.cpp 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslocationaccess.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslocationaccess.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupslocationaccess.h 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupslocationaccess.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslocationdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslocationdialog.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/cupsdconf/cupslocationdialog.cpp 17 Sep 2002 20:33:08 -0000 1.5 +++ kdeprint/cups/cupsdconf/cupslocationdialog.cpp 15 Mar 2004 10:30:25 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslocationdialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslocationdialog.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupslocationdialog.h 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupslocationdialog.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslocationgeneral.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslocationgeneral.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/cups/cupsdconf/cupslocationgeneral.cpp 16 May 2003 11:13:29 -0000 1.2 +++ kdeprint/cups/cupsdconf/cupslocationgeneral.cpp 15 Mar 2004 10:30:25 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupslocationgeneral.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupslocationgeneral.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupslocationgeneral.h 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupslocationgeneral.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsrelay.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsrelay.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsrelay.cpp 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsrelay.cpp 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/cupsrelay.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/cupsrelay.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/cupsrelay.h 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/cupsrelay.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/main.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/main.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/cups/cupsdconf/main.cpp 13 Oct 2003 21:31:58 -0000 1.3 +++ kdeprint/cups/cupsdconf/main.cpp 15 Mar 2004 10:30:25 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/mydialogbase.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/mydialogbase.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/cupsdconf/mydialogbase.cpp 17 Sep 2002 20:33:08 -0000 1.5 +++ kdeprint/cups/cupsdconf/mydialogbase.cpp 15 Mar 2004 10:30:25 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/mydialogbase.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/mydialogbase.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/mydialogbase.h 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/mydialogbase.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/qdirlineedit.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/qdirlineedit.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/qdirlineedit.cpp 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/qdirlineedit.cpp 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/qdirlineedit.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/qdirlineedit.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/cups/cupsdconf/qdirlineedit.h 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/cups/cupsdconf/qdirlineedit.h 15 Mar 2004 10:30:25 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/qinputbox.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/qinputbox.cpp,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/qinputbox.cpp 19 Aug 2001 12:01:42 -0000 1.2 +++ kdeprint/cups/cupsdconf/qinputbox.cpp 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf/qinputbox.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf/qinputbox.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf/qinputbox.h 25 Sep 2001 09:01:30 -0000 1.2 +++ kdeprint/cups/cupsdconf/qinputbox.h 15 Mar 2004 10:30:25 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/Makefile.am =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/Makefile.am,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -3 -p -r1.10.2.1 -r1.10.2.2 --- kdeprint/cups/cupsdconf2/Makefile.am 26 Jan 2004 22:06:46 -0000 1.10.2.1 +++ kdeprint/cups/cupsdconf2/Makefile.am 29 Feb 2004 15:51:31 -0000 1.10.2.2 @@ -1,4 +1,4 @@ -#$Id: Makefile.am,v 1.10.2.1 2004/01/26 22:06:46 domi Exp $ +#$Id: Makefile.am,v 1.10.2.2 2004/02/29 15:51:31 scripty Exp $ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includes) @@ -31,5 +31,5 @@ cupsdconfdatadir = $(kde_datadir)/kdep # Translations messages: perl cupsdcomment.pl < cupsd.conf.template > cupsd.conf.template.cpp - $(XGETTEXT) $(libcupsdconf_la_SOURCES) main.cpp cupsd.conf.template.cpp -o $(podir)/cupsdconf.pot + $(XGETTEXT) *.cpp -o $(podir)/cupsdconf.pot rm -f cupsd.conf.template.cpp Index: kdeprint/cups/cupsdconf2/addressdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/addressdialog.cpp,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/cups/cupsdconf2/addressdialog.cpp 11 Sep 2002 12:24:07 -0000 1.4 +++ kdeprint/cups/cupsdconf2/addressdialog.cpp 15 Mar 2004 10:30:26 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/addressdialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/addressdialog.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/addressdialog.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/addressdialog.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/browsedialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/browsedialog.cpp,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -3 -p -r1.3 -r1.3.4.1 --- kdeprint/cups/cupsdconf2/browsedialog.cpp 12 May 2002 19:00:31 -0000 1.3 +++ kdeprint/cups/cupsdconf2/browsedialog.cpp 15 Mar 2004 10:30:26 -0000 1.3.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/browsedialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/browsedialog.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf2/browsedialog.h 20 Feb 2002 12:33:19 -0000 1.2 +++ kdeprint/cups/cupsdconf2/browsedialog.h 15 Mar 2004 10:30:26 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cups-util.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cups-util.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cups-util.h 4 Oct 2001 14:18:15 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cups-util.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsd.conf.template =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsd.conf.template,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/cups/cupsdconf2/cupsd.conf.template 20 Sep 2003 16:55:57 -0000 1.7 +++ kdeprint/cups/cupsdconf2/cupsd.conf.template 15 Mar 2004 10:30:26 -0000 1.7.2.1 @@ -5,7 +5,7 @@ # in KDEPrint. The predecessors to KDEPrint in former KDE releases # were KUPS and QtCUPS; they are deprecated and no longer maintained. # -# Author: Michael Goffioul +# Author: Michael Goffioul # # Web site: http://printing.kde.org/ # Index: kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp 16 May 2003 11:13:29 -0000 1.4 +++ kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp 15 Mar 2004 10:30:26 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdcomment.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdcomment.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/cupsdconf2/cupsdcomment.cpp 16 Sep 2002 08:10:54 -0000 1.5 +++ kdeprint/cups/cupsdconf2/cupsdcomment.cpp 15 Mar 2004 10:30:26 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdcomment.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdcomment.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdcomment.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdcomment.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdconf.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdconf.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/cups/cupsdconf2/cupsdconf.cpp 19 May 2003 15:29:07 -0000 1.10 +++ kdeprint/cups/cupsdconf2/cupsdconf.cpp 15 Mar 2004 10:30:26 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdconf.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdconf.h,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/cupsdconf2/cupsdconf.h 15 Jun 2002 15:57:49 -0000 1.5 +++ kdeprint/cups/cupsdconf2/cupsdconf.h 15 Mar 2004 10:30:26 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsddialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsddialog.cpp,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -3 -p -r1.18 -r1.18.2.1 --- kdeprint/cups/cupsdconf2/cupsddialog.cpp 16 Jan 2003 12:40:56 -0000 1.18 +++ kdeprint/cups/cupsdconf2/cupsddialog.cpp 15 Mar 2004 10:30:26 -0000 1.18.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsddialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsddialog.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/cups/cupsdconf2/cupsddialog.h 16 Jun 2002 17:54:39 -0000 1.4 +++ kdeprint/cups/cupsdconf2/cupsddialog.h 15 Mar 2004 10:30:26 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsddirpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsddirpage.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/cups/cupsdconf2/cupsddirpage.cpp 26 Oct 2003 10:06:59 -0000 1.6 +++ kdeprint/cups/cupsdconf2/cupsddirpage.cpp 15 Mar 2004 10:30:26 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsddirpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsddirpage.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf2/cupsddirpage.h 12 Feb 2002 15:58:30 -0000 1.2 +++ kdeprint/cups/cupsdconf2/cupsddirpage.h 15 Mar 2004 10:30:26 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp 16 May 2003 11:13:29 -0000 1.6 +++ kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp 15 Mar 2004 10:30:26 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdfilterpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdfilterpage.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/cups/cupsdconf2/cupsdfilterpage.h 15 Jun 2002 15:57:49 -0000 1.4 +++ kdeprint/cups/cupsdconf2/cupsdfilterpage.h 15 Mar 2004 10:30:26 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdjobspage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdjobspage.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/cupsdconf2/cupsdjobspage.cpp 16 May 2003 11:13:29 -0000 1.4 +++ kdeprint/cups/cupsdconf2/cupsdjobspage.cpp 15 Mar 2004 10:30:26 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdjobspage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdjobspage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdjobspage.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdjobspage.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdlogpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdlogpage.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/cupsdconf2/cupsdlogpage.cpp 16 May 2003 11:13:29 -0000 1.4 +++ kdeprint/cups/cupsdconf2/cupsdlogpage.cpp 15 Mar 2004 10:30:26 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdlogpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdlogpage.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/cups/cupsdconf2/cupsdlogpage.h 15 Jun 2002 15:57:49 -0000 1.2 +++ kdeprint/cups/cupsdconf2/cupsdlogpage.h 15 Mar 2004 10:30:26 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp 16 May 2003 11:13:29 -0000 1.6 +++ kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp 15 Mar 2004 10:30:26 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdnetworkpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdnetworkpage.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/cups/cupsdconf2/cupsdnetworkpage.h 15 Jun 2002 15:57:49 -0000 1.2 +++ kdeprint/cups/cupsdconf2/cupsdnetworkpage.h 15 Mar 2004 10:30:26 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdpage.cpp,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdpage.cpp 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdpage.cpp 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdpage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdpage.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdpage.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp 16 May 2003 11:13:29 -0000 1.4 +++ kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp 15 Mar 2004 10:30:26 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdsecuritypage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdsecuritypage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdsecuritypage.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdsecuritypage.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdserverpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/cups/cupsdconf2/cupsdserverpage.cpp 16 May 2003 11:13:29 -0000 1.4 +++ kdeprint/cups/cupsdconf2/cupsdserverpage.cpp 15 Mar 2004 10:30:26 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdserverpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdserverpage.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdserverpage.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdserverpage.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdsplash.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdsplash.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -3 -p -r1.3.2.1 -r1.3.2.2 --- kdeprint/cups/cupsdconf2/cupsdsplash.cpp 26 Feb 2004 15:05:51 -0000 1.3.2.1 +++ kdeprint/cups/cupsdconf2/cupsdsplash.cpp 15 Mar 2004 10:30:26 -0000 1.3.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/cupsdsplash.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/cupsdsplash.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/cupsdsplash.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/cupsdsplash.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/editlist.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/editlist.cpp,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/cups/cupsdconf2/editlist.cpp 1 Mar 2002 01:24:35 -0000 1.3 +++ kdeprint/cups/cupsdconf2/editlist.cpp 15 Mar 2004 10:30:26 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/editlist.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/editlist.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/editlist.h 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/editlist.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/locationdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/locationdialog.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/cupsdconf2/locationdialog.cpp 14 Sep 2002 01:43:44 -0000 1.5 +++ kdeprint/cups/cupsdconf2/locationdialog.cpp 15 Mar 2004 10:30:26 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/locationdialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/locationdialog.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf2/locationdialog.h 20 Feb 2002 12:33:19 -0000 1.2 +++ kdeprint/cups/cupsdconf2/locationdialog.h 15 Mar 2004 10:30:26 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/main.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/main.cpp,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -3 -p -r1.4.2.1 -r1.4.2.2 --- kdeprint/cups/cupsdconf2/main.cpp 26 Jan 2004 22:06:46 -0000 1.4.2.1 +++ kdeprint/cups/cupsdconf2/main.cpp 15 Mar 2004 10:30:26 -0000 1.4.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/portdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/portdialog.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/cups/cupsdconf2/portdialog.cpp 12 Aug 2002 19:38:47 -0000 1.5 +++ kdeprint/cups/cupsdconf2/portdialog.cpp 15 Mar 2004 10:30:26 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/portdialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/portdialog.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/cups/cupsdconf2/portdialog.h 20 Feb 2002 12:33:19 -0000 1.2 +++ kdeprint/cups/cupsdconf2/portdialog.h 15 Mar 2004 10:30:26 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/qdirlineedit.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/qdirlineedit.cpp,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/qdirlineedit.cpp 25 Sep 2001 09:03:47 -0000 1.1 +++ kdeprint/cups/cupsdconf2/qdirlineedit.cpp 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/qdirlineedit.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/qdirlineedit.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/cups/cupsdconf2/qdirlineedit.h 6 Jun 2002 18:47:51 -0000 1.2 +++ kdeprint/cups/cupsdconf2/qdirlineedit.h 15 Mar 2004 10:30:26 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp 12 Feb 2002 15:58:30 -0000 1.1 +++ kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/qdirmultilineedit.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/qdirmultilineedit.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/cups/cupsdconf2/qdirmultilineedit.h 12 Feb 2002 15:58:30 -0000 1.1 +++ kdeprint/cups/cupsdconf2/qdirmultilineedit.h 15 Mar 2004 10:30:26 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/sizewidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/sizewidget.cpp,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -3 -p -r1.1 -r1.1.4.1 --- kdeprint/cups/cupsdconf2/sizewidget.cpp 15 Jun 2002 15:57:49 -0000 1.1 +++ kdeprint/cups/cupsdconf2/sizewidget.cpp 15 Mar 2004 10:30:26 -0000 1.1.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/cups/cupsdconf2/sizewidget.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/sizewidget.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -3 -p -r1.1 -r1.1.4.1 --- kdeprint/cups/cupsdconf2/sizewidget.h 15 Jun 2002 15:57:49 -0000 1.1 +++ kdeprint/cups/cupsdconf2/sizewidget.h 15 Mar 2004 10:30:26 -0000 1.1.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ext/ext.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/ext.print,v retrieving revision 1.122.2.2 retrieving revision 1.122.2.3 diff -u -3 -p -r1.122.2.2 -r1.122.2.3 --- kdeprint/ext/ext.print 11 Feb 2004 16:59:13 -0000 1.122.2.2 +++ kdeprint/ext/ext.print 29 Feb 2004 15:29:37 -0000 1.122.2.3 @@ -49,6 +49,7 @@ Comment[se]=Čálit olggoldas prográmma Comment[sk]=Tlač pomocou externého programu (generické) Comment[sl]=Tiskanje skozi zunanji program (splošno) Comment[sr]=Штампање преко спољњег програма (генерички) +Comment[sr@Latn]=Štampanje preko spoljnjeg programa (generički) Comment[ss]=Shicelela ngekusebentisa luhlelo lwangaphandle (banti) Comment[sv]=Skriv ut genom ett externt program (generellt) Comment[ta]=புற நிரலொன்றின் மூலம் அச்சிடவும் (பொது) Index: kdeprint/ext/kextprinterimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/kextprinterimpl.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/ext/kextprinterimpl.cpp 28 Jul 2003 08:29:32 -0000 1.5 +++ kdeprint/ext/kextprinterimpl.cpp 15 Mar 2004 10:30:27 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ext/kextprinterimpl.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/kextprinterimpl.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/ext/kextprinterimpl.h 28 Jul 2003 08:29:32 -0000 1.3 +++ kdeprint/ext/kextprinterimpl.h 15 Mar 2004 10:30:27 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ext/kmextfactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/kmextfactory.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/ext/kmextfactory.cpp 28 Jul 2003 08:29:32 -0000 1.4 +++ kdeprint/ext/kmextfactory.cpp 15 Mar 2004 10:30:27 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ext/kmextmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/kmextmanager.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/ext/kmextmanager.cpp 28 Jul 2003 08:29:32 -0000 1.4 +++ kdeprint/ext/kmextmanager.cpp 15 Mar 2004 10:30:27 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ext/kmextmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/kmextmanager.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/ext/kmextmanager.h 28 Jul 2003 08:29:32 -0000 1.3 +++ kdeprint/ext/kmextmanager.h 15 Mar 2004 10:30:27 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ext/kmextuimanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/kmextuimanager.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -3 -p -r1.3.2.1 -r1.3.2.2 --- kdeprint/ext/kmextuimanager.cpp 24 Feb 2004 08:51:30 -0000 1.3.2.1 +++ kdeprint/ext/kmextuimanager.cpp 15 Mar 2004 10:30:27 -0000 1.3.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/ext/kmextuimanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/kmextuimanager.h,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -3 -p -r1.3.2.1 -r1.3.2.2 --- kdeprint/ext/kmextuimanager.h 24 Feb 2004 08:51:30 -0000 1.3.2.1 +++ kdeprint/ext/kmextuimanager.h 15 Mar 2004 10:30:27 -0000 1.3.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/filters/enscript.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/enscript.desktop,v retrieving revision 1.126.2.2 retrieving revision 1.126.2.3 diff -u -3 -p -r1.126.2.2 -r1.126.2.3 --- kdeprint/filters/enscript.desktop 11 Feb 2004 16:59:15 -0000 1.126.2.2 +++ kdeprint/filters/enscript.desktop 29 Feb 2004 15:29:39 -0000 1.126.2.3 @@ -62,6 +62,7 @@ Comment[se]=Enscript teakstasilli Comment[sk]=Textový filter Enscript Comment[sl]=Besedilni filter enscript Comment[sr]=Enscript филтер за текст +Comment[sr@Latn]=Enscript filter za tekst Comment[ss]=Bhala ngemakhodi sisefo sembhalo Comment[sv]=Enscript-textfilter Comment[ta]=Enscript உரை வடிகட்டி Index: kdeprint/filters/imagetops.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/imagetops.desktop,v retrieving revision 1.126.2.2 retrieving revision 1.126.2.3 diff -u -3 -p -r1.126.2.2 -r1.126.2.3 --- kdeprint/filters/imagetops.desktop 11 Feb 2004 16:59:17 -0000 1.126.2.2 +++ kdeprint/filters/imagetops.desktop 29 Feb 2004 15:29:41 -0000 1.126.2.3 @@ -11,6 +11,7 @@ Name[nl]=Imagetops Name[nso]=mabogodimo a diponagalo Name[pt_BR]=Imagenstops Name[sr]=врхови слика +Name[sr@Latn]=vrhovi slika Name[sv]=Bildtoppar Name[tg]=баландтарини тасврирҳо Name[ven]=Zwa ntha zwa zwifanyiso @@ -64,6 +65,7 @@ Comment[se]=Oppalaš govva PS:ai filter Comment[sk]=Generický filter z obrázku do PS Comment[sl]=Filter iz splošnih slik v postscript Comment[sr]=Генерички „слика у PS“ филтер +Comment[sr@Latn]=Generički „slika u PS“ filter Comment[ss]=Umfanekiso lobanti kusisefo sePS Comment[sv]=Generell bild till PS-filter Comment[tg]=тасвири умумӣ барои газполои PS Index: kdeprint/filters/pdfwrite.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/pdfwrite.desktop,v retrieving revision 1.127.2.2 retrieving revision 1.127.2.3 diff -u -3 -p -r1.127.2.2 -r1.127.2.3 --- kdeprint/filters/pdfwrite.desktop 11 Feb 2004 16:59:19 -0000 1.127.2.2 +++ kdeprint/filters/pdfwrite.desktop 29 Feb 2004 15:29:43 -0000 1.127.2.3 @@ -60,6 +60,7 @@ Comment[se]=PDF-čálli (dárbbaša Ghos Comment[sk]=PDF Writer (vyžaduje GhostScript) Comment[sl]=Izdelovalnik PDF (potrebuje GhostScript) Comment[sr]=PDF Writer (писач, захтева GhostScript) +Comment[sr@Latn]=PDF Writer (pisač, zahteva GhostScript) Comment[ss]=Umbhali we PDF (yidzinga i-Ghostscript) Comment[sv]=PDF-skrivare (behöver Ghostscript) Comment[ta]=PDF எழுதி (Ghostscript தேவை) Index: kdeprint/filters/pdfwrite.xml =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/pdfwrite.xml,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/filters/pdfwrite.xml 10 Aug 2001 15:41:34 -0000 1.3 +++ kdeprint/filters/pdfwrite.xml 19 Mar 2004 15:15:37 -0000 1.3.6.1 @@ -1,6 +1,6 @@ - + Index: kdeprint/filters/ps2pdf.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/ps2pdf.desktop,v retrieving revision 1.104.2.2 retrieving revision 1.104.2.3 diff -u -3 -p -r1.104.2.2 -r1.104.2.3 --- kdeprint/filters/ps2pdf.desktop 11 Feb 2004 16:59:23 -0000 1.104.2.2 +++ kdeprint/filters/ps2pdf.desktop 29 Feb 2004 15:29:47 -0000 1.104.2.3 @@ -54,6 +54,7 @@ Comment[se]=Konverter PostScript:as PDF' Comment[sk]=Prevod súborov PostScript do PDF Comment[sl]=Pretvornik datotek PostScript v PDF Comment[sr]=Конвертор из PostScript-а у PDF +Comment[sr@Latn]=Konvertor iz PostScript-a u PDF Comment[ss]=Kusukela ku-PostScript kuya kusiguculi se PDF Comment[sv]=Postscript till PDF-konverterare Comment[ta]=PostScript இலிருந்து PDF இற்கு மாற்றி Index: kdeprint/filters/ps2pdf.xml =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/ps2pdf.xml,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/filters/ps2pdf.xml 29 Jul 2002 08:23:57 -0000 1.5 +++ kdeprint/filters/ps2pdf.xml 19 Mar 2004 15:15:37 -0000 1.5.4.1 @@ -1,6 +1,6 @@ - + Index: kdeprint/filters/psbook.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psbook.desktop,v retrieving revision 1.102.2.1 retrieving revision 1.102.2.2 diff -u -3 -p -r1.102.2.1 -r1.102.2.2 --- kdeprint/filters/psbook.desktop 11 Feb 2004 16:59:25 -0000 1.102.2.1 +++ kdeprint/filters/psbook.desktop 29 Feb 2004 15:29:49 -0000 1.102.2.2 @@ -56,6 +56,7 @@ Comment[se]=Gihppagačča čáliheapmi ( Comment[sk]=Tlač brožúry (použitie s obojstrannou tlačou na krátkom okraji) Comment[sl]=Tiskanje pamfletov (uporabljajte pri dupleksnem tiskanju z malim robom) Comment[sr]=Штампање памфлета (користите са дуплекс штампањем малих страна) +Comment[sr@Latn]=Štampanje pamfleta (koristite sa dupleks štampanjem malih strana) Comment[ss]=Kushicelela emapheshana (sebentisa nelicadzi lelincane lekushicelela lokuphindaphindziwe) Comment[sv]=Broschyrutskrift (använd med duplexutskrift längs kortsidan) Comment[ta]=கைநூல் பதிப்பு (சிறு பக்க இரட்டை அச்சுடன் பாவிக்கவும்) Index: kdeprint/filters/psbook1.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psbook1.desktop,v retrieving revision 1.103.2.1 retrieving revision 1.103.2.2 diff -u -3 -p -r1.103.2.1 -r1.103.2.2 --- kdeprint/filters/psbook1.desktop 11 Feb 2004 16:59:27 -0000 1.103.2.1 +++ kdeprint/filters/psbook1.desktop 29 Feb 2004 15:29:51 -0000 1.103.2.2 @@ -58,6 +58,7 @@ Comment[se]=Gihppagačča čáliheapmi - Comment[sk]=Tlač brožúry - párne stránky (krok 1) Comment[sl]=Tiskanje pamfletov - sode strani (1. korak) Comment[sr]=Штампање памфлета - парне стране (корак 1) +Comment[sr@Latn]=Štampanje pamfleta - parne strane (korak 1) Comment[sv]=Broschyrutskrift - jämna sidor (steg 1) Comment[ta]=கைநூல் பதிப்பு - இரட்டைப் பக்கங்கள் (படி 1) Comment[tg]=Ҳаҷвияи Чоп Кардани - Саҳифаҳои Баробар (иқдоми 1) Index: kdeprint/filters/psbook2.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psbook2.desktop,v retrieving revision 1.102.2.1 retrieving revision 1.102.2.2 diff -u -3 -p -r1.102.2.1 -r1.102.2.2 --- kdeprint/filters/psbook2.desktop 11 Feb 2004 16:59:29 -0000 1.102.2.1 +++ kdeprint/filters/psbook2.desktop 29 Feb 2004 15:29:53 -0000 1.102.2.2 @@ -58,6 +58,7 @@ Comment[se]=Gihppagačča čáliheapmi - Comment[sk]=Tlač brožúry - nepárne stránky (krok 2) Comment[sl]=Tiskanje pamfletov - lihe strani (2. korak) Comment[sr]=Штампање памфлета - непарне стране (корак 2) +Comment[sr@Latn]=Štampanje pamfleta - neparne strane (korak 2) Comment[ss]=Kushicelela emapheshana - Emakhasi labala ngalokuzuba kunye (sigama 2) Comment[sv]=Broschyrutskrift - udda sidor (steg 2) Comment[ta]=கைநூல் பதிப்பு - ஒற்றைப் பக்கங்கள் (படி 2) Index: kdeprint/filters/psnup.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psnup.desktop,v retrieving revision 1.120.2.1 retrieving revision 1.120.2.2 diff -u -3 -p -r1.120.2.1 -r1.120.2.2 --- kdeprint/filters/psnup.desktop 11 Feb 2004 16:59:31 -0000 1.120.2.1 +++ kdeprint/filters/psnup.desktop 29 Feb 2004 15:29:55 -0000 1.120.2.2 @@ -48,6 +48,7 @@ Comment[se]=Máŋga siiddu ovtta báhpá Comment[sk]=Filter pre viac strán na jednom liste Comment[sl]=Filter za več strani na enem listu papirja. Comment[sr]=Филтер за вишеструке стране по листу +Comment[sr@Latn]=Filter za višestruke strane po listu Comment[ss]=Emakhasi laphindzaphindziwe kuya ngelishidi lesisefo Comment[sv]=Filter för flera sidor per blad Comment[tg]=Саҳифаҳо Ҳар Як Газполои Варақ Зарб Задан Index: kdeprint/filters/psnup.xml =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psnup.xml,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/filters/psnup.xml 21 May 2003 13:20:46 -0000 1.5 +++ kdeprint/filters/psnup.xml 1 Mar 2004 09:30:49 -0000 1.5.2.1 @@ -9,7 +9,7 @@ - + Index: kdeprint/filters/psresize.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psresize.desktop,v retrieving revision 1.83.2.1 retrieving revision 1.83.2.2 diff -u -3 -p -r1.83.2.1 -r1.83.2.2 --- kdeprint/filters/psresize.desktop 11 Feb 2004 16:59:33 -0000 1.83.2.1 +++ kdeprint/filters/psresize.desktop 29 Feb 2004 15:29:57 -0000 1.83.2.2 @@ -57,6 +57,7 @@ Comment[se]=Skále čállosa sisdoalu he Comment[sk]=Roztiahnutie tlače pre iný rozmer papiera Comment[sl]=Prilagajanje vsebine tiskanja za drugo velikost papirja Comment[sr]=Увећава или умањује садржај за штампање како би стао на папир друге величине +Comment[sr@Latn]=Uvećava ili umanjuje sadržaj za štampanje kako bi stao na papir druge veličine Comment[ss]=Sikali sishicilela lokucuketfwe kuze kwanele bukhulu balelinye liphepha Comment[sv]=Ändra storlek på utskriften för att passa en annan sidstorlek Comment[ta]=வேறொரு பக்க அளவிற்கு பொருந்துமாறு அச்சு உள்ளடக்கங்களை உருமாற்று Index: kdeprint/filters/psselect.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psselect.desktop,v retrieving revision 1.108.2.1 retrieving revision 1.108.2.2 diff -u -3 -p -r1.108.2.1 -r1.108.2.2 --- kdeprint/filters/psselect.desktop 11 Feb 2004 16:59:35 -0000 1.108.2.1 +++ kdeprint/filters/psselect.desktop 29 Feb 2004 15:29:59 -0000 1.108.2.2 @@ -55,6 +55,7 @@ Comment[se]=Siidduid válljema/ordnema f Comment[sk]=Filter pre výber strán a ich poradie Comment[sl]=Filter za izbiranje/naročanje strani Comment[sr]=Филтер за избор и ређање страница +Comment[sr@Latn]=Filter za izbor i ređanje stranica Comment[ss]=kukhetfwa kwelikhasi/ku-oda sisefo Comment[sv]=Filter för sidval och sidordning Comment[ta]=பக்கத் தேர்வு/ஒழுங்கு வடிகட்டி Index: kdeprint/foomatic/kfoomaticprinterimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic/kfoomaticprinterimpl.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/foomatic/kfoomaticprinterimpl.cpp 28 Jul 2003 08:29:32 -0000 1.4 +++ kdeprint/foomatic/kfoomaticprinterimpl.cpp 15 Mar 2004 10:30:28 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/foomatic/kfoomaticprinterimpl.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic/kfoomaticprinterimpl.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/foomatic/kfoomaticprinterimpl.h 28 Jul 2003 08:29:32 -0000 1.2 +++ kdeprint/foomatic/kfoomaticprinterimpl.h 15 Mar 2004 10:30:28 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/foomatic/kmfoomaticfactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic/kmfoomaticfactory.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/foomatic/kmfoomaticfactory.cpp 28 Jul 2003 08:29:32 -0000 1.3 +++ kdeprint/foomatic/kmfoomaticfactory.cpp 15 Mar 2004 10:30:28 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/foomatic/kmfoomaticmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic/kmfoomaticmanager.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/foomatic/kmfoomaticmanager.cpp 28 Jul 2003 08:29:32 -0000 1.4 +++ kdeprint/foomatic/kmfoomaticmanager.cpp 15 Mar 2004 10:30:28 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/foomatic/kmfoomaticmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic/kmfoomaticmanager.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/foomatic/kmfoomaticmanager.h 28 Jul 2003 08:29:32 -0000 1.2 +++ kdeprint/foomatic/kmfoomaticmanager.h 15 Mar 2004 10:30:28 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/foomatic/make_driver_db_foomatic.c =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic/make_driver_db_foomatic.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/foomatic/make_driver_db_foomatic.c 7 Dec 2002 16:39:38 -0000 1.2 +++ kdeprint/foomatic/make_driver_db_foomatic.c 15 Mar 2004 10:30:28 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/gschecker.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/gschecker.cpp,v retrieving revision 1.2 retrieving revision 1.2.8.1 diff -u -3 -p -r1.2 -r1.2.8.1 --- kdeprint/lpd/gschecker.cpp 24 Apr 2001 14:52:07 -0000 1.2 +++ kdeprint/lpd/gschecker.cpp 15 Mar 2004 10:30:28 -0000 1.2.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/gschecker.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/gschecker.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/lpd/gschecker.h 22 Apr 2001 19:07:48 -0000 1.1 +++ kdeprint/lpd/gschecker.h 15 Mar 2004 10:30:28 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/klpdprinterimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/klpdprinterimpl.cpp,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -3 -p -r1.12 -r1.12.2.1 --- kdeprint/lpd/klpdprinterimpl.cpp 4 Jan 2004 17:52:29 -0000 1.12 +++ kdeprint/lpd/klpdprinterimpl.cpp 15 Mar 2004 10:30:28 -0000 1.12.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/klpdprinterimpl.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/klpdprinterimpl.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/lpd/klpdprinterimpl.h 4 Jan 2004 17:52:29 -0000 1.4 +++ kdeprint/lpd/klpdprinterimpl.h 15 Mar 2004 10:30:28 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/kmlpdfactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/kmlpdfactory.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/lpd/kmlpdfactory.cpp 4 Jan 2004 17:52:29 -0000 1.5 +++ kdeprint/lpd/kmlpdfactory.cpp 15 Mar 2004 10:30:28 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/kmlpdfactory.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/kmlpdfactory.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/lpd/kmlpdfactory.h 4 Jan 2004 17:52:29 -0000 1.3 +++ kdeprint/lpd/kmlpdfactory.h 15 Mar 2004 10:30:28 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/kmlpdmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/kmlpdmanager.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- kdeprint/lpd/kmlpdmanager.cpp 4 Jan 2004 17:52:29 -0000 1.21 +++ kdeprint/lpd/kmlpdmanager.cpp 15 Mar 2004 10:30:28 -0000 1.21.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/kmlpdmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/kmlpdmanager.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/lpd/kmlpdmanager.h 4 Jan 2004 17:52:29 -0000 1.7 +++ kdeprint/lpd/kmlpdmanager.h 15 Mar 2004 10:30:28 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/kmlpduimanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/kmlpduimanager.cpp,v retrieving revision 1.4 retrieving revision 1.4.8.1 diff -u -3 -p -r1.4 -r1.4.8.1 --- kdeprint/lpd/kmlpduimanager.cpp 28 Jun 2001 08:59:15 -0000 1.4 +++ kdeprint/lpd/kmlpduimanager.cpp 15 Mar 2004 10:30:28 -0000 1.4.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/kmlpduimanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/kmlpduimanager.h,v retrieving revision 1.2 retrieving revision 1.2.8.1 diff -u -3 -p -r1.2 -r1.2.8.1 --- kdeprint/lpd/kmlpduimanager.h 22 Apr 2001 19:07:05 -0000 1.2 +++ kdeprint/lpd/kmlpduimanager.h 15 Mar 2004 10:30:28 -0000 1.2.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/lpd.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/lpd.print,v retrieving revision 1.101.2.2 retrieving revision 1.101.2.3 diff -u -3 -p -r1.101.2.2 -r1.101.2.3 --- kdeprint/lpd/lpd.print 11 Feb 2004 16:59:40 -0000 1.101.2.2 +++ kdeprint/lpd/lpd.print 29 Feb 2004 15:30:03 -0000 1.101.2.3 @@ -51,6 +51,7 @@ Comment[se]=LPR (Standárda BSD čáliha Comment[sk]=LPR (Štandardný tlačový systém BSD) Comment[sl]=LPR (običajni tiskalniški sistem iz BSD) Comment[sr]=LPR (стандардни BSD систем за штампање) +Comment[sr@Latn]=LPR (standardni BSD sistem za štampanje) Comment[ss]=LPR (Umhini wekushicelela welizinga le BSD) Comment[sv]=LPR (Standardskrivarsystem för BSD) Comment[tg]=LPR (BSD Системаи чоп кардани стандартӣ) Index: kdeprint/lpd/lpdtools.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/lpdtools.cpp,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -3 -p -r1.5 -r1.5.6.1 --- kdeprint/lpd/lpdtools.cpp 23 Sep 2001 12:19:16 -0000 1.5 +++ kdeprint/lpd/lpdtools.cpp 15 Mar 2004 10:30:28 -0000 1.5.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/lpdtools.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/lpdtools.h,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -3 -p -r1.5 -r1.5.6.1 --- kdeprint/lpd/lpdtools.h 23 Sep 2001 12:19:16 -0000 1.5 +++ kdeprint/lpd/lpdtools.h 15 Mar 2004 10:30:28 -0000 1.5.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpd/make_driver_db_lpd.c =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/make_driver_db_lpd.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/lpd/make_driver_db_lpd.c 10 Dec 2002 22:36:56 -0000 1.3 +++ kdeprint/lpd/make_driver_db_lpd.c 15 Mar 2004 10:30:28 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/klpdunixprinterimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/klpdunixprinterimpl.cpp,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -3 -p -r1.14 -r1.14.2.1 --- kdeprint/lpdunix/klpdunixprinterimpl.cpp 4 Jan 2004 17:52:30 -0000 1.14 +++ kdeprint/lpdunix/klpdunixprinterimpl.cpp 15 Mar 2004 10:30:28 -0000 1.14.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/klpdunixprinterimpl.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/klpdunixprinterimpl.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/lpdunix/klpdunixprinterimpl.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/lpdunix/klpdunixprinterimpl.h 15 Mar 2004 10:30:28 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/kmlpdunixfactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/kmlpdunixfactory.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/lpdunix/kmlpdunixfactory.cpp 4 Jan 2004 17:52:30 -0000 1.7 +++ kdeprint/lpdunix/kmlpdunixfactory.cpp 15 Mar 2004 10:30:28 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/kmlpdunixmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/kmlpdunixmanager.cpp,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -3 -p -r1.14 -r1.14.2.1 --- kdeprint/lpdunix/kmlpdunixmanager.cpp 4 Jan 2004 17:52:30 -0000 1.14 +++ kdeprint/lpdunix/kmlpdunixmanager.cpp 15 Mar 2004 10:30:28 -0000 1.14.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/kmlpdunixmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/kmlpdunixmanager.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/lpdunix/kmlpdunixmanager.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/lpdunix/kmlpdunixmanager.h 15 Mar 2004 10:30:28 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/kmlpdunixuimanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/kmlpdunixuimanager.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -3 -p -r1.2.2.1 -r1.2.2.2 --- kdeprint/lpdunix/kmlpdunixuimanager.cpp 24 Feb 2004 08:51:30 -0000 1.2.2.1 +++ kdeprint/lpdunix/kmlpdunixuimanager.cpp 15 Mar 2004 10:30:28 -0000 1.2.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/kmlpdunixuimanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/kmlpdunixuimanager.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -3 -p -r1.2.2.1 -r1.2.2.2 --- kdeprint/lpdunix/kmlpdunixuimanager.h 24 Feb 2004 08:51:30 -0000 1.2.2.1 +++ kdeprint/lpdunix/kmlpdunixuimanager.h 15 Mar 2004 10:30:28 -0000 1.2.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpdunix/lpdunix.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/lpdunix.print,v retrieving revision 1.125.2.2 retrieving revision 1.125.2.3 diff -u -3 -p -r1.125.2.2 -r1.125.2.3 --- kdeprint/lpdunix/lpdunix.print 11 Feb 2004 16:59:42 -0000 1.125.2.2 +++ kdeprint/lpdunix/lpdunix.print 29 Feb 2004 15:30:05 -0000 1.125.2.3 @@ -49,6 +49,7 @@ Comment[se]=Oppalaš UNIX LPD čálihanv Comment[sk]=Generický tlačový systém UNIX LPD (štandardné) Comment[sl]=Splošni tiskalniški sistem LDP za Unix (privzeto) Comment[sr]=Генерички UNIX LPD систем за штампање (предефинисано) +Comment[sr@Latn]=Generički UNIX LPD sistem za štampanje (predefinisano) Comment[ss]=Umshini wekushicelela lobanti weLPD ku KDE (kwehluleka) Comment[sv]=Generellt Unix LPD-skrivarsystem (standard) Comment[ta]=பொது யுனிக்ஸ் LPD அச்சுத் தொகுதி (கொடாநிலை) Index: kdeprint/lpr/apshandler.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/apshandler.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/lpr/apshandler.cpp 21 May 2003 12:35:06 -0000 1.9 +++ kdeprint/lpr/apshandler.cpp 15 Mar 2004 10:30:28 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/apshandler.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/apshandler.h,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -3 -p -r1.4 -r1.4.6.1 --- kdeprint/lpr/apshandler.h 12 Feb 2002 12:13:16 -0000 1.4 +++ kdeprint/lpr/apshandler.h 15 Mar 2004 10:30:28 -0000 1.4.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/editentrydialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/editentrydialog.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -3 -p -r1.2.2.1 -r1.2.2.2 --- kdeprint/lpr/editentrydialog.cpp 10 Feb 2004 22:48:34 -0000 1.2.2.1 +++ kdeprint/lpr/editentrydialog.cpp 15 Mar 2004 10:30:28 -0000 1.2.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/editentrydialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/editentrydialog.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/lpr/editentrydialog.h 2 Mar 2002 23:45:12 -0000 1.1 +++ kdeprint/lpr/editentrydialog.h 15 Mar 2004 10:30:28 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/klprfactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/klprfactory.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/lpr/klprfactory.cpp 28 Jul 2003 08:29:32 -0000 1.6 +++ kdeprint/lpr/klprfactory.cpp 15 Mar 2004 10:30:28 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/klprprinterimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/klprprinterimpl.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/lpr/klprprinterimpl.cpp 28 Jul 2003 08:29:32 -0000 1.4 +++ kdeprint/lpr/klprprinterimpl.cpp 15 Mar 2004 10:30:28 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/klprprinterimpl.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/klprprinterimpl.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -3 -p -r1.2 -r1.2.2.1 --- kdeprint/lpr/klprprinterimpl.h 28 Jul 2003 08:29:32 -0000 1.2 +++ kdeprint/lpr/klprprinterimpl.h 15 Mar 2004 10:30:28 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmconfiglpr.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmconfiglpr.cpp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -3 -p -r1.2 -r1.2.4.1 --- kdeprint/lpr/kmconfiglpr.cpp 1 Aug 2002 12:52:56 -0000 1.2 +++ kdeprint/lpr/kmconfiglpr.cpp 15 Mar 2004 10:30:28 -0000 1.2.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmconfiglpr.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmconfiglpr.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/lpr/kmconfiglpr.h 26 Jan 2002 17:16:48 -0000 1.1 +++ kdeprint/lpr/kmconfiglpr.h 15 Mar 2004 10:30:28 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmlprjobmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmlprjobmanager.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/lpr/kmlprjobmanager.cpp 28 Jul 2003 08:29:32 -0000 1.6 +++ kdeprint/lpr/kmlprjobmanager.cpp 15 Mar 2004 10:30:28 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmlprjobmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmlprjobmanager.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/lpr/kmlprjobmanager.h 28 Jul 2003 08:29:32 -0000 1.4 +++ kdeprint/lpr/kmlprjobmanager.h 15 Mar 2004 10:30:28 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmlprmanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmlprmanager.cpp,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -u -3 -p -r1.38 -r1.38.2.1 --- kdeprint/lpr/kmlprmanager.cpp 28 Jul 2003 08:29:32 -0000 1.38 +++ kdeprint/lpr/kmlprmanager.cpp 15 Mar 2004 10:30:28 -0000 1.38.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmlprmanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmlprmanager.h,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -3 -p -r1.16 -r1.16.2.1 --- kdeprint/lpr/kmlprmanager.h 28 Jul 2003 08:29:32 -0000 1.16 +++ kdeprint/lpr/kmlprmanager.h 15 Mar 2004 10:30:28 -0000 1.16.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmlpruimanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmlpruimanager.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/lpr/kmlpruimanager.cpp 28 Jul 2003 08:29:32 -0000 1.6 +++ kdeprint/lpr/kmlpruimanager.cpp 15 Mar 2004 10:30:28 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/kmlpruimanager.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/kmlpruimanager.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/lpr/kmlpruimanager.h 28 Jul 2003 08:29:32 -0000 1.5 +++ kdeprint/lpr/kmlpruimanager.h 15 Mar 2004 10:30:28 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lpchelper.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lpchelper.cpp,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -3 -p -r1.13 -r1.13.2.1 --- kdeprint/lpr/lpchelper.cpp 28 May 2003 02:07:41 -0000 1.13 +++ kdeprint/lpr/lpchelper.cpp 15 Mar 2004 10:30:28 -0000 1.13.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lpchelper.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lpchelper.h,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -3 -p -r1.5 -r1.5.6.1 --- kdeprint/lpr/lpchelper.h 20 Feb 2002 23:02:50 -0000 1.5 +++ kdeprint/lpr/lpchelper.h 15 Mar 2004 10:30:28 -0000 1.5.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lpqhelper.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lpqhelper.cpp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -3 -p -r1.5 -r1.5.4.1 --- kdeprint/lpr/lpqhelper.cpp 1 Jul 2002 22:48:16 -0000 1.5 +++ kdeprint/lpr/lpqhelper.cpp 15 Mar 2004 10:30:28 -0000 1.5.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lpqhelper.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lpqhelper.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/lpr/lpqhelper.h 20 Jun 2002 14:01:44 -0000 1.4 +++ kdeprint/lpr/lpqhelper.h 15 Mar 2004 10:30:28 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lpr.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lpr.print,v retrieving revision 1.92.2.3 retrieving revision 1.92.2.4 diff -u -3 -p -r1.92.2.3 -r1.92.2.4 --- kdeprint/lpr/lpr.print 11 Feb 2004 16:59:44 -0000 1.92.2.3 +++ kdeprint/lpr/lpr.print 29 Feb 2004 15:30:07 -0000 1.92.2.4 @@ -49,6 +49,7 @@ Comment[se]=LPR/LPRng čálihanvuogádat Comment[sk]=Tlačový systém LPR/LPRng Comment[sl]=Tiskalniški sistem za LPR/LPRng Comment[sr]=LPR/LPRng систем за штампање +Comment[sr@Latn]=LPR/LPRng sistem za štampanje Comment[ss]=LPR/LPRng umhini wekushivelela Comment[sv]=LPR/LPRNG-skrivarsystem Comment[ta]=LPR/LPRng அச்சுத் தொகுதி Index: kdeprint/lpr/lprhandler.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lprhandler.cpp,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -3 -p -r1.16 -r1.16.2.1 --- kdeprint/lpr/lprhandler.cpp 19 Dec 2003 12:52:14 -0000 1.16 +++ kdeprint/lpr/lprhandler.cpp 15 Mar 2004 10:30:28 -0000 1.16.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lprhandler.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lprhandler.h,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -3 -p -r1.13 -r1.13.2.1 --- kdeprint/lpr/lprhandler.h 1 Aug 2003 12:51:43 -0000 1.13 +++ kdeprint/lpr/lprhandler.h 15 Mar 2004 10:30:28 -0000 1.13.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lprngtoolhandler.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lprngtoolhandler.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/lpr/lprngtoolhandler.cpp 21 May 2003 12:35:06 -0000 1.5 +++ kdeprint/lpr/lprngtoolhandler.cpp 15 Mar 2004 10:30:28 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lprngtoolhandler.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lprngtoolhandler.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/lpr/lprngtoolhandler.h 12 Feb 2002 12:13:16 -0000 1.2 +++ kdeprint/lpr/lprngtoolhandler.h 15 Mar 2004 10:30:28 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lprsettings.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lprsettings.cpp,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -3 -p -r1.6 -r1.6.4.1 --- kdeprint/lpr/lprsettings.cpp 14 May 2002 08:24:07 -0000 1.6 +++ kdeprint/lpr/lprsettings.cpp 15 Mar 2004 10:30:28 -0000 1.6.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul + * Copyright (c) 2001,2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/lprsettings.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lprsettings.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/lpr/lprsettings.h 1 Aug 2003 12:51:43 -0000 1.7 +++ kdeprint/lpr/lprsettings.h 15 Mar 2004 10:30:28 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul + * Copyright (c) 2001,2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/matichandler.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/matichandler.cpp,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -3 -p -r1.20 -r1.20.2.1 --- kdeprint/lpr/matichandler.cpp 4 Jun 2003 09:23:41 -0000 1.20 +++ kdeprint/lpr/matichandler.cpp 15 Mar 2004 10:30:28 -0000 1.20.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/matichandler.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/matichandler.h,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -3 -p -r1.11 -r1.11.2.1 --- kdeprint/lpr/matichandler.h 4 Jun 2003 09:23:41 -0000 1.11 +++ kdeprint/lpr/matichandler.h 15 Mar 2004 10:30:28 -0000 1.11.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/matichelper.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/matichelper.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/lpr/matichelper.cpp 4 Jun 2003 09:23:41 -0000 1.8 +++ kdeprint/lpr/matichelper.cpp 15 Mar 2004 10:30:28 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/matichelper.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/matichelper.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/lpr/matichelper.h 4 Jun 2003 09:23:41 -0000 1.3 +++ kdeprint/lpr/matichelper.h 15 Mar 2004 10:30:28 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/printcapentry.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/printcapentry.cpp,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -3 -p -r1.4 -r1.4.6.1 --- kdeprint/lpr/printcapentry.cpp 2 Mar 2002 23:45:12 -0000 1.4 +++ kdeprint/lpr/printcapentry.cpp 15 Mar 2004 10:30:28 -0000 1.4.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001,2002 Michael Goffioul + * Copyright (c) 2001,2002 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/printcapentry.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/printcapentry.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/lpr/printcapentry.h 1 Aug 2003 12:51:43 -0000 1.6 +++ kdeprint/lpr/printcapentry.h 15 Mar 2004 10:30:28 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/printcapreader.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/printcapreader.cpp,v retrieving revision 1.7 retrieving revision 1.7.6.1 diff -u -3 -p -r1.7 -r1.7.6.1 --- kdeprint/lpr/printcapreader.cpp 2 Mar 2002 23:45:12 -0000 1.7 +++ kdeprint/lpr/printcapreader.cpp 15 Mar 2004 10:30:28 -0000 1.7.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/lpr/printcapreader.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/printcapreader.h,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kdeprint/lpr/printcapreader.h 28 Feb 2002 19:41:28 -0000 1.3 +++ kdeprint/lpr/printcapreader.h 15 Mar 2004 10:30:28 -0000 1.3.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/cjanuswidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/cjanuswidget.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/cjanuswidget.cpp 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/cjanuswidget.cpp 15 Mar 2004 10:30:29 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/cjanuswidget.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/cjanuswidget.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/management/cjanuswidget.h 4 Jan 2004 17:52:30 -0000 1.6 +++ kdeprint/management/cjanuswidget.h 15 Mar 2004 10:30:29 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/jobitem.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/jobitem.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/management/jobitem.cpp 4 Jan 2004 17:52:30 -0000 1.9 +++ kdeprint/management/jobitem.cpp 15 Mar 2004 10:30:29 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/jobitem.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/jobitem.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/management/jobitem.h 4 Jan 2004 17:52:30 -0000 1.6 +++ kdeprint/management/jobitem.h 15 Mar 2004 10:30:29 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kdeprint_management_module.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kdeprint_management_module.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -3 -p -r1.1.2.1 -r1.1.2.2 --- kdeprint/management/kdeprint_management_module.cpp 15 Feb 2004 20:05:02 -0000 1.1.2.1 +++ kdeprint/management/kdeprint_management_module.cpp 15 Mar 2004 10:30:29 -0000 1.1.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * Copyright (C) 2004 Dominique Devriese * * This library is free software; you can redistribute it and/or Index: kdeprint/management/kiconselectaction.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kiconselectaction.cpp,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -3 -p -r1.5 -r1.5.6.1 --- kdeprint/management/kiconselectaction.cpp 15 Feb 2002 16:46:33 -0000 1.5 +++ kdeprint/management/kiconselectaction.cpp 15 Mar 2004 10:30:29 -0000 1.5.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kiconselectaction.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kiconselectaction.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/management/kiconselectaction.h 27 Jan 2002 00:45:40 -0000 1.2 +++ kdeprint/management/kiconselectaction.h 15 Mar 2004 10:30:29 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigcommand.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigcommand.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/management/kmconfigcommand.cpp 6 May 2003 01:34:03 -0000 1.6 +++ kdeprint/management/kmconfigcommand.cpp 15 Mar 2004 10:30:29 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigcommand.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigcommand.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/management/kmconfigcommand.h 14 Dec 2001 09:42:51 -0000 1.1 +++ kdeprint/management/kmconfigcommand.h 15 Mar 2004 10:30:29 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigdialog.cpp,v retrieving revision 1.12 retrieving revision 1.12.4.1 diff -u -3 -p -r1.12 -r1.12.4.1 --- kdeprint/management/kmconfigdialog.cpp 8 Jun 2002 22:45:06 -0000 1.12 +++ kdeprint/management/kmconfigdialog.cpp 15 Mar 2004 10:30:29 -0000 1.12.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigdialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigdialog.h,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -3 -p -r1.2 -r1.2.6.1 --- kdeprint/management/kmconfigdialog.h 23 Sep 2001 12:19:16 -0000 1.2 +++ kdeprint/management/kmconfigdialog.h 15 Mar 2004 10:30:29 -0000 1.2.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigfilter.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigfilter.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmconfigfilter.cpp 2 Nov 2003 23:07:14 -0000 1.8 +++ kdeprint/management/kmconfigfilter.cpp 15 Mar 2004 10:30:29 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigfilter.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigfilter.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmconfigfilter.h 6 May 2003 01:34:03 -0000 1.4 +++ kdeprint/management/kmconfigfilter.h 15 Mar 2004 10:30:29 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigfonts.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigfonts.cpp,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -3 -p -r1.6.2.1 -r1.6.2.2 --- kdeprint/management/kmconfigfonts.cpp 10 Feb 2004 22:48:34 -0000 1.6.2.1 +++ kdeprint/management/kmconfigfonts.cpp 15 Mar 2004 10:30:29 -0000 1.6.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigfonts.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigfonts.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -3 -p -r1.1 -r1.1.4.1 --- kdeprint/management/kmconfigfonts.h 27 Mar 2002 18:06:36 -0000 1.1 +++ kdeprint/management/kmconfigfonts.h 15 Mar 2004 10:30:29 -0000 1.1.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfiggeneral.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfiggeneral.cpp,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -3 -p -r1.22 -r1.22.2.1 --- kdeprint/management/kmconfiggeneral.cpp 21 Jun 2003 00:08:05 -0000 1.22 +++ kdeprint/management/kmconfiggeneral.cpp 15 Mar 2004 10:30:29 -0000 1.22.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfiggeneral.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfiggeneral.h,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -3 -p -r1.6 -r1.6.4.1 --- kdeprint/management/kmconfiggeneral.h 29 Mar 2002 15:23:46 -0000 1.6 +++ kdeprint/management/kmconfiggeneral.h 15 Mar 2004 10:30:29 -0000 1.6.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigjobs.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigjobs.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmconfigjobs.cpp 6 May 2003 01:34:03 -0000 1.5 +++ kdeprint/management/kmconfigjobs.cpp 15 Mar 2004 10:30:29 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigjobs.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigjobs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -3 -p -r1.1 -r1.1.4.1 --- kdeprint/management/kmconfigjobs.h 23 May 2002 16:55:14 -0000 1.1 +++ kdeprint/management/kmconfigjobs.h 15 Mar 2004 10:30:29 -0000 1.1.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigpage.cpp,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/management/kmconfigpage.cpp 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/management/kmconfigpage.cpp 15 Mar 2004 10:30:29 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigpage.h,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -3 -p -r1.1 -r1.1.8.1 --- kdeprint/management/kmconfigpage.h 30 Mar 2001 21:48:48 -0000 1.1 +++ kdeprint/management/kmconfigpage.h 15 Mar 2004 10:30:29 -0000 1.1.8.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigpreview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigpreview.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/management/kmconfigpreview.cpp 21 Jun 2003 00:08:05 -0000 1.9 +++ kdeprint/management/kmconfigpreview.cpp 15 Mar 2004 10:30:29 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmconfigpreview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmconfigpreview.h,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -3 -p -r1.1 -r1.1.6.1 --- kdeprint/management/kmconfigpreview.h 10 Oct 2001 11:36:18 -0000 1.1 +++ kdeprint/management/kmconfigpreview.h 15 Mar 2004 10:30:29 -0000 1.1.6.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdbcreator.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdbcreator.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kdeprint/management/kmdbcreator.cpp 4 Jan 2004 17:52:30 -0000 1.17 +++ kdeprint/management/kmdbcreator.cpp 15 Mar 2004 10:30:29 -0000 1.17.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdbcreator.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdbcreator.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmdbcreator.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmdbcreator.h 15 Mar 2004 10:30:29 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdriverdb.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdriverdb.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kdeprint/management/kmdriverdb.cpp 4 Jan 2004 17:52:30 -0000 1.17 +++ kdeprint/management/kmdriverdb.cpp 15 Mar 2004 10:30:29 -0000 1.17.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdriverdb.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdriverdb.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmdriverdb.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmdriverdb.h 15 Mar 2004 10:30:29 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdriverdbwidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdriverdbwidget.cpp,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -3 -p -r1.13 -r1.13.2.1 --- kdeprint/management/kmdriverdbwidget.cpp 4 Jan 2004 17:52:30 -0000 1.13 +++ kdeprint/management/kmdriverdbwidget.cpp 15 Mar 2004 10:30:29 -0000 1.13.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdriverdbwidget.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdriverdbwidget.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmdriverdbwidget.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmdriverdbwidget.h 15 Mar 2004 10:30:29 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdriverdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdriverdialog.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmdriverdialog.cpp 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmdriverdialog.cpp 15 Mar 2004 10:30:29 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmdriverdialog.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmdriverdialog.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmdriverdialog.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmdriverdialog.h 15 Mar 2004 10:30:29 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmiconview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmiconview.cpp,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -3 -p -r1.15 -r1.15.2.1 --- kdeprint/management/kmiconview.cpp 4 Jan 2004 17:52:30 -0000 1.15 +++ kdeprint/management/kmiconview.cpp 15 Mar 2004 10:30:29 -0000 1.15.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmiconview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmiconview.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/management/kmiconview.h 4 Jan 2004 17:52:30 -0000 1.7 +++ kdeprint/management/kmiconview.h 15 Mar 2004 10:30:29 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kminfopage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kminfopage.cpp,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -3 -p -r1.15 -r1.15.2.1 --- kdeprint/management/kminfopage.cpp 4 Jan 2004 17:52:30 -0000 1.15 +++ kdeprint/management/kminfopage.cpp 15 Mar 2004 10:30:29 -0000 1.15.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kminfopage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kminfopage.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kminfopage.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kminfopage.h 15 Mar 2004 10:30:29 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kminstancepage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kminstancepage.cpp,v retrieving revision 1.30 retrieving revision 1.30.2.2 diff -u -3 -p -r1.30 -r1.30.2.2 --- kdeprint/management/kminstancepage.cpp 4 Jan 2004 17:52:30 -0000 1.30 +++ kdeprint/management/kminstancepage.cpp 16 Mar 2004 08:31:57 -0000 1.30.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kminstancepage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kminstancepage.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kminstancepage.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kminstancepage.h 15 Mar 2004 10:30:29 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmjobviewer.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmjobviewer.cpp,v retrieving revision 1.43 retrieving revision 1.43.2.2 diff -u -3 -p -r1.43 -r1.43.2.2 --- kdeprint/management/kmjobviewer.cpp 4 Jan 2004 17:52:30 -0000 1.43 +++ kdeprint/management/kmjobviewer.cpp 15 Mar 2004 10:30:29 -0000 1.43.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -179,11 +179,13 @@ void KMJobViewer::addToManager() loadPrinters(); QPtrListIterator it(m_printers); for (; it.current(); ++it) - m_manager->addPrinter(it.current()->printerName(), (KMJobManager::JobType)m_type); + m_manager->addPrinter(it.current()->printerName(), (KMJobManager::JobType)m_type, it.current()->isSpecial()); } else if (!m_prname.isEmpty()) { - m_manager->addPrinter(m_prname, (KMJobManager::JobType)m_type); + KMPrinter *prt = KMManager::self()->findPrinter( m_prname ); + bool isSpecial = ( prt ? prt->isSpecial() : false ); + m_manager->addPrinter(m_prname, (KMJobManager::JobType)m_type, isSpecial); } } @@ -341,7 +343,7 @@ void KMJobViewer::initActions() slotSelectionChanged(); } -void KMJobViewer::buildPrinterMenu(QPopupMenu *menu, bool use_all) +void KMJobViewer::buildPrinterMenu(QPopupMenu *menu, bool use_all, bool use_specials) { loadPrinters(); menu->clear(); @@ -355,7 +357,8 @@ void KMJobViewer::buildPrinterMenu(QPopu } for (; it.current(); ++it, i++) { - if (!it.current()->instanceName().isEmpty()) + if ( !it.current()->instanceName().isEmpty() || + ( it.current()->isSpecial() && !use_specials ) ) continue; menu->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName(), i); } @@ -364,13 +367,13 @@ void KMJobViewer::buildPrinterMenu(QPopu void KMJobViewer::slotShowMoveMenu() { QPopupMenu *menu = static_cast(actionCollection()->action("job_move"))->popupMenu(); - buildPrinterMenu(menu, false); + buildPrinterMenu(menu, false, false); } void KMJobViewer::slotShowPrinterMenu() { QPopupMenu *menu = static_cast(actionCollection()->action("filter_modify"))->popupMenu(); - buildPrinterMenu(menu, true); + buildPrinterMenu(menu, true, true); } void KMJobViewer::updateJobs() @@ -524,8 +527,10 @@ void KMJobViewer::loadPrinters() QPtrListIterator it(*(KMFactory::self()->manager()->printerList(false))); for (;it.current();++it) { - // keep only real printers (no instance, no implicit) - if ((it.current()->isPrinter() || it.current()->isClass(false)) && (it.current()->name() == it.current()->printerName())) + // keep only real printers (no instance, no implicit) and special printers + if ((it.current()->isPrinter() || it.current()->isClass(false) || + ( it.current()->isSpecial() && it.current()->isValid() ) ) + && (it.current()->name() == it.current()->printerName())) m_printers.append(it.current()); } } @@ -721,7 +726,7 @@ void KMJobViewer::slotDropped( QDropEven for ( KURL::List::ConstIterator it = uris.begin(); it != uris.end(); ++it) { - if ( KIO::NetAccess::download( *it, target ) ) + if ( KIO::NetAccess::download( *it, target, 0 ) ) files << target; } Index: kdeprint/management/kmjobviewer.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmjobviewer.h,v retrieving revision 1.21 retrieving revision 1.21.2.2 diff -u -3 -p -r1.21 -r1.21.2.2 --- kdeprint/management/kmjobviewer.h 4 Jan 2004 17:52:30 -0000 1.21 +++ kdeprint/management/kmjobviewer.h 15 Mar 2004 10:30:29 -0000 1.21.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -103,7 +103,7 @@ protected: void triggerRefresh(); void addToManager(); void removeFromManager(); - void buildPrinterMenu(QPopupMenu *menu, bool use_all = false); + void buildPrinterMenu(QPopupMenu *menu, bool use_all = false, bool use_specials = false); void updateCaption(); void updateStatusBar(); Index: kdeprint/management/kmlistview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmlistview.cpp,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -3 -p -r1.14 -r1.14.2.1 --- kdeprint/management/kmlistview.cpp 4 Jan 2004 17:52:30 -0000 1.14 +++ kdeprint/management/kmlistview.cpp 15 Mar 2004 10:30:29 -0000 1.14.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmlistview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmlistview.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmlistview.h 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/kmlistview.h 15 Mar 2004 10:30:29 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmmainview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmmainview.cpp,v retrieving revision 1.68.2.1 retrieving revision 1.68.2.3 diff -u -3 -p -r1.68.2.1 -r1.68.2.3 --- kdeprint/management/kmmainview.cpp 15 Feb 2004 20:05:02 -0000 1.68.2.1 +++ kdeprint/management/kmmainview.cpp 15 Mar 2004 10:30:29 -0000 1.68.2.3 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -128,11 +128,8 @@ KMMainView::KMMainView(QWidget *parent, restoreSettings(); loadParameters(); - //slotRefresh(); - //KMTimer::self()->release(true); - KMTimer::self()->hold(); - createMessageWindow( i18n( "Initializing manager..." ) ); - m_manager->checkUpdatePossible(); + // delay first update until KMManager is ready + reset( i18n( "Initializing manager..." ), true, true ); } KMMainView::~KMMainView() @@ -325,7 +322,7 @@ void KMMainView::initActions() void KMMainView::slotRefresh() { - KMTimer::self()->delay(10); + // TODO: remove me } void KMMainView::slotTimer() @@ -334,9 +331,38 @@ void KMMainView::slotTimer() QPtrList *printerlist = m_manager->printerList(); bool ok = m_manager->errorMsg().isEmpty(); m_printerview->setPrinterList(printerlist); - if (!ok && m_first) + if ( m_first ) { - showErrorMsg(i18n("An error occurred while retrieving the printer list.")); + if ( !ok ) + showErrorMsg(i18n("An error occurred while retrieving the printer list.")); + else + { + /* try to select the most appropriate printer: + * - soft default owner printer + * - hard default printer + * - first printer + */ + QPtrListIterator it( *printerlist ); + KMPrinter *p1 = 0, *p2 = 0, *p3 = 0; + while ( it.current() ) + { + if ( !it.current()->isVirtual() ) + { + if ( it.current()->ownSoftDefault() ) + { + p1 = it.current(); + break; + } + else if ( it.current()->isHardDefault() ) + p2 = it.current(); + else if ( !p3 ) + p3 = it.current(); + } + ++it; + } + if ( p1 || p2 || p3 ) + m_printerview->setPrinter( p1 ? p1 : ( p2 ? p2 : p3 ) ); + } m_first = false; } } @@ -358,7 +384,7 @@ void KMMainView::slotPrinterSelected(con m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit())); m_actions->action("printer_configure")->setEnabled(!sp || ((mask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/)); m_actions->action("printer_hard_default")->setEnabled((sp && (mask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal())); - m_actions->action("printer_soft_default")->setEnabled((sp && p && !p->isSoftDefault())); + m_actions->action("printer_soft_default")->setEnabled((p && !p->isSoftDefault())); m_actions->action("printer_test")->setEnabled((sp && (mask & KMManager::PrinterTesting) && p && !p->isClass(true))); bool stmask = (sp && (mask & KMManager::PrinterEnabling) && p); m_actions->action("printer_state_change")->setEnabled(stmask && p->isLocal()); @@ -643,9 +669,7 @@ void KMMainView::slotServerRestart() } else { - m_printerview->setPrinterList( 0 ); - createMessageWindow( i18n( "Restarting server..." ), 0 ); - m_manager->checkUpdatePossible(); + reset( i18n( "Restarting server..." ), false, false ); } } @@ -660,9 +684,7 @@ void KMMainView::slotServerConfigure() } else { - m_printerview->setPrinterList( 0 ); - createMessageWindow( i18n( "Configuring server..." ), 0 ); - m_manager->checkUpdatePossible(); + reset( i18n( "Configuring server..." ), false, false ); } } @@ -684,12 +706,17 @@ void KMMainView::slotManagerConfigure() { KMTimer::self()->hold(); KMConfigDialog dlg(this,"ConfigDialog"); - bool refresh(false); - if ((refresh=dlg.exec())) + if ( dlg.exec() ) { loadParameters(); } - KMTimer::self()->release(refresh); + /* when "OK": + * => the config file is saved + * => triggering a DCOP signal + * => configChanged() called + * hence no need to refresh, just release the timer + */ + KMTimer::self()->release( false ); } void KMMainView::slotAddSpecial() @@ -746,10 +773,7 @@ void KMMainView::reload() // We must delay the refresh such that all objects has been // correctly reloaded (otherwise, crash in KMJobViewer). - KMTimer::self()->hold(); - m_printerview->setPrinterList( 0 ); - createMessageWindow( i18n( "Initializing manager..." ) ); - m_manager->checkUpdatePossible(); + reset( i18n( "Initializing manager..." ), true, true ); } void KMMainView::showPrinterInfos(bool on) @@ -825,7 +849,7 @@ void KMMainView::slotToggleFilter(bool o void KMMainView::configChanged() { - slotRefresh(); + reset( i18n( "Initializing manager..." ), false, true ); } void KMMainView::slotUpdatePossible( bool flag ) @@ -849,9 +873,17 @@ void KMMainView::destroyMessageWindow() void KMMainView::slotInit() { - KMTimer::self()->hold(); + reset( i18n( "Initializing manager..." ), true, true ); +} + +void KMMainView::reset( const QString& msg, bool useDelay, bool holdTimer ) +{ + if ( holdTimer ) + KMTimer::self()->hold(); m_printerview->setPrinterList( 0 ); - createMessageWindow( i18n( "Initializing manager..." ) ); + if ( !msg.isEmpty() ) + createMessageWindow( msg, ( useDelay ? 500 : 0 ) ); + m_first = true; m_manager->checkUpdatePossible(); } Index: kdeprint/management/kmmainview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmmainview.h,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.3 diff -u -3 -p -r1.28.2.1 -r1.28.2.3 --- kdeprint/management/kmmainview.h 15 Feb 2004 20:05:02 -0000 1.28.2.1 +++ kdeprint/management/kmmainview.h 15 Mar 2004 10:30:29 -0000 1.28.2.3 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -108,6 +108,7 @@ protected: void removePluginActions(); void createMessageWindow( const QString&, int delay = 500 ); void destroyMessageWindow(); + void reset( const QString& msg = QString::null, bool useDelay = true, bool holdTimer = true ); private: KMPrinterView *m_printerview; Index: kdeprint/management/kmpages.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpages.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/management/kmpages.cpp 4 Jan 2004 17:52:30 -0000 1.9 +++ kdeprint/management/kmpages.cpp 15 Mar 2004 10:30:29 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpages.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpages.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/management/kmpages.h 4 Jan 2004 17:52:30 -0000 1.6 +++ kdeprint/management/kmpages.h 15 Mar 2004 10:30:29 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmprinterpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmprinterpage.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmprinterpage.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmprinterpage.h 15 Mar 2004 10:30:29 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmprinterview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmprinterview.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.2 diff -u -3 -p -r1.10 -r1.10.2.2 --- kdeprint/management/kmprinterview.cpp 4 Jan 2004 17:52:30 -0000 1.10 +++ kdeprint/management/kmprinterview.cpp 15 Mar 2004 10:30:29 -0000 1.10.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -63,6 +63,14 @@ void KMPrinterView::setPrinterList(QPtrL m_listset = ( list != 0 ); } +void KMPrinterView::setPrinter( KMPrinter *p ) +{ + if ( m_type == KMPrinterView::Tree ) + m_listview->setPrinter( p ); + else + m_iconview->setPrinter( p ); +} + void KMPrinterView::setViewType(ViewType t) { m_type = t; Index: kdeprint/management/kmprinterview.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmprinterview.h,v retrieving revision 1.9 retrieving revision 1.9.2.2 diff -u -3 -p -r1.9 -r1.9.2.2 --- kdeprint/management/kmprinterview.h 4 Jan 2004 17:52:30 -0000 1.9 +++ kdeprint/management/kmprinterview.h 15 Mar 2004 10:30:30 -0000 1.9.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -38,6 +38,7 @@ public: ~KMPrinterView(); void setPrinterList(QPtrList *list); + void setPrinter( KMPrinter* ); void setViewType(ViewType t); ViewType viewType() const { return m_type; } Index: kdeprint/management/kmpropbackend.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropbackend.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmpropbackend.cpp 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/kmpropbackend.cpp 15 Mar 2004 10:30:30 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropbackend.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropbackend.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmpropbackend.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmpropbackend.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropcontainer.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropcontainer.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/management/kmpropcontainer.cpp 4 Jan 2004 17:52:30 -0000 1.7 +++ kdeprint/management/kmpropcontainer.cpp 15 Mar 2004 10:30:30 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropcontainer.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropcontainer.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmpropcontainer.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmpropcontainer.h 15 Mar 2004 10:30:30 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropdriver.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropdriver.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/management/kmpropdriver.cpp 4 Jan 2004 17:52:30 -0000 1.7 +++ kdeprint/management/kmpropdriver.cpp 15 Mar 2004 10:30:30 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropdriver.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropdriver.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmpropdriver.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmpropdriver.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropertypage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropertypage.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/management/kmpropertypage.cpp 4 Jan 2004 17:52:30 -0000 1.7 +++ kdeprint/management/kmpropertypage.cpp 15 Mar 2004 10:30:30 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropertypage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropertypage.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmpropertypage.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmpropertypage.h 15 Mar 2004 10:30:30 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropgeneral.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropgeneral.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmpropgeneral.cpp 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/kmpropgeneral.cpp 15 Mar 2004 10:30:30 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropgeneral.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropgeneral.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmpropgeneral.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmpropgeneral.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropmembers.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropmembers.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmpropmembers.cpp 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmpropmembers.cpp 15 Mar 2004 10:30:30 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropmembers.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropmembers.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmpropmembers.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmpropmembers.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropwidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropwidget.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/management/kmpropwidget.cpp 4 Jan 2004 17:52:30 -0000 1.10 +++ kdeprint/management/kmpropwidget.cpp 15 Mar 2004 10:30:30 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmpropwidget.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmpropwidget.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/management/kmpropwidget.h 4 Jan 2004 17:52:30 -0000 1.6 +++ kdeprint/management/kmpropwidget.h 15 Mar 2004 10:30:30 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmspecialprinterdlg.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmspecialprinterdlg.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kdeprint/management/kmspecialprinterdlg.cpp 30 Aug 2003 10:36:23 -0000 1.17 +++ kdeprint/management/kmspecialprinterdlg.cpp 15 Mar 2004 10:30:30 -0000 1.17.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmspecialprinterdlg.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmspecialprinterdlg.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/management/kmspecialprinterdlg.h 24 Jul 2003 08:01:23 -0000 1.9 +++ kdeprint/management/kmspecialprinterdlg.h 15 Mar 2004 10:30:30 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmtimer.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmtimer.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmtimer.cpp 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmtimer.cpp 15 Mar 2004 10:30:30 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmtimer.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmtimer.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/management/kmtimer.h 4 Jan 2004 17:52:30 -0000 1.6 +++ kdeprint/management/kmtimer.h 15 Mar 2004 10:30:30 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwbackend.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwbackend.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/management/kmwbackend.cpp 4 Jan 2004 17:52:30 -0000 1.10 +++ kdeprint/management/kmwbackend.cpp 15 Mar 2004 10:30:30 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwbackend.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwbackend.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmwbackend.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmwbackend.h 15 Mar 2004 10:30:30 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwclass.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwclass.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmwclass.cpp 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/kmwclass.cpp 15 Mar 2004 10:30:30 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwclass.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwclass.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmwclass.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwclass.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwdriver.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwdriver.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/management/kmwdriver.cpp 4 Jan 2004 17:52:30 -0000 1.7 +++ kdeprint/management/kmwdriver.cpp 15 Mar 2004 10:30:30 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwdriver.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwdriver.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmwdriver.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmwdriver.h 15 Mar 2004 10:30:30 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwdriverselect.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwdriverselect.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- kdeprint/management/kmwdriverselect.cpp 4 Jan 2004 17:52:30 -0000 1.10 +++ kdeprint/management/kmwdriverselect.cpp 15 Mar 2004 10:30:30 -0000 1.10.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwdriverselect.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwdriverselect.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmwdriverselect.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmwdriverselect.h 15 Mar 2004 10:30:30 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwdrivertest.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwdrivertest.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kdeprint/management/kmwdrivertest.cpp 11 Jan 2004 18:56:46 -0000 1.17 +++ kdeprint/management/kmwdrivertest.cpp 15 Mar 2004 10:30:30 -0000 1.17.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwdrivertest.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwdrivertest.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmwdrivertest.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmwdrivertest.h 15 Mar 2004 10:30:30 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwend.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwend.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmwend.cpp 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/kmwend.cpp 15 Mar 2004 10:30:30 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwend.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwend.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmwend.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwend.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwfile.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwfile.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- kdeprint/management/kmwfile.cpp 4 Jan 2004 17:52:30 -0000 1.9 +++ kdeprint/management/kmwfile.cpp 15 Mar 2004 10:30:30 -0000 1.9.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwfile.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwfile.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kdeprint/management/kmwfile.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmwfile.h 15 Mar 2004 10:30:30 -0000 1.4.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwinfobase.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwinfobase.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.2 diff -u -3 -p -r1.3 -r1.3.2.2 --- kdeprint/management/kmwinfobase.cpp 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwinfobase.cpp 15 Mar 2004 10:30:30 -0000 1.3.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -80,3 +80,11 @@ void KMWInfoBase::setCurrent(int i) m_edits.at(i)->setFocus(); } } + +QLineEdit* KMWInfoBase::lineEdit( int i ) +{ + if ( i >= 0 && i < m_nlines ) + return m_edits.at( i ); + else + return NULL; +} Index: kdeprint/management/kmwinfobase.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwinfobase.h,v retrieving revision 1.4 retrieving revision 1.4.2.2 diff -u -3 -p -r1.4 -r1.4.2.2 --- kdeprint/management/kmwinfobase.h 4 Jan 2004 17:52:30 -0000 1.4 +++ kdeprint/management/kmwinfobase.h 15 Mar 2004 10:30:30 -0000 1.4.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -38,6 +38,9 @@ public: QString text(int); +protected: + QLineEdit* lineEdit( int ); + private: QPtrList m_labels; QPtrList m_edits; Index: kdeprint/management/kmwinfopage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwinfopage.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/management/kmwinfopage.cpp 4 Jan 2004 17:52:30 -0000 1.7 +++ kdeprint/management/kmwinfopage.cpp 15 Mar 2004 10:30:30 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwinfopage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwinfopage.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmwinfopage.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwinfopage.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwizard.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwizard.cpp,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -3 -p -r1.16 -r1.16.2.1 --- kdeprint/management/kmwizard.cpp 4 Jan 2004 17:52:30 -0000 1.16 +++ kdeprint/management/kmwizard.cpp 15 Mar 2004 10:30:30 -0000 1.16.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwizard.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwizard.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kdeprint/management/kmwizard.h 4 Jan 2004 17:52:30 -0000 1.6 +++ kdeprint/management/kmwizard.h 15 Mar 2004 10:30:30 -0000 1.6.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwizardpage.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwizardpage.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmwizardpage.cpp 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwizardpage.cpp 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwizardpage.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwizardpage.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmwizardpage.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwizardpage.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwlocal.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwlocal.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kdeprint/management/kmwlocal.cpp 21 May 2003 12:35:06 -0000 1.7 +++ kdeprint/management/kmwlocal.cpp 15 Mar 2004 10:30:30 -0000 1.7.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwlocal.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwlocal.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/management/kmwlocal.h 28 Oct 2002 13:17:54 -0000 1.4 +++ kdeprint/management/kmwlocal.h 15 Mar 2004 10:30:30 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwlpd.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwlpd.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- kdeprint/management/kmwlpd.cpp 4 Jan 2004 17:52:30 -0000 1.21 +++ kdeprint/management/kmwlpd.cpp 15 Mar 2004 10:30:30 -0000 1.21.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwlpd.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwlpd.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmwlpd.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwlpd.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwname.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwname.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmwname.cpp 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/kmwname.cpp 15 Mar 2004 10:30:30 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwname.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwname.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeprint/management/kmwname.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwname.h 15 Mar 2004 10:30:30 -0000 1.3.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwpassword.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwpassword.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.2 diff -u -3 -p -r1.6 -r1.6.2.2 --- kdeprint/management/kmwpassword.cpp 4 Jan 2004 17:52:30 -0000 1.6 +++ kdeprint/management/kmwpassword.cpp 15 Mar 2004 10:30:30 -0000 1.6.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,7 +23,8 @@ #include #include -#include +#include +#include #include #include #include @@ -40,64 +41,93 @@ KMWPassword::KMWPassword(QWidget *parent // create widgets QLabel *infotext_ = new QLabel(this); infotext_->setText(i18n("

This backend may require a login/password to work properly. " - "Fill in the required entries or enable Guest account to " - "use anonymous access.

")); + "Select the type of access to use and fill in the login and password entries if needed.

")); m_login = new QLineEdit(this); m_login->setText(QString::fromLocal8Bit(getenv("USER"))); m_password = new QLineEdit(this); m_password->setEchoMode(QLineEdit::Password); QLabel *loginlabel_ = new QLabel(i18n("&Login:"),this); QLabel *passwdlabel_ = new QLabel(i18n("&Password:"),this); - m_guest = new QCheckBox(i18n("&Guest account"),this); - m_guest->setCursor(KCursor::handCursor()); + m_btngroup = new QVButtonGroup( this ); + m_btngroup->setFrameStyle( QFrame::NoFrame ); + QRadioButton *btn1 = new QRadioButton( i18n( "&Anonymous (no login/password)" ), m_btngroup ); + QRadioButton *btn2 = new QRadioButton( i18n( "&Guest account (login=\"guest\")" ), m_btngroup ); + QRadioButton *btn3 = new QRadioButton( i18n( "Nor&mal account" ), m_btngroup ); + btn1->setCursor( KCursor::handCursor() ); + btn2->setCursor( KCursor::handCursor() ); + btn3->setCursor( KCursor::handCursor() ); + m_btngroup->setButton( 0 ); loginlabel_->setBuddy(m_login); passwdlabel_->setBuddy(m_password); - m_guest->setChecked(true); m_login->setEnabled(false); m_password->setEnabled(false); - connect(m_guest,SIGNAL(toggled(bool)),m_login,SLOT(setDisabled(bool))); - connect(m_guest,SIGNAL(toggled(bool)),m_password,SLOT(setDisabled(bool))); + connect(btn3,SIGNAL(toggled(bool)),m_login,SLOT(setEnabled(bool))); + connect(btn3,SIGNAL(toggled(bool)),m_password,SLOT(setEnabled(bool))); // layout - QGridLayout *main_ = new QGridLayout(this, 7, 2, 0, 5); - main_->setRowStretch(6,1); - main_->setColStretch(1,1); - main_->addRowSpacing(1,20); - main_->addRowSpacing(4,20); - main_->addMultiCellWidget(infotext_, 0, 0, 0, 1); - main_->addWidget(loginlabel_, 2, 0); - main_->addWidget(passwdlabel_, 3, 0); - main_->addWidget(m_login, 2, 1); - main_->addWidget(m_password, 3, 1); - main_->addMultiCellWidget(m_guest, 5, 5, 0, 1); + QVBoxLayout *main_ = new QVBoxLayout( this, 0, 0 ); + main_->addWidget( infotext_ ); + main_->addSpacing( 10 ); + main_->addWidget( m_btngroup ); + QGridLayout *l1 = new QGridLayout( 0, 2, 3 ); + main_->addLayout( l1 ); + main_->addStretch( 1 ); + l1->setColSpacing( 0, 35 ); + l1->setColStretch( 2, 1 ); + l1->addWidget( loginlabel_, 0, 1 ); + l1->addWidget( passwdlabel_, 1, 1 ); + l1->addWidget( m_login, 0, 2 ); + l1->addWidget( m_password, 1, 2 ); } bool KMWPassword::isValid(QString& msg) { - if (!m_guest->isChecked() && m_login->text().isEmpty()) - { + if ( !m_btngroup->selected() ) + msg = i18n( "Select one option!" ); + else if (m_btngroup->selectedId() == 2 && m_login->text().isEmpty()) msg = i18n("User name is empty!"); - return false; + else + return true; + return false; +} + +void KMWPassword::initPrinter( KMPrinter* p ) +{ + /* guest account only for SMB backend */ + if ( p->option( "kde-backend" ).toInt() != KMWizard::SMB ) + { + int ID = m_btngroup->selectedId(); + m_btngroup->find( 1 )->hide(); + if ( ID == 1 ) + m_btngroup->setButton( 0 ); } - return true; + else + m_btngroup->find( 1 )->show(); } void KMWPassword::updatePrinter(KMPrinter *p) { QString s = p->option("kde-backend"); - if (!s.isEmpty()) setNextPage(s.toInt()); - else setNextPage(KMWizard::Error); - if (m_guest->isChecked()) - { - p->setOption("kde-login",QString::null); - p->setOption("kde-password",QString::null); - } + if (!s.isEmpty()) + setNextPage(s.toInt()); else + setNextPage(KMWizard::Error); + switch ( m_btngroup->selectedId() ) { - p->setOption("kde-login",m_login->text()); - p->setOption("kde-password",m_password->text()); + case 0: + p->setOption( "kde-login", QString::null ); + p->setOption( "kde-password", QString::null ); + break; + case 1: + p->setOption( "kde-login", QString::fromLatin1( "guest" ) ); + p->setOption( "kde-password", QString::null ); + break; + case 2: + p->setOption( "kde-login", m_login->text() ); + p->setOption( "kde-password", m_password->text() ); + break; } } Index: kdeprint/management/kmwpassword.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwpassword.h,v retrieving revision 1.3 retrieving revision 1.3.2.2 diff -u -3 -p -r1.3 -r1.3.2.2 --- kdeprint/management/kmwpassword.h 4 Jan 2004 17:52:30 -0000 1.3 +++ kdeprint/management/kmwpassword.h 15 Mar 2004 10:30:30 -0000 1.3.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,9 +22,8 @@ #include "kmwizardpage.h" -class QLabel; class QLineEdit; -class QCheckBox; +class QButtonGroup; class KMWPassword : public KMWizardPage { @@ -32,12 +31,13 @@ public: KMWPassword(QWidget *parent = 0, const char *name = 0); bool isValid(QString&); + void initPrinter( KMPrinter* ); void updatePrinter(KMPrinter*); private: - QLineEdit *m_login; - QLineEdit *m_password; - QCheckBox *m_guest; + QLineEdit *m_login; + QLineEdit *m_password; + QButtonGroup *m_btngroup; }; #endif Index: kdeprint/management/kmwsmb.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwsmb.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.2 diff -u -3 -p -r1.6 -r1.6.2.2 --- kdeprint/management/kmwsmb.cpp 21 May 2003 12:35:06 -0000 1.6 +++ kdeprint/management/kmwsmb.cpp 15 Mar 2004 10:30:30 -0000 1.6.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -37,6 +37,7 @@ KMWSmb::KMWSmb(QWidget *parent, const ch m_nextpage = KMWizard::Driver; m_view = new SmbView(this,"SmbView"); + m_loginlabel = new QLabel( this ); QPushButton *m_scan = new KPushButton(KGuiItem(i18n("Scan"), "viewmag"), this); QPushButton *m_abort = new KPushButton(KGuiItem(i18n("Abort"), "stop"), this); m_abort->setEnabled(false); @@ -61,6 +62,7 @@ KMWSmb::KMWSmb(QWidget *parent, const ch lay1->addWidget(m_work,0,1); lay1->addWidget(m_server,1,1); lay1->addWidget(m_printer,2,1); + lay3->addWidget( m_loginlabel ); lay3->addStretch(1); lay3->addWidget(m_scan); lay3->addWidget(m_abort); @@ -92,7 +94,9 @@ void KMWSmb::initPrinter(KMPrinter *prin { if (printer) { - m_view->setLoginInfos(printer->option("kde-login"),printer->option("kde-password")); + QString login = printer->option( "kde-login" ); + m_view->setLoginInfos(login,printer->option("kde-password")); + m_loginlabel->setText( i18n( "Login: %1" ).arg( login.isEmpty() ? i18n( "" ) : login ) ); } } Index: kdeprint/management/kmwsmb.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwsmb.h,v retrieving revision 1.2 retrieving revision 1.2.8.2 diff -u -3 -p -r1.2 -r1.2.8.2 --- kdeprint/management/kmwsmb.h 30 Mar 2001 21:48:48 -0000 1.2 +++ kdeprint/management/kmwsmb.h 15 Mar 2004 10:30:30 -0000 1.2.8.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,6 +24,7 @@ class SmbView; class QLineEdit; +class QLabel; class KMWSmb : public KMWizardPage { @@ -43,6 +44,7 @@ protected slots: protected: SmbView *m_view; QLineEdit *m_work, *m_server, *m_printer; + QLabel *m_loginlabel; }; #endif Index: kdeprint/management/kmwsocket.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwsocket.cpp,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -3 -p -r1.14 -r1.14.2.1 --- kdeprint/management/kmwsocket.cpp 4 Jan 2004 17:52:30 -0000 1.14 +++ kdeprint/management/kmwsocket.cpp 15 Mar 2004 10:30:30 -0000 1.14.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwsocket.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwsocket.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kmwsocket.h 4 Jan 2004 17:52:30 -0000 1.5 +++ kdeprint/management/kmwsocket.h 15 Mar 2004 10:30:30 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kmwsocketutil.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwsocketutil.cpp,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -3 -p -r1.16 -r1.16.2.1 --- kdeprint/management/kmwsocketutil.cpp 4 Jan 2004 17:09:16 -0000 1.16 +++ kdeprint/management/kmwsocketutil.cpp 15 Mar 2004 10:30:30 -0000 1.16.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * * This library is free software; you can redistribute it and/or Index: kdeprint/management/kmwsocketutil.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwsocketutil.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/kmwsocketutil.h 4 Jan 2004 17:52:30 -0000 1.8 +++ kdeprint/management/kmwsocketutil.h 15 Mar 2004 10:30:30 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kxmlcommanddlg.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kxmlcommanddlg.cpp,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -u -3 -p -r1.20.2.1 -r1.20.2.2 --- kdeprint/management/kxmlcommanddlg.cpp 10 Feb 2004 22:48:34 -0000 1.20.2.1 +++ kdeprint/management/kxmlcommanddlg.cpp 15 Mar 2004 10:30:30 -0000 1.20.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kxmlcommanddlg.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kxmlcommanddlg.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdeprint/management/kxmlcommanddlg.h 21 May 2003 13:49:15 -0000 1.5 +++ kdeprint/management/kxmlcommanddlg.h 15 Mar 2004 10:30:30 -0000 1.5.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kxmlcommandselector.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kxmlcommandselector.cpp,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -3 -p -r1.15.2.1 -r1.15.2.2 --- kdeprint/management/kxmlcommandselector.cpp 15 Feb 2004 20:05:02 -0000 1.15.2.1 +++ kdeprint/management/kxmlcommandselector.cpp 15 Mar 2004 10:30:30 -0000 1.15.2.2 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/kxmlcommandselector.h =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kxmlcommandselector.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -3 -p -r1.4 -r1.4.4.1 --- kdeprint/management/kxmlcommandselector.h 4 Sep 2002 13:51:06 -0000 1.4 +++ kdeprint/management/kxmlcommandselector.h 15 Mar 2004 10:30:30 -0000 1.4.4.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public Index: kdeprint/management/networkscanner.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/networkscanner.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdeprint/management/networkscanner.cpp 4 Jan 2004 14:21:42 -0000 1.8 +++ kdeprint/management/networkscanner.cpp 15 Mar 2004 10:30:30 -0000 1.8.2.1 @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001-2002 Michael Goffioul + * Copyright (c) 2001-2002 Michael Goffioul * * This library