Index: kde.pot =================================================================== RCS file: /home/kde/kdelibs/kde.pot,v retrieving revision 1.1480 retrieving revision 1.1480.2.28 diff -u -3 -p -r1.1480 -r1.1480.2.28 --- kde.pot 4 Aug 2004 23:19:24 -0000 1.1480 +++ kde.pot 26 Sep 2004 08:08:52 -0000 1.1480.2.28 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-08-05 01:19+0200\n" +"POT-Creation-Date: 2004-09-26 10:08+0200\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.461 retrieving revision 2.461.2.1 diff -u -3 -p -r2.461 -r2.461.2.1 --- admin/acinclude.m4.in 26 Jul 2004 14:13:36 -0000 2.461 +++ admin/acinclude.m4.in 25 Aug 2004 21:21:05 -0000 2.461.2.1 @@ -4553,6 +4553,11 @@ AC_DEFUN([KDE_SET_PREFIX_CORE], # And delete superfluous '/' to make compares easier prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` + + kde_libs_prefix='$(prefix)' + kde_libs_htmldir='$(kde_htmldir)' + AC_SUBST(kde_libs_prefix) + AC_SUBST(kde_libs_htmldir) KDE_FAST_CONFIGURE KDE_CONF_FILES ]) Index: admin/cvs.sh =================================================================== RCS file: /home/kde/kde-common/admin/cvs.sh,v retrieving revision 1.130 retrieving revision 1.130.2.2 diff -u -3 -p -r1.130 -r1.130.2.2 --- admin/cvs.sh 4 Aug 2004 12:53:05 -0000 1.130 +++ admin/cvs.sh 17 Sep 2004 00:02:29 -0000 1.130.2.2 @@ -575,7 +575,7 @@ for subdir in $dirs; do echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line" fi fi - if test -n "`grep -r KAboutData *.c* *.C* 2>/dev/null`"; then + if test -n "`find . -name \*.c\* -o -name \*.h\* | xargs grep -s KAboutData 2>/dev/null`"; then echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp else echo " " > _translatorinfo.cpp fi @@ -605,7 +605,7 @@ for i in `ls -1 po/*.pot 2>/dev/null | s egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot if test -f po.backup/$i && test -n "`diff temp.pot po.backup/$i`"; then echo "will update $i" - sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po.backup/$backup_$i > po/$i.new && mv po/$i.new po.backup/backup_$i + sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po.backup/backup_$i > po/$i.new && mv po/$i.new po.backup/backup_$i msgmerge -q po.backup/backup_$i po/$i > temp.pot mv temp.pot po/$i else Index: arts/kde/mcop-dcop/kmcop.desktop =================================================================== RCS file: /home/kde/kdelibs/arts/kde/mcop-dcop/kmcop.desktop,v retrieving revision 1.92 retrieving revision 1.92.2.2 diff -u -3 -p -r1.92 -r1.92.2.2 --- arts/kde/mcop-dcop/kmcop.desktop 27 Jul 2004 07:23:00 -0000 1.92 +++ arts/kde/mcop-dcop/kmcop.desktop 31 Aug 2004 07:21:02 -0000 1.92.2.2 @@ -3,9 +3,7 @@ Encoding=UTF-8 Type=Service Name=KMCOP Name[af]=Kmcop -Name[fr]=COCO Name[hi]=के-एमकॉप -Name[xx]=xxKMCOPxx Exec=kmcop Comment=KDE MCOP-DCOP Bridge Comment[af]=Kde MCOP-DCOP Brug @@ -31,7 +29,7 @@ Comment[fr]=Passerelle MCOP-DCOP pour KD Comment[ga]=Droichead KDE idir MCOP agus DCOP Comment[gl]=Ponte MCOP-DCOP de KDE Comment[he]=גשר MCOP-DCOP ל-KDE -Comment[hi]=केडीई MCOP-DCOP ब्रिज +Comment[hi]=केडीई MCOP-डीकॉप ब्रिज Comment[hr]=Most između MCOP-a i DCOP-a Comment[hu]=KDE MCOP-DCOP összekötőprogram Comment[id]=Jembatan KDE MCOP-DCOP @@ -69,7 +67,6 @@ Comment[uk]=Міст KDE MCOP-DCOP Comment[uz]=KDE MCOP-DCOP кўприги Comment[ven]=KDE MCOP-DCOP Buroho Comment[xh]=KDE MCOP-DCOP Ibhulorho -Comment[xx]=xxKDE MCOP-DCOP Bridgexx Comment[zh_CN]=KDED MCOP-DCOP 桥 Comment[zh_TW]=KDE MCOP-DCOP 橋樑 Comment[zu]=Ibhulogo le-KDE MCOP-DCOP Index: arts/knotify/knotify.desktop =================================================================== RCS file: /home/kde/kdelibs/arts/knotify/knotify.desktop,v retrieving revision 1.192 retrieving revision 1.192.2.1 diff -u -3 -p -r1.192 -r1.192.2.1 --- arts/knotify/knotify.desktop 27 Jul 2004 07:23:00 -0000 1.192 +++ arts/knotify/knotify.desktop 24 Aug 2004 06:28:49 -0000 1.192.2.1 @@ -23,7 +23,6 @@ Name[ta]=கேகுறிப்பெ Name[tg]=KХабарнома Name[th]=ระบบแจ้งเตือน - K Name[ven]=U divhadza ha K -Name[xx]=xxKNotifyxx Name[zu]=I-KNotify Exec=knotify Comment=KDE Notification Daemon @@ -94,7 +93,6 @@ Comment[ven]=Daemon yau divhadza ya KDE Comment[vi]=Daemon thông báo của KDE Comment[wa]=Démon di notifiaedje di KDE Comment[xh]=Daemon Ulwaziso lwe KDE -Comment[xx]=xxKDE Notification Daemonxx Comment[zh_CN]=KDE 通告守护进程 Comment[zh_TW]=KDE 通知服務程式 Comment[zu]=Isaziso se-Daemon ye-KDE Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/kimproxy/interface/dcopinstantmessenger.desktop,v retrieving revision 1.31 retrieving revision 1.31.2.5 diff -u -3 -p -r1.31 -r1.31.2.5 --- interfaces/kimproxy/interface/dcopinstantmessenger.desktop 2 Aug 2004 06:53:11 -0000 1.31 +++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop 20 Sep 2004 13:53:09 -0000 1.31.2.5 @@ -26,6 +26,9 @@ Comment[pa]=ਇੱਕ DCOP ਇੰਟਰ Comment[pl]=Komunikator internetowy z interfejsem DCOP Comment[pt]=Mensageiro Instantâneo com interface DCOP Comment[pt_BR]=Mensageiro Instantâneo com uma interface DCOP +Comment[ro]=Aplicaţie de mesaje instantanee cu interfaţă DCOP +Comment[ru]=Клиент обмена сообщениями с интерфейсом DCOP +Comment[se]=Šleađgadiehtoprográmma mas lea DCOP-lákta Comment[sk]=Instant Messanger s rozhraním DCOP Comment[sl]=Takojšni sporočilnik z vmesnikom DCOP Comment[sr]=Брзи гласник са DCOP интерфејсом @@ -33,5 +36,5 @@ Comment[sr@Latn]=Брзи гласник Comment[sv]=Direktmeddelanden med ett DCOP-gränssnitt Comment[ta]=உடனடி செய்தியாளர் DCOP இடைமுகத்தோடு Comment[tg]=Коргири хизматгоҳи AOL пайғоми ахборот -Comment[xx]=xxInstant Messenger with a DCOP interfacexx +Comment[uk]=Програма для миттєвого зв'язку через DCOP Comment[zh_CN]=带 DCOP 接口的即时通讯程序 Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/kimproxy/interface/kcm_instantmessenger.desktop,v retrieving revision 1.33 retrieving revision 1.33.2.5 diff -u -3 -p -r1.33 -r1.33.2.5 --- interfaces/kimproxy/interface/kcm_instantmessenger.desktop 2 Aug 2004 06:53:11 -0000 1.33 +++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop 20 Sep 2004 13:53:09 -0000 1.33.2.5 @@ -19,15 +19,17 @@ Name[pa]=ਮੌਕਾ ਸੁਨੇਹਾ Name[pl]=Komunikator internetowy Name[pt]=Mensageiro Instantâneo Name[pt_BR]=Mensagem Instantâneo -Name[ro]=Mesaj instantaneu +Name[ro]=Mesaje instantanee +Name[ru]=Обмен сообщениями +Name[se]=Šleađgadieđut Name[sl]=Takojšni sporočilnik Name[sr]=Брзи гласник Name[sr@Latn]=Брзи гласник Name[sv]=Direktmeddelanden Name[ta]=உடனடி செய்தியாளர் Name[tg]=Пайғоми ахборот +Name[uk]=Програма для миттєвого зв'язку через DCOP Name[uz]=Хабар алмашиш воситаси -Name[xx]=xxInstant Messengerxx Name[zh_CN]=即时通讯程序 Comment=The instant messenger allows two-way chat between individuals and groups. Comment[bg]=Разговор между различни хора в реално време. @@ -53,6 +55,9 @@ Comment[pa]=ਇਹ ਮੌਕਾ ਸੁ Comment[pl]=Komunikator internetowy umożliwia pogawędki między dwiema osobami lub grupami osób. Comment[pt]=O mensageiro instantâneo permite conversar entre dois extremos com indivíduos e com grupos. Comment[pt_BR]=O mensageiro instantâneo permite que exista um bate-papo entre indivíduos e grupos +Comment[ro]=Aplicaţia de mesaje instantanee permite convorbiri între persoane sau grupuri de persoane. +Comment[ru]=Клиент обмена сообщениями служит для обмена сообщениями между людьми и группами. +Comment[se]=Šleađgadiehtoprográmma gos olbmot ja joavkkut sáhttet buillardallat (chat). Comment[sk]=Instant messenger umožňuje rozhovor medzi rôznymi osobami a skupinami. Comment[sl]=Takojšni sporočilnik omogoča dvosmeren klepet med posamezniki in skupinami. Comment[sr]=Брзи гласник вам омогућава двосмерно ћаскање између индивидуа и група. @@ -60,7 +65,7 @@ Comment[sr@Latn]=Брзи гласник Comment[sv]=Direktmeddelanden möjliggör tvåvägschatt mellan individer och grupper. Comment[ta]=உடனடி தகவல் உங்களை இரண்டு வழியில் தனிநபர் மற்றும் குழுக்கள் இடையே அனுமதிக்கும். Comment[tg]=Пайғоми ахборот ба шумо иҷозат медиҳад, ки ду роҳигуфтугӯиро байни шахсҳо ва гурӯҳҳоро ба истифода баред. -Comment[xx]=xxThe instant messenger allows two-way chat between individuals and groups.xx +Comment[uk]=Програма для миттєвого зв'язку дозволяє розмовляти з іншою людиною чи групою людей. Comment[zh_CN]=允许在个人和群组之间双向聊天的即时通讯程序。 ServiceTypeToConfigure=DCOP/InstantMessenger MimeTypeOfInterest=DCOP/InstantMessenger Index: interfaces/kscript/scriptinterface.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/kscript/scriptinterface.desktop,v retrieving revision 1.91 retrieving revision 1.91.2.2 diff -u -3 -p -r1.91 -r1.91.2.2 --- interfaces/kscript/scriptinterface.desktop 3 Aug 2004 07:01:10 -0000 1.91 +++ interfaces/kscript/scriptinterface.desktop 31 Aug 2004 07:21:05 -0000 1.91.2.2 @@ -24,7 +24,7 @@ Comment[fo]=Hetta er ein almen royndarfo Comment[fr]=Ceci est un moteur de script de test générique pour expérimenter l'interface de script. Comment[gl]=Ésta é unha ferramenta para proba-la interface dos guións. Comment[he]=זהו מנוע תסריטים כללי לבדיקת ממשק התסריטים -Comment[hi]= स्क्रिप्ट इंटरफेस जांचने हेतु यह एक जेनरिक टेस्ट स्क्रिप्ट इंजन है. +Comment[hi]= स्क्रिप्ट इंटरफेस जांचने के लिए यह एक जेनरिक टेस्ट स्क्रिप्ट इंजन है. Comment[hu]=Ez egy tesztszkript a szkript-felület kipróbálásához. Comment[is]=Þetta er almennur þýðandi til að prófa skriftuviðmótið. Comment[it]=Questo è un motore di script generico per provare l'interfaccia di script. @@ -63,7 +63,6 @@ Comment[ven]=Heyi ndi inzhini ya bammbir Comment[vi]=Đây là bộ script thử nghiệm chung cho việc thử các script giao diện Comment[wa]=Çouchal est on programe di saye po vey kimint rote l' eterface di scripes. Comment[xh]=Olu luvavanyo luka wonke-wonke lwenjini yokushicilelweyo yokuvavanya ujongano loshicilelo. -Comment[xx]=xxThis is a generic test script engine for testing the script interface.xx Comment[zh_CN]=这是一个用于测试脚本接口的通用脚本测试引擎。 Comment[zh_TW]=這是用來測試手稿介面用的一般性測試手稿引擎 Comment[zu]=Lena yinjini yesikripti sokuvivinya sawonke wonke yokuvivinya isikripti somxhumanisi. Index: interfaces/kscript/sample/shellscript.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/kscript/sample/shellscript.desktop,v retrieving revision 1.61 retrieving revision 1.61.2.2 diff -u -3 -p -r1.61 -r1.61.2.2 --- interfaces/kscript/sample/shellscript.desktop 5 Aug 2004 06:36:40 -0000 1.61 +++ interfaces/kscript/sample/shellscript.desktop 31 Aug 2004 07:21:05 -0000 1.61.2.2 @@ -18,7 +18,7 @@ Name[fa]=مجری نویسه‌ی پوس Name[fi]=Komentotulkkiohjelmien käynnistäjä Name[fr]=Lanceur de scripts shell Bash Name[gl]=Guión Executábel da Shell Bash -Name[hi]=बैश शैल स्क्रिप्ट चालक +Name[hi]=बैश शेल स्क्रिप्ट चालक Name[hr]=Izvršivač skripti Bash shella Name[hu]=Bash parancsfájl futtatása Name[is]=Keyrsluforrit bash skeljaforrita @@ -50,7 +50,6 @@ Name[tr]=Kabuk Betiği Çalıştırıcı Name[uk]=Виконувач скриптів командної оболонки (bash) Name[uz]=Bash шелл скриптини ишга тушурувчи Name[wa]=Enondeu di scripes shell bash -Name[xx]=xxBash Shell Script Runnerxx Name[zh_CN]=Bash Shell 脚本运行程序 Type=Service X-KDE-Library=libshellscript @@ -110,6 +109,5 @@ Comment[tr]=Uygulama içinden bash beti Comment[uk]=Запускає скрипти командної оболонки (bash) з програми. Comment[uz]=Дастурларнинг ичдан bash шелл скриптини ишга туширади Comment[wa]=Enonder des scripes shell bash a pårti do programe -Comment[xx]=xxRuns bash shell scripts from inside the application.xx Comment[zh_CN]=在应用程序内运行 bash shell 脚本。 Comment[zh_TW]=於程式內執行 bash shell script 檔案 Index: interfaces/ktexteditor/kcm_ktexteditor.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/kcm_ktexteditor.desktop,v retrieving revision 1.106 retrieving revision 1.106.2.2 diff -u -3 -p -r1.106 -r1.106.2.2 --- interfaces/ktexteditor/kcm_ktexteditor.desktop 4 Aug 2004 06:46:37 -0000 1.106 +++ interfaces/ktexteditor/kcm_ktexteditor.desktop 31 Aug 2004 07:21:05 -0000 1.106.2.2 @@ -21,7 +21,7 @@ Name[fr]=Éditeur de texte intégré Name[ga]=Eagarthóir téacs leabaithe Name[gl]=Editor de Textos Incrustado Name[he]=עורך טקסט מוטבע -Name[hi]=अंतरनिहित पाठ्य संसाघक +Name[hi]=अंतर्निहित पाठ संपादक Name[hr]=Ugrađeni uređivač teksta Name[hu]=Beágyazott szövegszerkesztő Name[id]=Komponen Editor Teks Embedded @@ -58,7 +58,6 @@ Name[uz]=Ички матн таҳрир Name[ven]=Musengulusi wa manwalwa o dzheniswaho Name[wa]=Ravalé aspougneu di tecse Name[xh]=Umhleli Wombhalo Olungiselelweyo -Name[xx]=xxEmbedded Text Editorxx Name[zh_CN]=嵌入式文本编辑器 Name[zh_TW]=嵌入式文字編輯器 Name[zu]=Umlungisi Wombhalo Oshuthekiwe @@ -121,7 +120,6 @@ Comment[uk]=Служба "Текстов Comment[uz]=Матн тарҳрирчи хизмати дастурларни матн кўрувчи ва таҳрирчи билан таъминлайди. Матн таҳрирлаш имкониятини яратувчи KDE дастурлари шу хизматни ишлатиши керак. Comment[ven]=Tshumelo ya musengulusi wa manwalwa i diswa apulifikhesheni dzirena na vhavhoni vha manwalwa na musengulusi. Apulifikhesheni ya KDE ine ya disa zwishumiswa zwa u sengulusa manwalwa i fanela u shumisa tshumelo ino. Comment[xh]=Inkonzo yomhleli wombhalo onika izicelo ngombonisi wombhalo nomhleli Izicelo ze KDE ezinikezela ngohlelo lombhalo ekufuneka isebenzise lenkonzo. -Comment[xx]=xxThe text editor service provides applications with a text viewer and editor. KDE applications that provide text editing facilities should use this service.xx Comment[zh_CN]=文本编辑器服务提供了文本查看器和编辑器的应用程序。提供文本编辑功能的 KDE 应用程序都应该使用此服务。 Comment[zh_TW]=文字編輯服務提供程式一個文字檢視器以及編輯器。提供文字編輯功能的 KDE 程式擁該使用這項服務。 Comment[zu]=Umsebenzi womlungisi wombhalo onikeza imiyaleli ngombukisi wombhalo kanye nomhleli.Abayaleli abanikeza izisebenzi zokulungisa umbhalo okumele zisebenzise lomsebenzi. Index: interfaces/ktexteditor/ktexteditor.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/ktexteditor.desktop,v retrieving revision 1.104 retrieving revision 1.104.2.2 diff -u -3 -p -r1.104 -r1.104.2.2 --- interfaces/ktexteditor/ktexteditor.desktop 4 Aug 2004 06:46:37 -0000 1.104 +++ interfaces/ktexteditor/ktexteditor.desktop 31 Aug 2004 07:21:05 -0000 1.104.2.2 @@ -26,7 +26,7 @@ Comment[fr]=Composant d'édition de text Comment[ga]=Comhpháirt eagarthóireacht téacs inleabaithe (le deighilt idir cáipéis agus amharc) Comment[gl]=Compoñente incrustábel de Edición de Texto (cunha Separación Doc/Vista) Comment[he]=רכיב עורך טקסט בר הטבעה (עם הפרדה בין מסמך לתצוגה) -Comment[hi]=अंतरनिहित किया जा सकने वाला पाठ संपादक (डाक/व्यू सेपरेशन के साथ) +Comment[hi]=अंतर्निहित किया जा सकने वाला पाठ संपादक (डाक/व्यू सेपरेशन के साथ) Comment[hr]=Umetljiva komponenta za obradu teksta (sa Doc/View separacijom) Comment[hu]=Beágyazható szövegszerkesztő (dokumentum/nézet modellel) Comment[is]=Ívafinn textaritill (með skjal/sýn aðskilnaði) @@ -65,7 +65,6 @@ Comment[uz]=Ичига ўрнатиб б Comment[ven]=Khomphonente ya musengulusi ya manwalwa (ina Doc/u khethekana ha u vhona) Comment[vi]=Componet của trình soạn thảo văn bản có thể embeđ Comment[xh]=Inxenye Yomhleli Wombhalo Olungiselelweyo (ngo Xwebhu/Ulwahlulo Lwemboniselo) -Comment[xx]=xxEmbeddable Text Editor Component (with Doc/View Separation)xx Comment[zh_CN]=可嵌入的文本编辑器部件(带 文档/查看 分离) Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 分開) Comment[zu]=IIunga Lomlungisi Wombhalo (Ngokuhlukana kwe-Doc/Umbukiso) Index: interfaces/ktexteditor/ktexteditoreditor.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/ktexteditoreditor.desktop,v retrieving revision 1.97 retrieving revision 1.97.2.2 diff -u -3 -p -r1.97 -r1.97.2.2 --- interfaces/ktexteditor/ktexteditoreditor.desktop 4 Aug 2004 06:46:37 -0000 1.97 +++ interfaces/ktexteditor/ktexteditoreditor.desktop 31 Aug 2004 07:21:05 -0000 1.97.2.2 @@ -26,7 +26,7 @@ Comment[fr]=Composant d'édition de text Comment[ga]=Comhpháirt eagarthóireacht téacs inleabaithe (gan deighilt idir cáipéis agus amharc) Comment[gl]=Compoñente incrustábel de Edición de Texto (sen Separación Doc/Vista) Comment[he]=רכיב עורך טקסט בר הטבעה (בלי הפרדה בין מסמך לתצוגה) -Comment[hi]=अंतरनिहित किया जा सकने वाला पाठ्य संसाघक (डाक/व्यू सेपरेशन के बगैर) +Comment[hi]=अंतर्निहित किया जा सकने वाला पाठ संपादक (डाक/व्यू सेपरेशन के बगैर) Comment[hr]=Umetljiva komponenta za obradu teksta (bez Doc/View separacije) Comment[hu]=Beágyazható szövegszerkesztő (dokumentum/nézet modell nélkül) Comment[is]=Ívafinn textaritill (án skjal/sýn aðskilnaðar) @@ -65,7 +65,6 @@ Comment[uz]=Ичига ўрнатиб б Comment[ven]=Khomphonente ya musengulusi wa manwalwa (i sina Doc/U khethekana hau vhona) Comment[vi]=Componet của trình soạn thảo văn bản có thể Embed( không phan^ biệtn Doc/ View) Comment[xh]=Ingxenye Yomhleli Wombhalo Olungiselekayo (ngaphandle Koxwebhu/Ulwahlulo Lwemboniselo) -Comment[xx]=xxEmbeddable Text Editor Component (without Doc/View Separation)xx Comment[zh_CN]=可嵌入的文本编辑器部件(不带 文档/查看 分离) Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 不分開) Comment[zu]=Ilunga Lomlungisi Wombhalo (ngaphandle Kokuhlukana kwe-Doc/Umbukiso) Index: interfaces/ktexteditor/ktexteditorplugin.desktop =================================================================== RCS file: /home/kde/kdelibs/interfaces/ktexteditor/ktexteditorplugin.desktop,v retrieving revision 1.78 retrieving revision 1.78.2.1 diff -u -3 -p -r1.78 -r1.78.2.1 --- interfaces/ktexteditor/ktexteditorplugin.desktop 27 Jul 2004 07:23:03 -0000 1.78 +++ interfaces/ktexteditor/ktexteditorplugin.desktop 24 Aug 2004 06:28:52 -0000 1.78.2.1 @@ -66,7 +66,6 @@ Comment[uz]=KTextEditor плагини Comment[ven]=Pulagini ya musengulusi wa manwalwa a K Comment[wa]=Tchôke-divins KTextEditor Comment[xh]=KTextEditor ye Plagi efakiweyo -Comment[xx]=xxKTextEditor Pluginxx Comment[zh_CN]=KTextEditor 插件 Comment[zh_TW]=KTextEditor 外掛程式 Comment[zu]= Ukungena ngaphakathi kwe-KTextEditor Index: kabc/kab2kabc.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/kab2kabc.desktop,v retrieving revision 1.88 retrieving revision 1.88.2.1 diff -u -3 -p -r1.88 -r1.88.2.1 --- kabc/kab2kabc.desktop 3 Aug 2004 07:01:12 -0000 1.88 +++ kabc/kab2kabc.desktop 24 Aug 2004 06:28:54 -0000 1.88.2.1 @@ -12,7 +12,6 @@ Name[pl]=Konwersja książki adresowej Name[pt_BR]=Conversão de kab para kabc Name[ro]=Kab2kabc Name[sv]=Kab2kabc -Name[xx]=xxkab2kabcxx Name[zu]=i-kab2kabc Exec=kab2kabc --disable-autostart --quiet Icon=misc @@ -80,7 +79,6 @@ Comment[uz]=libkab'ни libkabc'га а Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libkabc Comment[vi]=Công cụ hoán chuyển libkab thành libkabc . Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela. -Comment[xx]=xxlibkab to libkabc conversion tool.xx Comment[zh_CN]=libkab 到 libkabc 的转换工具。 Comment[zh_TW]=libkab 至 libkabc 轉換工具 Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc Index: kabc/ldapclient.cpp =================================================================== RCS file: /home/kde/kdelibs/kabc/ldapclient.cpp,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -3 -p -r1.22 -r1.22.2.1 --- kabc/ldapclient.cpp 3 Jul 2004 21:41:56 -0000 1.22 +++ kabc/ldapclient.cpp 6 Sep 2004 19:43:20 -0000 1.22.2.1 @@ -275,7 +275,7 @@ LdapSearch::LdapSearch() if ( !bindDN.isEmpty() ) ldapClient->setBindDN( bindDN ); - QString pwdBindDN = config.readEntry( QString( "SelectedPwdBind%1" ).arg( j ) ).stripWhiteSpace(); + QString pwdBindDN = config.readEntry( QString( "SelectedPwdBind%1" ).arg( j ) ); if ( !pwdBindDN.isEmpty() ) ldapClient->setPwdBindDN( pwdBindDN ); Index: kabc/ldapconfigwidget.h =================================================================== RCS file: /home/kde/kdelibs/kabc/ldapconfigwidget.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kabc/ldapconfigwidget.h 11 Jun 2004 22:31:39 -0000 1.5 +++ kabc/ldapconfigwidget.h 24 Sep 2004 06:46:27 -0000 1.5.2.1 @@ -96,7 +96,7 @@ namespace KABC { LdapConfigWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); /** Constructs a configuration widget */ - LdapConfigWidget( int flags = W_ALL, QWidget* parent = 0, + LdapConfigWidget( int flags, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); /** Destructs a configuration widget */ virtual ~LdapConfigWidget(); Index: kabc/formats/binary.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/formats/binary.desktop,v retrieving revision 1.63 retrieving revision 1.63.2.1 diff -u -3 -p -r1.63 -r1.63.2.1 --- kabc/formats/binary.desktop 5 Aug 2004 06:36:42 -0000 1.63 +++ kabc/formats/binary.desktop 24 Aug 2004 06:28:54 -0000 1.63.2.1 @@ -61,7 +61,6 @@ Name[uz]=Бинар Name[ven]=Zwivhili Name[wa]=Binaire Name[xh]=Ephindwe kabini -Name[xx]=xxBinaryxx Name[zh_CN]=二进制 Name[zh_TW]=二進位 Name[zu]=Okuhambisana ngambili Index: kabc/plugins/dir/dir.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/dir/dir.desktop,v retrieving revision 1.44 retrieving revision 1.44.2.1 diff -u -3 -p -r1.44 -r1.44.2.1 --- kabc/plugins/dir/dir.desktop 5 Aug 2004 06:36:42 -0000 1.44 +++ kabc/plugins/dir/dir.desktop 24 Aug 2004 06:28:55 -0000 1.44.2.1 @@ -69,7 +69,6 @@ Name[ven]=Tsumbavhulwo Name[vi]=Thư mục Name[wa]=Ridant Name[xh]=Ulawulo -Name[xx]=xxDirectoryxx Name[zh_CN]=目录 Name[zh_TW]=目錄 Name[zu]=Uhlu lwamafayela Index: kabc/plugins/evolution/evolution.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/evolution/evolution.desktop,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- kabc/plugins/evolution/evolution.desktop 5 Aug 2004 06:36:42 -0000 1.17 +++ kabc/plugins/evolution/evolution.desktop 24 Aug 2004 06:28:55 -0000 1.17.2.1 @@ -16,7 +16,6 @@ Name[tg]=Таҳаввул Name[ven]=Tsikoni Name[wa]=Evolucion Name[xh]=Utshintsho lwendawo ngokwenqanawa -Name[xx]=xxEvolutionxx Name[zu]=Evolushini X-KDE-Library=kabc_evo Type=Service Index: kabc/plugins/file/file.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/file/file.desktop,v retrieving revision 1.60 retrieving revision 1.60.2.1 diff -u -3 -p -r1.60 -r1.60.2.1 --- kabc/plugins/file/file.desktop 30 Jul 2004 07:00:52 -0000 1.60 +++ kabc/plugins/file/file.desktop 24 Aug 2004 06:28:55 -0000 1.60.2.1 @@ -57,7 +57,6 @@ Name[tr]=Dosya Name[uk]=Файл Name[uz]=Файл Name[wa]=Fitchî -Name[xx]=xxFilexx Name[zh_CN]=文件 X-KDE-Library=kabc_file Type=Service Index: kabc/plugins/ldapkio/ldapkio.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/ldapkio/ldapkio.desktop,v retrieving revision 1.11 retrieving revision 1.11.6.1 diff -u -3 -p -r1.11 -r1.11.6.1 --- kabc/plugins/ldapkio/ldapkio.desktop 25 Dec 2003 06:51:39 -0000 1.11 +++ kabc/plugins/ldapkio/ldapkio.desktop 24 Aug 2004 06:28:56 -0000 1.11.6.1 @@ -3,7 +3,6 @@ Encoding=UTF-8 Name=LDAP Name[bn]=এল-ডি-এ-পি (LDAP) Name[hi]=एलडीएपी (LDAP) -Name[xx]=xxLDAPxx X-KDE-Library=kabc_ldapkio Type=Service ServiceTypes=KResources/Plugin Index: kabc/plugins/net/net.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/net/net.desktop,v retrieving revision 1.39 retrieving revision 1.39.2.1 diff -u -3 -p -r1.39 -r1.39.2.1 --- kabc/plugins/net/net.desktop 27 Jul 2004 07:23:07 -0000 1.39 +++ kabc/plugins/net/net.desktop 24 Aug 2004 06:28:56 -0000 1.39.2.1 @@ -66,7 +66,6 @@ Name[ven]=Vhukwamani Name[vi]=Mạng Name[wa]=Rantoele Name[xh]=Umsebenzi womnatha -Name[xx]=xxNetworkxx Name[zh_CN]=网络 Name[zh_TW]=網路 Name[zu]=Umsebenzi wokuxhumana okusakazekile Index: kabc/plugins/sql/sql.desktop =================================================================== RCS file: /home/kde/kdelibs/kabc/plugins/sql/sql.desktop,v retrieving revision 1.11 retrieving revision 1.11.6.1 diff -u -3 -p -r1.11 -r1.11.6.1 --- kabc/plugins/sql/sql.desktop 25 Dec 2003 06:51:43 -0000 1.11 +++ kabc/plugins/sql/sql.desktop 24 Aug 2004 06:28:56 -0000 1.11.6.1 @@ -5,7 +5,6 @@ Name[af]=Sql Name[bn]=এস-কিউ-এল (SQL) Name[hi]=एसक्यूएल (SQL) Name[ss]=I-SQL -Name[xx]=xxSQLxx [Plugin] Type=sql Index: kate/Makefile.am =================================================================== RCS file: /home/kde/kdelibs/kate/Makefile.am,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -u -3 -p -r1.9 -r1.9.4.1 --- kate/Makefile.am 24 Feb 2004 19:14:48 -0000 1.9 +++ kate/Makefile.am 20 Aug 2004 21:47:59 -0000 1.9.4.1 @@ -4,7 +4,7 @@ EXTRA_DIST = AUTHORS COPYING.LIB ChangeL messages: $(EXTRACTRC) ./*/*.rc >> ./rc.cpp perl -n kate-extract-i18n-xml.pl data/*.xml >> rc.cpp - $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/katepart.pot + $(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts include ../admin/Doxyfile.am Index: kate/data/awk.xml =================================================================== RCS file: /home/kde/kdelibs/kate/data/awk.xml,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -3 -p -r1.4 -r1.4.2.1 --- kate/data/awk.xml 27 Jun 2004 14:04:26 -0000 1.4 +++ kate/data/awk.xml 25 Sep 2004 13:54:19 -0000 1.4.2.1 @@ -1,10 +1,8 @@ - + - BEGIN - END if else while @@ -41,6 +39,7 @@ gsub + gensub index length match @@ -63,29 +62,33 @@ fflush system + + + + + + + + - + - - - + - - - - - - + + + + Index: kate/data/css.xml =================================================================== RCS file: /home/kde/kdelibs/kate/data/css.xml,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -u -3 -p -r1.27 -r1.27.2.1 --- kate/data/css.xml 3 Aug 2004 21:18:16 -0000 1.27 +++ kate/data/css.xml 24 Sep 2004 21:00:49 -0000 1.27.2.1 @@ -1,6 +1,6 @@ - + @@ -509,7 +509,7 @@ - + @@ -582,7 +582,7 @@ - + Index: kate/data/doxygen.xml =================================================================== RCS file: /home/kde/kdelibs/kate/data/doxygen.xml,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -3 -p -r1.22 -r1.22.2.1 --- kate/data/doxygen.xml 19 Jul 2004 11:01:31 -0000 1.22 +++ kate/data/doxygen.xml 19 Sep 2004 11:42:36 -0000 1.22.2.1 @@ -23,7 +23,7 @@ * Boston, MA 02111-1307, USA. * ********************************************************************** --> - + @@ -283,7 +283,7 @@ - + Index: kate/data/html.xml =================================================================== RCS file: /home/kde/kdelibs/kate/data/html.xml,v retrieving revision 1.34 retrieving revision 1.34.2.1 diff -u -3 -p -r1.34 -r1.34.2.1 --- kate/data/html.xml 16 Jul 2004 16:34:12 -0000 1.34 +++ kate/data/html.xml 23 Aug 2004 13:19:29 -0000 1.34.2.1 @@ -4,7 +4,7 @@ ]> - + Index: kate/data/katepart.desktop =================================================================== RCS file: /home/kde/kdelibs/kate/data/katepart.desktop,v retrieving revision 1.127 retrieving revision 1.127.2.3 diff -u -3 -p -r1.127 -r1.127.2.3 --- kate/data/katepart.desktop 27 Jul 2004 07:23:09 -0000 1.127 +++ kate/data/katepart.desktop 31 Aug 2004 07:21:08 -0000 1.127.2.3 @@ -23,7 +23,7 @@ Name[fr]=Éditeur de texte avancé inté Name[ga]=Ard-eagarthóir téacs leabaithe Name[gl]=Editor de Textos Avanzado Incrustado Name[he]=עורך הטקסט המתקדם המוטבע -Name[hi]= अंतरनिहित उन्नत पाठ संसाधक +Name[hi]= अंतर्निहित विकसित पाठ संपादक Name[hr]=Umetljiva komponenta za naprednu obradu teksta Name[hu]=Beágyazott Kate szövegszerkesztő Name[id]=Komponen Editor Teks Embedded @@ -61,7 +61,6 @@ Name[uz]=Кенгайтирилган и Name[ven]=Musengulusi wa manwalwa a nthesa o dzheniswaho Name[wa]=Ravalé aspougneu di tecse avancî Name[xh]=Umhleli Wombhalo Obhekisa phambili Olungiselweyo -Name[xx]=xxEmbedded Advanced Text Editorxx Name[zh_CN]=嵌入式 KDE 高级文本编辑器 Name[zh_TW]=嵌入式進階文字編輯器 Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe @@ -70,4 +69,4 @@ Icon=kate ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document Type=Service InitialPreference=8 -MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/x-csharp-src;text/x-csharp-hde;text/css;application/x-desktop;text/x-diff;text/x-eiffel-src;text/x-ferite-src;text/x-fortran;text/html;text/x-ilerpg-src;text/x-java;text/x-javascript;text/x-kbasic-src;text/x-tex;text/x-makefile;text/mfile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;application/x-ruby;text/x-sather-src;text/x-scheme;text/sgml;text/x-sql;text/x-verilog-src;text/x-vhdl;text/xml;text/book;model/vrml +MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;application/x-ruby;text/sgml;text/xml;model/vrml Index: kate/data/katepartreadonlyui.rc =================================================================== RCS file: /home/kde/kdelibs/kate/data/katepartreadonlyui.rc,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -3 -p -r1.28 -r1.28.2.1 --- kate/data/katepartreadonlyui.rc 9 Jul 2004 22:08:56 -0000 1.28 +++ kate/data/katepartreadonlyui.rc 23 Sep 2004 08:27:21 -0000 1.28.2.1 @@ -45,9 +45,9 @@ - &Tools + Index: kate/data/mup.xml =================================================================== RCS file: /home/kde/kdelibs/kate/data/mup.xml,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -p -r1.6 -r1.6.2.1 --- kate/data/mup.xml 21 Jul 2004 05:52:22 -0000 1.6 +++ kate/data/mup.xml 4 Sep 2004 19:43:36 -0000 1.6.2.1 @@ -20,6 +20,7 @@ grids music headshape + block Index: kate/data/picsrc.xml =================================================================== RCS file: /home/kde/kdelibs/kate/data/picsrc.xml,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kate/data/picsrc.xml 20 Jun 2004 19:56:41 -0000 1.8 +++ kate/data/picsrc.xml 22 Sep 2004 12:40:21 -0000 1.8.2.1 @@ -4,7 +4,7 @@ Alain GIBAUD (alain.gibaud@univ-valenciennes.fr) Small modifications for the new DTD by Joseph Wenninger --> - + @@ -21,6 +21,7 @@ Small modifications for the new DTD by J de dt dw + endc endm equ error @@ -53,6 +54,7 @@ Small modifications for the new DTD by J DE DT DW + ENDC ENDM EQU ERROR @@ -78,7 +80,7 @@ Small modifications for the new DTD by J END - + if else idef @@ -94,16 +96,11 @@ Small modifications for the new DTD by J addcf b - bc - bz - bnc - bnz clrc clrz setc setz movfw - negf skpc skpz skpnc @@ -113,16 +110,11 @@ Small modifications for the new DTD by J ADDCF B - BC - BZ - BNC - BNZ CLRC CLRZ SETC SETZ MOVFW - NEGF SKPC SKPZ SKPNC @@ -134,86 +126,164 @@ Small modifications for the new DTD by J addlw addwf + addwfc + andlw + bc bcf + bn + bnc + bnov + bnz + bov + bra bsf + btg + bz btfsc btfss call clrf clrw - clrwtd + clrwdt comf + cpfseq + cpfslt + cpfsgt + daw decf + dcfsnz decfsz goto incf incfsz + infsnz iorlw + lfsr movf + movff + movlb movlw movwf + mullw + mulwf + negf nop option + pop + push + rcall + reset retfie retlw return - rlf - rrf + rlcf + rlncf + rrcf + rrncf + setf sleep + subfwb sublw subwf + subwfb swapf - tris + tblrd + tblwt + tstfsz xorlw xorwf ADDLW ADDWF + ADDWFC + ANDLW + BC BCF + BN + BNC + BNOV + BNZ + BOV + BRA BSF + BTG + BZ BTFSC BTFSS CALL CLRF CLRW - CLRWTD + CLRWDT COMF + CPFSEQ + CPFSLT + CPFSGT + DAW + DCFSNZ DECF DECFSZ GOTO INCF INCFSZ + INFSNZ IORLW + LFSR MOVF + MOVFF + MOVLB MOVLW MOVWF + MULLW + MULWF + NEGF NOP OPTION + POP + PUSH + RCALL + RESET RETFIE RETLW RETURN - RLF - RRF + RLCF + RLNCF + RRCF + RRNCF + SETF SLEEP + SUBFWB SUBLW SUBWF + SUBWFB SWAPF - TRIS + TBLRD + TBLWT + TSTFSZ XORLW XORWF + + + A + ACCESS + BANKED + W + F + + - + + - - - - + + + + @@ -268,19 +338,20 @@ Small modifications for the new DTD by J - - - - - - - - - - - - - + + + + + + + + + + + + + + Index: kate/data/sql-postgresql.xml =================================================================== RCS file: /home/kde/kdelibs/kate/data/sql-postgresql.xml,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kate/data/sql-postgresql.xml 20 Jun 2004 19:56:41 -0000 1.8 +++ kate/data/sql-postgresql.xml 22 Aug 2004 17:07:27 -0000 1.8.2.1 @@ -1,13 +1,13 @@ - + ABORT ACCESS ACTION - ADA + ADD ADMIN AFTER AGGREGATE @@ -198,6 +198,7 @@ IGNORE ILIKE IMMEDIATE + IMMUTABLE IMPLEMENTATION IN INCREMENT @@ -411,6 +412,7 @@ SQLEXCEPTION SQLSTATE SQLWARNING + STABLE START STATE STATEMENT @@ -485,6 +487,7 @@ VERBOSE VERSION VIEW + VOLATILE WHEN WHENEVER WHERE @@ -724,6 +727,7 @@ TIMETZ TIMESTAMP TIMESTAMPTZ + TIMESTAMP WITH TIMEZONE Index: kate/part/kateautoindent.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/kateautoindent.cpp,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -3 -p -r1.23 -r1.23.2.1 --- kate/part/kateautoindent.cpp 18 Jun 2004 20:01:05 -0000 1.23 +++ kate/part/kateautoindent.cpp 14 Sep 2004 08:23:13 -0000 1.23.2.1 @@ -423,7 +423,7 @@ bool KateCSmartIndent::handleDoxygen (Ka while ((line > 0) && (first < 0)) first = doc->plainKateTextLine(--line)->firstChar(); - if (first > 0) + if (first >= 0) { KateTextLine::Ptr textLine = doc->plainKateTextLine(line); bool insideDoxygen = false; @@ -441,7 +441,7 @@ bool KateCSmartIndent::handleDoxygen (Ka int indent = findOpeningComment(begin); QString filler = tabString (indent); - bool doxygenAutoInsert = doc->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping; + bool doxygenAutoInsert = doc->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping; if ( doxygenAutoInsert && (!textLine->stringAtPos(first, "*/") && !textLine->stringAtPos(first, "*"))) { @@ -453,7 +453,7 @@ bool KateCSmartIndent::handleDoxygen (Ka begin.setCol(filler.length()); return true; - } + } } return false; @@ -472,7 +472,7 @@ void KateCSmartIndent::processNewline (K { QString filler = tabString (indent); doc->insertText (begin.line(), 0, filler); - begin.setCol(filler.length()); + begin.setCol(filler.length()); // Handles cases where user hits enter at the beginning or middle of text if (inMiddle) Index: kate/part/katecodecompletion.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katecodecompletion.cpp,v retrieving revision 1.35 retrieving revision 1.35.8.3 diff -u -3 -p -r1.35 -r1.35.8.3 --- kate/part/katecodecompletion.cpp 1 Jan 2004 18:03:04 -0000 1.35 +++ kate/part/katecodecompletion.cpp 23 Sep 2004 13:23:54 -0000 1.35.8.3 @@ -121,12 +121,13 @@ KateCodeCompletion::KateCodeCompletion( m_completionListBox = new KateCCListBox( m_completionPopup ); m_completionListBox->setFrameStyle( QFrame::NoFrame ); m_completionListBox->setCornerWidget( new QSizeGrip( m_completionListBox) ); + m_completionListBox->setFocusProxy( m_view->m_viewInternal ); m_completionListBox->installEventFilter( this ); m_completionPopup->resize(m_completionListBox->sizeHint() + QSize(2,2)); m_completionPopup->installEventFilter( this ); - m_completionPopup->setFocusProxy( m_completionListBox ); + m_completionPopup->setFocusProxy( m_view->m_viewInternal ); m_pArgHint = new KateArgHint( m_view ); connect( m_pArgHint, SIGNAL(argHintHidden()), @@ -178,51 +179,31 @@ bool KateCodeCompletion::eventFilter( QO return false; } - if ( e->type() == QEvent::KeyPress ) { - QKeyEvent *ke = (QKeyEvent*)e; - if( /*(ke->key() == Key_Left) || (ke->key() == Key_Right) ||*///what are <- and -> used for?? - (ke->key() == Key_Up) || (ke->key() == Key_Down ) || - (ke->key() == Key_Home ) || (ke->key() == Key_End) || - (ke->key() == Key_Prior) || (ke->key() == Key_Next )) { - QTimer::singleShot(0,this,SLOT(showComment())); - return false; - } - if( ke->key() == Key_Enter || ke->key() == Key_Return ) { - doComplete(); - return false; - } - - if( ke->key() == Key_Escape ) { - abortCompletion(); - m_view->setFocus(); - return false; - } - - int qtKeyCode = ke->key() | ((ke->state() & Qt::ShiftButton) ? Qt::SHIFT : 0) | ((ke->state() & Qt::ControlButton) ? Qt::CTRL : 0) | ((ke->state() & Qt::AltButton) ? Qt::ALT : 0) | ((ke->state() & Qt::MetaButton) ? Qt::META : 0); - - // redirect the event to the editor - if( ke->key() == Key_Backspace) { - m_view->backspace(); - } else if (qtKeyCode == m_view->m_editUndo->shortcut().keyCodeQt()) { - m_view->m_editUndo->activate(); - } else { - QApplication::sendEvent( m_view->m_viewInternal, e ); - } + return false; +} - if( m_colCursor > m_view->cursorColumnReal() ) { - // the cursor is too far left - kdDebug(13035) << "Aborting Codecompletion after sendEvent" << endl; - kdDebug(13035) << m_view->cursorColumnReal() << endl; - abortCompletion(); - m_view->setFocus(); - return true; - } +void KateCodeCompletion::handleKey (QKeyEvent *e) +{ + // close completion if you move out of range + if ((e->key() == Key_Up) && (m_completionListBox->currentItem() == 0)) + { + abortCompletion(); + m_view->setFocus(); + return; + } - updateBox(); - return true; + // keyboard movement + if( (e->key() == Key_Up) || (e->key() == Key_Down ) || + (e->key() == Key_Home ) || (e->key() == Key_End) || + (e->key() == Key_Prior) || (e->key() == Key_Next )) + { + QTimer::singleShot(0,this,SLOT(showComment())); + QApplication::sendEvent( m_completionListBox, (QEvent*)e ); + return; } - return false; + // update the box + updateBox(); } void KateCodeCompletion::doComplete() @@ -267,6 +248,15 @@ void KateCodeCompletion::complete( KText void KateCodeCompletion::updateBox( bool ) { + if( m_colCursor > m_view->cursorColumnReal() ) { + // the cursor is too far left + kdDebug(13035) << "Aborting Codecompletion after sendEvent" << endl; + kdDebug(13035) << m_view->cursorColumnReal() << endl; + abortCompletion(); + m_view->setFocus(); + return; + } + m_completionListBox->clear(); QString currentLine = m_view->currentTextLine(); @@ -394,6 +384,7 @@ KateArgHint::KateArgHint( KateView* pare : QFrame( parent, name, WType_Popup ) { setBackgroundColor( black ); + setPaletteForegroundColor( Qt::black ); labelDict.setAutoDelete( true ); layout = new QVBoxLayout( this, 1, 2 ); Index: kate/part/katecodecompletion.h =================================================================== RCS file: /home/kde/kdelibs/kate/part/katecodecompletion.h,v retrieving revision 1.12 retrieving revision 1.12.4.1 diff -u -3 -p -r1.12 -r1.12.4.1 --- kate/part/katecodecompletion.h 12 May 2004 16:36:13 -0000 1.12 +++ kate/part/katecodecompletion.h 23 Aug 2004 15:55:56 -0000 1.12.4.1 @@ -42,11 +42,12 @@ class KateArgHint; class KateCCListBox; class QLayout; +class QVBox; class KateCodeCompletionCommentLabel : public QLabel { Q_OBJECT - + public: KateCodeCompletionCommentLabel( QWidget* parent, const QString& text) : QLabel( parent, "toolTipTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ) @@ -67,37 +68,42 @@ class KateCodeCompletion : public QObjec { Q_OBJECT + friend class KateViewInternal; + public: KateCodeCompletion(KateView *view); - + bool codeCompletionVisible (); - + void showArgHint( QStringList functionList, const QString& strWrapping, const QString& strDelimiter ); void showCompletionBox( QValueList entries, int offset = 0, bool casesensitive = true ); bool eventFilter( QObject* o, QEvent* e ); - + + void handleKey (QKeyEvent *e); + public slots: void slotCursorPosChanged(); void showComment(); - + void updateBox () { updateBox(false); } + signals: void completionAborted(); void completionDone(); void argHintHidden(); void completionDone(KTextEditor::CompletionEntry); void filterInsertString(KTextEditor::CompletionEntry*,QString *); - + private: void doComplete(); void abortCompletion(); void complete( KTextEditor::CompletionEntry ); - void updateBox( bool newCoordinate = false ); - + void updateBox( bool newCoordinate ); + KateArgHint* m_pArgHint; KateView* m_view; - class QVBox* m_completionPopup; + QVBox* m_completionPopup; KateCCListBox* m_completionListBox; QValueList m_complList; uint m_lineCursor; @@ -110,35 +116,35 @@ class KateCodeCompletion : public QObjec class KateArgHint: public QFrame { Q_OBJECT - + public: KateArgHint( KateView* =0, const char* =0 ); virtual ~KateArgHint(); - + virtual void setCurrentFunction( int ); virtual int currentFunction() const { return m_currentFunction; } - + void setArgMarkInfos( const QString&, const QString& ); - + virtual void addFunction( int, const QString& ); QString functionAt( int id ) const { return m_functionMap[ id ]; } - + virtual void show(); virtual void adjustSize(); virtual bool eventFilter( QObject*, QEvent* ); - + signals: void argHintHidden(); void argHintCompleted(); void argHintAborted(); - + public slots: virtual void reset( int, int ); virtual void cursorPositionChanged( KateView*, int, int ); - + private slots: void slotDone(bool completed); - + private: QMap m_functionMap; int m_currentFunction; Index: kate/part/katecodefoldinghelpers.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katecodefoldinghelpers.cpp,v retrieving revision 1.63 retrieving revision 1.63.4.1 diff -u -3 -p -r1.63 -r1.63.4.1 --- kate/part/katecodefoldinghelpers.cpp 23 May 2004 12:33:16 -0000 1.63 +++ kate/part/katecodefoldinghelpers.cpp 25 Aug 2004 01:16:55 -0000 1.63.4.1 @@ -19,6 +19,8 @@ #include "katecodefoldinghelpers.h" #include "katecodefoldinghelpers.moc" +#include "katebuffer.h" + #include #include @@ -63,7 +65,7 @@ KateCodeFoldingNode::~KateCodeFoldingNod } -KateCodeFoldingTree::KateCodeFoldingTree(QObject *par): QObject(par), KateCodeFoldingNode() +KateCodeFoldingTree::KateCodeFoldingTree(KateBuffer *buffer): QObject(buffer), KateCodeFoldingNode(), m_buffer (buffer) { clear(); } @@ -421,7 +423,7 @@ bool KateCodeFoldingTree::removeEnding(K if (!parent) return false; - + if (node->type == 0) return false; @@ -1145,6 +1147,9 @@ void KateCodeFoldingTree::dontDeleteOpen void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line) { + // hl whole file + m_buffer->line (m_buffer->count()-1); + lineMapping.clear(); hiddenLinesCountCacheValid = false; kdDebug(13000)<line (m_buffer->count()-1); + if( !hasChildNodes ()) return; @@ -1364,6 +1371,9 @@ void KateCodeFoldingTree::collapseToplev void KateCodeFoldingTree::expandToplevelNodes(int numLines) { + // hl whole file + m_buffer->line (m_buffer->count()-1); + KateLineInfo line; for (int i = 0; i < numLines; i++) { getLineInfo(&line, i); @@ -1375,6 +1385,9 @@ void KateCodeFoldingTree::expandToplevel int KateCodeFoldingTree::collapseOne(int realLine) { + // hl whole file + m_buffer->line (m_buffer->count()-1); + KateLineInfo line; int unrelatedBlocks = 0; for (int i = realLine; i >= 0; i--) { @@ -1401,6 +1414,9 @@ int KateCodeFoldingTree::collapseOne(int void KateCodeFoldingTree::expandOne(int realLine, int numLines) { + // hl whole file + m_buffer->line (m_buffer->count()-1); + KateLineInfo line; int blockTrack = 0; for (int i = realLine; i >= 0; i--) { Index: kate/part/katecodefoldinghelpers.h =================================================================== RCS file: /home/kde/kdelibs/kate/part/katecodefoldinghelpers.h,v retrieving revision 1.27 retrieving revision 1.27.4.1 diff -u -3 -p -r1.27 -r1.27.4.1 --- kate/part/katecodefoldinghelpers.h 23 May 2004 17:00:07 -0000 1.27 +++ kate/part/katecodefoldinghelpers.h 25 Aug 2004 01:16:55 -0000 1.27.4.1 @@ -25,6 +25,8 @@ #include #include +class KateBuffer; + class QString; //END @@ -94,7 +96,7 @@ class KateCodeFoldingTree : public QObje Q_OBJECT public: - KateCodeFoldingTree (QObject *); + KateCodeFoldingTree (KateBuffer *buffer); ~KateCodeFoldingTree (); KateCodeFoldingNode *findNodeForLine (unsigned int line); @@ -116,6 +118,8 @@ class KateCodeFoldingTree : public QObje void clear (); private: + KateBuffer *m_buffer; + QIntDict lineMapping; QIntDict dontIgnoreUnchangedLines; Index: kate/part/katedialogs.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katedialogs.cpp,v retrieving revision 1.134 retrieving revision 1.134.2.2 diff -u -3 -p -r1.134 -r1.134.2.2 --- kate/part/katedialogs.cpp 10 Jul 2004 19:39:06 -0000 1.134 +++ kate/part/katedialogs.cpp 21 Sep 2004 13:27:13 -0000 1.134.2.2 @@ -121,7 +121,9 @@ #include #include -#define HLDOWNLOADPATH "http://www.kde.org/apps/kate/hl/update.xml" +// trailing slash is important +#define HLDOWNLOADPATH "http://www.kde.org/apps/kate/syntax/" + //END //BEGIN KateConfigPage @@ -281,7 +283,7 @@ void KateIndentConfigTab::somethingToggl void KateIndentConfigTab::indenterSelected (int index) { - if (KateAutoIndent::modeDescription(index) == "C Style") + if (index == KateDocumentConfig::imCStyle) opt[6]->setEnabled(true); else opt[6]->setEnabled(false); @@ -1367,24 +1369,29 @@ void KateHlConfigPage::showMTDlg() //BEGIN KateHlDownloadDialog KateHlDownloadDialog::KateHlDownloadDialog(QWidget *parent, const char *name, bool modal) - :KDialogBase(KDialogBase::Swallow, i18n("Highlight Download"), User1|Cancel, User1, parent, name, modal, true, i18n("&Install")) + :KDialogBase(KDialogBase::Swallow, i18n("Highlight Download"), User1|Close, User1, parent, name, modal, true, i18n("&Install")) { QVBox* vbox = new QVBox(this); setMainWidget(vbox); vbox->setSpacing(spacingHint()); new QLabel(i18n("Select the syntax highlighting files you want to update:"), vbox); list = new QListView(vbox); + list->addColumn(""); list->addColumn(i18n("Name")); list->addColumn(i18n("Installed")); list->addColumn(i18n("Latest")); - list->addColumn(i18n("Release Date")); list->setSelectionMode(QListView::Multi); + list->setAllColumnsShowFocus(true); new QLabel(i18n("Note: New versions are selected automatically."), vbox); actionButton (User1)->setIconSet(SmallIconSet("ok")); - KIO::TransferJob *getIt=KIO::get(KURL(HLDOWNLOADPATH), true, true ); - connect(getIt,SIGNAL(data(KIO::Job *, const QByteArray &)), + transferJob = KIO::get( + KURL(QString(HLDOWNLOADPATH) + + QString("update-") + + QString(KATEPART_VERSION) + + QString(".xml")), true, true ); + connect(transferJob, SIGNAL(data(KIO::Job *, const QByteArray &)), this, SLOT(listDataReceived(KIO::Job *, const QByteArray &))); // void data( KIO::Job *, const QByteArray &data); resize(450, 400); @@ -1394,6 +1401,12 @@ KateHlDownloadDialog::~KateHlDownloadDia void KateHlDownloadDialog::listDataReceived(KIO::Job *, const QByteArray &data) { + if (!transferJob || transferJob->isErrorPage()) + { + actionButton(User1)->setEnabled(false); + return; + } + listData+=QString(data); kdDebug(13000)<version() < e.attribute("version")) { entry->setSelected(true); + entry->setPixmap(0, SmallIcon(("knewstuff"))); } } } Index: kate/part/katedialogs.h =================================================================== RCS file: /home/kde/kdelibs/kate/part/katedialogs.h,v retrieving revision 1.67 retrieving revision 1.67.2.1 diff -u -3 -p -r1.67 -r1.67.2.1 --- kate/part/katedialogs.h 18 Jun 2004 20:01:07 -0000 1.67 +++ kate/part/katedialogs.h 25 Aug 2004 21:52:43 -0000 1.67.2.1 @@ -46,7 +46,11 @@ struct syntaxContextData; class KateDocument; class KateView; -namespace KIO { class Job; } +namespace KIO +{ + class Job; + class TransferJob; +} class KAccel; class KColorButton; @@ -355,6 +359,7 @@ class KateHlDownloadDialog: public KDial private: class QListView *list; class QString listData; + KIO::TransferJob *transferJob; private slots: void listDataReceived(KIO::Job *, const QByteArray &data); Index: kate/part/katedocument.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katedocument.cpp,v retrieving revision 1.734 retrieving revision 1.734.2.4 diff -u -3 -p -r1.734 -r1.734.2.4 --- kate/part/katedocument.cpp 6 Jul 2004 20:32:46 -0000 1.734 +++ kate/part/katedocument.cpp 27 Aug 2004 16:59:01 -0000 1.734.2.4 @@ -236,7 +236,7 @@ KateDocument::KateDocument ( bool bSingl for (uint z = 0; z < m_views.count(); z++) connect( m_views.at(z), SIGNAL(gotFocus( Kate::View * )), this, SLOT(slotModifiedOnDisk()) ); - m_isasking = false; + m_isasking = 0; } // @@ -1051,17 +1051,37 @@ bool KateDocument::wrapText (uint startL if (!l) return false; - if (l->length() > col) + kdDebug () << "try wrap line: " << line << endl; + + if (l->lengthWithTabs(m_buffer->tabWidth()) > col) { KateTextLine::Ptr nextl = m_buffer->line(line+1); + kdDebug () << "do wrap line: " << line << endl; + const QChar *text = l->text(); uint eolPosition = l->length()-1; - uint searchStart = col; - //If where we are wrapping is an end of line and is a space we don't - //want to wrap there - if (col == eolPosition && text[col].isSpace()) + // take tabs into account here, too + uint x = 0; + const QString & t = l->string(); + uint z2 = 0; + for ( ; z2 < l->length(); z2++) + { + if (t[z2] == QChar('\t')) + x += m_buffer->tabWidth() - (x % m_buffer->tabWidth()); + else + x++; + + if (x > col) + break; + } + + uint searchStart = KMIN (z2, l->length()-1); + + // If where we are wrapping is an end of line and is a space we don't + // want to wrap there + if (searchStart == eolPosition && text[searchStart].isSpace()) searchStart--; // Scan backwards looking for a place to break the line @@ -1110,8 +1130,7 @@ bool KateDocument::wrapText (uint startL editMarkLineAutoWrapped (line+1, true); - if (newLineAdded) - endLine++; + endLine++; } } } @@ -3653,7 +3672,12 @@ void KateDocument::addStartLineCommentTo bool KateDocument::nextNonSpaceCharPos(int &line, int &col) { for(; line < (int)m_buffer->count(); line++) { - col = m_buffer->plainLine(line)->nextNonSpaceChar(col); + KateTextLine::Ptr textLine = m_buffer->plainLine(line); + + if (!textLine) + break; + + col = textLine->nextNonSpaceChar(col); if(col != -1) return true; // Next non-space char found col = 0; @@ -3668,11 +3692,16 @@ bool KateDocument::previousNonSpaceCharP { while(true) { - col = m_buffer->plainLine(line)->previousNonSpaceChar(col); + KateTextLine::Ptr textLine = m_buffer->plainLine(line); + + if (!textLine) + break; + + col = textLine->previousNonSpaceChar(col); if(col != -1) return true; if(line == 0) return false; --line; - col = m_buffer->plainLine(line)->length(); + col = textLine->length(); } // No non-space char found line = -1; @@ -3689,8 +3718,8 @@ bool KateDocument::removeStartStopCommen QString startComment = m_highlight->getCommentStart( attrib ); QString endComment = m_highlight->getCommentEnd( attrib ); - int sl = selectStart.line(); - int el = selectEnd.line(); + int sl = kMax (0, selectStart.line()); + int el = kMin (selectEnd.line(), lastLine()); int sc = selectStart.col(); int ec = selectEnd.col(); @@ -3969,10 +3998,38 @@ void KateDocument::joinLines( uint first { // if ( first == last ) last += 1; editStart(); - int l( first ); + int line( first ); while ( first < last ) { - editUnWrapLine( l ); + // Normalize the whitespace in the joined lines by making sure there's + // always exactly one space between the joined lines + // This cannot be done in editUnwrapLine, because we do NOT want this + // behaviour when deleting from the start of a line, just when explicitly + // calling the join command + KateTextLine::Ptr l = m_buffer->line( line ); + KateTextLine::Ptr tl = m_buffer->line( line + 1 ); + + if ( !l || !tl ) + { + editEnd(); + return; + } + + int pos = tl->firstChar(); + if ( pos >= 0 ) + { + if (pos != 0) + editRemoveText( line + 1, 0, pos ); + if ( !( l->length() == 0 || l->getChar( l->length() - 1 ).isSpace() ) ) + editInsertText( line + 1, 0, " " ); + } + else + { + // Just remove the whitespace and let Kate handle the rest + editRemoveText( line + 1, 0, tl->length() ); + } + + editUnWrapLine( line ); first++; } editEnd(); @@ -4278,19 +4335,13 @@ void KateDocument::setDocName (QString n void KateDocument::slotModifiedOnDisk( Kate::View *v ) { - if ( ! s_fileChangedDialogsActivated || m_isasking ) + if ( !s_fileChangedDialogsActivated || m_isasking ) return; - // we got focus after the dialog was canceled for the active view - if ( m_isasking < 0 ) - { - m_isasking = 0; - return; - } - if (m_modOnHd && !url().isEmpty()) { m_isasking = 1; + int exitval = ( v && v->hasFocus() ? 0 : -1 ); switch ( KMessageBox::warningYesNoCancel( widget(), @@ -4302,15 +4353,18 @@ void KateDocument::slotModifiedOnDisk( K m_modOnHd = false; // trick reloadFile() to not ask again emit modifiedOnDisc( this, false, 0 ); reloadFile(); + m_isasking = 0; break; + case KMessageBox::No: // "ignore changes" m_modOnHd = false; emit modifiedOnDisc( this, false, 0 ); + m_isasking = 0; break; -// default: // cancel: ignore next focus event - } - m_isasking = exitval; + default: // cancel: ignore next focus event + m_isasking = -1; + } } } @@ -4334,7 +4388,7 @@ void KateDocument::reloadFile() if (m_modOnHd && s_fileChangedDialogsActivated) { int i = KMessageBox::warningYesNoCancel - (0, reasonedMOHString() + "\n\n" + i18n("What do you want to do?"), + (0, reasonedMOHString() + "\n\n" + i18n("What do you want to do?"), i18n("File Was Changed on Disk"), i18n("&Reload File"), i18n("&Ignore Changes")); if ( i != KMessageBox::Yes) @@ -5142,6 +5196,11 @@ void KateDocument::slotModOnHdDirty (con m_modOnHd = true; m_modOnHdReason = 1; + + // reenable dialog if not running atm + if (m_isasking == -1) + m_isasking = false; + emit modifiedOnDisc (this, m_modOnHd, m_modOnHdReason); } } @@ -5152,6 +5211,11 @@ void KateDocument::slotModOnHdCreated (c { m_modOnHd = true; m_modOnHdReason = 2; + + // reenable dialog if not running atm + if (m_isasking == -1) + m_isasking = false; + emit modifiedOnDisc (this, m_modOnHd, m_modOnHdReason); } } @@ -5162,6 +5226,11 @@ void KateDocument::slotModOnHdDeleted (c { m_modOnHd = true; m_modOnHdReason = 3; + + // reenable dialog if not running atm + if (m_isasking == -1) + m_isasking = false; + emit modifiedOnDisc (this, m_modOnHd, m_modOnHdReason); } } Index: kate/part/katedocument.h =================================================================== RCS file: /home/kde/kdelibs/kate/part/katedocument.h,v retrieving revision 1.284 retrieving revision 1.284.4.1 diff -u -3 -p -r1.284 -r1.284.4.1 --- kate/part/katedocument.h 30 May 2004 08:53:11 -0000 1.284 +++ kate/part/katedocument.h 20 Aug 2004 21:46:10 -0000 1.284.4.1 @@ -847,7 +847,7 @@ class KateDocument : public Kate::Docume else if ( m_modOnHdReason == 3 ) reason = i18n("deleted"); - return i18n("The file '%1' was changed (%2) on disc by another program!").arg( url().prettyURL() ).arg( reason ); + return i18n("The file '%1' was changed (%2) on disk by another program!").arg( url().prettyURL() ).arg( reason ); } /** Index: kate/part/katefactory.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katefactory.cpp,v retrieving revision 1.62 retrieving revision 1.62.2.1 diff -u -3 -p -r1.62 -r1.62.2.1 --- kate/part/katefactory.cpp 4 Aug 2004 20:28:36 -0000 1.62 +++ kate/part/katefactory.cpp 25 Aug 2004 21:52:43 -0000 1.62.2.1 @@ -64,7 +64,7 @@ extern "C" KateFactory *KateFactory::s_self = 0; KateFactory::KateFactory () - : m_aboutData ("katepart", I18N_NOOP("Kate Part"), "2.3", + : m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION, I18N_NOOP( "Embeddable editor component" ), KAboutData::License_LGPL_V2, I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org") , m_instance (&m_aboutData) Index: kate/part/katefactory.h =================================================================== RCS file: /home/kde/kdelibs/kate/part/katefactory.h,v retrieving revision 1.30 retrieving revision 1.30.4.1 diff -u -3 -p -r1.30 -r1.30.4.1 --- kate/part/katefactory.h 12 May 2004 16:09:23 -0000 1.30 +++ kate/part/katefactory.h 25 Aug 2004 21:52:43 -0000 1.30.4.1 @@ -25,6 +25,9 @@ #include #include +// katepart version must be a string in double quotes, format: "x.x" +#define KATEPART_VERSION "2.3" + class KateCmd; class KateFileTypeManager; class KateSchemaManager; Index: kate/part/katehighlight.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katehighlight.cpp,v retrieving revision 1.171 retrieving revision 1.171.2.3 diff -u -3 -p -r1.171 -r1.171.2.3 --- kate/part/katehighlight.cpp 30 Jun 2004 17:11:38 -0000 1.171 +++ kate/part/katehighlight.cpp 13 Sep 2004 09:57:17 -0000 1.171.2.3 @@ -1727,7 +1727,7 @@ void KateHighlighting::createKateHlItemD // If no highlighting is selected we need only one default. if (noHl) { - list.append(new KateHlItemData(I18N_NOOP("Normal Text"), KateHlItemData::dsNormal)); + list.append(new KateHlItemData(i18n("Normal Text"), KateHlItemData::dsNormal)); return; } @@ -1984,7 +1984,7 @@ bool KateHighlighting::canComment( int s int k = hlKeyForAttrib( startAttrib ); return ( k == hlKeyForAttrib( endAttrib ) && ( ( !m_additionalData[k][0].isEmpty() && !m_additionalData[k][1].isEmpty() ) || - m_additionalData[k][2].isEmpty() ) ); + ! m_additionalData[k][2].isEmpty() ) ); } QString KateHighlighting::getCommentString( int which, int attrib ) const @@ -2926,31 +2926,49 @@ uint KateHlManager::defaultStyles() return 14; } -QString KateHlManager::defaultStyleName(int n) +QString KateHlManager::defaultStyleName(int n, bool translateNames) { static QStringList names; + static QStringList translatedNames; if (names.isEmpty()) { - names << i18n("Normal"); - names << i18n("Keyword"); - names << i18n("Data Type"); - names << i18n("Decimal/Value"); - names << i18n("Base-N Integer"); - names << i18n("Floating Point"); - names << i18n("Character"); - names << i18n("String"); - names << i18n("Comment"); - names << i18n("Others"); - names << i18n("Alert"); - names << i18n("Function"); + names << "Normal"; + names << "Keyword"; + names << "Data Type"; + names << "Decimal/Value"; + names << "Base-N Integer"; + names << "Floating Point"; + names << "Character"; + names << "String"; + names << "Comment"; + names << "Others"; + names << "Alert"; + names << "Function"; // this next one is for denoting the beginning/end of a user defined folding region - names << i18n("Region Marker"); + names << "Region Marker"; // this one is for marking invalid input - names << i18n("Error"); + names << "Error"; + + translatedNames << i18n("Normal"); + translatedNames << i18n("Keyword"); + translatedNames << i18n("Data Type"); + translatedNames << i18n("Decimal/Value"); + translatedNames << i18n("Base-N Integer"); + translatedNames << i18n("Floating Point"); + translatedNames << i18n("Character"); + translatedNames << i18n("String"); + translatedNames << i18n("Comment"); + translatedNames << i18n("Others"); + translatedNames << i18n("Alert"); + translatedNames << i18n("Function"); + // this next one is for denoting the beginning/end of a user defined folding region + translatedNames << i18n("Region Marker"); + // this one is for marking invalid input + translatedNames << i18n("Error"); } - return names[n]; + return translateNames ? translatedNames[n] : names[n]; } void KateHlManager::getDefaults(uint schema, KateAttributeList &list) Index: kate/part/katehighlight.h =================================================================== RCS file: /home/kde/kdelibs/kate/part/katehighlight.h,v retrieving revision 1.77 retrieving revision 1.77.2.1 diff -u -3 -p -r1.77 -r1.77.2.1 --- kate/part/katehighlight.h 17 Jun 2004 19:05:41 -0000 1.77 +++ kate/part/katehighlight.h 23 Aug 2004 16:19:39 -0000 1.77.2.1 @@ -321,7 +321,7 @@ class KateHlManager : public QObject // methodes to get the default style count + names static uint defaultStyles(); - static QString defaultStyleName(int n); + static QString defaultStyleName(int n, bool translateNames = false); void getDefaults(uint schema, KateAttributeList &); void setDefaults(uint schema, KateAttributeList &); Index: kate/part/kateschema.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/kateschema.cpp,v retrieving revision 1.57 retrieving revision 1.57.2.1 diff -u -3 -p -r1.57 -r1.57.2.1 --- kate/part/kateschema.cpp 19 Jul 2004 16:12:51 -0000 1.57 +++ kate/part/kateschema.cpp 23 Aug 2004 16:19:39 -0000 1.57.2.1 @@ -584,7 +584,7 @@ void KateSchemaConfigFontColorTab::schem // insert the default styles backwards to get them in the right order for ( int i = KateHlManager::self()->defaultStyles() - 1; i >= 0; i-- ) { - new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i), l->at( i ) ); + new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i, true), l->at( i ) ); } QWhatsThis::add( m_defaultStyles, i18n( Index: kate/part/katesearch.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katesearch.cpp,v retrieving revision 1.72 retrieving revision 1.72.2.3 diff -u -3 -p -r1.72 -r1.72.2.3 --- kate/part/katesearch.cpp 14 Jun 2004 11:00:45 -0000 1.72 +++ kate/part/katesearch.cpp 25 Aug 2004 01:07:38 -0000 1.72.2.3 @@ -87,11 +87,17 @@ void KateSearch::addToList( QStringList& void KateSearch::find() { - KFindDialog *findDialog = new KFindDialog ( m_view, "", KateViewConfig::global()->searchFlags(), + // if multiline selection around, search in it + long searchf = KateViewConfig::global()->searchFlags(); + if (m_doc->hasSelection() && m_doc->selStartLine() != m_doc->selEndLine()) + searchf |= KFindDialog::SelectedText; + + KFindDialog *findDialog = new KFindDialog ( m_view, "", searchf, s_searchList, m_doc->hasSelection() ); findDialog->setPattern (getSearchText()); + if( findDialog->exec() == QDialog::Accepted ) { s_searchList = findDialog->findHistory () ; KateViewConfig::global()->setSearchFlags(findDialog->options ()); @@ -132,7 +138,12 @@ void KateSearch::replace() { if (!doc()->isReadWrite()) return; - KReplaceDialog *replaceDialog = new KReplaceDialog ( m_view, "", KateViewConfig::global()->searchFlags(), + // if multiline selection around, search in it + long searchf = KateViewConfig::global()->searchFlags(); + if (m_doc->hasSelection() && m_doc->selStartLine() != m_doc->selEndLine()) + searchf |= KFindDialog::SelectedText; + + KReplaceDialog *replaceDialog = new KReplaceDialog ( m_view, "", searchf, s_searchList, s_replaceList, m_doc->hasSelection() ); replaceDialog->setPattern (getSearchText()); @@ -354,11 +365,18 @@ void KateSearch::replaceOne() replaces++; + // adjust selection endcursor if needed if( s.flags.selected && s.cursor.line() == s.selEnd.line() ) { s.selEnd.setCol(s.selEnd.col() + replaceWith.length() - s.matchedLength ); } + // adjust wrap cursor if needed + if( s.cursor.line() == s.wrappedEnd.line() && s.cursor.col() <= s.wrappedEnd.col()) + { + s.wrappedEnd.setCol(s.wrappedEnd.col() + replaceWith.length() - s.matchedLength ); + } + if( !s.flags.backward ) { s.cursor.setCol(s.cursor.col() + replaceWith.length()); } else if( s.cursor.col() > 0 ) { @@ -511,30 +529,42 @@ bool KateSearch::doSearch( const QString uint foundLine, foundCol, matchLen; bool found = false; //kdDebug() << "Searching at " << line << ", " << col << endl; - if( regExp ) { - m_re = QRegExp( text, caseSensitive ); - found = doc()->searchText( line, col, m_re, - &foundLine, &foundCol, - &matchLen, backward ); - } else if ( wholeWords ) { - QRegExp re( "\\b" + text + "\\b", caseSensitive ); - found = doc()->searchText( line, col, re, - &foundLine, &foundCol, - &matchLen, backward ); - } else { - found = doc()->searchText( line, col, text, - &foundLine, &foundCol, - &matchLen, caseSensitive, backward ); - } - if ( found && s.flags.selected ) - { - if ( !s.flags.backward && KateTextCursor( foundLine, foundCol ) >= s.selEnd - || s.flags.backward && KateTextCursor( foundLine, foundCol ) < s.selBegin ) - found = false; + + do { + if( regExp ) { + m_re = QRegExp( text, caseSensitive ); + found = doc()->searchText( line, col, m_re, + &foundLine, &foundCol, + &matchLen, backward ); + } else if ( wholeWords ) { + QRegExp re( "\\b" + text + "\\b", caseSensitive ); + found = doc()->searchText( line, col, re, + &foundLine, &foundCol, + &matchLen, backward ); + } else { + found = doc()->searchText( line, col, text, + &foundLine, &foundCol, + &matchLen, caseSensitive, backward ); + } + + if ( found && s.flags.selected ) + { + if ( !s.flags.backward && KateTextCursor( foundLine, foundCol ) >= s.selEnd + || s.flags.backward && KateTextCursor( foundLine, foundCol ) < s.selBegin ) + found = false; + else if (m_doc->blockSelectionMode()) + { + if ((int)foundCol < s.selEnd.col() && (int)foundCol >= s.selBegin.col()) + break; + } + } + + line = foundLine; + col = foundCol+1; } - if( !found ) return false; //break; + while (m_doc->blockSelectionMode() && found); - //result = true; + if( !found ) return false; // save the search result s.cursor.setPos(foundLine, foundCol); @@ -545,13 +575,14 @@ bool KateSearch::doSearch( const QString { if (s.flags.backward) { - if (s.cursor < s.wrappedEnd) - return false; + if ( (s.cursor.line() < s.wrappedEnd.line()) + || ( (s.cursor.line() == s.wrappedEnd.line()) && ((s.cursor.col()+matchLen) <= uint(s.wrappedEnd.col())) ) ) + return false; } else { if ( (s.cursor.line() > s.wrappedEnd.line()) - || ( (s.cursor.line() == s.wrappedEnd.line()) && ((s.cursor.col()+matchLen) > uint(s.wrappedEnd.col())) ) ) + || ( (s.cursor.line() == s.wrappedEnd.line()) && (s.cursor.col() > s.wrappedEnd.col()) ) ) return false; } } Index: kate/part/katetextline.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/katetextline.cpp,v retrieving revision 1.77 retrieving revision 1.77.4.1 diff -u -3 -p -r1.77 -r1.77.4.1 --- kate/part/katetextline.cpp 27 May 2004 07:08:47 -0000 1.77 +++ kate/part/katetextline.cpp 25 Aug 2004 02:04:50 -0000 1.77.4.1 @@ -184,8 +184,23 @@ bool KateTextLine::endingWith(const QStr int KateTextLine::cursorX(uint pos, uint tabChars) const { uint x = 0; - uint z; - for ( z = 0; z < kMin (pos, m_text.length()); z++) + + for ( uint z = 0; z < kMin (pos, m_text.length()); z++) + { + if (m_text[z] == QChar('\t')) + x += tabChars - (x % tabChars); + else + x++; + } + + return x; +} + +uint KateTextLine::lengthWithTabs (uint tabChars) const +{ + uint x = 0; + + for ( uint z = 0; z < m_text.length(); z++) { if (m_text[z] == QChar('\t')) x += tabChars - (x % tabChars); Index: kate/part/katetextline.h =================================================================== RCS file: /home/kde/kdelibs/kate/part/katetextline.h,v retrieving revision 1.66 retrieving revision 1.66.2.1 diff -u -3 -p -r1.66 -r1.66.2.1 --- kate/part/katetextline.h 4 Jun 2004 22:00:56 -0000 1.66 +++ kate/part/katetextline.h 25 Aug 2004 02:04:50 -0000 1.66.2.1 @@ -42,7 +42,7 @@ class KateTextLine : public KShared * Define a Shared-Pointer type */ typedef KSharedPtr Ptr; - + public: /** * Used Flags @@ -62,7 +62,7 @@ class KateTextLine : public KShared * context */ KateTextLine (); - + /** * Destructor */ @@ -74,13 +74,13 @@ class KateTextLine : public KShared public: /** * Returns the length - * @return length of text in line + * @return length of text in line */ inline uint length() const { return m_text.length(); } /** * has the line the hl continue flag set - * @return hl continue set? + * @return hl continue set? */ inline bool hlLineContinue () const { return m_flags & KateTextLine::flagHlContinue; } @@ -158,7 +158,7 @@ class KateTextLine : public KShared */ inline QString string(uint startCol, uint length) const { return m_text.mid(startCol, length); } - + /** * Gets a substring as constant string. * @param startCol start column of substring @@ -191,6 +191,13 @@ class KateTextLine : public KShared int cursorX(uint pos, uint tabChars) const; /** + * Returns the text length with tabs calced in + * @param tabChars tabulator width in chars + * @return text length + */ + uint lengthWithTabs (uint tabChars) const; + + /** * Can we find the given string at the given position * @param pos startpostion of given string * @param match string to match at given pos @@ -226,7 +233,7 @@ class KateTextLine : public KShared uint *foundAtCol, uint *matchLen, bool casesensitive = true, bool backwards = false); - + /** * search given regexp * @param startCol column to start search @@ -256,13 +263,13 @@ class KateTextLine : public KShared * @return context stack */ inline const QMemArray &ctxArray () const { return m_ctx; }; - + /** * folding list * @return folding array */ inline const QMemArray &foldingListArray () const { return m_foldingList; }; - + /** * indentation stack * @return indentation array @@ -277,7 +284,7 @@ class KateTextLine : public KShared * @param insAttribs attributes for the insert text */ void insertText (uint pos, uint insLen, const QChar *insText, uchar *insAttribs = 0); - + /** * remove text at given position * @param pos start position of remove @@ -301,7 +308,7 @@ class KateTextLine : public KShared else m_flags = m_flags & ~ KateTextLine::flagHlContinue; } - /** + /** * set visibility * @param val visible? */ @@ -397,7 +404,7 @@ class KateTextLine : public KShared * text of line as unicode */ QString m_text; - + /** * array of highlighting attributes */ @@ -407,12 +414,12 @@ class KateTextLine : public KShared * context stack */ QMemArray m_ctx; - + /** * list of folding starts/ends */ QMemArray m_foldingList; - + /** * indentation stack */ Index: kate/part/kateview.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/kateview.cpp,v retrieving revision 1.354 retrieving revision 1.354.2.1 diff -u -3 -p -r1.354 -r1.354.2.1 --- kate/part/kateview.cpp 10 Jul 2004 19:33:32 -0000 1.354 +++ kate/part/kateview.cpp 23 Aug 2004 12:54:36 -0000 1.354.2.1 @@ -854,11 +854,11 @@ bool KateView::checkOverwrite( KURL u ) if( !info.exists() ) return true; - return KMessageBox::Cancel != KMessageBox::warningContinueCancel( this, + return KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "Overwrite File?" ), - i18n( "&Overwrite" ) ); + KGuiItem( i18n( "&Overwrite" ), "filesave" ) ); } void KateView::slotSaveCanceled( const QString& error ) Index: kate/part/kateviewinternal.cpp =================================================================== RCS file: /home/kde/kdelibs/kate/part/kateviewinternal.cpp,v retrieving revision 1.304 retrieving revision 1.304.2.4 diff -u -3 -p -r1.304 -r1.304.2.4 --- kate/part/kateviewinternal.cpp 23 Jul 2004 20:17:48 -0000 1.304 +++ kate/part/kateviewinternal.cpp 26 Aug 2004 11:06:16 -0000 1.304.2.4 @@ -50,6 +50,7 @@ #include #include #include +#include KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) : QWidget (view, "", Qt::WStaticContents | Qt::WRepaintNoErase | Qt::WResizeNoErase ) @@ -2277,6 +2278,14 @@ bool KateViewInternal::eventFilter( QObj { QKeyEvent *k = (QKeyEvent *)e; + if (m_view->m_codeCompletion->codeCompletionVisible ()) + { + kdDebug (13030) << "hint around" << endl; + + if( k->key() == Key_Escape ) + m_view->m_codeCompletion->abortCompletion(); + } + if ((k->key() == Qt::Key_Escape) && !(m_doc->configFlags() & KateDocument::cfPersistent) ) { m_doc->clearSelection(); @@ -2309,6 +2318,7 @@ bool KateViewInternal::eventFilter( QObj } break; case QEvent::DragLeave: + // happens only when pressing ESC while dragging stopDragScroll(); break; @@ -2323,10 +2333,36 @@ void KateViewInternal::keyPressEvent( QK { KKey key(e); - if (key == Qt::Key_Left) + bool codeComp = m_view->m_codeCompletion->codeCompletionVisible (); + + if (codeComp) + { + kdDebug (13030) << "hint around" << endl; + + if( e->key() == Key_Enter || e->key() == Key_Return || + (key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) { + m_view->m_codeCompletion->doComplete(); + e->accept(); + return; + } + + if( (e->key() == Key_Up) || (e->key() == Key_Down ) || + (e->key() == Key_Home ) || (e->key() == Key_End) || + (e->key() == Key_Prior) || (e->key() == Key_Next )) { + m_view->m_codeCompletion->handleKey (e); + e->accept(); + return; + } + } + + if (key == Qt::Key_Left) { m_view->cursorLeft(); e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } @@ -2334,6 +2370,10 @@ void KateViewInternal::keyPressEvent( QK { m_view->cursorRight(); e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } @@ -2367,18 +2407,31 @@ void KateViewInternal::keyPressEvent( QK if ((key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) { uint ln = cursor.line(); + int col = cursor.col(); KateTextLine::Ptr line = m_doc->kateTextLine( ln ); int pos = line->firstChar(); + if (pos > cursor.col()) pos = cursor.col(); if (pos != -1) { - while ((int)line->length() > pos && !line->getChar(pos).isLetterOrNumber()) ++pos; + while ((int)line->length() > pos && + !line->getChar(pos).isLetterOrNumber() && + pos < cursor.col()) ++pos; } else { pos = line->length(); // stay indented } - m_doc->insertText( cursor.line(), line->length(), "\n" + line->string(0, pos) ); + m_doc->editStart(); + m_doc->insertText( cursor.line(), line->length(), "\n" + line->string(0, pos) + + line->string().right( line->length() - cursor.col() ) ); cursor.setPos(ln + 1, pos); + if (col < line->length()) + m_doc->editRemoveText(ln, col, line->length() - col); + m_doc->editEnd(); updateCursor(cursor, true); updateView(); e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } @@ -2386,6 +2439,10 @@ void KateViewInternal::keyPressEvent( QK { m_view->backspace(); e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } @@ -2393,6 +2450,10 @@ void KateViewInternal::keyPressEvent( QK { m_view->keyDelete(); e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } @@ -2409,6 +2470,10 @@ void KateViewInternal::keyPressEvent( QK m_doc->insertIndentChars ( m_view ); e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } @@ -2416,6 +2481,10 @@ void KateViewInternal::keyPressEvent( QK { m_doc->indent( m_view, cursor.line(), -1 ); e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } } @@ -2424,6 +2493,10 @@ void KateViewInternal::keyPressEvent( QK && m_doc->typeChars ( m_view, e->text() ) ) { e->accept(); + + if (codeComp) + m_view->m_codeCompletion->updateBox (); + return; } @@ -2821,7 +2894,7 @@ void KateViewInternal::doDrag() { dragInfo.state = diDragging; dragInfo.dragObject = new QTextDrag(m_doc->selection(), this); - dragInfo.dragObject->dragCopy(); + dragInfo.dragObject->drag(); } void KateViewInternal::dragEnterEvent( QDragEnterEvent* event ) @@ -2834,6 +2907,10 @@ void KateViewInternal::dragMoveEvent( QD { // track the cursor to the current drop location placeCursor( event->pos(), true, false ); + + // important: accept action to switch between copy and move mode + // without this, the text will always be copied. + event->acceptAction(); } void KateViewInternal::dropEvent( QDropEvent* event ) @@ -2863,12 +2940,20 @@ void KateViewInternal::dropEvent( QDropE return; } - // atm only copy the text, no move + // on move: remove selected text; on copy: duplicate text + if ( event->action() != QDropEvent::Copy ) + m_doc->removeSelectedText(); m_doc->insertText( cursor.line(), cursor.col(), text ); placeCursor( event->pos() ); + event->acceptAction(); updateView(); } + + // finally finish drag and drop mode + dragInfo.state = diNone; + // important, because the eventFilter`s DragLeave does not occure + stopDragScroll(); } void KateViewInternal::imStartEvent( QIMEvent *e ) @@ -3009,8 +3094,10 @@ void KateViewInternal::doDragScroll() if (dy) scrollLines(startPos().line() + dy); - if (dx) - scrollColumns(m_startX + dx); + + if (!m_view->dynWordWrap() && m_columnScrollDisplayed && dx) + scrollColumns(kMin (m_startX + dx, m_columnScroll->maxValue())); + if (!dy && !dx) stopDragScroll(); } Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop =================================================================== RCS file: /home/kde/kdelibs/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop,v retrieving revision 1.37 retrieving revision 1.37.2.4 diff -u -3 -p -r1.37 -r1.37.2.4 --- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop 5 Aug 2004 06:36:44 -0000 1.37 +++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop 12 Sep 2004 13:55:49 -0000 1.37.2.4 @@ -25,6 +25,9 @@ Name[pa]=ਕੇਪਾਠਸੰਪਾਦ Name[pl]=Automatyczne wstawianie zakładek dla KTextEditor Name[pt]=Auto-favoritos do KTextEditor Name[pt_BR]=Marca favoritos automático para Editor de textos +Name[ro]=Semne de carte automate pentru KTextEditor +Name[ru]=Автозакладки KTextEditor +Name[se]=KTextEditor:a automáhtalaš girjemerkejeaddji Name[sk]=Automatické záložky pre KTextEditor Name[sr]=KTextEditor-ов аутомаркер Name[sr@Latn]=KTextEditor-ов аутомаркер @@ -32,7 +35,6 @@ Name[sv]=Automatiska bokmärken för Kte Name[ta]=கேஉரைதொகுப்பாளர் தானியக்க புத்தக உருவாக்கி Name[tg]=Китоби худқайдкуни KTextEditor Name[uk]=Втулок автоматичних закладок KTextEditor -Name[xx]=xxKTextEditor Autobookmarkerxx Name[zh_CN]=KTextEditor 自动书签器 Comment=Set bookmarks on lines matching a pattern when documents are loaded Comment[ar]=يقوم بوضع علامات على الأسطر المطابقة لنمط عند تحميل المستندات @@ -51,7 +53,7 @@ Comment[fr]=Positionne des signets sur l Comment[he]=קובע סימניות בשורות המתאים לתבנית מסוימת בעת טעינת מסמך Comment[hr]=Postavite oznake na linijama koje odgovaraju šabloni kad su dokumenti učitani Comment[hu]=Fájl betöltésekor könyvjelzők automatikus létrehozása minta alapján -Comment[is]=Setja bókamerki á línur sem passa þegar skjöl eru lesin +Comment[is]=Setur bókamerki á línur sem passa ákveðnu mynstri, þegar skjöl eru lesin Comment[it]=Imposta dei segnalibri sulle righe corrispondendi a uno schema quando si caricano dei documenti Comment[ja]=文書が読み込まれた時、パターンにマッチした行にブックマークを設定します Comment[nb]=Bestem bokmerke på linjer som passer til et mønster når dokument blir åpnet @@ -61,6 +63,8 @@ Comment[pa]=ਜਦੋਂ ਵੀ ਦਸ Comment[pl]=W czasie wczytywanie dokumentu ustawia zakładki w liniach pasujących do podanego wzorca Comment[pt]=Coloca favoritos em linhas que condizem com um padrão quando os documentos são carregados. Comment[pt_BR]=Configura os favoritos em linhas que combinam com um padrão, quando os documentos forem carregados +Comment[ro]=La încărcarea documentului setează semne de carte la liniile care se potrivesc cu un model de text +Comment[ru]=Установка закладок в текстовом документе по шаблону Comment[sk]=Nastavuje záložky pri načítaní dokumentu na riadky zodpovedajúce vzorke Comment[sr]=Поставља маркере на линијама које се уклапају у узорак када се учитавају документи Comment[sr@Latn]=Поставља маркере на линијама које се уклапају у узорак када се учитавају документи @@ -68,7 +72,6 @@ Comment[sv]=Lägg till bokmärken på ra Comment[ta]= ஆவணங்கள் பதிவாகும் போது அமைப்பு புத்தகக்குறிப்பு கோடுகள் பொருத்தும் மாதிரி Comment[tg]=Вақте ки санад пурбор шудааст, монданиҳоро дар хати мутобиқат низ сабт намоед Comment[uk]=Встановлює закладки на рядках, що відповідають взірцю, при завантаженні документів -Comment[xx]=xxSet bookmarks on lines matching a pattern when documents are loadedxx Comment[zh_CN]=文档装入时根据匹配模式自动设置书签 X-KDE-Library=ktexteditor_autobookmarker ServiceTypes=KTextEditor/Plugin Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop =================================================================== RCS file: /home/kde/kdelibs/kate/plugins/insertfile/ktexteditor_insertfile.desktop,v retrieving revision 1.114 retrieving revision 1.114.2.4 diff -u -3 -p -r1.114 -r1.114.2.4 --- kate/plugins/insertfile/ktexteditor_insertfile.desktop 5 Aug 2004 06:36:44 -0000 1.114 +++ kate/plugins/insertfile/ktexteditor_insertfile.desktop 12 Sep 2004 13:55:49 -0000 1.114.2.4 @@ -61,7 +61,6 @@ Name[uz]=KTextEditor учун файлд Name[ven]=Musengulusi wa manwalwa K i dzhenisa pulagini ya faela Name[wa]=Tchôke-divins di KTextEditor po stitchî des fitchîs Name[xh]=KTextEditor Faka Ifayile ye Plagi efakiweyo -Name[xx]=xxKTextEditor Insert File Pluginxx Name[zh_CN]=KTextEditor 插入文件插件 Name[zh_TW]=文字編輯器插入檔案外掛程式 Name[zu]=Faka Ifayela Lokungena ngaphakathi le-KTextEditor @@ -69,16 +68,21 @@ Comment=Insert any readable file at curs Comment[ar]=أدرج أي ملف قابل للقراءة عند موضع المؤشر Comment[bg]=Вмъкване на файл от мястото на курсора Comment[bn]=কার্সার অবস্থানে যে কোনো (পাঠযোগ্য) ফাইল অন্তর্ভুক্ত করতে পারে +Comment[bs]=Ubacuje bilo koju čitljivu datoteku na poziciju kursora +Comment[ca]=Inserir qualsevol fitxer llegible en la posició del cursor Comment[da]=Indsæt en vilkårlig læsbar fil ved markørens position Comment[de]=Beliebige lesbare Datei an Cursor-Position einfügen Comment[el]=Εισαγωγή οποιουδήποτε αναγνώσιμου αρχείου στη θέση του κέρσορα Comment[eo]=Enmetu iun legeblan dosieron je ĉi tiu posicio +Comment[es]=Insertar cualquier archivo legible en la posición del cursor Comment[et]=Suvalise loetava faili lisamine kursori asukohta Comment[fi]=Lisää mikä tahansa luettava tiedosto kursorin kohdalle +Comment[fr]=Insérer tout fichier lisible à la position du curseur Comment[he]=מוסיף כל קובץ בר קיראה במיקום הסמן Comment[hu]=Tetszőleges olvasható fájl beszúrása a kurzorpozíciónál -Comment[is]=Setur inn hvaða lesanlega skrá sem er í stöðu bendilsins +Comment[is]=Setur inn hvaða lesanlegu skrá sem er í stöðu bendilsins Comment[it]=Inserisce un qualsiasi file alla posizione del cursore +Comment[ja]=カーソル位置に読み込み可能なファイルを挿入します Comment[ko]=커서가 있는 곳에 읽을 수 있는 파일을 끼워 넣습니다 Comment[nb]=Sett inn en lesbar fil ved skrivemerket Comment[nl]=Voeg een willekeurig leesbaar bestand in op de cursorpositie @@ -87,6 +91,8 @@ Comment[pa]=ਕੋਈ ਪੜਨਯੋਗ Comment[pl]=Wstawia zawartość pliku w pozycji kursora Comment[pt]=Insira qualquer ficheiro legível na posição do cursor Comment[pt_BR]=Insere qualquer arquivo com permissões de leitura na posição do cursor +Comment[ro]=Inserează la poziţia cursorului orice fişier citibil +Comment[ru]=вставка любого читаемого файла в позиции курсора Comment[sk]=Vloží ľubovoľný súbor na pozíciu kurzora Comment[sl]=Vstavi katerokoli berljivo datoteko na položaju kazalca Comment[sr]=Убаците било који читљиви фајл на положају курсора @@ -97,7 +103,6 @@ Comment[tg]=Ягон файли хонд Comment[tr]=İmleç konumunda herhangi bir dosyanın içeriğini ekle Comment[uk]=Вставляє зміст будь-якого файлу, який можна прочитати, у позицію курсору Comment[uz]=Ҳар қандай ўқиб бўладиган файлни курсорнинг жойидан қўйиш -Comment[xx]=xxInsert any readable file at cursor positionxx Comment[zh_CN]=在光标位置插入任何可读文件 X-KDE-Library=ktexteditor_insertfile ServiceTypes=KTextEditor/Plugin Index: kate/plugins/isearch/ktexteditor_isearch.desktop =================================================================== RCS file: /home/kde/kdelibs/kate/plugins/isearch/ktexteditor_isearch.desktop,v retrieving revision 1.97 retrieving revision 1.97.2.5 diff -u -3 -p -r1.97 -r1.97.2.5 --- kate/plugins/isearch/ktexteditor_isearch.desktop 5 Aug 2004 06:36:45 -0000 1.97 +++ kate/plugins/isearch/ktexteditor_isearch.desktop 20 Sep 2004 13:53:12 -0000 1.97.2.5 @@ -39,7 +39,7 @@ Name[pl]=Wtyczka edytora do szukania prz Name[pt]='Plugin' de Procura Incremental do KTextEditor Name[pt_BR]=Plug-in de Busca Incremental para o Editor de textos Name[ro]=Modul de căutare incrementală pentru KTextEditor -Name[ru]=Модуль продолженного поиска KTextEditor +Name[ru]=Модуль поиска по набору KTextEditor Name[se]=KTextEditor lassáneaddji-ohcan lassemoduvla Name[sk]=Modul pre inkrementálne hľadanie KTextEditor Name[sl]=Vstavek KTextEditor za postopno iskanje @@ -55,7 +55,6 @@ Name[uk]=Втулок KTextEditor для Name[uz]=KTextEditor кетма-кет қидириш плагини Name[ven]=Pulagini yau toda yo engedzeaho ya musengulusi wa manwalwa a K Name[xh]=KTextEditor Iplagi yangaphakathi Yokuphendla Ngokunyukayo -Name[xx]=xxKTextEditor Incremental Search Pluginxx Name[zh_CN]=KTextEditor 增量搜索插件 Name[zh_TW]=KTextEditor 漸進式搜尋外掛程式 Name[zu]=I-Plugin Yosesho Lokwenyuka ngezigaba ze-KTextEditor @@ -86,6 +85,9 @@ Comment[pa]=ਇਸ ਤਰਾਂ ਵੀ Comment[pl]=Tzw. "wyszukiwanie podczas pisania" Comment[pt]=Também conhecida como "Procura enquanto escreve" Comment[pt_BR]=Conhecido também como "Busca como você digitar" +Comment[ro]=Căutare instantanee, pe măsură ce scrieţi modelul de text căutat +Comment[ru]=Поиск по набору символов +Comment[se]=Maiddái dovddus «oza dađistaga go čálát» namas. Comment[sk]=Známe aj ako "Hľadanie podľa napísaného textu" Comment[sl]=Znano tudi kot »Iskanje med tipkanjem« Comment[sr]=Познато и као „претрага док куцате“ @@ -93,7 +95,7 @@ Comment[sr@Latn]=Познато и ка Comment[sv]=Också känt som "Sök medan du skriver" Comment[ta]="தேடு என்று தட்டச்சிட்டவுடன்" என்றும் அழைக்கப்படும் Comment[tg]=Ҳамчун "Вақти чоп кардан ба ҷустуҷ шавед" шинохта мешавад -Comment[xx]=xxAlso known as "As you type search"xx +Comment[uk]=Також відомий як "Пошук за вводом" Comment[zh_CN]=也称为“即输即搜” X-KDE-Library=ktexteditor_isearch ServiceTypes=KTextEditor/Plugin Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop =================================================================== RCS file: /home/kde/kdelibs/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop,v retrieving revision 1.87 retrieving revision 1.87.2.3 diff -u -3 -p -r1.87 -r1.87.2.3 --- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop 4 Aug 2004 06:46:40 -0000 1.87 +++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop 12 Sep 2004 13:55:49 -0000 1.87.2.3 @@ -41,7 +41,7 @@ Name[pl]=Wtyczka edytora do obsługi dan Name[pt]='Plugin' do KDataTool do KTextEditor Name[pt_BR]=Plug-in de Ferramenta de Dados para o Editor de textos Name[ro]=Modul KDataTool pentru KTextEditor -Name[ru]=Модуль KDataTool KTextEditor +Name[ru]=Модуль обработки данных KTextEditor Name[se]=KDataTool-lassemoduvla čállinprográmmaid várás Name[sk]=Module KDataTool KTextEditor Name[sl]=Vstavek KTextEditor KDataTool @@ -58,7 +58,6 @@ Name[uz]=KTextEditor KDataTool плаг Name[ven]=Pulagini ya tshishumiswa tsha data ya K ya musengulusi wa manwalwa a K Name[wa]=Tchôke-divins KDataTool po KTextEditor Name[xh]=KTextEditor KDataTool Iplagi yangaphakathi -Name[xx]=xxKTextEditor KDataTool Pluginxx Name[zh_CN]=KTextEditor KDataTool 插件 Name[zh_TW]=KTextEditor KDataTool 外排程式 Name[zu]=I-Plugin ye-KDataTool ye-KTextEditor @@ -88,7 +87,7 @@ Comment[he]=אפשר שימוש בכלי Comment[hi]= डाटा टूल्स जैसे शब्दकोश व वर्तनी जांच को सक्षम करें(यदि स्थापित हों) Comment[hr]=Uključiti podatkovne alate kao što su tezaurus i ispravak pravopisa (ako su instalirani) Comment[hu]=Adatkezelési eszközök (pl. szinonimaszótár, helyesírás-ellenőrző) támogatása -Comment[is]=Virkja gagnatól eins og stafsetningaforrit og leiðréttingar (ef uppsett) +Comment[is]=Virkir gagnatól eins og stafsetningaforrit og leiðréttingar (ef uppsett) Comment[it]=Abilita gli strumenti per i dati come il dizionario dei sinonimi e il controllo ortografico Comment[ja]=同義語ツールやスペルチェックなどのデータツールを有効にします （インストールされている場合） Comment[ko]=(깔려 있다면) 비슷한 말 사전과 맞춤법 검사기 같은 도구를 씁니다 @@ -122,7 +121,6 @@ Comment[uz]=Луғат ва имлони Comment[ven]=U konisa zwishumiswa zwa data sa bugu nau sedza ha tshipelini (arali zwo dzheniswa) Comment[wa]=Mete en alaedje les usteyes po manaedjî les dnêyes, come les diccionaires ou les coridjreces (si astalés) Comment[xh]=Yenza izixhobo ze data ezinjenge thesaurus nomkhangeli wopelo (ukuba ifakelwe) -Comment[xx]=xxEnable data tools like thesaurus and spell check (if installed)xx Comment[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的数据工具(如果安装了的话) Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話) Comment[zu]=Nika amandla amathuluzi edata anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe) Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop =================================================================== RCS file: /home/kde/kdelibs/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop,v retrieving revision 1.40 retrieving revision 1.40.2.4 diff -u -3 -p -r1.40 -r1.40.2.4 --- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop 5 Aug 2004 06:36:45 -0000 1.40 +++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop 12 Sep 2004 13:55:50 -0000 1.40.2.4 @@ -26,6 +26,8 @@ Name[pa]=KTextEditor ਪਾਠ ਪੂਰ Name[pl]=Wtyczka edytora do dopełniania słów Name[pt]='Plugin' de Completação de Palavras do KTextEditor Name[pt_BR]=Plug-in de Complementação de Palavras para Editor de textos +Name[ro]=Modul completare cuvinte pentru KTextEditor +Name[ru]=Модуль автодополнения слов KTextEditor Name[sk]=Modul pre doplnenie slov pre KTextEditor Name[sr]=KTextEditor прикључак за довршаванје речи Name[sr@Latn]=KTextEditor прикључак за довршаванје речи @@ -33,7 +35,6 @@ Name[sv]=Ktexteditor-insticksprogram fö Name[ta]=கேஉரைதொகுப்பாளர் கோப்பு உள்ளீட்டுச் சொருகுப்பொருள் Name[tg]=Мутассалкунандаи файли вуруди KTextEditor Name[uk]=Втулок KTextEditor для завершення слів -Name[xx]=xxKTextEditor Word Completion Pluginxx Name[zh_CN]=KTextEditor 单词补全插件 Comment=Directional or popup-based completion from words in the document Comment[bg]=Автоматично завършване на думи, базирано на използваните вече думи в документа @@ -50,7 +51,7 @@ Comment[fi]=Asiakirjasta löytyvillä sa Comment[fr]=Complètement basé sur la direction ou un menu à partir des mots du document Comment[hr]=Direkcijsko ili popup bazirano dovršavanje iz riječi u dokumentu Comment[hu]=Irány szerinti vagy felbukkanó kiegészítés dokumentum szavai alapján -Comment[is]=Áttvíst forrit sem getur líka opnað glugga með örðatillögum +Comment[is]=Áttvíst forrit sem getur líka opnað glugga með orðatillögum Comment[it]=Completamento direzionale o con finestre a comparsa di parole nel documento Comment[ja]=ドキュメントで単語から指向性またはポップアップベース補完をします Comment[nb]=Retningsbestemt eller sprettopp-basert fullføring av ord i dokumentet @@ -60,13 +61,13 @@ Comment[pa]=ਦਸਤਾਵੇਜ਼ ਵਿ Comment[pl]=Dopełnianie na podstawie listy słów w dokumencie Comment[pt]=Completação direccional ou por lista de palavras no documento Comment[pt_BR]=Complementação direcional, ou baseada em popup, de palavras do documento +Comment[ro]=Propune completarea cuvintelor din document dintr-o listă popup sau direcţională Comment[sk]=Dopĺňanie slov v dokumente priame alebo pomocou dialógu Comment[sr]=Директна или искачућа допуна од речи у документу Comment[sr@Latn]=Директна или искачућа допуна од речи у документу Comment[sv]=Komplettering av ord i dokumentet baserad på ordlista eller dialogruta Comment[ta]=ஆவணத்திலுள்ள வார்த்தைகளிலிருந்து திசைகள் அல்லது மேல்விரி-சார்ந்த நிறைவு Comment[tg]=Моқабл ё мобаъди ҷамъи аз калимаҳо дар санадот -Comment[xx]=xxDirectional or popup-based completion from words in the documentxx Comment[zh_CN]=在文档中基于方向或弹出补全单词 X-KDE-Library=ktexteditor_docwordcompletion ServiceTypes=KTextEditor/Plugin Index: kcert/kcertpart.desktop =================================================================== RCS file: /home/kde/kdelibs/kcert/kcertpart.desktop,v retrieving revision 1.99 retrieving revision 1.99.2.2 diff -u -3 -p -r1.99 -r1.99.2.2 --- kcert/kcertpart.desktop 4 Aug 2004 06:46:42 -0000 1.99 +++ kcert/kcertpart.desktop 31 Aug 2004 07:21:11 -0000 1.99.2.2 @@ -24,7 +24,7 @@ Comment[fr]=Gestionnaire de certificats Comment[ga]=Bainisteoir Teastas Pearsanta Inleabaithe Comment[gl]=Xestor Persoal de Certificados Incrustábel Comment[he]=מנהל תעודות אישי בר-הטבעה -Comment[hi]=अंतरनिहित निजी सर्टिफिकेट प्रबंधक +Comment[hi]=अंतर्निहित निजी सर्टिफिकेट प्रबंधक Comment[hr]=Ugradivi upravitelj osobnim certifikatima Comment[hu]=Beágyazható személyes tanúsítványkezelő Comment[is]=Ívefjanlegur einka-skírteina-stjóri @@ -63,7 +63,6 @@ Comment[uz]=Ичига ўрнатиб б Comment[ven]=Mulanguli wa sethifikheithi ya vhune Comment[vi]=Embeđable Personal Certificate Manager Comment[xh]=Umphathi Wesiqinisekiso Sobuntu bakho Obulungiselelweyo -Comment[xx]=xxEmbeddable Personal Certificate Managerxx Comment[zh_CN]=可嵌入的个人证书管理器 Comment[zh_TW]=可嵌入的個人認證管理工具 Comment[zu]=Imeneja Yesitifiketi Sobunini Oshuthekiwe @@ -78,7 +77,6 @@ Name[nso]=Seripa sa KCert Name[sv]=Kcertpart Name[ta]=கேசான்றிதழ்பகுதி Name[ven]=Tshipida tsha cert ya K -Name[xx]=xxKCertPartxx ServiceTypes=KParts/ReadWritePart X-KDE-Library=libkcertpart InitialPreference=15 Index: kdecore/all_languages.desktop =================================================================== RCS file: /home/kde/kdelibs/kdecore/all_languages.desktop,v retrieving revision 1.151 retrieving revision 1.151.2.3 diff -u -3 -p -r1.151 -r1.151.2.3 --- kdecore/all_languages.desktop 4 Aug 2004 06:46:44 -0000 1.151 +++ kdecore/all_languages.desktop 25 Sep 2004 13:40:39 -0000 1.151.2.3 @@ -29,7 +29,6 @@ Name[ta]=அஃபார் Name[tg]=Афар Name[uk]=Афар Name[uz]=Афар -Name[xx]=xxAfarxx Name[zh_CN]=阿法尔语 Name[zh_TW]=阿發爾 Name[zu]=Okude kakhulu @@ -82,7 +81,6 @@ Name[tg]=Абхозиён Name[uk]=Абхазька Name[uz]=Абхазча Name[wa]=Abxhaze -Name[xx]=xxAbkhazianxx Name[zh_CN]=阿布哈西亚语 Name[zh_TW]=阿布哈西亞語 Name[zu]=I-Abkhazian @@ -137,7 +135,6 @@ Name[uk]=Південноафрикан Name[uz]=Африканча Name[ven]=Tshivhuru Name[xh]=Isibhulu -Name[xx]=xxAfrikaansxx Name[zh_CN]=南非荷兰语 Name[zh_TW]=南非荷蘭語 Name[zu]=Isi-Bhunu @@ -201,7 +198,6 @@ Name[tg]=Албанӣ Name[uk]=Албанська Name[uz]=Албанча Name[wa]=Albanyin -Name[xx]=xxAlbanianxx Name[zh_CN]=阿尔巴尼亚语 Name[zh_TW]=阿爾巴尼亞語 Name[zu]=Isi-Albanian @@ -255,7 +251,6 @@ Name[ta]=அம்ஹாரிக் Name[tg]=Амхарикӣ Name[uk]=Амхарська Name[uz]=Амхарик -Name[xx]=xxAmharicxx Name[zh_CN]=阿姆哈拉语 Name[zh_TW]=衣索比亞官方語 Name[zu]=isi-Amharic @@ -329,7 +324,6 @@ Name[uz]=Арабча Name[ven]=Tshiarabiki Name[vi]=Arabic (A? Rập) Name[wa]=Arabe -Name[xx]=xxArabicxx Name[zh_CN]=阿拉伯语 Name[zh_TW]=阿拉伯語 Name[zu]=Isi-Arabhu @@ -396,7 +390,6 @@ Name[tr]=Ermenice Name[uk]=Вірменська Name[uz]=Арманча Name[wa]=Årmenyin -Name[xx]=xxArmenianxx Name[zh_CN]=亚美尼亚语 Name[zh_TW]=亞美尼亞語 Name[zu]=Isi-Armenian @@ -444,7 +437,6 @@ Name[ta]=அஸ்ஸாமிய Name[tg]=Аззамесӣ Name[uk]=Асамійська Name[uz]=Ассамесе -Name[xx]=xxAssamesexx Name[zh_CN]=阿萨姆语 Name[zh_TW]=阿薩姆語 Name[zu]=Isi-Assamese @@ -487,7 +479,6 @@ Name[ta]=அவெஸ்தன் Name[tg]=Авестӣ Name[uk]=Авестан Name[uz]=Авеста -Name[xx]=xxAvestanxx Name[zh_CN]=阿维斯陀语 Name[zh_TW]=阿維斯陀語 Name[zu]=Isi-Avestan @@ -525,7 +516,6 @@ Name[ta]=அய்மாரா Name[tg]=Ямарагӣ Name[uk]=Аймарська Name[uz]=Аймара -Name[xx]=xxAymaraxx Name[zh_CN]=艾马拉语 Name[zh_TW]=愛瑪拉語 Name[zu]=Isi-Aymara @@ -594,7 +584,6 @@ Name[uk]=Азербайджанська Name[uz]=Озарбайжонча Name[vi]=Agiecbaigiăng Name[wa]=Azeri -Name[xx]=xxAzerbaijanixx Name[zh_CN]=阿塞拜疆语 Name[zh_TW]=亞塞拜然語 Name[zu]=Isi-Azerbaijani @@ -641,7 +630,6 @@ Name[ta]=பாக்ஷீர் Name[tg]=Бошқирдӣ Name[uk]=Башкирська Name[uz]=Бошқирча -Name[xx]=xxBashkirxx Name[zh_CN]=巴什基尔语 Name[zh_TW]=Bashkir語 Name[zu]=Isi-Bashkir @@ -709,7 +697,6 @@ Name[uk]=Баскська Name[uz]=Баскча Name[vi]=Tiếng Baxcơ Name[wa]=Basse -Name[xx]=xxBasquexx Name[zh_CN]=巴斯克语 Name[zh_TW]=巴斯克語 Name[zu]=Isi-Basque @@ -778,7 +765,6 @@ Name[uk]=Білоруська Name[uz]=Белорусча Name[vi]=SBelarusian Name[wa]=Bielorûsse -Name[xx]=xxBelarusianxx Name[zh_CN]=白俄罗斯语 Name[zh_TW]=白俄羅斯語 Name[zu]=Isi-Belarusian @@ -825,7 +811,6 @@ Name[tg]=Банголӣ Name[tr]=Bengal Name[uk]=Бенгальська Name[uz]=Бенгалча -Name[xx]=xxBengalixx Name[zh_CN]=孟加拉语 Name[zh_TW]=孟加拉語 Name[zu]=Isi-Bengali @@ -859,7 +844,6 @@ Name[ta]=பீகாரி Name[tg]=Бихарӣ Name[uk]=Біхарі Name[uz]=Бихари -Name[xx]=xxBiharixx Name[zh_CN]=比哈里语 Name[zh_TW]=比哈爾語 Name[zu]=Isi-Bihari @@ -892,7 +876,6 @@ Name[ta]=பிஸ்லாமா Name[tg]=Бислама Name[uk]=Біслама Name[uz]=Бислама -Name[xx]=xxBislamaxx Name[zh_CN]=比斯拉马语 Name[zh_TW]=Bislama語 Name[zu]=Isi-Bislama @@ -962,7 +945,6 @@ Name[uk]=Боснійська Name[uz]=Боснияча Name[ven]=Mubosinia Name[wa]=Bosnyin -Name[xx]=xxBosnianxx Name[zh_CN]=波斯尼亚语 Name[zh_TW]=波士尼亞語 Name[zu]=Isi-Bosnian @@ -1029,7 +1011,6 @@ Name[tr]=Britanya Dili Name[uk]=Бретонська Name[uz]=Бретонча Name[wa]=Burton -Name[xx]=xxBretonxx Name[zh_CN]=布里多尼语 Name[zh_TW]=不列塔尼語 Name[zu]=Isi-Breton @@ -1102,7 +1083,6 @@ Name[uk]=Болгарська Name[uz]=Болгарча Name[vi]=Tiếng Bungari Name[wa]=Bulgåre -Name[xx]=xxBulgarianxx Name[zh_CN]=保加利亚语 Name[zh_TW]=保加利亞語 Name[zu]=Isi-Bulgarian @@ -1160,7 +1140,6 @@ Name[ta]=பர்மிய Name[tg]=Бурмезӣ Name[uk]=Бірманська Name[uz]=Бурмезча -Name[xx]=xxBurmesexx Name[zh_CN]=缅甸语 Name[zh_TW]=緬甸語 Name[zu]=Isi-Burmese @@ -1228,7 +1207,6 @@ Name[tr]=Katalan Dili Name[uk]=Каталонська Name[uz]=Каталанча Name[vi]=Tiếng Catalăng -Name[xx]=xxCatalanxx Name[zh_CN]=加泰罗尼亚语 Name[zh_TW]=嘉泰羅尼亞語 Name[zu]=Isi-Catalan @@ -1264,7 +1242,6 @@ Name[ta]=சமாரோ Name[tg]=Чаморро Name[uk]=Чаморо Name[uz]=Чаморро -Name[xx]=xxChamorroxx Name[zh_CN]=查莫罗语 Name[zh_TW]=查摩洛語 Name[zu]=Isi-Chamorro @@ -1322,7 +1299,6 @@ Name[tr]=Çeçen Name[uk]=Чеченська Name[uz]=Чеченча Name[wa]=Tchetchene -Name[xx]=xxChechenxx Name[zh_CN]=车臣语 Name[zh_TW]=Chechen語 Name[zu]=Isi-Chechen @@ -1397,7 +1373,6 @@ Name[ven]=Mutshaina Name[vi]=Tiếng Trung Quốc Name[wa]=Chinwès Name[xh]=Isitshayina -Name[xx]=xxChinesexx Name[zh_CN]=汉语 Name[zh_TW]=中文 Name[zu]=Isi-Shayina @@ -1456,7 +1431,6 @@ Name[uk]=Церковнослов'янс Name[uz]=Черков-словянча Name[ven]=Slavic Zwakereke Name[wa]=Eslave d' eglijhe -Name[xx]=xxChurch Slavicxx Name[zh_CN]=宗教斯拉夫语(古代俄语) Name[zh_TW]=教堂斯拉夫語 Name[zu]=Isi-Church Slavic @@ -1503,7 +1477,6 @@ Name[tg]=Чувашӣ Name[uk]=Чуваська Name[uz]=Чувашча Name[wa]=Tchouvache -Name[xx]=xxChuvashxx Name[zh_CN]=楚瓦什语 Name[zh_TW]=楚瓦士語 Name[zu]=Isi-Chuvash @@ -1558,7 +1531,6 @@ Name[tg]=Корниягӣ Name[uk]=Корнійська Name[uz]=Корн Name[wa]=Cornike -Name[xx]=xxCornishxx Name[zh_CN]=康瓦尔郡语 Name[zh_TW]=康瓦耳語 Name[zu]=Isi-Khonishi @@ -1618,7 +1590,6 @@ Name[tg]=Корсикаягӣ Name[uk]=Корсиканська Name[uz]=Корсиканча Name[wa]=Corse -Name[xx]=xxCorsicanxx Name[zh_CN]=科西嘉语 Name[zh_TW]=科西嘉語 Name[zu]=Isi-Corsican @@ -1689,7 +1660,6 @@ Name[uk]=Чеська Name[uz]=Чехча Name[vi]=Tiếng Séc Name[wa]=Tcheke -Name[xx]=xxCzechxx Name[zh_CN]=捷克语 Name[zh_TW]=捷克語 Name[zu]=Isi-Czech @@ -1761,7 +1731,6 @@ Name[uk]=Датська Name[uz]=Данияча Name[vi]=Tiếng Đan Mạch Name[wa]=Daenwès -Name[xx]=xxDanishxx Name[zh_CN]=丹麦语 Name[zh_TW]=丹麥語 Name[zu]=Isi-Danishi @@ -1835,7 +1804,6 @@ Name[uz]=Голландча Name[vi]=Tiếng Hà Lan Name[wa]=Neyerlandès Name[xh]=Isidatshi -Name[xx]=xxDutchxx Name[zh_CN]=荷兰语 Name[zh_TW]=荷蘭語 Name[zu]=Isi-Danishi @@ -1867,7 +1835,6 @@ Name[tg]=Жонгхагӣ Name[uk]=Дзонгка Name[uz]=Дзонгха Name[wa]=Boutanès -Name[xx]=xxDzongkhaxx Name[zh_CN]=不丹宗卡语 Name[zh_TW]=Dzongkha語 Name[zu]=Isi-Dzongkha @@ -1897,7 +1864,7 @@ Name[fr]=Anglais Name[ga]=Béarla Name[gl]=Inglés Name[he]=אנגלית -Name[hi]=अंग्रेजी +Name[hi]=अंग्रेज़ी Name[hr]=Engleski Name[hu]=angol Name[id]=Inggris @@ -1942,7 +1909,6 @@ Name[ven]=Luisimane Name[vi]=English(Anh) Name[wa]=Inglès Name[xh]=Isingesi -Name[xx]=xxEnglishxx Name[zh_CN]=英语 Name[zh_TW]=英語 Name[zu]=Isi-Ngisi @@ -1976,7 +1942,6 @@ Name[th]=เอสเปอร์รั Name[uk]=Есперанто Name[uz]=Эсперанто Name[vi]=Tiếng Etpêrantô -Name[xx]=xxEsperantoxx Name[zh_CN]=世界语 Name[zh_TW]=世界語 Name[zu]=Isi-Esperanto @@ -2048,7 +2013,6 @@ Name[uk]=Естонська Name[uz]=Эстонча Name[vi]=Tiếng Estonian Name[wa]=Estonyin -Name[xx]=xxEstonianxx Name[zh_CN]=爱沙尼亚语 Name[zh_TW]=愛沙尼亞語 Name[zu]=Isi-Estonian @@ -2103,7 +2067,6 @@ Name[tg]=Фароесӣ Name[uk]=Фарерська Name[uz]=Фарерча Name[wa]=Faeroyès -Name[xx]=xxFaroesexx Name[zh_CN]=法罗群岛语 Name[zh_TW]=法羅語 Name[zu]=Isi-Faroese @@ -2160,7 +2123,6 @@ Name[tg]=Фиҷианӣ Name[uk]=Фіджійська Name[uz]=Фижича Name[wa]=Fidjyin -Name[xx]=xxFijianxx Name[zh_CN]=斐济语 Name[zh_TW]=斐濟語 Name[zu]=Isi-Fijiyani @@ -2232,7 +2194,6 @@ Name[uk]=Фінська Name[uz]=Финча Name[vi]=Tiếng Phần Lan Name[wa]=Finwès -Name[xx]=xxFinnishxx Name[zh_CN]=芬兰语 Name[zh_TW]=芬蘭語 Name[zu]=Isi-Finishi @@ -2307,7 +2268,6 @@ Name[ven]=Mufura Name[vi]=Pháp Name[wa]=Francès Name[xh]=Isifrentshi -Name[xx]=xxFrenchxx Name[zh_CN]=法语 Name[zh_TW]=法語 Name[zu]=Isi-Frentshi @@ -2365,7 +2325,6 @@ Name[tg]=Фрисианӣ Name[uk]=Фризійська Name[uz]=Фризча Name[wa]=Frizon -Name[xx]=xxFrisianxx Name[zh_CN]=弗里斯兰语 Name[zh_TW]=弗利然語 Name[zu]=Isi-Frisiyani @@ -2428,7 +2387,6 @@ Name[tr]=Gürcüce Name[uk]=Грузинська Name[uz]=Грузинча Name[wa]=Djeyordjyin -Name[xx]=xxGeorgianxx Name[zh_CN]=乔治亚语 Name[zh_TW]=喬治亞語 Name[zu]=Isi-Jojiyani @@ -2503,7 +2461,6 @@ Name[ven]=Mudzhemeni Name[vi]=Tiếng Đức Name[wa]=Almand Name[xh]=Isijamani -Name[xx]=xxGermanxx Name[zh_CN]=德语 Name[zh_TW]=德語 Name[zu]=Isi-Jalimani @@ -2563,7 +2520,6 @@ Name[tr]=Galik Name[uk]=Гальська Name[uz]=Галикча Name[wa]=Gayel -Name[xx]=xxGaelicxx Name[zh_CN]=盖尔语 Name[zh_TW]=蓋爾語 Name[zu]=Isi-Gayelikhi @@ -2635,7 +2591,6 @@ Name[uk]=Ірландська Name[uz]=Ирландча Name[vi]=Tiếng Ai-len Name[wa]=Irlandès -Name[xx]=xxIrishxx Name[zh_CN]=爱尔兰语 Name[zh_TW]=愛爾蘭語 Name[zu]=Isi-Irishi @@ -2686,7 +2641,6 @@ Name[tg]=Галлиганиявӣ Name[uk]=Галлеган Name[uz]=Галеганча Name[wa]=Galicyin -Name[xx]=xxGalleganxx Name[zh_CN]=加利西亚语 Name[zh_TW]=Gallegan語 Name[zu]=Isi-Galegani @@ -2726,7 +2680,6 @@ Name[tg]=Манқсӣ Name[uk]=Манкс Name[uz]=Манкс Name[wa]=Gayel del Iye di Man -Name[xx]=xxManxxx Name[zh_CN]=马恩岛语 Name[zh_TW]=曼島語 Name[zu]=Isi-Manx @@ -2756,7 +2709,7 @@ Name[fr]=Grec Name[ga]=Gréigis Name[gl]=Grego Name[he]=יוונית -Name[hi]=ग्रीक +Name[hi]=यूनानी Name[hr]=Grčki Name[hu]=görög Name[id]=Yunani @@ -2800,7 +2753,6 @@ Name[ven]=Mugerika Name[vi]=Tiếng Hy Lạp Name[wa]=Grek Name[xh]=isigrike -Name[xx]=xxGreekxx Name[zh_CN]=希腊语 Name[zh_TW]=希臘語 Name[zu]=Isi-Grike @@ -2841,7 +2793,6 @@ Name[tg]=Гуараниявӣ Name[uk]=Гуарані Name[uz]=Гуарани Name[wa]=Gwarani -Name[xx]=xxGuaranixx Name[zh_CN]=瓜拉尼语 Name[zh_TW]=瓜拉尼語 Name[zu]=Isi-Guarani @@ -2878,7 +2829,6 @@ Name[tg]=Гӯҷаратӣ Name[uk]=Гуяраті Name[uz]=Гужарати Name[wa]=Goudjarati -Name[xx]=xxGujaratixx Name[zh_CN]=古吉拉特语 Name[zh_TW]=古吉拉特語 Name[zu]=Isi-Gujarati @@ -2909,7 +2859,6 @@ Name[ta]=ஹவுசா Name[tg]=Хаусагӣ Name[uk]=Гауса Name[uz]=Хауса -Name[xx]=xxHausaxx Name[zh_CN]=豪撒语 Name[zh_TW]=豪薩語 Name[zu]=Isi-Hausa @@ -2982,7 +2931,6 @@ Name[uz]=Яҳудийча Name[vi]=Tiếng Do Thái Name[wa]=Ebreu Name[xh]=Isihebhere -Name[xx]=xxHebrewxx Name[zh_CN]=希伯来语 Name[zh_TW]=希伯來語 Name[zu]=Isi-Hebheru @@ -3014,7 +2962,6 @@ Name[ta]=ஹெர்ரோ Name[tg]=Херэро Name[uk]=Гереро Name[uz]=Хереро -Name[xx]=xxHereroxx Name[zh_CN]=赫雷罗语 Name[zh_TW]=Herero語 Name[zu]=Isi-Herero @@ -3039,7 +2986,6 @@ Name[ko]=힌디어 Name[mn]=Хинди Name[nso]=Se-Hindi Name[pa]=ਹਿੰਦੀ -Name[pl]=Hinduski Name[pt]=Hindu Name[ro]=Hindusă Name[ru]=Хинди @@ -3054,7 +3000,6 @@ Name[ta]=ஹிந்தி Name[tg]=Ҳиндӣ Name[uk]=Хінді Name[uz]=Ҳиндча -Name[xx]=xxHindixx Name[zh_CN]=北印度语 Name[zh_TW]=北印度語 Name[zu]=Isi-Hindi @@ -3089,7 +3034,6 @@ Name[ta]=ஹிரி மொட்டு Name[tg]=Хири Моту Name[uk]=Хірі Моту Name[uz]=Хири Моту -Name[xx]=xxHiri Motuxx Name[zh_CN]=新里木托语 Name[zh_TW]=Hiri Motu語 Name[zu]=Isi-Hiri Motu @@ -3162,7 +3106,6 @@ Name[uk]=Угорська Name[uz]=Венгрча Name[vi]=Tiếng Hung-ga-ri Name[wa]=Hongrwès -Name[xx]=xxHungarianxx Name[zh_CN]=匈牙利语 Name[zh_TW]=匈牙利語 Name[zu]=Isi-Hangariyani @@ -3234,7 +3177,6 @@ Name[uk]=Ісландська Name[uz]=Исландча Name[vi]=Tiếng Ai-xơ-len Name[wa]=Izlandès -Name[xx]=xxIcelandicxx Name[zh_CN]=冰岛语 Name[zh_TW]=冰島語 Name[zu]=isi-Icelandic @@ -3263,7 +3205,6 @@ Name[ta]=ஈடோ Name[tg]=Идо Name[uk]=Ідо Name[uz]=Идо -Name[xx]=xxIdoxx Name[zh_CN]=伊多语 Name[zh_TW]=伊多語 Name[zu]=Isi-Ido @@ -3294,7 +3235,6 @@ Name[ta]=இனுக்டிடுட Name[tg]=Инуктитут Name[uk]=Інуктітут Name[uz]=Инуктитут -Name[xx]=xxInuktitutxx Name[zh_CN]=因纽特语 Name[zh_TW]=Inuktitut語 Name[zu]=Isi-Inuktitut @@ -3325,7 +3265,6 @@ Name[tg]=Интерлингӣ Name[uk]=Інтерлінгва Name[uz]=Интерлингуе Name[ven]=Luambo lwa hothe -Name[xx]=xxInterlinguexx Name[zh_CN]=语际语 Name[zh_TW]=Interlingue語 Name[zu]=Izilimi ezifanayo @@ -3357,7 +3296,6 @@ Name[uk]=Інтерлінгва Name[uz]=Интерлингуа Name[ven]=Luambo lwa hothe Name[wa]=Interlingua (noû latén) -Name[xx]=xxInterlinguaxx Name[zh_CN]=拉丁国际语(国际辅助语) Name[zh_TW]=科技共通語 Name[zu]=Ulimi olufanayo @@ -3426,7 +3364,6 @@ Name[tr]=İndonezya dili Name[uk]=Індонезійська Name[uz]=Индонезча Name[wa]=Indonezyin -Name[xx]=xxIndonesianxx Name[zh_CN]=印度尼西亚语 Name[zh_TW]=印尼語 Name[zu]=Indoneshiya @@ -3462,7 +3399,6 @@ Name[tg]=Инупайқӣ Name[uk]=Інупіак Name[uz]=Инупиак Name[wa]=Inyupiak -Name[xx]=xxInupiaqxx Name[zh_CN]=因纽佩特语 Name[zh_TW]=Inupiaq語 Name[zu]=Isi-Inupiaq @@ -3535,7 +3471,6 @@ Name[uz]=Италянча Name[vi]=Tiếng Italia Name[wa]=Itålyin Name[xh]=isitaliyane -Name[xx]=xxItalianxx Name[zh_CN]=意大利语 Name[zh_TW]=義大利語 Name[zu]=Isi-Ntaliyane @@ -3594,7 +3529,6 @@ Name[tg]=Явагӣ Name[uk]=Яванська Name[uz]=Яаванез Name[wa]=Djavanès -Name[xx]=xxJavanesexx Name[zh_CN]=爪哇语 Name[zh_TW]=爪哇語 Name[zu]=Isi-Javanisi @@ -3668,7 +3602,6 @@ Name[ven]=Mudzhapani Name[vi]=Tiếng Nhật Name[wa]=Djaponès Name[xh]=Isijapani -Name[xx]=xxJapanesexx Name[zh_CN]=日语 Name[zh_TW]=日語 Name[zu]=Isi-Jaliphani @@ -3702,7 +3635,6 @@ Name[ta]=கலாலிசுட் Name[tg]=Калаалисутӣ Name[uk]=Калаалісут Name[uz]=Калааллисут -Name[xx]=xxKalaallisutxx Name[zh_CN]=格陵兰语 Name[zh_TW]=Kalaallisut語 Name[zu]=Isi-Kalaallisut @@ -3735,7 +3667,6 @@ Name[ta]=கன்னடம் Name[tg]=Каннадӣ Name[uk]=Каннада Name[uz]=Каннада -Name[xx]=xxKannadaxx Name[zh_CN]=坎纳德语 Name[zh_TW]=坎那達語 Name[zu]=Isi-Khanada @@ -3783,7 +3714,6 @@ Name[tg]=Кашмирӣ Name[uk]=Кашмірська Name[uz]=Кашмирча Name[wa]=Cachmiri -Name[xx]=xxKashmirixx Name[zh_CN]=克什米尔语 Name[zh_TW]=喀什米爾語 Name[zu]=Isi-Kashimiri @@ -3831,9 +3761,8 @@ Name[sv]=Kazakiska Name[ta]=கசாக் Name[tg]=Қазоқӣ Name[uk]=Казахська -Name[uz]=Қазоқча +Name[uz]=Қозоқча Name[wa]=Kazaxh -Name[xx]=xxKazakhxx Name[zh_CN]=哈萨克语 Name[zh_TW]=哈薩克語 Name[zu]=Isi-Kazakhi @@ -3876,7 +3805,6 @@ Name[tg]=Хмерӣ Name[uk]=Кхмерська Name[uz]=Кхмерча Name[wa]=Xhmer -Name[xx]=xxKhmerxx Name[zh_CN]=高棉语 Name[zh_TW]=高棉語 Name[zu]=Isi-Khmer @@ -3909,7 +3837,6 @@ Name[ta]=கியுகு Name[tg]=Кикуягӣ Name[uk]=Кікую Name[uz]=Кикуйу -Name[xx]=xxKikuyuxx Name[zh_CN]=基库尤语 Name[zh_TW]=吉庫猶語 Name[zu]=Isi-Kikuyu @@ -3944,7 +3871,6 @@ Name[tg]=Кинуарвандӣ Name[uk]=Кіньярванда Name[uz]=Кинярванда Name[wa]=Kiniarwanda -Name[xx]=xxKinyarwandaxx Name[zh_CN]=卢旺达语 Name[zh_TW]=Kinyarwanda語 Name[zu]=Isi-Kinyarwanda @@ -3999,7 +3925,6 @@ Name[tr]=Kırgız Name[uk]=Киргизька Name[uz]=Қирғизча Name[wa]=Kirguize -Name[xx]=xxKirghizxx Name[zh_CN]=吉尔吉斯语 Name[zh_TW]=吉爾吉斯語 Name[zu]=Isi-Kirghizi @@ -4033,7 +3958,6 @@ Name[ta]=கோமி Name[tg]=Коми Name[uk]=Комі Name[uz]=Коми -Name[xx]=xxKomixx Name[zh_CN]=科米语 Name[zh_TW]=Komi語 Name[zu]=Isi-Komi @@ -4063,7 +3987,7 @@ Name[fr]=Coréen Name[ga]=Córéis Name[gl]=Coreano Name[he]=קוריאנית -Name[hi]=कोरियन +Name[hi]=कोरियाई Name[hr]=Korejski Name[hu]=koreai Name[id]=Korea @@ -4105,7 +4029,6 @@ Name[uz]=Корейсча Name[vi]=Tiếng Hàn Quốc Name[wa]=Coreyin Name[xh]=Isikorea -Name[xx]=xxKoreanxx Name[zh_CN]=朝鲜语 Name[zh_TW]=韓國語 Name[zu]=Isi-Korean @@ -4172,7 +4095,6 @@ Name[tr]=Kürtçe Name[uk]=Курдська Name[uz]=Курдча Name[wa]=Kurdi -Name[xx]=xxKurdishxx Name[zh_CN]=库尔德语 Name[zh_TW]=庫德語 Name[zu]=isi-Kurdish @@ -4213,7 +4135,6 @@ Name[th]=ลาว Name[uk]=Лаоська Name[uz]=Лаосча Name[wa]=Lawocyin -Name[xx]=xxLaoxx Name[zh_CN]=老挝语 Name[zh_TW]=寮國語 Name[zu]=Isi-Lao @@ -4271,7 +4192,6 @@ Name[th]=ละติน Name[uk]=Латинська Name[uz]=Лотинча Name[wa]=Latén -Name[xx]=xxLatinxx Name[zh_CN]=拉丁语 Name[zh_TW]=拉丁語 Name[zu]=Isi-Lathini @@ -4340,7 +4260,6 @@ Name[uz]=Латишча Name[vi]=Tiếng Latvia Name[wa]=Letonyin Name[xh]=Isilatvian -Name[xx]=xxLatvianxx Name[zh_CN]=拉脱维亚语 Name[zh_TW]=拉脫維亞語 Name[zu]=Isi-Latvian @@ -4390,7 +4309,6 @@ Name[tg]=Лимбурганӣ Name[uk]=Лімбурганська Name[uz]=Лимбурган Name[wa]=Limbordjwès -Name[xx]=xxLimburganxx Name[zh_CN]=林堡语 Name[zh_TW]=Limburgan語 Name[zu]=Isi-Lumburgan @@ -4420,7 +4338,6 @@ Name[ta]=லிங்காலா Name[tg]=Лингалӣ Name[uk]=Лінгала Name[uz]=Лингала -Name[xx]=xxLingalaxx Name[zh_CN]=林加拉语 Name[zh_TW]=Lingala語 Name[zu]=Isi-Lingala @@ -4492,7 +4409,6 @@ Name[uk]=Литовська Name[uz]=Литвача Name[vi]=Lithuanian Name[wa]=Litwanyin -Name[xx]=xxLithuanianxx Name[zh_CN]=立陶宛语 Name[zh_TW]=立陶宛語 Name[zu]=Isi-Lithuanian @@ -4553,7 +4469,6 @@ Name[tg]=Люксембургӣ Name[uk]=Люксембурзька Name[uz]=Люксембургча Name[wa]=Lussimbordjwès -Name[xx]=xxLuxembourgishxx Name[zh_CN]=卢森堡语 Name[zh_TW]=盧森堡語 Name[zu]=Isi-Luxembourgish @@ -4625,7 +4540,6 @@ Name[uk]=Македонська Name[uz]=Македонияча Name[vi]=Tiếng Macedonian Name[wa]=Macedonyin -Name[xx]=xxMacedonianxx Name[zh_CN]=马其顿语 Name[zh_TW]=馬其頓語 Name[zu]=Isi-Makhedoniya @@ -4679,7 +4593,6 @@ Name[tg]=Маршалезӣ Name[uk]=Маршальська Name[uz]=Маршаллез Name[wa]=Marshalès -Name[xx]=xxMarshallesexx Name[zh_CN]=马绍尔语 Name[zh_TW]=馬紹爾語 Name[zu]=Isi-Marshallese @@ -4718,7 +4631,6 @@ Name[ta]=மலையாளம் Name[tg]=Малаямӣ Name[uk]=Малайська Name[uz]=Малайалам -Name[xx]=xxMalayalamxx Name[zh_CN]=德拉维族语 Name[zh_TW]=馬來亞拉姆語 Name[zu]=Isi-Malayalam @@ -4773,7 +4685,6 @@ Name[uk]=Маорі Name[uz]=Маори Name[vi]=Tiếng Maori Name[wa]=Mawori -Name[xx]=xxMaorixx Name[zh_CN]=毛利语 Name[zh_TW]=毛利語 Name[zu]=Isi-Maori @@ -4808,7 +4719,6 @@ Name[tg]=Маравӣ Name[uk]=Мараті Name[uz]=Марати Name[wa]=Marati -Name[xx]=xxMarathixx Name[zh_CN]=马拉地语 Name[zh_TW]=馬拉地語 Name[zu]=Isi-Marathi @@ -4864,7 +4774,6 @@ Name[ta]=மலாய் Name[tg]=Малайӣ Name[uk]=Малайська Name[uz]=Малайча -Name[xx]=xxMalayxx Name[zh_CN]=马来西亚语 Name[zh_TW]=馬來語 Name[zu]=Isi-Malay @@ -4913,7 +4822,6 @@ Name[tg]=Малагасӣ Name[uk]=Малагська Name[uz]=Малагаси Name[wa]=Malgache -Name[xx]=xxMalagasyxx Name[zh_CN]=马尔加什语 Name[zh_TW]=馬拉加西語 Name[zu]=Isi-Malagasy @@ -4981,7 +4889,6 @@ Name[uk]=Мальтійська Name[uz]=Малтача Name[vi]=Tiếng Mantơ Name[wa]=Maltès -Name[xx]=xxMaltesexx Name[zh_CN]=马耳他语 Name[zh_TW]=馬爾他語 Name[zu]=Isi-Maltase @@ -5045,7 +4952,6 @@ Name[tr]=Moldavaca Name[uk]=Молдовська Name[uz]=Молдавча Name[wa]=Moldåve -Name[xx]=xxMoldavianxx Name[zh_CN]=摩尔多瓦 Name[zh_TW]=摩爾達維亞語 Name[zu]=Isi-Moldavian @@ -5111,7 +5017,6 @@ Name[tr]=Mongolca Name[uk]=Монгольська Name[uz]=Муғулча Name[wa]=Mongol -Name[xx]=xxMongolianxx Name[zh_CN]=蒙古语 Name[zh_TW]=蒙古語 Name[zu]=Isi-Mongolian @@ -5148,7 +5053,6 @@ Name[ta]=நவுரு Name[tg]=Науру Name[uk]=Науру Name[uz]=Науру -Name[xx]=xxNauruxx Name[zh_CN]=瑙鲁语 Name[zh_TW]=諾魯語 Name[zu]=Isi-Nauru @@ -5199,9 +5103,8 @@ Name[sv]=Nordsotho Name[ta]=நார்தன் சோத்தோ Name[tg]=Сотои Шимолӣ Name[uk]=Північне Сото -Name[uz]=Шимолий Сото +Name[uz]=Шимолий Соточа Name[wa]=Soto (bijhe) -Name[xx]=xxNorthern Sothoxx Name[zh_CN]=北部梭托语 [nv] Name=Navajo @@ -5237,7 +5140,6 @@ Name[tg]=Наваҷо Name[uk]=Навахо Name[uz]=Наважо Name[wa]=Navaxho -Name[xx]=xxNavajoxx Name[zh_CN]=纳瓦霍语 Name[zh_TW]=納瓦伙語 Name[zu]=Isi-Navajo @@ -5296,7 +5198,6 @@ Name[uz]=Ндебеле, Жануб Name[ven]=Ndebele, Tshipembe Name[wa]=Ndebele (nonne) Name[xh]=Isindebele, Emazantsi -Name[xx]=xxNdebele, Southxx Name[zh_CN]=Ndebele，南部 Name[zh_TW]=Ndebele語，南部 Name[zu]=Isi-Ndebele, Sase-Mzansi @@ -5355,7 +5256,6 @@ Name[uz]=Ндебеле, Шимол Name[ven]=Ndebele, Devhula Name[wa]=Ndebele (bijhe) Name[xh]=Isindebele, Emntla -Name[xx]=xxNdebele, Northxx Name[zh_CN]=Ndebele，北部 Name[zh_TW]=Ndebele語，北部 Name[zu]=Isi-Ndebele, Sase-Ntshonalanga @@ -5381,7 +5281,6 @@ Name[ta]=டொங்கா Name[tg]=Ндонга Name[uk]=Ндонга Name[uz]=Ндонга -Name[xx]=xxNdongaxx Name[zh_TW]=Ndonga語 Name[zu]=Isi-Ndonga [ne] @@ -5434,7 +5333,6 @@ Name[tg]=Непалӣ Name[uk]=Непальська Name[uz]=Непалча Name[wa]=Nepalès -Name[xx]=xxNepalixx Name[zh_CN]=尼泊尔语 Name[zh_TW]=尼泊爾語 Name[zu]=Isi-Nepali @@ -5507,7 +5405,6 @@ Name[uk]=Норвезька Name[uz]=Норвегияча Name[vi]=Norwegian (Na-Uy) Name[wa]=Norvedjyin -Name[xx]=xxNorwegianxx Name[zh_CN]=挪威语 Name[zh_TW]=挪威語 Name[zu]=Isi-Norwegian @@ -5569,7 +5466,6 @@ Name[tr]=Norveççe Nynorsk Name[uk]=Норвезька (Nynorsk) Name[uz]=Норвегияча (Нйнорск) Name[wa]=Noû-Norvedjyin (Nynorsk) -Name[xx]=xxNorwegian Nynorskxx Name[zh_CN]=挪威语 (尼诺斯克语) Name[zh_TW]=挪威 Nynorsk 語 Name[zu]=Isi-Norwegian Nynorsk @@ -5628,9 +5524,8 @@ Name[ta]=நார்வீஜியன Name[tg]=Норвегиягӣ Боқмал Name[tr]=Norveççe Bokmål Name[uk]=Норвезька (Bokmål) -Name[uz]=Норвегияча (Бокмаал) +Name[uz]=Норвегча (Бокмаал) Name[wa]=Norvedjyin (Bokmål) -Name[xx]=xxNorwegian Bokmålxx Name[zh_CN]=挪威语 (博克马尔语) Name[zu]=Isi-Norwegian Bokmaal [ny] @@ -5664,7 +5559,6 @@ Name[tg]=Чичевагӣ Name[uk]=Чічеванська Name[uz]=Чичева Name[wa]=Tchitchewa -Name[xx]=xxChichewaxx Name[zh_CN]=齐切瓦语 Name[zh_TW]=Chichewa語 Name[zu]=Isi-Chichewa @@ -5722,7 +5616,6 @@ Name[th]=ออคซิทัน Name[tr]=Oksitan dili Name[uk]=Оксітанська Name[uz]=Французча (Осситан шеваси) -Name[xx]=xxOccitanxx Name[zh_CN]=奥西坦语 Name[zh_TW]=Occitan語 Name[zu]=Isi-Osithani @@ -5758,7 +5651,6 @@ Name[ta]=ஒரியா Name[tg]=Ориёӣ Name[uk]=Орія Name[uz]=Ория -Name[xx]=xxOriyaxx Name[zh_CN]=欧里亚语 Name[zh_TW]=Oriya語 Name[zu]=Isi-Oriya @@ -5790,7 +5682,6 @@ Name[ta]=ஒரோமோ Name[tg]=Оромо Name[uk]=Оромо Name[uz]=Оромо -Name[xx]=xxOromoxx Name[zh_CN]=阿曼语 Name[zh_TW]=Oromo語 Name[zu]=Isi-Oromo @@ -5842,7 +5733,6 @@ Name[tg]=Осетинӣ Name[uk]=Осетійська Name[uz]=Оссетинча Name[wa]=Ossete -Name[xx]=xxOssetianxx Name[zh_CN]=奥塞梯语 Name[zh_TW]=Ossetian語 Name[zu]=Isi-Ossethiyani @@ -5887,7 +5777,6 @@ Name[tg]=Панҷабӣ Name[uk]=Панджабська Name[uz]=Панжабча Name[wa]=Pundjabi -Name[xx]=xxPanjabixx Name[zh_CN]=旁遮普语 Name[zh_TW]=Panjabi語 Name[zu]=Isi-Phanjabi @@ -5941,7 +5830,6 @@ Name[tg]=Фрисианӣ Name[uk]=Фризійська (Перська) Name[uz]=Форсча (Персча) Name[wa]=Farsi -Name[xx]=xxFarsi (Persian)xx Name[zh_CN]=波斯语 [pi] Name=Pali @@ -5972,7 +5860,6 @@ Name[tg]=Пали Name[uk]=Палі Name[uz]=Пали Name[wa]=Pâli -Name[xx]=xxPalixx Name[zh_CN]=巴利语 Name[zh_TW]=巴利語 Name[zu]=Isi-Phali @@ -6044,7 +5931,6 @@ Name[uk]=Польська Name[uz]=Полякча Name[vi]=Tiếng Ba Lan Name[wa]=Polonès -Name[xx]=xxPolishxx Name[zh_CN]=波兰语 Name[zh_TW]=波蘭語 Name[zu]=Isi-Pholishi @@ -6117,7 +6003,6 @@ Name[uk]=Португальська Name[uz]=Португалча Name[vi]=Tiếng BềEĐào Nha Name[wa]=Portuguès -Name[xx]=xxPortuguesexx Name[zh_CN]=葡萄牙语 Name[zh_TW]=葡萄牙語 Name[zu]=Isi-Phuthukesi @@ -6177,7 +6062,6 @@ Name[tr]=Brezilya Portekizcesi Name[uk]=Бразильська португальська Name[uz]=Португалча (Бразилия) Name[wa]=Portuguès do Braezi -Name[xx]=xxBrazilian Portuguesexx Name[zh_CN]=巴西葡萄牙语 [ps] Name=Pushto @@ -6216,7 +6100,6 @@ Name[tg]=Пушто Name[uk]=Пуштунська Name[uz]=Пуштунча Name[wa]=Pashto -Name[xx]=xxPushtoxx Name[zh_CN]=普什图语 Name[zh_TW]=普什圖語 Name[zu]=Dudula ku @@ -6252,7 +6135,6 @@ Name[tg]=Квечуа Name[uk]=Кечуа Name[uz]=Квечуа Name[wa]=Kitchwa -Name[xx]=xxQuechuaxx Name[zh_CN]=盖丘亚语 Name[zh_TW]=蓋楚瓦語 Name[zu]=Isi-Quechua @@ -6324,7 +6206,6 @@ Name[uk]=Румунська Name[uz]=Руминча Name[vi]=Tiếng BềEĐào Nha Name[wa]=Roumin -Name[xx]=xxRomanianxx Name[zh_CN]=罗马尼亚语 Name[zh_TW]=羅馬尼亞語 Name[zu]=Isi-Romania @@ -6357,7 +6238,6 @@ Name[tg]=Рунди Name[uk]=Рунді Name[uz]=Рунди Name[wa]=Kirundi -Name[xx]=xxRundixx Name[zh_CN]=基隆迪语 Name[zh_TW]=Rundi語 Name[zu]=Isi-Rundi @@ -6431,7 +6311,6 @@ Name[uz]=Русча Name[vi]=Tiếng Nga Name[wa]=Rûsse Name[xh]=Isirashiya -Name[xx]=xxRussianxx Name[zh_CN]=俄语 Name[zh_TW]=俄語 Name[zu]=Isi-Rashiya @@ -6461,7 +6340,6 @@ Name[ta]=சாங்கோ Name[tg]=Санго Name[uk]=Санго Name[uz]=Санго -Name[xx]=xxSangoxx Name[zh_CN]=桑戈语 Name[zh_TW]=Sango語 Name[zu]=Isi-Sango @@ -6504,7 +6382,6 @@ Name[ta]=சமஸ்கிருதம Name[tg]=Санскрит Name[uk]=Санскрит Name[uz]=Санскрит -Name[xx]=xxSanskritxx Name[zh_CN]=梵语 Name[zh_TW]=梵語 Name[zu]=Isi-Sanskrit @@ -6575,7 +6452,6 @@ Name[uk]=Сербська Name[uz]=Сербча Name[vi]=Tiếng Séc bi Name[wa]=Serbe -Name[xx]=xxSerbianxx Name[zh_CN]=塞尔维亚语 Name[zh_TW]=塞爾維亞語 Name[zu]=Isi-Serbian @@ -6648,7 +6524,6 @@ Name[uk]=Хорватська Name[uz]=Хорватча Name[vi]=Tiếng Crô-át Name[wa]=Crowåte -Name[xx]=xxCroatianxx Name[zh_CN]=克罗地亚语 Name[zh_TW]=克羅埃西亞語 Name[zu]=Isi-Croatian @@ -6701,7 +6576,6 @@ Name[tg]=Сингалӣ Name[uk]=Сингалійська Name[uz]=Синхалесе Name[wa]=Sinhalès -Name[xx]=xxSinhalesexx Name[zh_CN]=僧伽罗语 Name[zh_TW]=錫蘭語 Name[zu]=Isi-Sinhalese @@ -6772,7 +6646,6 @@ Name[tr]=Slovence Name[uk]=Словенська Name[uz]=Словенианча Name[wa]=Eslovenyin -Name[xx]=xxSlovenianxx Name[zh_CN]=斯洛文尼亚语 Name[zh_TW]=斯洛維尼亞語 Name[zu]=Isi-Slovenian @@ -6833,7 +6706,6 @@ Name[uz]=Шимолий Сами Name[ven]=Sami ya Devhula Name[wa]=Bijhe såmi Name[xh]=Sami Yasemntla -Name[xx]=xxNorthern Samixx Name[zh_CN]=北部沙米语 Name[zh_TW]=北薩米語 Name[zu]=Isi-Sami Sase-Ntshonalanga @@ -6902,7 +6774,6 @@ Name[ven]=Musilovaka Name[vi]=Tiếng Slô-vác Name[wa]=Eslovake Name[xh]=isiSlovak -Name[xx]=xxSlovakxx Name[zh_CN]=斯洛伐克语 Name[zu]=Isi-Silovaki [sm] @@ -6958,7 +6829,6 @@ Name[tg]=Самоанӣ Name[uk]=Самойська Name[uz]=Самоача Name[wa]=Samowan -Name[xx]=xxSamoanxx Name[zh_CN]=萨摩亚语 Name[zh_TW]=薩摩牙語 Name[zu]=Isi-Samoan @@ -6989,7 +6859,6 @@ Name[tg]=Шонӣ Name[uk]=Шона Name[uz]=Шона Name[xh]=Isishona -Name[xx]=xxShonaxx Name[zh_CN]=修纳语 Name[zh_TW]=Shona語 Name[zu]=Isi-Shona @@ -7023,7 +6892,6 @@ Name[tg]=Синдхӣ Name[uk]=Сіндхі Name[uz]=Синдхи Name[wa]=Sindi -Name[xx]=xxSindhixx Name[zh_TW]=Sindhi語 Name[zu]=Isi-Sindi [so] @@ -7074,7 +6942,6 @@ Name[tg]=Сомалӣ Name[uk]=Сомалійська Name[uz]=Сомалича Name[wa]=Somalyin -Name[xx]=xxSomalixx Name[zh_CN]=索马里语 Name[zh_TW]=索馬利語 Name[zu]=Isi-Somali @@ -7133,7 +7000,6 @@ Name[uz]=Сотхо, Жанубий Name[ven]=Sotho, Tshipembe Name[wa]=Soto (nonne) Name[xh]=Isisuthu, Sasemzantsi -Name[xx]=xxSotho, Southernxx Name[zh_CN]=索托，南部 Name[zh_TW]=梭托語，南部 Name[zu]=Isi-Suthu, Sase-Mzantsi @@ -7207,7 +7073,6 @@ Name[uz]=Испанча Name[vi]=Tiếng Tây Ban Nha Name[wa]=Castiyan Name[xh]=Isipanishi -Name[xx]=xxSpanishxx Name[zh_CN]=西班牙语 Name[zh_TW]=西班牙語 Name[zu]=Isi-Penishi @@ -7263,7 +7128,6 @@ Name[tg]=Сардиниягӣ Name[uk]=Сардинська Name[uz]=Сардинча Name[wa]=Sardinyin -Name[xx]=xxSardinianxx Name[zh_CN]=撒丁语 Name[zh_TW]=薩丁尼亞語 Name[zu]=Isi-Sardinian @@ -7298,7 +7162,6 @@ Name[uk]=Суаті Name[uz]=Свати Name[wa]=Suwati Name[xh]=Isiswati -Name[xx]=xxSwatixx Name[zh_CN]=斯瓦特语 Name[zh_TW]=Swati語 Name[zu]=Isi-Swati @@ -7353,7 +7216,6 @@ Name[tg]=Санданизӣ Name[uk]=Сунданійська Name[uz]=Сунданча Name[wa]=Soudanès -Name[xx]=xxSundanesexx Name[zh_CN]=巽他语 Name[zh_TW]=Sundanese語 Name[zu]=Isi-Sundanese @@ -7396,7 +7258,6 @@ Name[tg]=Свахили Name[uk]=Суахілі Name[uz]=Свахили Name[wa]=Suwahili -Name[xx]=xxSwahilixx Name[zh_CN]=斯瓦希里语 Name[zh_TW]=斯華西里語 Name[zu]=Isi-Swahili @@ -7468,7 +7329,6 @@ Name[uk]=Шведська Name[uz]=Шведча Name[vi]=Tiếng Thuỵ Điển Name[wa]=Suwedwès -Name[xx]=xxSwedishxx Name[zh_CN]=瑞典语 Name[zh_TW]=瑞典語 Name[zu]=Isi-Swidishi @@ -7527,7 +7387,6 @@ Name[tg]=Таитиягӣ Name[uk]=Таїтянська Name[uz]=Тахитиан Name[wa]=Tahityin -Name[xx]=xxTahitianxx Name[zh_CN]=塔希提语 Name[zh_TW]=大溪地語 Name[zu]=Isi-Tahitian @@ -7583,7 +7442,6 @@ Name[uk]=Тамільська Name[uz]=Тамилча Name[vi]=Tiếng Tamil Name[wa]=Tamoul -Name[xx]=xxTamilxx Name[zh_CN]=泰米尔语 Name[zh_TW]=坦米爾語 Name[zu]=Isi-Tamili @@ -7631,7 +7489,6 @@ Name[tg]=Тоторӣ Name[uk]=Татарська Name[uz]=Тотарча Name[wa]=Tatår -Name[xx]=xxTatarxx Name[zh_CN]=鞑靼语 Name[zh_TW]=韃靼語 Name[zu]=Isi-Tatar @@ -7666,7 +7523,6 @@ Name[tg]=Телугуягӣ Name[uk]=Телугу Name[uz]=Телугу Name[wa]=Telougou -Name[xx]=xxTeluguxx Name[zh_CN]=泰卢固语 Name[zh_TW]=特拉古語 Name[zu]=Isi-Telugu @@ -7720,7 +7576,6 @@ Name[tg]=Тоҷикӣ Name[uk]=Таджицька Name[uz]=Тожикча Name[wa]=Tadjik -Name[xx]=xxTajikxx Name[zh_CN]=塔吉克语 Name[zh_TW]=塔吉克語 Name[zu]=Isi-Tajik @@ -7780,7 +7635,6 @@ Name[uk]=Тайська Name[uz]=Тайча Name[vi]=Tiếng Thái Lan Name[wa]=Taylandès -Name[xx]=xxThaixx Name[zh_CN]=泰语 Name[zh_TW]=泰國語 Name[zu]=Isi-Thayi @@ -7842,7 +7696,6 @@ Name[tg]=Тибетӣ Name[uk]=Тибетська Name[uz]=Тибетча Name[wa]=Tibetyin -Name[xx]=xxTibetanxx Name[zh_CN]=藏语 Name[zh_TW]=藏語 Name[zu]=Isi-Tibetan @@ -7881,7 +7734,6 @@ Name[tg]=Тигринягӣ Name[uk]=Тигринійська Name[uz]=Тигриня Name[wa]=Tigrinia -Name[xx]=xxTigrinyaxx Name[zh_CN]=提格里尼亚语 Name[zh_TW]=提格利尼亞語 Name[zu]=Isi-Tigrinya @@ -7915,7 +7767,6 @@ Name[ta]=டோங்கா Name[tg]=Тонгаӣ Name[uk]=Тонга Name[uz]=Тонга -Name[xx]=xxTongaxx Name[zh_CN]=汤加语 Name[zh_TW]=東加語 Name[zu]=Isi-Tonga @@ -7950,7 +7801,6 @@ Name[tg]=Сванавӣ Name[uk]=Тсвана Name[uz]=Тсвана Name[xh]=Isitswana -Name[xx]=xxTswanaxx Name[zh_CN]=茨瓦纳语 Name[zh_TW]=班圖語 Name[zu]=Isi-Tswana @@ -7981,7 +7831,6 @@ Name[ta]=டிசோங்கா Name[tg]=Сонгавӣ Name[uk]=Цонґа Name[uz]=Цонга -Name[xx]=xxTsongaxx Name[zh_CN]=特松加语 Name[zh_TW]=Tsonga語 Name[zu]=Isi-Tsonga @@ -8038,7 +7887,6 @@ Name[uk]=Туркменська Name[uz]=Туркманча Name[ven]=Munna wa Turkey Name[wa]=Turkmene -Name[xx]=xxTurkmenxx Name[zh_CN]=土库曼语 Name[zh_TW]=土庫曼語 Name[zu]=Amadoda Ase-Thekishi @@ -8068,7 +7916,7 @@ Name[fr]=Turc Name[ga]=Tuircis Name[gl]=Turco Name[he]=טורקית -Name[hi]=तुर्किश +Name[hi]=तुर्की Name[hr]=Turski Name[hu]=török Name[id]=Turki @@ -8110,7 +7958,6 @@ Name[uk]=Турецька Name[uz]=Туркча Name[vi]=Tiếng ThềENhĩ Kì Name[wa]=Turk -Name[xx]=xxTurkishxx Name[zh_CN]=土耳其语 Name[zh_TW]=土耳其語 Name[zu]=Isi-Thekishi @@ -8139,7 +7986,6 @@ Name[ta]=த்வீ Name[tg]=Твиягӣ Name[uk]=Тві Name[uz]=Тви -Name[xx]=xxTwixx Name[zh_CN]=契维语 Name[zh_TW]=契維語 Name[zu]=Isi-Twi @@ -8182,7 +8028,6 @@ Name[tr]=Uygurca Name[uk]=Уйгур Name[uz]=Уйғурча Name[wa]=Ouygour -Name[xx]=xxUighurxx Name[zh_CN]=维吾尔语 Name[zh_TW]=維吾爾語 Name[zu]=Isi-Uighur @@ -8255,7 +8100,6 @@ Name[uz]=Украинча Name[vi]=Tiếng Ukraina Name[wa]=Oucrinnyin Name[xh]=Ukranian -Name[xx]=xxUkrainianxx Name[zh_CN]=乌克兰语 Name[zh_TW]=烏克蘭語 Name[zu]=Isi-Ukraniyani @@ -8290,7 +8134,6 @@ Name[tg]=Урду Name[uk]=Урду Name[uz]=Урду Name[wa]=Ourdou -Name[xx]=xxUrduxx Name[zh_CN]=乌尔都语 Name[zh_TW]=烏都語 Name[zu]=Isi-Urdu @@ -8345,7 +8188,6 @@ Name[tr]=Özbek Name[uk]=Узбецька Name[uz]=Ўзбекча Name[wa]=Ouzbeke -Name[xx]=xxUzbekxx Name[zh_CN]=乌兹别克语 Name[zh_TW]=烏茲別克語 Name[zu]=Isi-Uzbek @@ -8371,7 +8213,6 @@ Name[tg]=Вендаӣ Name[th]=เวนดา Name[uk]=Венда Name[uz]=Венда -Name[xx]=xxVendaxx Name[zh_CN]=闻达语 [vi] Name=Vietnamese @@ -8438,7 +8279,6 @@ Name[uk]=В'єтнамська Name[uz]=Ветнамча Name[vi]=Tiếng Việt Name[wa]=Vietnamyin -Name[xx]=xxVietnamesexx Name[zh_CN]=越南语 Name[zh_TW]=越南語 Name[zu]=Isi-Vietnamese @@ -8471,7 +8311,6 @@ Name[ta]=வொல்பாக் Name[tg]=Волапёкӣ Name[uk]=Волап'юк Name[uz]=Волапук -Name[xx]=xxVolapükxx Name[zh_CN]=沃拉普克语 Name[zu]=Isi-Volapük [cy] @@ -8535,7 +8374,6 @@ Name[th]=เวลช์ Name[uk]=Уельська Name[uz]=Уэлсча Name[wa]=Walès -Name[xx]=xxWelshxx Name[zh_CN]=威尔士 Name[zh_TW]=威爾斯語 Name[zu]=Isi-Welsh @@ -8600,7 +8438,6 @@ Name[uk]=Валлонська Name[uz]=Валлонча Name[vi]=Tiếng Wallon Name[wa]=Walon -Name[xx]=xxWalloonxx Name[zh_CN]=瓦龙语 Name[zh_TW]=華隆語 Name[zu]=Isi-Walloon @@ -8634,7 +8471,6 @@ Name[ta]=வொலொஃப் Name[tg]=Волофӣ Name[uk]=Волоф Name[uz]=Волоф -Name[xx]=xxWolofxx Name[zh_CN]=沃洛夫语 Name[zh_TW]=Wolof語 Name[zu]=Isi-Wolof @@ -8670,7 +8506,6 @@ Name[ven]=Xhoza Name[vi]=Xhosa Name[wa]=Xhossa Name[xh]=isixhosa -Name[xx]=xxXhosaxx Name[zh_CN]=科萨语 Name[zh_TW]=科薩語 Name[zu]=Isi-Xhosa @@ -8716,7 +8551,6 @@ Name[tg]=Йидишӣ Name[uk]=Ідиш Name[uz]=Йиддиш Name[wa]=Yidish -Name[xx]=xxYiddishxx Name[zh_CN]=依地语 Name[zh_TW]=意第緒語 Name[zu]=Isi-Yidishi @@ -8752,7 +8586,6 @@ Name[tg]=Ёруба Name[uk]=Йоруба Name[uz]=Ёруба Name[wa]=Yorouba -Name[xx]=xxYorubaxx Name[zh_CN]=约鲁巴语 Name[zh_TW]=優魯巴語 Name[zu]=Isi-Yoruba @@ -8781,7 +8614,6 @@ Name[ta]=சுவாங் Name[tg]=Жуанг Name[uk]=Жуан Name[uz]=Зхуанг -Name[xx]=xxZhuangxx Name[zh_CN]=壮语 Name[zh_TW]=Zhuang語 Name[zu]=Isi-Zhuang @@ -8820,11 +8652,10 @@ Name[ta]=ஜுலு Name[tg]=Зулу Name[th]=ซูลู Name[uk]=Зулуська -Name[uz]=Зулусча +Name[uz]=Зулуча Name[ven]=Muzulu Name[wa]=Zoulou Name[xh]=Isizulu -Name[xx]=xxZuluxx Name[zh_CN]=祖鲁语 Name[zh_TW]=袓魯語 Name[zu]=Isi-Zulu Index: kdecore/configure.in.in =================================================================== RCS file: /home/kde/kdelibs/kdecore/configure.in.in,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -u -3 -p -r1.42 -r1.42.2.1 --- kdecore/configure.in.in 24 May 2004 08:58:06 -0000 1.42 +++ kdecore/configure.in.in 21 Aug 2004 22:02:14 -0000 1.42.2.1 @@ -51,12 +51,12 @@ AC_CHECK_HEADERS([idna.h punycode.h stri AC_SUBST(LIB_IDN) dnl -------- -dnl KSocketAddress/KExtendedSocket extra configuration +dnl KNetwork extra configuration dnl -------- kde_safe_LIBS="$LIBS" LIBS="$LIBS $all_libraries $X_EXTRA_LIBS" -AC_CHECK_FUNCS(inet_ntop inet_pton getpeername getsockname getsockopt gethostbyname2_r gethostbyname_r gethostbyname2) +AC_CHECK_FUNCS([inet_ntop inet_pton getpeername getsockname getsockopt gethostbyname2_r gethostbyname_r gethostbyname2 if_nametoindex getprotobyname_r getservbyname_r]) LIBS="$kde_safe_LIBS" AC_CHECK_HEADERS([netinet/in.h net/if.h],,, [#include Index: kdecore/eventsrc =================================================================== RCS file: /home/kde/kdelibs/kdecore/eventsrc,v retrieving revision 1.389 retrieving revision 1.389.2.4 diff -u -3 -p -r1.389 -r1.389.2.4 --- kdecore/eventsrc 5 Aug 2004 06:36:47 -0000 1.389 +++ kdecore/eventsrc 20 Sep 2004 13:53:14 -0000 1.389.2.4 @@ -24,7 +24,7 @@ Comment[fr]=Notifications du système KD Comment[ga]=Fógairt Chóras KDE Comment[gl]=Notificacións do Sistema de KDE Comment[he]=הודעות מערכת של KDE -Comment[hi]=केडीई सिस्टम सूचना +Comment[hi]=केडीई तंत्र सूचना Comment[hr]=KDE Obavijesti sustava Comment[hu]=KDE rendszerüzenetek Comment[id]=Sistem Pemberitahuan KDE @@ -68,7 +68,6 @@ Comment[ven]=U divhadza maitele a KDE Comment[vi]=Thông báo hềEthống của KDE Comment[wa]=Notifiaedjes sistinme di KDE Comment[xh]=Izaziso Zendlela ye KDE -Comment[xx]=xxKDE System Notificationsxx Comment[zh_CN]=KDE 系统通知 Comment[zh_TW]=KDE 系統通知 Comment[zu]=Izaziso Zesistimu ye-KDE @@ -140,7 +139,6 @@ Name[uz]=Матнни тугатиш: қ Name[ven]=U fhela ha manwalwa: U mona Name[vi]=Textcompletion:Quay Name[xh]=Textcompletion: ujikeleziso -Name[xx]=xxTextcompletion: rotationxx Name[zh_CN]=文字补齐：轮转 Name[zh_TW]=文字補齊：旋轉 Name[zu]=Ukuqedwa kombhalo:ukujikelezisa @@ -158,6 +156,7 @@ Comment[fi]=Osumalistan loppu saavutettu Comment[fr]=La fin de la liste des correspondances a été atteinte Comment[he]=הגיעו לסוף רשימת ההתאמות Comment[hu]=A találatok listájának végére értem +Comment[is]=Enda listans yfir atriði sem passa náð Comment[it]=È stata raggiunta la fine della lista delle corrispondenze Comment[ja]=マッチリストの終端に達しました Comment[nb]=Har kommet til slutten av lista over treff @@ -167,13 +166,16 @@ Comment[pa]=ਮੇਲ ਸੂਚੀ ਦ Comment[pl]=Osiągnięto koniec listy dopasowań Comment[pt]=O fim da lista de escolhas foi atingido Comment[pt_BR]=O fim da lista de coincidências foi atingido +Comment[ro]=Am ajuns la sfîrşitul listei de potriviri +Comment[se]=Ollii gávdnosiid listtu lohppii Comment[sk]=Bol dosiahnutý koniec zoznamu nájdených položiek Comment[sl]=To je konec seznama zadetkov Comment[sr]=Достигнут је крај листе подударања Comment[sr@Latn]=Достигнут је крај листе подударања Comment[sv]=Slutet på listan med träffar har nåtts +Comment[ta]=பொருத்தப் பட்டியலின் முடிவை அடைந்தாயிற்று. Comment[tg]=Охири рӯйхати наздикоянда расидед -Comment[xx]=xxThe end of the list of matches has been reachedxx +Comment[uk]=Досягнуто кінець списку співпадань Comment[zh_CN]=已到达匹配项列表的最后 default_presentation=1 @@ -245,7 +247,6 @@ Name[uz]=Матнни тугатиш: м Name[ven]=U fhela ha manwalwa: A huna u fanyisa Name[vi]=Textcompletion: Không phù hợp Name[xh]=Textcompletion: akukho ntelekiso -Name[xx]=xxTextcompletion: no matchxx Name[zh_CN]=文字补齐：没有匹配 Name[zh_TW]=文字補齊：沒有匹配 Name[zu]=Ukuqedwa kokumbhalo: akukho okufanayo @@ -263,6 +264,7 @@ Comment[fi]=Ei osumia täydennettäväks Comment[fr]=Aucune possibilité d'auto-complètement trouvée Comment[he]=לא נמצאה אף השלמה תואמת Comment[hu]=Nem található megfelelő kiegészítés +Comment[is]=Ekkert passar Comment[it]=Nessun completamento corrispondente trovato Comment[ja]=マッチする補完は見つかりませんでした Comment[nb]=Ingen passende fullføring funnet @@ -272,13 +274,16 @@ Comment[pa]=ਸਮਾਪਤੀ ਤੱਕ Comment[pl]=Nie znaleziono dopasowania Comment[pt]=Não foi encontrada qualquer completação Comment[pt_BR]=Nenhuma coincidência foi encontrada +Comment[ro]=Nu am găsit nimic potrivit +Comment[se]=Heivvolaš ollašuhttin ii gávdnon Comment[sk]=Žiadna zhoda nebola nájdená Comment[sl]=Ni najti ujemajočih se zadetkov Comment[sr]=Подударна допуна није пронађена Comment[sr@Latn]=Подударна допуна није пронађена Comment[sv]=Ingen matchande komplettering hittades +Comment[ta]=பொருத்தமான நிறைவு ஏதுமில்லை. Comment[tg]=Анҷомдиҳии наздикоянда накофтан -Comment[xx]=xxNo matching completion was foundxx +Comment[uk]=Відповідного завершення не знайдено Comment[zh_CN]=没有找到匹配的补全项 default_presentation=1 @@ -350,7 +355,6 @@ Name[uz]=Матнни тугатиш: қ Name[ven]=U fhela ha manwalwa: U elana hu tukunyana Name[vi]=Textcompletion: Phù hợp một phần Name[xh]=Ugqibeko lokubhaliweyo: intelekiso engaphelelanga -Name[xx]=xxTextcompletion: partial matchxx Name[zh_CN]=文字补齐：部分匹配 Name[zh_TW]=文字補齊︰部分匹配 Name[zu]=Ukuqedwa kokubhaliweyo: ukufaniswa kwesikhashana @@ -368,6 +372,7 @@ Comment[fi]=Useampia mahdollisia osumia Comment[fr]=Au moins deux correspondances ont été trouvées Comment[he]=יש יותר מהתאמה אפשרית אחת Comment[hu]=Egynél több lehetséges kiegészítés van +Comment[is]=Það eru fleiri en eitt atriði sem passar Comment[it]=C'è più di una corrispondenza possibile Comment[ja]=1つ以上のマッチがあります Comment[nb]=Det er mer enn ett mulig treff @@ -377,13 +382,16 @@ Comment[pa]=ਇੱਕ ਤੋਂ ਵਧ Comment[pl]=Jest więcej niż jedno dopasowanie Comment[pt]=Há mais do que uma completação possível Comment[pt_BR]=Há mais de uma opção possível +Comment[ro]=Există mai mult de o potrivire posibilă +Comment[se]=Leat eanet go ovtta vejolaš gávdnus Comment[sk]=Existuje viac ako jedna zhoda Comment[sl]=Mogoč je več kakor en zadetek Comment[sr]=Постоји више од једног могућег подударања Comment[sr@Latn]=Постоји више од једног могућег подударања Comment[sv]=Det finns mer än en möjlig träff +Comment[ta]=ஒன்றுக்கு மேற்பட்ட பொருத்தங்கள் உள்ளன. Comment[tg]=Ин ҷо калонтар нисбат ба як дута эҳтимолӣ -Comment[xx]=xxThere is more than one possible matchxx +Comment[uk]=Більше одного відповідного значення Comment[zh_CN]=有多于一个的可能匹配项 default_presentation=1 @@ -459,7 +467,6 @@ Name[ven]=I ngasi vule faela Name[vi]=Không thềEmềEfile Name[wa]=Dji n' sai drovi l' fitchî Name[xh]=Ayinakuyivula Ifayile -Name[xx]=xxCannot Open Filexx Name[zh_CN]=无法打开文件 Name[zh_TW]=無法打開檔案 Name[zu]=Ifayela Alivulekile @@ -511,7 +518,7 @@ Comment[pa]=ਚੁਣੀ ਫਾਇਲ Comment[pl]=Wybrany plik nie może być otwarty do odczytu lub zapisu Comment[pt]=O ficheiro seleccionado não pode ser aberto para leitura ou escrita. Comment[pt_BR]=O arquivo selecionado não pode ser aberto para leitura ou gravação -Comment[ro]=Fişierul selectat nu poate fi deschis în scriere sau citire +Comment[ro]=Fişierul selectat nu poate fi deschis pentru scriere sau citire Comment[ru]=Не удается открыть выбранный файл для записи или чтения Comment[se]=Válljejuvvon fiilla ii sáhte rahpat lohkama dahje čállima várás Comment[sk]=Vybraný súbor nemôžem otvoriť na čítanie alebo zápis @@ -530,7 +537,6 @@ Comment[uz]=Танланган файл Comment[ven]=Faela yo nangwaho ingasi vulwe u vhala kana u nwala Comment[vi]=File được chọn không thềEmềEđược đềEđọc hay viết Comment[xh]=Ifayile ekhethiweyo ayinakuvulelwa ukufunda okanye ukubhala -Comment[xx]=xxThe selected file cannot be opened for reading or writingxx Comment[zh_CN]=选中的文件不能打开来读或写 Comment[zh_TW]=所選取的檔案無法開啟進行讀取或者是寫入 Comment[zu]=Ifayela elikhethiwe alingeke livulwe ukuze lifundwe ukufundwa noma ukubhalwa @@ -606,7 +612,6 @@ Name[ven]=Vhukhakhi vhuhulwane Name[vi]=Lỗi nghiêm trọng Name[wa]=Aroke moirt Name[xh]=Imposiso Enengozi -Name[xx]=xxFatal Errorxx Name[zh_CN]=致命错误 Name[zh_TW]=嚴重錯誤 Name[zu]=Iphutha Lengozi @@ -624,6 +629,7 @@ Comment[fi]=Tapahtui vakava virhe, jonka Comment[fr]=Un problème grave a provoqué l'arrêt du programme Comment[he]=אירעה שגיאה חמורה שגרמה לתוכנית לצאת Comment[hu]=Súlyos hiba történt, ezért a program futása félbeszakadt. +Comment[is]=Alvarleg villa stöðvaði keyrslu forritsins. Comment[it]=Si è verificato un errore grave che ha causato la fine del programma Comment[ja]=プログラムが終了する深刻なエラーがあります Comment[nb]=Det var en alvorlig feil som førte til at programmet avsluttet @@ -634,13 +640,16 @@ Comment[pa]= ਇੱਕ ਘਾਤਕ ਗ Comment[pl]=Wystąpił poważny błąd, który spowodował zamknięcie programu Comment[pt]=Ocorreu um erro grave que provocou o fim da execução do programa Comment[pt_BR]=Houve um erro sério, que fez o programa finalizar +Comment[ro]=A apărut o eroare severă care a determinat terminarea programului +Comment[se]=Vearrás meattáhusa geažil prográmma heittii Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukončenie programu Comment[sl]=Program se je končal zaradi resne napake Comment[sr]=Десила се озбиљна грешка, која је изазвала да се програм затвори Comment[sr@Latn]=Десила се озбиљна грешка, која је изазвала да се програм затвори Comment[sv]=Ett allvarligt fel uppstod vilket fick programmet att avslutas +Comment[ta]=நிரலை வெளியேறச் செய்கிற அளவில் ஒரு பெரிய தவறுண்டு. Comment[tg]=Хатои ҷиддӣ иҷозат дода шудан ба нақшаи баромадан таъсир кардан -Comment[xx]=xxThere was a serious error causing the program to exitxx +Comment[uk]=Серйозна помилка стала причиною виходу програми Comment[zh_CN]=有一个严重的错误导致程序退出 default_presentation=2 level=4 @@ -714,7 +723,6 @@ Name[ven]=Ndivhadzo Name[vi]=Thông báo Name[wa]=Notifiaedje Name[xh]=Isaziso -Name[xx]=xxNotificationxx Name[zh_CN]=通知 Name[zh_TW]=通知 Name[zu]=Isaziso @@ -732,6 +740,7 @@ Comment[fi]=Ohjelmassa tapahtui jotain e Comment[fr]=Quelque chose de spécial s'est passé dans le programme Comment[he]=משהו מיוחד קרה עם התוכנית Comment[hu]=Valami különleges történt a programban +Comment[is]=Eitthvað sérstakt gerðist í forritinu Comment[it]=È successo qualcosa di speciale nel programma Comment[ja]=何か特別なことがプログラムにおこりました Comment[nb]=Noe spesielt skjedde med programmet @@ -742,13 +751,16 @@ Comment[pa]=ਇਸ ਕਾਰਜ ਵਿ Comment[pl]=Coś specjalnego stało sie w programie Comment[pt]=Ocorreu algo de especial no programa Comment[pt_BR]=Algo especial ocorreu no programa +Comment[ro]=S-a întîmplat ceva neaşteptat în program +Comment[se]=Juoga erenoamáš dáhpáhuvai prográmmas 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]=Нешто посебно се десило у програму Comment[sv]=Någonting speciellt inträffade i programmet +Comment[ta]=நிரலில் ஏதோ விசேடம் நிகழ்ந்துள்ளது Comment[tg]=Чизе махсус ин нақша рӯй додан -Comment[xx]=xxSomething special happened in the programxx +Comment[uk]=Щось особливе сталось у програмі Comment[zh_CN]=程序中发生了特殊情况 default_presentation=1 default_sound=KDE_Beep.ogg @@ -825,7 +837,6 @@ Name[ven]=Khaidzo Name[vi]=Cảnh cáo Name[wa]=Adviertixhmint Name[xh]=Isilumkiso -Name[xx]=xxWarningxx Name[zh_CN]=警告 Name[zh_TW]=警告 Name[zu]=Isexwayiso @@ -843,6 +854,7 @@ Comment[fi]=Ohjelmassa tapahtui virhe, j Comment[fr]=Une erreur est survenu dans le programme, pouvant causer des dysfonctionnements. Comment[he]=אירעה שגיאה חמורה שעלולה לגרום לבעיות Comment[hu]=Olyan hiba történt a programban, mely további problémákat okozhat +Comment[is]=Það kom upp villa í forritinu sem gæti valdið vandræðum Comment[it]=Nel programma si è verificato un errore che può causare problemi Comment[ja]=プログラムに問題を引き起こすエラーがあります Comment[nb]=Det var en feil i programmet som kan føre til problemer @@ -853,13 +865,16 @@ Comment[pa]=ਕਾਰਜ ਵਿੱਚ Comment[pl]=Wystąpił błąd, który może spowodować zakłócenia w pracy Comment[pt]=Ocorreu um erro grave no programa que pode causar problemas Comment[pt_BR]=Houve um erro no programa que pode ter causado problemas +Comment[ro]=A apărut o eroare în program care ar putea cauza probleme +Comment[se]=Prográmmas lei meattáhus mii sáhttá dagahit váttisvuođaid 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]=Десила се грешка у програму која може изазвати проблеме Comment[sv]=Det uppstod ett fel i programmet vilket kan orsaka problem +Comment[ta]=பிரச்னைகளை ஏற்படுத்தும் அளவிற்கு நிரலில் ஒரு தவறு இருந்தது. Comment[tg]=Хатои иҷозат дода шудан дар нақша, кадом масъалаҳо таъсир кардан метавонед -Comment[xx]=xxThere was an error in the program which may cause problemsxx +Comment[uk]=Сталася серйозна помилка, яка може викликати проблеми Comment[zh_CN]=程序中发生了可能导致问题的错误 default_presentation=2 level=2 @@ -931,7 +946,6 @@ Name[uz]=Фожиа Name[ven]=Mutshinyalo Name[vi]=Thảm hoạ Name[xh]=Ingozi enkulu -Name[xx]=xxCatastrophexx Name[zh_CN]=严重问题 Name[zh_TW]=嚴重問題 Name[zu]=Inhlekelele @@ -975,7 +989,7 @@ Comment[pa]=ਇੱਕ ਘਾਤਕ ਗ Comment[pl]=Wystąpił bardzo poważny błąd, który spowodował przynajmniej zakończenie programu Comment[pt]=Ocorreu um erro muito grave, que no mínimo provocou o fim da execução do programa Comment[pt_BR]=Ocorreu um erro grave, que causou no mínimo a saída do programa. -Comment[ro]=A apărut o eroare foarte serioasă în program care a provocat terminarea lui +Comment[ro]=A apărut o eroare foarte severă în program care a provocat cel puţin terminarea lui Comment[ru]=Возник серьезный сбой, приведший как минимум к выходу из программы Comment[se]=Hui vearrás meattáhus dáhpáhuvai, dagahii goit prográmma heaitit Comment[sk]=Vyskytla sa veľmi vážna chyba, ktorá minimálne ukončí program @@ -990,7 +1004,6 @@ Comment[th]=เกิดข้อผิ Comment[tr]=Programın kapanmasına neden olan ciddi bir hata oluştu ve programdan çıkıldı. Comment[uk]=Сталася дуже серйозна помилка, яка, щонайменше, стала причиною виходу програми Comment[uz]=Дастурнинг ишини якунланишига сабабчи бўлган жиддий хато рўй берди -Comment[xx]=xxA very serious error occurred, at least causing the program to exitxx Comment[zh_CN]=出现了一个非常严重的错误，至少使程序退出 default_presentation=2 level=8 @@ -1058,7 +1071,6 @@ Name[ven]=U dzhena kha khomupwutha Name[vi]=Đăng nhập Name[wa]=Elodjaedje Name[xh]=Igama elithile -Name[xx]=xxLoginxx Name[zh_CN]=登录 Name[zh_TW]=登入 Name[zu]=Ukungena ngaphakathi @@ -1076,6 +1088,7 @@ Comment[fi]=KDE:tä käynnistetään Comment[fr]=KDE est en cours de démarrage Comment[he]=איתחול KDE בעיצומו Comment[hu]=A KDE elindul +Comment[is]=KDE er að ræsa Comment[it]=Avvio di KDE Comment[ja]=KDE起動中 Comment[nb]=KDE starter @@ -1086,14 +1099,17 @@ Comment[pa]=KDE ਸ਼ੁਰੂ ਹੋ ਰ Comment[pl]=Uruchomienie KDE Comment[pt]=O KDE está a arrancar Comment[pt_BR]=KDE está iniciando +Comment[ro]=KDE porneşte +Comment[se]=KDE vuolgigoahtá johtui Comment[sk]=KDE sa spúšťa Comment[sl]=KDE se zaganja Comment[sr]=KDE се покреће Comment[sr@Latn]=KDE се покреће Comment[sv]=KDE startas +Comment[ta]=கேடிஇ ஆரம்பிக்கிறது Comment[tg]=KDE боркарда шуда истодааст +Comment[uk]=Триває запуск KDE Comment[uz]=KDE ишга тушмоқда -Comment[xx]=xxKDE is starting upxx Comment[zh_CN]=KDE 正在启动 default_presentation=1 default_sound=KDE_Startup_1.ogg @@ -1163,7 +1179,6 @@ Name[uz]=Чиқиш Name[ven]=U litsha u shumisa khomupwutha Name[wa]=Dislodjaedje Name[xh]=Phuma ngaphandle -Name[xx]=xxLogoutxx Name[zh_CN]=注消 Name[zh_TW]=登出 Name[zu]=Phumela ngaphandle @@ -1181,6 +1196,7 @@ Comment[fi]=KDE:tä sammutetaan Comment[fr]=KDE est en cours d'arrêt Comment[he]=היציאה מ-KDE בעיצומה Comment[hu]=A KDE kilép +Comment[is]=KDE er að hætta Comment[it]=Uscita da KDE Comment[ja]=KDE終了中 Comment[nb]=KDE avslutter @@ -1191,14 +1207,17 @@ Comment[pa]=KDE ਸਮਾਪਤ ਹੋ Comment[pl]=Zakończenie KDE Comment[pt]=O KDE está a terminar Comment[pt_BR]=KDE está finalizando +Comment[ro]=KDE se termină +Comment[se]=KDE heaitigođii Comment[sk]=KDE sa ukončuje Comment[sl]=KDE se končuje Comment[sr]=KDE се завршава Comment[sr@Latn]=KDE се завршава Comment[sv]=KDE avslutas +Comment[ta]=கேடிஇ வெளிச்செல்கிறது Comment[tg]=KDE бароварда шуда истодааст +Comment[uk]=Триває завершення роботи KDE Comment[uz]=KDE ишини якунламоқда -Comment[xx]=xxKDE is exitingxx Comment[zh_CN]=KDE 正在退出 default_presentation=1 default_sound=KDE_Logout_3.ogg @@ -1270,7 +1289,6 @@ Name[ven]=Vhukhakhi hau phirintha Name[vi]=Lỗi khi in Name[wa]=Aroke d' imprimaedje Name[xh]=Imposiso yoshicilelo -Name[xx]=xxPrint errorxx Name[zh_CN]=打印错误 Name[zh_TW]=列印錯誤 Name[zu]=Iphutha lokushicelela @@ -1330,7 +1348,6 @@ Comment[tr]=Bir yazdırma hatası oluşt Comment[uk]=Сталася помилка друку Comment[uz]=Босиб чиқариш хатоси рўй берди Comment[wa]=Åk n' a nén stî tot-z imprimant -Comment[xx]=xxA print error has occurredxx Comment[zh_CN]=发生了打印错误 Comment[zh_TW]=列印時發生錯誤 default_presentation=2 @@ -1394,7 +1411,6 @@ Name[tr]=Bilgi mesajı Name[uk]=Інформаційне повідомлення Name[uz]=Маълумот хабари Name[wa]=Messaedje d' informåcion -Name[xx]=xxInformation messagexx Name[zh_CN]=信息性消息 Comment=An information message is being shown Comment[ar]=تظهر الآن رسالة معلوماتية @@ -1451,7 +1467,6 @@ Comment[th]=ข้อมูลสนเ Comment[uk]=Показується інформативне повідомлення Comment[uz]=Маълумот хабари кўрсатилди Comment[wa]=On messaedje d' informåcion est håyné -Comment[xx]=xxAn information message is being shownxx Comment[zh_CN]=正在显示信息性消息 default_sound=KDE_Chimes_2.ogg default_presentation=65 @@ -1515,7 +1530,6 @@ Name[tr]=Uyarı mesajı Name[uk]=Попередження Name[uz]=Огоҳнома хабари Name[wa]=Messaedje d' adviertixhmint -Name[xx]=xxWarning messagexx Name[zh_CN]=警告消息 Comment=A warning message is being shown Comment[ar]=تظهر الآن رسالة تحذيرية @@ -1572,7 +1586,6 @@ Comment[th]=ข้อความแจ Comment[uk]=Показується повідомлення з попередженням Comment[uz]=Огоҳнома хабари кўрсатилди Comment[wa]=On messaedje d' adviertixhmint est håyné -Comment[xx]=xxA warning message is being shownxx Comment[zh_CN]=正在显示警告消息 Comment[zh_TW]=警告訊息已顯示 default_sound=KDE_Error_1.ogg @@ -1636,7 +1649,6 @@ Name[tr]=Kritik hata mesajı Name[uk]=Критична помилка Name[uz]=Муаммо хабари Name[wa]=Messaedje critike -Name[xx]=xxCritical messagexx Name[zh_CN]=关键消息 Comment=A critical message is being shown Comment[ar]=تظهر الآن رسالة مهمَة @@ -1692,7 +1704,6 @@ Comment[th]=ข้อความวิ Comment[uk]=Показується повідомлення про критичну помилку Comment[uz]=Муаммо хабари кўрсатилди Comment[wa]=On messaedje critike est håyné -Comment[xx]=xxA critical message is being shownxx Comment[zh_CN]=正在显示关键消息 Comment[zh_TW]=嚴重的警告訊息已顯示 default_sound=KDE_Glass_Break.ogg @@ -1757,7 +1768,6 @@ Name[tr]=Soru Name[uk]=Запитання Name[uz]=Савол Name[wa]=Kesse -Name[xx]=xxQuestionxx Name[zh_CN]=问题 Comment=A question is being asked Comment[ar]=هناك سؤال يتم سؤاله @@ -1815,7 +1825,6 @@ Comment[tr]=Bir soru soruldu Comment[uk]=Показується запитання Comment[uz]=Савол берилди Comment[wa]=Ene kesse est dmandêye -Comment[xx]=xxA question is being askedxx Comment[zh_CN]=正在提问 Comment[zh_TW]=問題已經在詢問中 default_sound=KDE_Vox_Ahem.ogg Index: kdecore/kapplication.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kapplication.cpp,v retrieving revision 1.670 retrieving revision 1.670.2.1 diff -u -3 -p -r1.670 -r1.670.2.1 --- kdecore/kapplication.cpp 22 Jul 2004 16:50:04 -0000 1.670 +++ kdecore/kapplication.cpp 17 Aug 2004 13:44:00 -0000 1.670.2.1 @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ -// $Id: kapplication.cpp,v 1.670 2004/07/22 16:50:04 waba Exp $ +// $Id: kapplication.cpp,v 1.670.2.1 2004/08/17 13:44:00 waba Exp $ #include "config.h" @@ -2171,6 +2171,9 @@ void KApplication::invokeMailer(const KU if (allowAttachments && q.startsWith("attach=")) attachURLs.push_back(KURL::decode_string((*it).mid(7))); else + if (allowAttachments && q.startsWith("attachment=")) + attachURLs.push_back(KURL::decode_string((*it).mid(11))); + else if (q.startsWith("to=")) address = address.isEmpty()? KURL::decode_string((*it).mid(3)): address + ',' + KURL::decode_string((*it).mid(3)); } Index: kdecore/kcmdlineargs.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kcmdlineargs.cpp,v retrieving revision 1.91 retrieving revision 1.91.2.1 diff -u -3 -p -r1.91 -r1.91.2.1 --- kdecore/kcmdlineargs.cpp 10 Jun 2004 12:47:03 -0000 1.91 +++ kdecore/kcmdlineargs.cpp 21 Sep 2004 10:41:11 -0000 1.91.2.1 @@ -156,10 +156,6 @@ KCmdLineArgs::init(const KAboutData* ab) void KCmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKApp) { - assert( argsList == 0 ); // Don't call init twice. - assert( argc == 0 ); // Don't call init twice. - assert( argv == 0 ); // Don't call init twice. - assert( about == 0 ); // Don't call init twice. argc = _argc; argv = _argv; Index: kdecore/kconfigbackend.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kconfigbackend.cpp,v retrieving revision 1.95 retrieving revision 1.95.2.1 diff -u -3 -p -r1.95 -r1.95.2.1 --- kdecore/kconfigbackend.cpp 21 May 2004 20:51:18 -0000 1.95 +++ kdecore/kconfigbackend.cpp 26 Aug 2004 09:53:40 -0000 1.95.2.1 @@ -972,18 +972,9 @@ bool KConfigINIBackEnd::writeConfigFile( bool createNew = true; struct stat buf; - if (lstat(QFile::encodeName(filename), &buf) == 0) + if (stat(QFile::encodeName(filename), &buf) == 0) { - if (S_ISLNK(buf.st_mode)) - { - // File is a symlink: - if (stat(QFile::encodeName(filename), &buf) == 0) - { - // Don't create new file but write to existing file instead. - createNew = false; - } - } - else if (buf.st_uid == getuid()) + if (buf.st_uid == getuid()) { // Preserve file mode if file exists and is owned by user. fileMode = buf.st_mode & 0777; Index: kdecore/kextsock.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kextsock.cpp,v retrieving revision 1.74 retrieving revision 1.74.2.1 diff -u -3 -p -r1.74 -r1.74.2.1 --- kdecore/kextsock.cpp 11 Jul 2004 18:30:41 -0000 1.74 +++ kdecore/kextsock.cpp 15 Aug 2004 18:52:31 -0000 1.74.2.1 @@ -1369,7 +1369,7 @@ void KExtendedSocket::flush() QByteArray *a = outBuf.first(); unsigned count = 0; - while (a && count + (a->size() - offset) < buf.size()) + while (a && count + (a->size() - offset) <= buf.size()) { memcpy(buf.data() + count, a->data() + offset, a->size() - offset); count += a->size() - offset; @@ -1377,6 +1377,16 @@ void KExtendedSocket::flush() a = outBuf.next(); } + // see if we can still fit more + if (a && count < buf.size()) + { + // getting here means this buffer (a) is larger than + // (buf.size() - count) (even for count == 0). + memcpy(buf.data() + count, a->data() + offset, buf.size() - count); + offset += buf.size() - count; + count = buf.size(); + } + // now try to write those bytes int wrote = KSocks::self()->write(sockfd, buf, count); Index: kdecore/kglobalaccel_x11.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kglobalaccel_x11.cpp,v retrieving revision 1.30 retrieving revision 1.30.4.1 diff -u -3 -p -r1.30 -r1.30.4.1 --- kdecore/kglobalaccel_x11.cpp 13 Mar 2004 13:55:27 -0000 1.30 +++ kdecore/kglobalaccel_x11.cpp 23 Aug 2004 17:45:05 -0000 1.30.4.1 @@ -104,6 +104,11 @@ bool KGlobalAccelPrivate::grabKey( const uchar keyCodeX = key.code(); uint keyModX = key.mod() & g_keyModMaskXAccel; // Get rid of any non-relevant bits in mod + // HACK: make Alt+Print work + if( key.sym() == XK_Sys_Req ) { + keyModX |= KKeyServer::modXAlt(); + keyCodeX = 111; + } #ifndef __osf__ // this crashes under Tru64 so ..... Index: kdecore/ksavefile.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/ksavefile.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.2 diff -u -3 -p -r1.17 -r1.17.2.2 --- kdecore/ksavefile.cpp 15 Jul 2004 16:16:43 -0000 1.17 +++ kdecore/ksavefile.cpp 26 Aug 2004 10:12:03 -0000 1.17.2.2 @@ -19,12 +19,14 @@ #include +#include #include #ifdef HAVE_SYS_STAT_H #include #endif +#include #include #include @@ -37,20 +39,28 @@ #include "kapplication.h" #include "ksavefile.h" +#include "kstandarddirs.h" + +static QString realFilePath(const QString &filename) +{ + char realpath_buffer[MAXPATHLEN + 1]; + memset(realpath_buffer, 0, MAXPATHLEN + 1); + + /* If the path contains symlinks, get the real name */ + if (realpath( QFile::encodeName(filename).data(), realpath_buffer) != 0) { + // succes, use result from realpath + return QFile::decodeName(realpath_buffer); + } + + return filename; +} + KSaveFile::KSaveFile(const QString &filename, int mode) : mTempFile(true) { - // follow symbolic link, if any - QString real_filename = filename; - - QFileInfo file_info(real_filename); - int c=0; - while(file_info.isSymLink() && ++c<6) { - real_filename = file_info.readLink(); - file_info.setFile( real_filename ); - } + QString real_filename = realFilePath(filename); // we only check here if the directory can be written to // the actual filename isn't written to, but replaced later @@ -69,11 +79,23 @@ KSaveFile::KSaveFile(const QString &file // permissions are the same as existing file so the existing // file's permissions are preserved struct stat stat_buf; - if ((stat(QFile::encodeName(real_filename), &stat_buf)==0) - && (stat_buf.st_uid == getuid()) - && (stat_buf.st_gid == getgid())) + if (stat(QFile::encodeName(real_filename), &stat_buf)==0) { - fchmod(mTempFile.handle() , stat_buf.st_mode); + // But only if we own the existing file + if (stat_buf.st_uid == getuid()) + { + bool changePermission = true; + if (stat_buf.st_gid != getgid()) + { + if (fchown(mTempFile.handle(), (uid_t) -1, stat_buf.st_gid) != 0) + { + // Use standard permission if we can't set the group + changePermission = false; + } + } + if (changePermission) + fchmod(mTempFile.handle(), stat_buf.st_mode); + } } } return; Index: kdecore/kstandarddirs.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/kstandarddirs.cpp,v retrieving revision 1.182 retrieving revision 1.182.2.4 diff -u -3 -p -r1.182 -r1.182.2.4 --- kdecore/kstandarddirs.cpp 16 Jul 2004 16:10:24 -0000 1.182 +++ kdecore/kstandarddirs.cpp 13 Sep 2004 13:04:15 -0000 1.182.2.4 @@ -20,7 +20,7 @@ /* * Author: Stephan Kulow and Sirtaj Singh Kang - * Version: $Id: kstandarddirs.cpp,v 1.182 2004/07/16 16:10:24 waba Exp $ + * Version: $Id: kstandarddirs.cpp,v 1.182.2.4 2004/09/13 13:04:15 waba Exp $ * Generated: Thu Mar 5 16:05:28 EST 1998 */ @@ -1291,6 +1291,9 @@ static QStringList lookupProfiles(const } QCString user = pw->pw_name; + + gid_t sup_gids[512]; + int sup_gids_nr = getgroups(512, sup_gids); KSimpleConfig mapCfg(mapFile, true); mapCfg.setGroup("Users"); @@ -1312,15 +1315,22 @@ static QStringList lookupProfiles(const // Check if user is in this group struct group *grp_ent = getgrnam(grp); if (!grp_ent) continue; - - char ** members = grp_ent->gr_mem; - for(char * member; (member = *members); ++members) + gid_t gid = grp_ent->gr_gid; + if (pw->pw_gid == gid) { - if (user == member) + // User is in this group --> add profiles + profiles += mapCfg.readListEntry(*it); + } + else + { + for(int i = 0; i < sup_gids_nr; i++) { - // User is in this group --> add profiles - profiles += mapCfg.readListEntry(*it); - break; + if (sup_gids[i] == gid) + { + // User is in this group --> add profiles + profiles += mapCfg.readListEntry(*it); + break; + } } } } Index: kdecore/kstandarddirs.h =================================================================== RCS file: /home/kde/kdelibs/kdecore/kstandarddirs.h,v retrieving revision 1.115 retrieving revision 1.115.2.2 diff -u -3 -p -r1.115 -r1.115.2.2 --- kdecore/kstandarddirs.h 21 Apr 2004 21:06:24 -0000 1.115 +++ kdecore/kstandarddirs.h 26 Aug 2004 10:12:03 -0000 1.115.2.2 @@ -34,7 +34,7 @@ class KStandardDirsPrivate; /** * @short Site-independent access to standard KDE directories. * @author Stephan Kulow and Sirtaj Singh Kang - * @version $Id: kstandarddirs.h,v 1.115 2004/04/21 21:06:24 waba Exp $ + * @version $Id: kstandarddirs.h,v 1.115.2.2 2004/08/26 10:12:03 waba Exp $ * * This is one of the most central classes in kdelibs as * it provides a basic service: It knows where the files Index: kdecore/network/kbufferedsocket.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/kbufferedsocket.cpp,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdecore/network/kbufferedsocket.cpp 26 Jul 2004 22:58:03 -0000 1.8 +++ kdecore/network/kbufferedsocket.cpp 19 Sep 2004 16:17:57 -0000 1.8.2.1 @@ -52,7 +52,6 @@ KBufferedSocket::KBufferedSocket(const Q : KStreamSocket(host, service, parent, name), d(new KBufferedSocketPrivate) { - setBlocking(false); setInputBuffering(true); setOutputBuffering(true); } Index: kdecore/network/kbufferedsocket.h =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/kbufferedsocket.h,v retrieving revision 1.7 retrieving revision 1.7.2.2 diff -u -3 -p -r1.7 -r1.7.2.2 --- kdecore/network/kbufferedsocket.h 26 Jun 2004 01:30:04 -0000 1.7 +++ kdecore/network/kbufferedsocket.h 19 Sep 2004 23:50:48 -0000 1.7.2.2 @@ -40,7 +40,11 @@ class KBufferedSocketPrivate; * * This class allows the user to create and operate buffered stream sockets * such as those used in most Internet connections. This class is - * also the one that resembles the most to the old @ref QSocket implementation. + * also the one that resembles the most to the old @ref QSocket + * implementation. + * + * Objects of this type operate only in non-blocking mode. A call to + * setBlocking(true) will result in an error. * * @author Thiago Macieira */ @@ -54,7 +58,7 @@ public: * @param node destination host * @param service destination service to connect to */ - KBufferedSocket(const QString& host = QString::null, const QString& service = QString::null, + KBufferedSocket(const QString& node = QString::null, const QString& service = QString::null, QObject* parent = 0L, const char *name = 0L); /** @@ -69,7 +73,7 @@ public: protected: /** - * Buffered sockets can only operate in blocking mode. + * Buffered sockets can only operate in non-blocking mode. */ virtual bool setSocketOptions(int opts); Index: kdecore/network/kresolver.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/kresolver.cpp,v retrieving revision 1.32 retrieving revision 1.32.2.2 diff -u -3 -p -r1.32 -r1.32.2.2 --- kdecore/network/kresolver.cpp 11 Jul 2004 18:30:41 -0000 1.32 +++ kdecore/network/kresolver.cpp 30 Aug 2004 00:50:48 -0000 1.32.2.2 @@ -314,10 +314,8 @@ KResolver::KResolver(const QString& node // destructor KResolver::~KResolver() { - // this deletes our d pointer (if necessary) - // and cancels the lookup as well - KResolverManager::manager()->aboutToBeDeleted(this); - d = 0L; + cancel(false); + delete d; } // get the status @@ -452,7 +450,6 @@ bool KResolver::start() if (!isRunning()) { d->results.empty(); - d->emitSignal = true; // reset the variable // is there anything to be queued? if (d->input.node.isEmpty() && d->input.service.isEmpty()) @@ -512,8 +509,9 @@ bool KResolver::wait(int msec) void KResolver::cancel(bool emitSignal) { - d->emitSignal = emitSignal; KResolverManager::manager()->dequeue(this); + if (emitSignal) + emitFinished(); } KResolverResults @@ -547,8 +545,7 @@ void KResolver::emitFinished() QGuardedPtr p = this; // guard against deletion - if (d->emitSignal) - emit finished(d->results); + emit finished(d->results); if (p && d->deleteWhenDone) deleteLater(); // in QObject @@ -631,7 +628,11 @@ QStrList KResolver::protocolName(int pro do { buf = new char[buflen]; +# ifdef USE_SOLARIS // Solaris uses a 4 argument getprotobynumber_r which returns struct *protoent or NULL + if ((pe = getprotobynumber_r(protonum, &protobuf, buf, buflen)) && (errno == ERANGE)) +# else if (getprotobynumber_r(protonum, &protobuf, buf, buflen, &pe) == ERANGE) +# endif { buflen += 1024; delete [] buf; @@ -673,7 +674,11 @@ QStrList KResolver::protocolName(const c do { buf = new char[buflen]; +# ifdef USE_SOLARIS // Solaris uses a 4 argument getprotobyname_r which returns struct *protoent or NULL + if ((pe = getprotobyname_r(protoname, &protobuf, buf, buflen)) && (errno == ERANGE)) +# else if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) +# endif { buflen += 1024; delete [] buf; @@ -715,7 +720,11 @@ int KResolver::protocolNumber(const char do { buf = new char[buflen]; +# ifdef USE_SOLARIS // Solaris uses a 4 argument getprotobyname_r which returns struct *protoent or NULL + if ((pe = getprotobyname_r(protoname, &protobuf, buf, buflen)) && (errno == ERANGE)) +# else if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) +# endif { buflen += 1024; delete [] buf; @@ -753,7 +762,11 @@ int KResolver::servicePort(const char *s do { buf = new char[buflen]; +# ifdef USE_SOLARIS // Solaris uses a 5 argument getservbyname_r which returns struct *servent or NULL + if ((se = getservbyname_r(servname, protoname, &servbuf, buf, buflen)) && (errno == ERANGE)) +# else if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) +# endif { buflen += 1024; delete [] buf; @@ -791,7 +804,11 @@ QStrList KResolver::serviceName(const ch do { buf = new char[buflen]; +# ifdef USE_SOLARIS // Solaris uses a 5 argument getservbyname_r which returns struct *servent or NULL + if ((se = getservbyname_r(servname, protoname, &servbuf, buf, buflen)) && (errno == ERANGE)) +# else if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) +# endif { buflen += 1024; delete [] buf; @@ -833,7 +850,11 @@ QStrList KResolver::serviceName(int port do { buf = new char[buflen]; +# ifdef USE_SOLARIS // Solaris uses a 5 argument getservbyport_r which returns struct *servent or NULL + if ((se = getservbyport_r(port, protoname, &servbuf, buf, buflen)) && (errno == ERANGE)) +# else if (getservbyport_r(port, protoname, &servbuf, buf, buflen, &se) == ERANGE) +# endif { buflen += 1024; delete [] buf; Index: kdecore/network/kresolver_p.h =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/kresolver_p.h,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -3 -p -r1.12 -r1.12.2.1 --- kdecore/network/kresolver_p.h 13 May 2004 08:20:34 -0000 1.12 +++ kdecore/network/kresolver_p.h 30 Aug 2004 00:36:29 -0000 1.12.2.1 @@ -61,7 +61,6 @@ namespace KNetwork KResolver* parent; bool deleteWhenDone : 1; bool waiting : 1; - mutable bool emitSignal : 1; // class status. Should not be changed by worker threads! volatile int status; @@ -87,7 +86,7 @@ namespace KNetwork KResolverPrivate(KResolver* _parent, const QString& _node = QString::null, const QString& _service = QString::null) - : parent(_parent), deleteWhenDone(false), waiting(false), emitSignal(true), + : parent(_parent), deleteWhenDone(false), waiting(false), status(0), errorcode(0), syserror(0) { input.node = _node; Index: kdecore/network/kresolvermanager.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/kresolvermanager.cpp,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -3 -p -r1.28 -r1.28.2.1 --- kdecore/network/kresolvermanager.cpp 11 Jul 2004 18:30:41 -0000 1.28 +++ kdecore/network/kresolvermanager.cpp 30 Aug 2004 00:36:29 -0000 1.28.2.1 @@ -526,37 +526,34 @@ void KResolverManager::doNotifying(Reque // lock the object p->obj->mutex.lock(); KResolver* parent = p->obj->parent; // is 0 for non-"user" objects - - // post processing - if (p->obj->status != KResolver::Canceled - && p->worker) - p->worker->postprocess(); // ignore the result - - // copy the results from the worker thread to the final - // object KResolverResults& r = p->obj->results; - if (p->worker) + + if (p->obj->status == KResolver::Canceled) + { + p->obj->status = KResolver::Canceled; + p->obj->errorcode = KResolver::Canceled; + p->obj->syserror = 0; + r.setError(KResolver::Canceled, 0); + } + else if (p->worker) { + // post processing + p->worker->postprocess(); // ignore the result + + // copy the results from the worker thread to the final + // object r = p->worker->results; + // reset address r.setAddress(p->input->node, p->input->service); //qDebug("KResolverManager::doNotifying(%u/%p): for %p whose status is %d and has %d results", //pid, (void*)QThread::currentThread(), (void*)p, p->obj->status, r.count()); - if (p->obj->status != KResolver::Canceled) - { - p->obj->errorcode = r.error(); - p->obj->syserror = r.systemError(); - p->obj->status = !r.isEmpty() ? - KResolver::Success : KResolver::Failed; - } - else - { - p->obj->status = KResolver::Canceled; - p->obj->errorcode = KResolver::Canceled; - p->obj->syserror = 0; - } + p->obj->errorcode = r.error(); + p->obj->syserror = r.systemError(); + p->obj->status = !r.isEmpty() ? + KResolver::Success : KResolver::Failed; } else { @@ -573,11 +570,6 @@ void KResolverManager::doNotifying(Reque // release the mutex p->obj->mutex.unlock(); - - if (parent == 0L) - // it doesn't have a parent, which means it was a destroyed object lying - // around - delete p->obj; } else { @@ -712,44 +704,59 @@ void KResolverManager::dispatch(RequestD } } -// this function is called by KResolverManager::dequeue and -// KResolverManager::aboutToDelete below. +// this function is called by KResolverManager::dequeue bool KResolverManager::dequeueNew(KResolver* obj) { // This function must be called with a locked mutex // Deadlock warning: // always lock the global mutex first if both mutexes must be locked - // check if this object is running - if (!obj->isRunning()) - { - KResolverPrivate *d = obj->d; + KResolverPrivate *d = obj->d; + + // check if it's in the new request list + RequestData *curr = newRequests.first(); + while (curr) + if (curr->obj == d) + { + // yes, this object is still in the list + // but it has never been processed + d->status = KResolver::Canceled; + d->errorcode = KResolver::Canceled; + d->syserror = 0; + newRequests.take(); + + delete curr->worker; + delete curr; + + return true; + } + else + curr = newRequests.next(); + + // check if it's running + curr = currentRequests.first(); + while (curr) + if (curr->obj == d) + { + // it's running. We cannot simply take it out of the list. + // it will be handled when the thread that is working on it finishes + d->mutex.lock(); + + d->status = KResolver::Canceled; + d->errorcode = KResolver::Canceled; + d->syserror = 0; + + // disengage from the running threads + curr->obj = 0L; + curr->input = 0L; + if (curr->worker) + curr->worker->input = 0L; + + d->mutex.unlock(); + } + else + curr = currentRequests.next(); - // check if it's in the new request list - RequestData *curr = newRequests.first(); - while (curr) - if (curr->obj == d) - { - // yes, this object is still in the list - // but it has never been processed - d->status = KResolver::Canceled; - newRequests.take(); - doNotifying(curr); - - return true; - } - else - curr = currentRequests.next(); - - // This object has never been queued - return true; // do nothing with it - } - - // no, it's running. We cannot simply take it out of the list. - // it will be handled when the thread that is working on it finishes - obj->d->mutex.lock(); - obj->d->status = KResolver::Canceled; - obj->d->mutex.unlock(); return false; } @@ -761,44 +768,4 @@ void KResolverManager::dequeue(KResolver dequeueNew(obj); } -// this function is called by the KResolver destructor -// it's expected to be thread-safe -void KResolverManager::aboutToBeDeleted(KResolver *obj) -{ - // This function is called when the object is being destroyed. - // Unlike cancellation, we must also make sure the object is - // no longer referenced. And the signal will not be emitted. - - QMutexLocker locker(&mutex); - KResolverPrivate* d = obj->d; - - if (!dequeueNew(obj)) - { - // the object failed to dequeue - // that means it is running and is in the currentRequests list - RequestData *curr = currentRequests.first(); - while (curr) - if (curr->obj == d) - { - // yes, this object is still in the list - // let the thread working on it dispose of it - d->parent = 0L; - d->emitSignal = false; - d->status = KResolver::Canceled; - - return; - } - else - curr = currentRequests.next(); - - // we couldn't find it in the list - qWarning("KResolverManager::aboutToBeDeleted: pid = %u, obj = %p: could not find obj in list", - pid, (void*)obj); - } - - // the object is not in any list - // it's safe to delete - delete d; -} - } // anonymous namespace Index: kdecore/network/ksocketbuffer.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/ksocketbuffer.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -3 -p -r1.5 -r1.5.2.1 --- kdecore/network/ksocketbuffer.cpp 31 Jul 2004 14:36:27 -0000 1.5 +++ kdecore/network/ksocketbuffer.cpp 15 Aug 2004 18:40:04 -0000 1.5.2.1 @@ -248,7 +248,7 @@ Q_LONG KSocketBuffer::sendTo(KActiveSock // better by concatenating a few of them into a big buffer // question is: how big should that buffer be? 2 kB should be enough - Q_ULONG bufsize = 2048; + Q_ULONG bufsize = 1460; if (len != -1 && len < bufsize) bufsize = len; QByteArray buf(bufsize); @@ -262,6 +262,16 @@ Q_LONG KSocketBuffer::sendTo(KActiveSock ++it; } + // see if we can still fit more + if (count < bufsize && it != end) + { + // getting here means this buffer (*it) is larger than + // (bufsize - count) (even for count == 0). + memcpy(buf.data() + count, (*it).data() + offset, bufsize - count); + offset += bufsize - count; + count = bufsize; + } + // now try to write those bytes Q_LONG wrote = dev->writeBlock(buf, count); Index: kdecore/network/ksocketdevice.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/ksocketdevice.cpp,v retrieving revision 1.18 retrieving revision 1.18.2.2 diff -u -3 -p -r1.18 -r1.18.2.2 --- kdecore/network/ksocketdevice.cpp 1 Aug 2004 02:39:23 -0000 1.18 +++ kdecore/network/ksocketdevice.cpp 30 Aug 2004 00:50:48 -0000 1.18.2.2 @@ -26,6 +26,9 @@ #include +#ifdef USE_SOLARIS +# include +#endif #include #include #include @@ -53,6 +56,7 @@ #include "ksocketaddress.h" #include "ksocketbase.h" #include "ksocketdevice.h" +#include "ksockssocketdevice.h" using namespace KNetwork; @@ -208,8 +212,8 @@ bool KSocketDevice::create(int family, i return false; } - setSocketOptions(socketOptions()); d->af = family; + setSocketOptions(socketOptions()); return true; // successfully created } @@ -812,6 +816,8 @@ namespace if (device != 0L) return device; + KSocksSocketDevice::initSocks(); + if (defaultImplFactory) return defaultImplFactory->create(parent); Index: kdecore/network/ksockssocketdevice.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/ksockssocketdevice.cpp,v retrieving revision 1.4 retrieving revision 1.4.2.2 diff -u -3 -p -r1.4 -r1.4.2.2 --- kdecore/network/ksockssocketdevice.cpp 12 Jun 2004 16:43:39 -0000 1.4 +++ kdecore/network/ksockssocketdevice.cpp 22 Sep 2004 15:31:22 -0000 1.4.2.2 @@ -27,6 +27,8 @@ #include #endif +#include "kapplication.h" + #include "ksocks.h" #include "ksocketaddress.h" #include "kresolver.h" @@ -153,7 +155,7 @@ KSocksSocketDevice* KSocksSocketDevice:: } struct sockaddr sa; - socklen_t len = sizeof(sa); + kde_socklen_t len = sizeof(sa); int newfd = KSocks::self()->accept(m_sockfd, &sa, &len); if (newfd == -1) { @@ -169,7 +171,7 @@ KSocksSocketDevice* KSocksSocketDevice:: static int socks_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) { - socklen_t len; + kde_socklen_t len; if (from) { from->setLength(len = 128); // arbitrary length @@ -307,7 +309,7 @@ KSocketAddress KSocksSocketDevice::local if (m_sockfd == -1) return KSocketAddress(); // not open, empty value - socklen_t len; + kde_socklen_t len; KSocketAddress localAddress; localAddress.setLength(len = 32); // arbitrary value if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1) @@ -336,7 +338,7 @@ KSocketAddress KSocksSocketDevice::peerA if (m_sockfd == -1) return KSocketAddress(); // not open, empty value - socklen_t len; + kde_socklen_t len; KSocketAddress peerAddress; peerAddress.setLength(len = 32); // arbitrary value if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1) @@ -436,3 +438,29 @@ bool KSocksSocketDevice::poll(bool *inpu return true; } + +void KSocksSocketDevice::initSocks() +{ + static bool init = false; + + if (init) + return; + + if (kapp == 0L) + return; // no KApplication, so don't initialise + // this should, however, test for KInstance + + init = true; + + if (KSocks::self()->hasSocks()) + delete KSocketDevice::setDefaultImpl(new KSocketDeviceFactory); +} + +#if 0 +static bool register() +{ + KSocketDevice::addNewImpl(new KSocketDeviceFactory, 0); +} + +static bool register = registered(); +#endif Index: kdecore/network/ksockssocketdevice.h =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/ksockssocketdevice.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -p -r1.1 -r1.1.2.1 --- kdecore/network/ksockssocketdevice.h 26 May 2004 02:36:11 -0000 1.1 +++ kdecore/network/ksockssocketdevice.h 30 Aug 2004 01:19:42 -0000 1.1.2.1 @@ -118,6 +118,10 @@ public: */ virtual bool poll(bool* input, bool* output, bool* exception = 0L, int timeout = -1, bool* timedout = 0L); + +private: + static void initSocks(); + friend class KSocketDevice; }; } // namespace KNetwork Index: kdecore/network/kstreamsocket.cpp =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/kstreamsocket.cpp,v retrieving revision 1.12 retrieving revision 1.12.2.2 diff -u -3 -p -r1.12 -r1.12.2.2 --- kdecore/network/kstreamsocket.cpp 23 Jun 2004 22:40:51 -0000 1.12 +++ kdecore/network/kstreamsocket.cpp 19 Sep 2004 23:50:48 -0000 1.12.2.2 @@ -57,7 +57,8 @@ KStreamSocket::KStreamSocket(const QStri peerResolver().setServiceName(service); peerResolver().setFamily(KResolver::KnownFamily); localResolver().setFamily(KResolver::KnownFamily); - setBlocking(false); + + setSocketOptions(socketOptions() & ~Blocking); QObject::connect(&d->timer, SIGNAL(timeout()), this, SLOT(timeoutSlot())); } Index: kdecore/network/kstreamsocket.h =================================================================== RCS file: /home/kde/kdelibs/kdecore/network/kstreamsocket.h,v retrieving revision 1.10 retrieving revision 1.10.2.2 diff -u -3 -p -r1.10 -r1.10.2.2 --- kdecore/network/kstreamsocket.h 4 Aug 2004 01:18:32 -0000 1.10 +++ kdecore/network/kstreamsocket.h 19 Sep 2004 23:50:48 -0000 1.10.2.2 @@ -43,6 +43,9 @@ class KStreamSocketPrivate; * sockets. In the case of Internet (IP) sockets, this class creates and * uses TCP/IP sockets. * + * Objects of this class start, by default, on non-blocking mode. Call + * setBlocking if you wish to change that. + * * Sample usage: * \code * QByteArray httpGet(const QString& hostname) Index: kded/applications.menu =================================================================== RCS file: /home/kde/kdelibs/kded/applications.menu,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -3 -p -r1.22 -r1.22.2.1 --- kded/applications.menu 6 May 2004 09:36:56 -0000 1.22 +++ kded/applications.menu 24 Sep 2004 21:30:51 -0000 1.22.2.1 @@ -276,6 +276,7 @@ kde-koshell.desktop + kde-Kontact.desktop kde-kword.desktop kde-kspread.desktop Index: kded/kdedmodule.desktop =================================================================== RCS file: /home/kde/kdelibs/kded/kdedmodule.desktop,v retrieving revision 1.93 retrieving revision 1.93.2.1 diff -u -3 -p -r1.93 -r1.93.2.1 --- kded/kdedmodule.desktop 27 Jul 2004 07:23:14 -0000 1.93 +++ kded/kdedmodule.desktop 24 Aug 2004 06:29:07 -0000 1.93.2.1 @@ -66,7 +66,6 @@ Comment[uz]=KDED модули Comment[ven]=Modulu wa KDED Comment[vi]=Mô đun KDED Comment[xh]=KDED Isichatshulwa -Comment[xx]=xxKDED Modulexx Comment[zh_CN]=KDED 模块 Comment[zh_TW]=KDED 模組 Comment[zu]=Ingxenye ye-KDED Index: kded/test/test.desktop =================================================================== RCS file: /home/kde/kdelibs/kded/test/test.desktop,v retrieving revision 1.111 retrieving revision 1.111.2.1 diff -u -3 -p -r1.111 -r1.111.2.1 --- kded/test/test.desktop 30 Jul 2004 03:27:07 -0000 1.111 +++ kded/test/test.desktop 24 Aug 2004 06:29:07 -0000 1.111.2.1 @@ -72,7 +72,6 @@ Name[uz]=KDED синов модули Name[ven]=Modulu ya mulingo wa KDED Name[vi]=Mô đun thử nghiệm KDED Name[xh]=Isichatshulwa Sovavanyo lwe KDED -Name[xx]=xxKDED Test Modulexx Name[zh_CN]=KDED 测试模块 Name[zh_TW]=KDED 測試模組 Name[zu]=Ingxenye Yokuvivinya ye-KDED @@ -140,7 +139,6 @@ Comment[uz]=KDED учун синов м Comment[ven]=Modulu ya mulingo ya KDED Comment[vi]=Mô đun thử nghiệm cho KDED Comment[xh]=Isichatshulwa Sovavavanyo lwe KDED -Comment[xx]=xxA Test Module for KDEDxx Comment[zh_CN]=KDED 的测试模块 Comment[zh_TW]=KDED 的測試模組 Comment[zu]=Ingxenye Yokuvivinya ye-KDED Index: kdeprint/kdeprintd.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/kdeprintd.desktop,v retrieving revision 1.163 retrieving revision 1.163.2.4 diff -u -3 -p -r1.163 -r1.163.2.4 --- kdeprint/kdeprintd.desktop 5 Aug 2004 06:36:49 -0000 1.163 +++ kdeprint/kdeprintd.desktop 20 Sep 2004 13:53:16 -0000 1.163.2.4 @@ -71,7 +71,6 @@ Name[uz]=KDE босиб чиқариш Name[ven]=Daemon yau phirintha ya KDE Name[wa]=Démon d' imprimaedje di KDE Name[xh]=Daemon Yoshicilelo lwe KDE -Name[xx]=xxKDE Print Daemonxx Name[zh_CN]=KDE 打印守护进程 Name[zh_TW]=KDE 列印伺服程式 Name[zu]= I-Daemon Yokushicilela kwe-KDE @@ -87,7 +86,9 @@ Comment[es]=Demonio de impresión para K Comment[et]=KDE trükkimise deemon Comment[fi]=KDE:n tulostuspalvelin Comment[fr]=Un démon d'impression pour KDE +Comment[he]=תהליך רקע של KDE להדפסה Comment[hu]=Nyomtatószolgáltatás a KDE-hez +Comment[is]=Prentþjónn fyrir KDE Comment[it]=Demone di stampa per KDE Comment[ja]=KDE用の印刷デーモン Comment[nb]=Utskriftsnisse for KDE @@ -97,12 +98,15 @@ Comment[pa]=KDE ਲਈ ਪ੍ਰਿੰ Comment[pl]=Drukowanie w KDE Comment[pt]=Servidor de impressão para o KDE Comment[pt_BR]=Serviço de Impressão para o KDE +Comment[ro]=Demon de tipărire KDE +Comment[se]=KDE:a čálihanbálvá Comment[sk]=Démon tlače pre KDE Comment[sl]=Tiskalniški strežnik za KDE Comment[sr]=KDE-ов демон за штампање Comment[sr@Latn]=KDE-ов демон за штампање Comment[sv]=Skrivardemon för KDE +Comment[ta]=கேடிஇக்கான ஒரு அச்ச் டெமான் Comment[tg]=Демони Чопкардан барои KDE +Comment[uk]=Демон друку KDE Comment[uz]=KDE учун босиб чиқариш хизмати -Comment[xx]=xxPrint daemon for KDExx Comment[zh_CN]=KDE 的打印守护进程 Index: kdeprint/specials.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/specials.desktop,v retrieving revision 1.232 retrieving revision 1.232.2.3 diff -u -3 -p -r1.232 -r1.232.2.3 --- kdeprint/specials.desktop 4 Aug 2004 06:46:47 -0000 1.232 +++ kdeprint/specials.desktop 12 Sep 2004 13:55:55 -0000 1.232.2.3 @@ -66,7 +66,6 @@ Name[uz]=PostScript-файли сифа Name[ven]=Phirinthani kha faela (Bammbiri la poso) Name[wa]=Imprimer en on fitchî (PostScript) Name[xh]=Shicilela Kwifayile (PostScript) -Name[xx]=xxPrint to File (PostScript)xx Name[zh_CN]=打印到文件(PostScript) Name[zh_TW]=列印到檔案(PostScript) Name[zu]=Shicilela Efayeleni (PostScript) @@ -136,7 +135,6 @@ Description[ven]=Nwalani faela ya bammbi Description[vi]=Viết ra file PostScript Description[wa]=Fé on fitchî PostScript Description[xh]=Bhala ifayile ye PostScript -Description[xx]=xxWrite PostScript filexx Description[zh_CN]=写入 PostScript 文件 Description[zh_TW]=寫成 PostScript 檔案 Description[zu]=Bhala ifayile le-PosrtScript @@ -206,7 +204,6 @@ Comment[ven]=Faela ya henefhano Comment[vi]=File địa phương Comment[wa]=Fitchî locål Comment[xh]=Ifayile yobulali -Comment[xx]=xxLocal filexx Comment[zh_CN]=本地文件 Comment[zh_TW]=本地檔案 Comment[zu]=Ifayela laseduze @@ -281,7 +278,6 @@ Name[uz]=PDF-файли сифатида Name[ven]=Phirinthani ni kone u faela (PDF) Name[wa]=Imprimer en on fitchî (PDF) Name[xh]=Shicilela Kwifayile (PDF) -Name[xx]=xxPrint to File (PDF)xx Name[zh_CN]=打印到文件(PDF) Name[zh_TW]=列印到文件(PDF) Name[zu]=Shicilela Efayeleni (PDF) @@ -351,7 +347,6 @@ Description[ven]=Nwalani PDF/faela ya Ac Description[vi]=Viết ra file PDF/Acrobat Description[wa]=Fé on fitchî PDF/Acrobat Description[xh]=Bhala PDF/Ifayile ye Acrobat -Description[xx]=xxWrite PDF/Acrobat filexx Description[zh_CN]=写入 PDF/Acrobat 文件 Description[zh_TW]=寫成 PDF/Acrobat 檔案 Description[zu]=Bhala ifayela le-IPDF/Acrobat @@ -421,7 +416,6 @@ Comment[ven]=Faela ya henefhano Comment[vi]=File địa phương Comment[wa]=Fitchî locål Comment[xh]=Ifayile yobulali -Comment[xx]=xxLocal filexx Comment[zh_CN]=本地文件 Comment[zh_TW]=本地檔案 Comment[zu]=Ifayela laseduze @@ -457,7 +451,7 @@ Name[fr]=Envoyer au fax Name[ga]=Seol go Facs Name[gl]=Enviar por Fax Name[he]=שלח בפקס -Name[hi]=फेक्स को भेजें +Name[hi]=फ़ैक्स करें Name[hr]=Slanje faksom Name[hu]=Elküldés faxként Name[id]=Kirim sebagai Faks @@ -497,7 +491,6 @@ Name[uz]=Факсга жўнатиш Name[ven]=Rumela kha fekisi Name[wa]=Evoyî so on facs Name[xh]=Thumela kwi Fax -Name[xx]=xxSend to Faxxx Name[zh_CN]=发送至传真 Name[zh_TW]=發送至傳真 Name[zu]=Thumela kwi-fax @@ -565,7 +558,6 @@ Description[ven]=Rumelani kha sisitemu y Description[vi]=Gửi tới hềEthống fax ềEbên ngoài (external) Description[wa]=Evoyî so on dfoûtrin sistinme di facs Description[xh]=Thumela kwindlela engaphandle ye fax -Description[xx]=xxSend to external fax systemxx Description[zh_CN]=发至外部传真系统 Description[zh_TW]=發送到外部傳真系統 Description[zu]=Thumela kwisistimu yangaphandle ye-fax @@ -634,7 +626,6 @@ Comment[ven]=Zwangannda Comment[vi]=Bên ngoài(external) Comment[wa]=Difoûtrin Comment[xh]=Ngaphandle -Comment[xx]=xxExternalxx Comment[zh_CN]=外部 Comment[zh_TW]=外部 Comment[zu]=Ngaphandle @@ -708,7 +699,6 @@ Comment[uz]=KMail учун илова Comment[ven]=U tangana na mubveledzi wa meili wa K Comment[vi]=Đính vào trình soạn Kmail Comment[xh]=Ufakelo Lomqhambi we KMail -Comment[xx]=xxAttachment for KMail Composerxx Comment[zh_CN]=KMail 编写器的附件 Comment[zh_TW]=當作 KMail 郵件編輯器的附件 Comment[zu]=Ukunamathisela Komsunguli we-KMail @@ -777,7 +767,6 @@ Description[ven]=Itani PDF/Faela ya Acro Description[vi]=Tạo file PDF/Acrobat dưới dạng file đính Description[wa]=Fé des fitchîs PDF/Acrobat come atatchmints po KMail Description[xh]=Yenza PDF/Ifayile yomenzi womthambo njengofakelelo lwe KMail -Description[xx]=xxCreates PDF/Acrobat file as attachment for KMailxx Description[zh_CN]=创建 PDF/Acrobat 文件作为 KMail 附件 Description[zh_TW]=建立 PDF/Acrobat 文件作為 KMail 附件 Description[zu]=Idala ifayela le-PDF/Acrobat libe njengokunamathisela kwe-KMail @@ -812,15 +801,17 @@ Name[pa]=PDF ਫਾਇਲ ਮੇਲ ਕ Name[pl]=Wyślij plik PDF e-mailem Name[pt]=Enviar PDF por E-mail Name[pt_BR]=Enviar por E-Mail Arquivo PDF +Name[ro]=Trimite prin mail ca PDF +Name[se]=Sádde PDF-fiilla Name[sk]=Poslať súbor PDF Name[sl]=Pošlji datoteko PDF po pošti Name[sr]=Слање PDF фајла поштом Name[sr@Latn]=Слање PDF фајла поштом Name[sv]=Skicka PDF-fil +Name[ta]=PDF கோப்பை அஞ்சல் அனுப்பு Name[tg]=Файли почтавии PDF Name[uk]=Відсилання файлу PDF поштою Name[uz]=PDF-файли сифатида хат орқали жўнатиш -Name[xx]=xxMail PDF Filexx Name[zh_CN]=邮寄 PDF 文件 Require=exec:/ps2pdf,exec:/kmail @@ -842,7 +833,6 @@ Comment[tg]=KФакс Фиристода Comment[th]=ส่งโทรสาร K Comment[uz]=Факс жўнатиш Comment[ven]=K i rumela Fekisi -Comment[xx]=xxKSendFaxxx Description=Use ksendfax to fax the current document Description[ar]=استخدم ksendfax ﻹرسال المستند الحالي بالفاكس Description[az]=Hazırkı sənədi fakslamaq üçün ksendfax vasitəsini işlədin @@ -865,7 +855,7 @@ Description[fr]=Utiliser KSendfax pour f Description[ga]=Úsáid ksendfax chun an cháipéis reatha a sheoladh mar facs Description[gl]=Empregue ksendfax para enviar por fax o documento actual Description[he]=השתמש ב-ksendfax כדי לשלוח את המסמך הנוכחי בפקס -Description[hi]=वर्तमान दस्तावेज़ को फेक्स करने के लिए के-सेंड-फेक्स का ईस्तमाल करें +Description[hi]=मौज़ूदा दस्तावेज़ को फेक्स करने के लिए के-सेंड-फेक्स का ईस्तमाल करें Description[hu]=A KSendFax használata az aktuális dokumentum elfaxolásához Description[is]=Nota ksendfax til að senda skjal á faxtæki Description[it]=Usa ksendfax per faxare il documento corrente @@ -877,7 +867,7 @@ Description[ms]=Guna ksendfax untuk faks Description[mt]=Uża ksendfax biex tiffaksja d-dokument kurrenti Description[nb]=Bruk ksendfax for å fakse det aktive dokumentet Description[nds]=Dat aktuelle Dokment mit ksendfax as Fax afschicken -Description[nl]=Gebruik KSendfax voor het faxen van het huidige document +Description[nl]=Gebruik KSendFax voor het faxen van het huidige document Description[nn]=Bruk ksendfax til å faksa dokument Description[nso]=Somisa ksendfax go faxa tokomane ya bjale Description[pa]=ਮੌਜੂਦਾ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਫੈਕਸ ਕਰਨ ਲਈ ksendfax ਵਰਤੋਂ @@ -902,7 +892,6 @@ Description[uz]=Жорий ҳужжат Description[ven]=Shumisani fekisi yau rumele kha k u fekisa manwalwa a zwino Description[wa]=Eploye ksendfax po-z evoyî pa facs li documint do moumint Description[xh]=Sebenzisa i ksendfax ukuthumela i fax yoxwebhu lwangoku -Description[xx]=xxUse ksendfax to fax the current documentxx Description[zh_CN]=使用 ksendfax 发送当前文档 Description[zh_TW]=使用 ksendfax 將目前文件傳真出去 Description[zu]=Sebenzisa i-ksendfax ukuthumela i-fax yohlu lwamafayela amanje @@ -968,7 +957,6 @@ Name[uk]=Потужний засіб в Name[uz]=Факс жўнатиш учун кенгайтирилган восита (ksendfax) Name[ven]=Tshishumiswa tsha fekisi ya khwinesa (ksendfax) Name[xh]=Isixhobo se Fax Esibhekisa phambili (ksendfax) -Name[xx]=xxAdvanced Faxing Tool (ksendfax)xx Name[zh_CN]=高级传真工具(ksendfax) Name[zh_TW]=高階傳真工具 (ksendfax) Name[zu]=Ithuluz Lezinga eliphezulu lokuthumela i-fax (ksendfax) Index: kdeprint/cups/cups.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/cups/cups.print,v retrieving revision 1.97 retrieving revision 1.97.2.2 diff -u -3 -p -r1.97 -r1.97.2.2 --- kdeprint/cups/cups.print 27 Jul 2004 07:23:17 -0000 1.97 +++ kdeprint/cups/cups.print 31 Aug 2004 07:21:17 -0000 1.97.2.2 @@ -17,14 +17,13 @@ Comment[fa]=CUPS (سیستم چاپ عم Comment[fr]=CUPS (Common Unix Print System) Comment[gl]=CUPS (Sistema Común de Impresión para UNIX) Comment[he]=מערכת הדפסה נפוצה ליוניקס (CUPS) -Comment[hi]=CUPS (आम यूनिक्स प्रिंट सिस्टम) +Comment[hi]=CUPS (सामान्य यूनिक्स प्रिंट सिस्टम) Comment[hr]=CUPS (Common Unix Print System) Comment[is]=CUPS (Common Unix Print System) Comment[ko]=CUPS (공통 유닉스 인쇄 시스템) Comment[lt]=CUPS (Bendra Unix Spausdinimo Sistema) Comment[mn]=CUPS (Юниксын Ерөнхий Хэвлэх Систем) Comment[mt]=CUPS (Common Unix Print System) -Comment[nl]=CUPS (Common Unix Print System) Comment[nn]=CUPS («Common Unix Print System», utskriftssystem) Comment[nso]=CUPS (System yago Swana ya Kgatiso ya UNIX) Comment[pa]=CUPS (ਕਾਮਨ UNIX ਪ੍ਰਿੰਟਰ ਸਿਸਟਮ) @@ -47,7 +46,6 @@ Comment[uz]=CUPS (UNIX учун умум Comment[ven]=CUPS (Maitele au phirintha a UNIX zwao) Comment[wa]=CUPS (Comon Sistinme d' Imprimaedje po UNIX) Comment[xh]=CUPS (Indlela Elula Yoshicilelo lwe UNIX) -Comment[xx]=xxCUPS (Common UNIX Print System)xx Comment[zh_CN]=CUPS (通用 Unix 打印系统) Comment[zh_TW]=CUPS (通用 Unix 列印系統) Comment[zu]=CUPS (Isistimu Yokushicilela ye-Unix Eyejwayelekile) Index: kdeprint/ext/ext.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/ext/ext.print,v retrieving revision 1.130 retrieving revision 1.130.2.1 diff -u -3 -p -r1.130 -r1.130.2.1 --- kdeprint/ext/ext.print 4 Aug 2004 06:46:47 -0000 1.130 +++ kdeprint/ext/ext.print 24 Aug 2004 06:29:11 -0000 1.130.2.1 @@ -62,7 +62,6 @@ Comment[uz]=Ташқи дастур ёр Comment[ven]=Phirinthani nga Mbekanyamushumo yanga nnda (tshigwada) Comment[wa]=Imprimer åd truviè d' on dfoûtrin programe (djenerike) Comment[xh]=Shicilela Ngapha Kodweliso lwenkqubo olungaphandle (ngokubanzi) -Comment[xx]=xxPrint Through an External Program (generic)xx Comment[zh_CN]=通过外部程序打印(通用) Comment[zh_TW]=使用外部程式進行列印 (一般) Comment[zu]=Shicilela Ngokwedlulela Kuhlelo lwemisebenzi Langaphandle (okukawonke wonke) Index: kdeprint/filters/enscript.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/enscript.desktop,v retrieving revision 1.134 retrieving revision 1.134.2.2 diff -u -3 -p -r1.134 -r1.134.2.2 --- kdeprint/filters/enscript.desktop 27 Jul 2004 07:23:17 -0000 1.134 +++ kdeprint/filters/enscript.desktop 31 Aug 2004 07:21:17 -0000 1.134.2.2 @@ -14,7 +14,6 @@ Name[sv]=Enscript Name[ta]=என்ஸ்கிரிப்ட் Name[tg]=Ба зери хат кашидан Name[xh]=okushicilelwe phantsi kuyo -Name[xx]=xxenscriptxx Require=exec:/enscript Comment=Enscript Text Filter Comment[af]=Gravering Teks Filter @@ -37,7 +36,7 @@ Comment[fi]=Enscript-tekstisuodin Comment[fr]=Filtre de texte Enscript Comment[ga]=Scagaire Téacs Enscript Comment[he]=מסנן טקסט Enscript -Comment[hi]=एनस्क्रिप्ट पाठ फिल्टर +Comment[hi]=एनस्क्रिप्ट पाठ फ़िल्टर Comment[hr]=Enscript filter za tekst Comment[hu]=Enscript szövegszűrő Comment[id]=Filter Teks Enscript @@ -76,7 +75,6 @@ Comment[uz]=Enscript матн филте Comment[ven]=Nwalani ya filithara ya manwalwa Comment[wa]=Passete po-z imprimer do peur tecse avou enscript Comment[xh]=Enscript Uhluzo Lombhalo -Comment[xx]=xxEnscript Text Filterxx Comment[zh_CN]=Enscript 文本过滤程序 Comment[zh_TW]=Enscript 文字過濾器 Comment[zu]=Qopha Ihluzo Lombhalo Index: kdeprint/filters/imagetops.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/imagetops.desktop,v retrieving revision 1.138 retrieving revision 1.138.2.2 diff -u -3 -p -r1.138 -r1.138.2.2 --- kdeprint/filters/imagetops.desktop 4 Aug 2004 06:46:47 -0000 1.138 +++ kdeprint/filters/imagetops.desktop 31 Aug 2004 07:21:17 -0000 1.138.2.2 @@ -16,7 +16,6 @@ Name[sv]=Bildtoppar Name[ta]=மேல்பிம்பங்கள் Name[tg]=баландтарини тасврирҳо Name[ven]=Zwa ntha zwa zwifanyiso -Name[xx]=xximagetopsxx Name[zu]=uphahla lwesithombe Require=exec:/imagetops Comment=Generic Image to PS Filter @@ -41,7 +40,7 @@ Comment[fr]=Filtre d'image générique v Comment[ga]=Scagaire cineálach Íomhá go PS Comment[gl]=Imaxe Xenérica para o Filtro PS Comment[he]=מסנן כללי מתמונה ל-PS -Comment[hi]= जेनरिक छवि से PS फिल्टर +Comment[hi]= जेनरिक छवि से PS फ़िल्टर Comment[hr]=Generički filtar za sliku u PS Comment[hu]=Általános PS szűrő képekhez Comment[id]=Fiter Gambar ke PS @@ -81,7 +80,6 @@ Comment[uz]=Расмни PS'га айл Comment[ven]=Tshifanyiso kha tshigwada kha filithara ya PS Comment[wa]=Passete djenerike imådjes viè PostScript Comment[xh]=Umfanekiso ngokubanzi kwicebo lokucoca ulwelo le PS -Comment[xx]=xxGeneric Image to PS Filterxx Comment[zh_CN]=通用图像到 PS 过滤程序 Comment[zh_TW]=一般圖檔轉成 PS 的過濾器 Comment[zu]=Isithombe Sawowonke Sehluzo le-PS Index: kdeprint/filters/pdfwrite.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/pdfwrite.desktop,v retrieving revision 1.135 retrieving revision 1.135.2.1 diff -u -3 -p -r1.135 -r1.135.2.1 --- kdeprint/filters/pdfwrite.desktop 27 Jul 2004 07:23:17 -0000 1.135 +++ kdeprint/filters/pdfwrite.desktop 24 Aug 2004 06:29:11 -0000 1.135.2.1 @@ -11,7 +11,6 @@ Name[sv]=PDFwrite Name[ta]=பிடிஎஃப் எழுதி Name[tr]=pdfyaz Name[ven]=pdfnwala -Name[xx]=xxpdfwritexx Name[zu]=bhala kwe-pdf Require=exec:/gs Comment=PDF Writer (needs Ghostscript) @@ -76,7 +75,6 @@ Comment[uz]=PDF ёзгич (Ghostscript Comment[ven]=Munwali wa PDF (I toda bammbiri la tshipuku) Comment[wa]=Fijheu di fitchîs PDF (a mezåjhe di Ghostscript) Comment[xh]=Umbhali we PDF (ufuna i Ghostscript) -Comment[xx]=xxPDF Writer (needs Ghostscript)xx Comment[zh_CN]=PDF 书写器 (需要 GhostScript) Comment[zh_TW]=PDF 產生器 (需要 GhostScript) Comment[zu]=Umbhali we-PDF (idinga i-Ghostscript) Index: kdeprint/filters/poster.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/poster.desktop,v retrieving revision 1.87 retrieving revision 1.87.2.2 diff -u -3 -p -r1.87 -r1.87.2.2 --- kdeprint/filters/poster.desktop 4 Aug 2004 06:46:47 -0000 1.87 +++ kdeprint/filters/poster.desktop 31 Aug 2004 07:21:17 -0000 1.87.2.2 @@ -59,7 +59,6 @@ Comment[uz]=Плакат босиб чи Comment[ven]=Phirinthani ya phosithara Comment[wa]=Imprimaedje poster Comment[xh]=Ushicilelo Lwephepha elinomyalezo -Comment[xx]=xxPoster Printingxx Comment[zh_CN]=海报打印 Comment[zh_TW]=海報列印 Comment[zu]=Ukushicilela Kwebhodi lezithombe @@ -72,7 +71,7 @@ Description[bs]=Alat za štampanje velik Description[ca]=Utilitat per a imprimir grans pòsters en diverses fulles de paper. Per a usar aquest comandament, l'executable poster haurà d'estar accessible a la vostra PATH. El codi font per aquesta utilitat pot trobar-se en el lloc web del KDEPrint.

ATENCIÓ: El paquet en el lloc web del KDEPrint és una versió modificada de l'original que pot trobar-se en qualsevol rèplica de l'arxiu CTAN, però el paquet original no funciona amb el KDE. Així que haureu d'emprar el paquet que es troba en el lloc web del KDEPrint. Description[cs]=Nástroj pro tisk velkých plakátů na více menších listů. Aby bylo možné použít tento nástroj, je nutné aby byl dostupný program poster, tj. aby byl k nalezení v cestě udané promněnnou PATH. Zdrojový kó tohoto nástroje je možné nalézt na www stránce nástroje KDEPrint.

VAROVÁNÍ: Balík, který je možné nalézt na webové stránce KDEPrintu je upravená verze originálu, který je k nalezení na každém archívu CTANu. Originální balík nebude s KDE fungovat. Musíte požít balík ze stránkyKDEPrintu. Description[cy]=Cyleuster i argraffu posteri mawr ar dalennau bach lluosol o bapur. Er mwyn defnyddio'r gorchymyn yma, rhaid i'r gweithredadwyn poster fod yn gyraeddadwy yn eich PATH. Gall côd tarddiad i'r cyfleuster yma fod ar y wefan KDEPrint.

RHYBUDD:Mae'r pecyn sydd ar gael ar y wefan KDEPrint yn fersiwn addasiedig o'r un gwreiddiol sydd i'w ganfod ar unrhyw drych archif CTAN, ond ni fydd y pecyn gwreiddiol yn gweithio efo KDE. Rhaid i chi ddefnyddio'r pecyn sydd ar gael ar y wefan KDEPrint. -Description[da]=Værktøj til udskrivning af store plakater på flere små ark papir. Programmet poster skal være tilgængelig fra din sti (PATH) for at du kan bruge denne kommando. Værktøjets kildekode kan findes på KDEPrint-netstedet.

ADVARSEL: Pakken der findes på KDEPrint-netstedet, er en ændret version af den oprindelige som kan findes på enhver CTAN-arkivspejlside, men den oprindelige pakke vil ikke fungere med KDE. Du er nødt til at bruge pakken fra KDEPrint-netstedet. +Description[da]=Værktøj til udskrivning af store plakater på flere små ark papir. Programmet poster skal være tilgængelig fra din sti (PATH) for at du kan bruge denne kommando. Værktøjets kildekode kan findes på KDEPrints hjemmeside.

ADVARSEL: Pakken der findes på KDEPrints hjemmeside, er en ændret version af den oprindelige som kan findes på enhver CTAN-arkivspejlside, men den oprindelige pakke vil ikke fungere med KDE. Du er nødt til at bruge pakken fra KDEPrints hjemmeside. Description[de]=Dienstprogramm zum Drucken von Plakaten auf kleineren Papierformaten. Um diesen Befehl verwenden zu können, muss sich das Programm poster in Ihrem PATH befinden. Der Quellcode dafür lässt sich über dieWebseiten des KDEPrint-Projekts herunterladen.

Achtung: Das Paket auf den KDEPrint-Seiten weist einige Veränderungen gegenüber dem Original auf. Letzeres ist beziehbar über jeden Spiegelserver des CTAN-Archivs, aber leider funktioniert diese Originalversion nicht mit KDE. Verwenden Sie also bitte die Version auf den KDEPrint-Seiten. Description[el]=Εργαλείο για εκτύπωση μεγάλων αφισών σε πολλές μικρές σελίδες. Για να χρησιμοποιήσετε αυτήν την εντολή, το εκτελέσιμο poster πρέπει να βρίσκεται στο PATH σας. Ο πηγαίος κώδικας γι' αυτό το εργαλείο μπορεί να βρεθεί στο Δικτυακός τόπος του KDEPrint.

ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Το πακέτο που βρίσκεται στο δικτυακό τόπο του KDEPrint είναι μια τροποποιημένη έκδοση του πρωτότυπου που μπορεί να βρεθεί σε οποιοδήποτε αρχειοθήκη CTAN, αλλά το αρχικό πακέτο δε θα δουλέψει με το KDE. Πρέπει να χρησιμοποιήσετε το πακέτο που βρίσκεται στο Δικτυακός τόπος του KDEPrint. Description[eo]=Ilo por presi grandajn plakatojn al multaj malgrandaj paperfolioj. Vi bezonas la programon poster. La kodon por tiu programo troveblas ĉe: KDEPresado ttt-paĝo.

AVERTO: la programo trovebla sur la KDEPresado ttt-paĝo estas ŝanĝita versio de tiu sur la CTAN-ttt-paĝo. La origina pakaĵo de CTAN ne laborus sub la KDE sistemo. Vi devas uzi la pakaĵon trovebla ĉe KDEPresado ttt-paĝo. @@ -84,7 +83,7 @@ Description[fi]=Työkalu isojen julistei Description[fr]=Utilitaire pour imprimer de grandes affiches sur de multiples petites feuilles de papier. Pour utiliser cette commande, l'exécutable poster doit être accessible dans votre PATH. Vous pouvez trouver le code source de cet utilitaire à l'adresse KDEPrint web site.

ATTENTION : le paquetage présent sur le site web de KDEPrint est une version modifiée de l'original se trouvant sur n'importe quel miroir des archives du CTAN, mais le paquetage d'origine ne fonctionnera pas avec KDE. Vous devez utiliser le paquetage qui se trouve sur le site web de KDEPrint. Description[gl]=Utilidade para imprimir grandes carteis en múltiples follas de pequeno tamaño. Para empregar este comando, o executábel poster debe estar no seu PATH. O código fonte desta utilidade pode obterse no Sitio Web de KDEPrint.

PRECAUCIÓN: O paquete que se atopa no sitio web de KDEPrint é unha versión modificada do programa orixinal que se pode atopar en calquera réplica CTAN, pero o paquete orixinal non funcionará con KDE. Vostede deberá emprega-lo paquete do Sitio Web de KDEPrint. Description[he]=כלי להדפסת כרזות גדולות על גבי מספר גיליונות נייר קטנים. כדי להשתמש בפקודה זו, קובץ התוכנית poster צריך להיות נגיש ב-PATH שלך. את קוד המקור של כלי זה ניתן למצוא באתר האינטרנט של KDEPrint.

אזהרה: החבילה שנמצאת באתר של KDEPrint היא גירסה עם שינויים לעומת הגירסה המקורית שניתן למצוא בכל אתר מראה של ארכיון CTAN. החבילה המקורית לא תעבוד עם KDE. אתה חייב להשתמש בחבילה שנמצאת באתר האינטרנט של KDEPrint. -Description[hi]=बहुत से छोटे-छोटे कागज के पन्नों में बड़े पोस्टर छापने की यूटिलिटी. इस कमांड- poster का उपयोग करने हेतु एक्जिक्यूटेबल आपके पथ PATH के पँहुच में होना चाहिए. इस यूटिलिटी का सोर्स कोड इस वेबसाइट से प्राप्त किया जा सकता है- KDEPrint web site.

चेतावनी: केडीई प्रिंट वेब साइट से प्राप्त पैकेज मूल संसकरण का बदला प्रकार है जो किसी भी CTAN आर्काइव मिरर से प्राप्त हो सकता है, परंतु मूल पैकेज केडीई के साथ कार्य नहीं करेगा. आप आवश्यक रूप सेइस साइट पर उपलब्ध पैकेज का उपयोग करें KDEPrint web site. +Description[hi]=बहुत से छोटे-छोटे कागज के पन्नों में बड़े पोस्टर छापने की यूटिलिटी. इस कमांड- poster का उपयोग करने के लिए एक्जिक्यूटेबल आपके पथ PATH के पँहुच में होना चाहिए. इस यूटिलिटी का स्रोत कोड इस वेबसाइट से प्राप्त किया जा सकता है- KDEPrint web site.

चेतावनी: केडीई प्रिंट वेब साइट से प्राप्त पैकेज मूल संसकरण का बदला क़िस्म है जो किसी भी CTAN आर्काइव मिरर से प्राप्त हो सकता है, परंतु मूल पैकेज केडीई के साथ कार्य नहीं करेगा. आप आवश्यक रूप सेइस साइट पर उपलब्ध पैकेज इस्तेमाल करें KDEPrint web site. Description[hu]=Ezzel a szűrővel nagy posztereket lehet kinyomtatni sok kis lapra. A parancs használatához a poster programfájl könyvtárának szerepelnie kell a PATH változóban. A program forráskódja letölthető a KDEPrint website-ról.

Figyelem: a website-on található csomag az eredeti program egy módosított változata (az eredeti bármelyik CTAN archívumból letölthető), de az eredeti változat nem működik a KDE-vel, ezért feltétlenül a KDEPrint website-on levőt használja! Description[is]=Forrit til að prenta stór veggspjöld á lítil blöð. Til að nota þessa skipun verður posterforritið að vera aðgengilegt á slóðinni path fumkóði að þessu forriti finnst á KDEPrint web site

Aðvörun: Forritið sem finnst á KDEPrint vefsíðunni er breytt útgáfa af upprunalegu útgáfunni sem finnst á öllum CTAN vefsvæðum, en upprunalegi pakkinn virkar ekki með KDE. Þú verður að nota pakkann sem er á:KDEPrint web site. Description[it]=Utilità per stampare poster grandi su più fogli piccoli. Per usare questo comando, l'eseguibile poster deve essere accessibile nel tuo PATH. È possibile trovare il codice sorgente di questa utilità sul sito Web di KDEPrint.

ATTENZIONE: il pacchetto presente sul sito Web di KDEPrint è una versione modificata dell'originale reperibile in un qualsiasi mirror CTAN, ma il pacchetto originale non funziona con KDE. È necessario usare il pacchetto del sito Web di KDEPrint. @@ -94,7 +93,7 @@ Description[lt]=Programėlė, skirta did Description[mn]=Том зарлалыг олон жижиг хуудсууд дээр хэвлэх хэрэгсэл.Энэ тушаалыг хэрэглэхдээ poster-ггүйцэтгэхээр болгохдоо өөрийнPATH даа ханддаг болгох ёстой. Энэ хэрэгслийн эх код KDEPrint вэб хуудсанд байгаа байх.

САНАМЖ: KDEPrint вэб хуудсанд эх хувилбарын өөрчилөгдсөн хувилбарууд олдох ба CTAN ариваар шахагдаж тус тусын сайтан дээр тавигдсан байгаа.Харин эх пакет КДЭ-тэй ажиллахгүй. Та KDEPrint веб хуудсаас авсан пакетаа хэрэглэх ёстой. Description[ms]=Utiliti untuk mencetak poster besar pada banyak helaian kertas. Untuk menggunakan fungsi ini ini, poster boleh laksana mesti ada pada PATH anda.Kod sumber untuk utiliti ini ada di Laman KDEPrint.

AMARAN: Pakej di laman KDEPrint ialah versi telah diubah dari versi asal yang boleh diperoleh dari mana-mana cermin arkib CTAN. Namun, pakej asal tidak boleh berfungsi dengan KDE. Anda mesti menggunakan pakej yang terdapat di Laman KDEPrint. Description[nb]=Hjelpeprogram for å skrive ut store plakater fordelt på mange små papirark. Du må ha poster-programmet i søkestien din, PATH. Kildekoden for dette programmet kan hentes fra KDEPrint-siden.

ADVARSEL Pakken som finnes på KDEPrint-siden er en modifisert utgave av originalen som kan finnes på alle CTAN-arkivspeil, men originalen virker ikke med KDE. Du må bruke utgaven fra KDEPrint-siden. -Description[nl]=Hulpprograma voor het afdrukken van grote posterformaten op kleine vellen papier. Om dit commando te gebruiken dient het programmma poster zich in uw zoekpad ($PATH) te bevinden. De broncode voor dit hulpprogramma kunt u vinden op de website van KDEPrint.

Waarschuwing: het pakket dat aangeboden wordt op de website van KDEPrint is een afgeleide versie. Het originele pakket kunt u vinden op elke CTAN-archiefmirror, maar dit pakket zal niet met KDE werken. U kunt alleen het pakket dat aangeboden wordt op de website van KDEPrint gebruiken. +Description[nl]=Hulpprogramma voor het afdrukken van grote posterformaten op kleine vellen papier. Om dit commando te gebruiken dient het programmma poster zich in uw zoekpad ($PATH) te bevinden. De broncode voor dit hulpprogramma kunt u vinden op de website van KDEPrint.

Waarschuwing: het pakket dat aangeboden wordt op de website van KDEPrint is een afgeleide versie. Het originele pakket kunt u vinden op elke CTAN-archiefmirror, maar dit pakket zal niet met KDE werken. U kunt alleen het pakket dat aangeboden wordt op de website van KDEPrint gebruiken. Description[nn]=Verktøy som let deg skriva ut store plakatar på fleire små ark. For å bruka denne kommandoen, må programmet poster vera tilgjengeleg i søkjestigen (PATH). Kjeldekoden til dette verktøyet finn du på nettstaden til KDEPrint.

ÅTVARING: Pakken som ligg på KDEPrint-nettstaden er ei tilpassa utgåve av den opphavlege som du kan finna i CTAN-arkivet. Den opphavlege pakken fungerer ikkje med KDE. Du må bruka pakken som ligg på KDEPrint-nettstaden. Description[nso]=Sebereka sago gatisa diswantsho tse kgolo go matlakala a mantshi a mannyane. Go somisa taelo ye, phethagatsego ya seswantsho e swanetse go tsenelega kago TSEJANA ya gago. Khoutu ya mothopo wa sebereka se ekaba ele go Lefelo la web la Kgatiso ya KDE.

TEMOSO: Pakana yeo e hweditswego kago lefelo la web la Kgatiso ya KDE ke tsweletso yeo e kaonafaditswego ya ya mathomothomo yeo eka hwetswago kago seipone sa polokelo ya CTAN, efela pakana ya mathomothomo e kase beereke le KDE. O swanetse go somisa pakana yeo e hweditswego kago lefelo la web la Kgatiso ya KDE. Description[pa]=ਕਈ ਛੋਟੇ ਆਕਾਰ ਦੇ ਸਫਿਆ ਤੇ ਵੱਡਾ ਪੋਸਟਰ ਛਾਪਣ ਦੀ ਉਪਯੋਗਤਾ| ਇਹ ਕਮਾਂਡ , ਪੋਸਟਰ ਚੱਲਣਯੋਗ ਤੁਹਾਡੇ ਰਸਤੇ ਵਿੱਚ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ| ਇਸ ਦਾ ਸਰੋਤ KDEPrint ਵੈੱਬ ਸਾਈਟ ਤੋਂ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ

ਚੇਤਾਵਨੀ: ਵੈੱਬ ਸਾਇਟ KDEPrint ਅਸਲੀ ਵਰਜਨ ਜੋ ਕਿ CTAN ਸੰਕੁਚਿਤ ਤੇ ਮਿਲ ਸਕਦਾ ਹੈ, ਤੋਂ ਬਿਲਕੁੱਲ ਵੱਖਰਾ ਹੈ, ਪਰ ਅਸਲੀ ਪੈਕੇਜ KDE ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਦਾ ਹੈ| ਤੁਹਾਨੂੰ ਇੱਥੇਉਪਲੱਬਧ ਪੈਕੇਜ ਹੀ ਵਰਤਣਾ ਚਾਹੀਦਾ ਹੈ KDEPrint ਵੈੱਬ ਸਾਇਟ| @@ -117,7 +116,6 @@ Description[uz]=Катта плакат Description[ven]=Tshitikedzi khau phirintha dziphosithara khulwane kha ma bammbiri matuku manzhi. U shumisa muthetho uyu, Phosithara zwinotumulea zwi fanela u dzhenea kha PATH. Khoudu ya vhubvo ya tshitikedzi itshi ingavha kha KDEPrint web site.

WARNING: Tshiputo tshi wanalaho kha KDEPrint web site ndi tshivhumbeo tsho dzudzanywaho tsha vhukuma tshine tshinga wanala kha tshivhoni, fhedzi tshiputo tsha tshavhukuma tshinga si shume nga KDE. Ni u shumisa tshiputo tsho wanalaho kha KDEPrint web site. Description[wa]=Usteye po-z imprimer des lådjes posters so sacwantès foyes pus ptites et les poleur mete eshonne po-z aveur li grand poster. Po-z eployî l' comande, li programe poster doet esse dins vosse tchimin (PATH). Li côde sourdant po ciste usteye si trove sol waibe di KDEPrint.

ASTEME: Li pacaedje ki s' trove sol waibe da KDEPrint est ene modêye ene miete candjeye di l' oridjinå (ki s' pout trover so tot l' minme li ké muroe d' årtchives do CTAN), ca l' oridjinå n' rote nén avou KDE. Vos dvoz eployî li pacaedje k' est sol waibe di KDEPrint. Description[xh]=Uncedo lokushicilela izazisi eszinkulu kumakhasi amaphepha amaninzi. Ukusebenzisa lomyalelo, isazisi esiphumezekayo kufuneka sikwazi ukufumaneka kowakho UMENDO. Ikhowudi yemvelaphi yalento eluncedo inga kwi web site ye KDEPrint.

ISILUMKISO: Impahla efumaneke kwi we site ye KDEPrint iluguqulelo kancincane lomsesebenzi woqobo enokwazi ukufumaneka kuso nayiphi indawo yogcino yesipili se CTAN, kodwa impahla yoqobo ayizukusebenzelana ne KDE. Kufuneka usebenzise impahla ifumanwe kwi web site ye KDEPrint. -Description[xx]=xxUtility to print large posters on multiple small paper sheets. To use this command, the poster executable must be accessible in your PATH. Source code for this utility can be on the KDEPrint web site.

WARNING: The package found on the KDEPrint web site is a modified version of the original one that can be found on any CTAN archive mirror, but the original package will not work with KDE. You must use the package found on the KDEPrint web site.xx Description[zh_CN]=此工具用于在多张纸上打印大型的海报。要使用此命令，poster 可执行文件必须可在您的 PATH 中访问到。此工具的源代码位于KDEPrint 网站。

警告：您虽然可以在任何 CTAN 归档镜像找到的原始版本，但是在 KDEPrint 网站上找到的包对其进行了修改，原因是原始的包无法用于 KDE。您必须使用在 KDEPrint 网站上找到的包。 Description[zh_TW]=將大型海報列印在多張小型紙張上的公用程式。要使用這個命令，可執行檔poster必須在您的PATH中。這個公用程式的原始碼可以在。

警告：在 KDEPrint 網站上找到的套件是修改過的版本，而非在任何 CTAN 檔案庫鏡射站中可以找到的原始版本，其原始套件無法在 KDE 下運作。您必須使用在KDEPrint 網站上的套件。 Description[zu]=Insebenziso yokushicicela amabhodi emiyalezo emikhulu kumapheshana ekhasi eliningana elincane. Ukusebenzisa lomyalelo, ibhodi lomyalezo eliphumelelisekayo kumele lingeniswe ngokunemvume kweyakho Indlela. Ikhodi lemvelaphi lalokhu k kusebenzisa kungaba kwi kwindawo yeweb ye KDEPrint.

Isexwayiso: Iphakethe elitholakala kwindawo yeweb ye-KDEPrint inguguqulelo olushintshiweyo lwasekuqaleni lolo olungatholakala kunoma yisiphi isibuko somqulu we CTAN, kodwa iphakethe lasekuqaleni angeke lisebenze nge-KDE. Wenakumele usebenzise iphakethe elitholakala e kwindawo yeweb ye-KDEPrint. Index: kdeprint/filters/ps2pdf.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/ps2pdf.desktop,v retrieving revision 1.113 retrieving revision 1.113.2.1 diff -u -3 -p -r1.113 -r1.113.2.1 --- kdeprint/filters/ps2pdf.desktop 27 Jul 2004 07:23:17 -0000 1.113 +++ kdeprint/filters/ps2pdf.desktop 24 Aug 2004 06:29:12 -0000 1.113.2.1 @@ -4,7 +4,6 @@ Name[af]=ps-na-pdf Name[pl]=Konwersja PS do PDF Name[pt_BR]=Conversão de PS para PDF Name[sv]=Ps2pdf -Name[xx]=xxps2pdfxx Require=exec:/gs Comment=PostScript to PDF Converter Comment[af]=Postscript na Pdf Omskakelaar @@ -68,7 +67,6 @@ Comment[uz]=PostScrip'ни PDF'га ай Comment[ven]=Bammbiri la poso uya kha mushandukisi wa PDF Comment[wa]=Covierseu di PostScript viè PDF Comment[xh]=PostScript Kumguqili we PDF -Comment[xx]=xxPostScript to PDF Converterxx Comment[zh_CN]=PostScript 到 PDF 的转换器 Comment[zh_TW]=PostScript 至 PDF 轉換器 Comment[zu]=Umguquli we-PostScript se-DPF Index: kdeprint/filters/psbook.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psbook.desktop,v retrieving revision 1.108 retrieving revision 1.108.2.1 diff -u -3 -p -r1.108 -r1.108.2.1 --- kdeprint/filters/psbook.desktop 27 Jul 2004 07:23:17 -0000 1.108 +++ kdeprint/filters/psbook.desktop 24 Aug 2004 06:29:12 -0000 1.108.2.1 @@ -11,7 +11,6 @@ Name[sv]=broschyr Name[ta]=psபுத்தகம் Name[tg]=psкитоб Name[ven]=Bugu ya ps -Name[xx]=xxpsbookxx Name[zu]=incwadi ye-ps Require=exec:/psbook,exec:/psnup Comment=Pamphlet Printing (use with small side duplex printing) @@ -68,7 +67,6 @@ Comment[uk]=Друк брошури (в Comment[uz]=Памфлет босиб чиқариш (кичик тарафлама варақнинг иккита томонига босиб чиқариш) Comment[ven]=U phirintha ha tshibugwana (shumisa na lurumbu lutuku lwa u phirintha a duplex) Comment[xh]=Ushicilelo Lwephetshana (sebenzisa ngoshicilelo oluncinane olusecaleni oluphindwe kabini) -Comment[xx]=xxPamphlet Printing (use with small side duplex printing)xx Comment[zh_CN]=打印小册 (使用小张双面打印) Comment[zh_TW]=列印小冊 (使用小張雙面列印) Comment[zu]=Ibhukwana Lokushicilela (sebenzisa ngecala elincane lukushicilela okuphindwe kabili) Index: kdeprint/filters/psbook1.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psbook1.desktop,v retrieving revision 1.110 retrieving revision 1.110.2.1 diff -u -3 -p -r1.110 -r1.110.2.1 --- kdeprint/filters/psbook1.desktop 5 Aug 2004 06:36:50 -0000 1.110 +++ kdeprint/filters/psbook1.desktop 24 Aug 2004 06:29:12 -0000 1.110.2.1 @@ -12,7 +12,6 @@ Name[sv]=broschyr 1 Name[ta]=psபுத்தகம்1 Name[tg]=psкитоб1 Name[ven]=Bugu ya ps yau thoma -Name[xx]=xxpsbook1xx Name[zu]=incwadi ye ps yokuqala Require=exec:/psbook,exec:/psnup,exec:/psselect Comment=Pamphlet Printing - Even Pages (step 1) @@ -69,7 +68,6 @@ Comment[uk]=Друк брошури - п Comment[uz]=Памфлет босиб чиқариш - Жуфт бетлар (қадам 1) Comment[ven]=U phirintha ha tshibugwana - masiatari (tshitepe tshau thoma) Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Alinganayo (inyathelo 1) -Comment[xx]=xxPamphlet Printing - Even Pages (step 1)xx Comment[zh_CN]=打印小册 - 偶数页(第一步) Comment[zh_TW]=列印小冊 - 偶數頁(第一步) Comment[zu]=Ukushicilela Ibhukwana - Amaphepha Alinganayo (isiqendu 1) Index: kdeprint/filters/psbook2.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psbook2.desktop,v retrieving revision 1.109 retrieving revision 1.109.2.1 diff -u -3 -p -r1.109 -r1.109.2.1 --- kdeprint/filters/psbook2.desktop 5 Aug 2004 06:36:50 -0000 1.109 +++ kdeprint/filters/psbook2.desktop 24 Aug 2004 06:29:12 -0000 1.109.2.1 @@ -12,7 +12,6 @@ Name[sv]=broschyr 2 Name[ta]=psபுத்தகம்2 Name[tg]=psкитоб2 Name[ven]=Bugu ya ps ya vhuvhili -Name[xx]=xxpsbook2xx Name[zu]=incwadi ye ps yesibili Require=exec:/psbook,exec:/psnup,exec:/psselect Comment=Pamphlet Printing - Odd Pages (step 2) @@ -70,7 +69,6 @@ Comment[uk]=Друк брошури - н Comment[uz]=Памфлет босиб чиқариш - Тоқ бетлар (қадам 2) Comment[ven]=U phirintha tshibugwana - masaitari (tshitepe tsha vhuvhili) Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Amnqakathi (inyathelo 2) -Comment[xx]=xxPamphlet Printing - Odd Pages (step 2)xx Comment[zh_CN]=打印小册 - 奇数页(第二步) Comment[zh_TW]=列印小冊 - 奇數頁(第二步) Comment[zu]=Ukushicilela Kwebhukwana - Amaphepha Angalingani (isiqendu 2) Index: kdeprint/filters/psnup.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psnup.desktop,v retrieving revision 1.128 retrieving revision 1.128.2.2 diff -u -3 -p -r1.128 -r1.128.2.2 --- kdeprint/filters/psnup.desktop 27 Jul 2004 07:23:17 -0000 1.128 +++ kdeprint/filters/psnup.desktop 31 Aug 2004 07:21:17 -0000 1.128.2.2 @@ -1,7 +1,6 @@ [KDE Print Filter Entry] Name=psnup Name[sv]=Psnup -Name[xx]=xxpsnupxx Require=exec:/psnup Comment=Multiple Pages per Sheet Filter Comment[af]=Veelvuldige Bladsye per Staat Filter @@ -24,7 +23,7 @@ Comment[fi]=Useita sivuja samalle arkill Comment[fr]=Plusieurs pages par feuille Comment[gl]=Filtro de Múltiples Páxinas por Folla Comment[he]=מסנן עמודים מרובים לגיליון -Comment[hi]=प्रति शीट एक से अघिक पृष्ठ फिल्टर +Comment[hi]=प्रति शीट एक से अघिक पृष्ठ फ़िल्टर Comment[hr]=Filter za višestruke stranice na listu Comment[hu]=Szűrő több lap egy oldalra helyezéséhez Comment[id]=Filter Banyak Halaman per Lembar @@ -62,7 +61,6 @@ Comment[uz]=Битта варақга б Comment[ven]=Masiatari manzhi kha filithara ya bammbiri Comment[wa]=Passete pus d' ene pådje par foye Comment[xh]=Amaphepha Amaninzi Ngekhasi Lesihluzi ngasinye -Comment[xx]=xxMultiple Pages per Sheet Filterxx Comment[zh_CN]=每张多页过滤程序 Comment[zh_TW]=單張多頁過濾器 Comment[zu]=Amakhasi Amaningana Kumhlaziyi Wepheshana ngamunye Index: kdeprint/filters/psresize.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psresize.desktop,v retrieving revision 1.94 retrieving revision 1.94.2.1 diff -u -3 -p -r1.94 -r1.94.2.1 --- kdeprint/filters/psresize.desktop 5 Aug 2004 06:36:50 -0000 1.94 +++ kdeprint/filters/psresize.desktop 24 Aug 2004 06:29:12 -0000 1.94.2.1 @@ -11,7 +11,6 @@ Name[ta]=psஅளவு மாற்ற Name[tg]=ps аз нав андоза кардан Name[ven]=U linganisela ps Name[xh]=psresiza -Name[xx]=xxpsresizexx Name[zu]=psphinda ushintshe usayizi Require=exec:/psresize Comment=Scale Print Content to Fit on Another Paper Size @@ -73,7 +72,6 @@ Comment[uz]=Варақнинг бошқ Comment[ven]=Zwirengomu ha tshikeili tshau phirintha uitela u dzhena kha saizi inwe ya siatari Comment[wa]=Mete al schåle çou ki va esse imprimer po k' ça rimplixhe ene pådje d' ene ôte grandeu di papî Comment[xh]=Isikali Soshicelela Somphakati esinokungena Kwelinye Uhlobo Lephepa -Comment[xx]=xxScale Print Content to Fit on Another Paper Sizexx Comment[zh_CN]=缩放打印内容以适合其它纸张大小 Comment[zh_TW]=調整列印內容以符合其它的紙張大小 Comment[zu]=Kala Okuphakathi Kokushicilela Ukugcwalisa Omunye Usayizi Wephepha Index: kdeprint/filters/psselect.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/filters/psselect.desktop,v retrieving revision 1.119 retrieving revision 1.119.2.2 diff -u -3 -p -r1.119 -r1.119.2.2 --- kdeprint/filters/psselect.desktop 27 Jul 2004 07:23:17 -0000 1.119 +++ kdeprint/filters/psselect.desktop 31 Aug 2004 07:21:17 -0000 1.119.2.2 @@ -9,7 +9,6 @@ Name[sv]=Psselect Name[ta]=psதேர்ந்தெடு Name[tg]=psҷудо карда додани Name[ven]=U nanga ha ps -Name[xx]=xxpsselectxx Name[zu]=pskhetha Require=exec:/psselect Comment=Page Selection/Ordering Filter @@ -34,7 +33,7 @@ Comment[fr]=Sélection de pages / Filt Comment[ga]=Scagaire chun leathanaigh a roghnú agus a chur in ord Comment[gl]=Filtro de Selección/Ordeamento de Páxina Comment[he]=מסנן בחירת\סידור עמודים -Comment[hi]=पृष्ठ चुनाव/क्रमवार करने का फिल्टर +Comment[hi]=पृष्ठ चुनाव/क्रमवार करने का फ़िल्टर Comment[hr]=Filtar za odabir i poredak stranica Comment[hu]=Oldalkijelölő és -rendező szűrő Comment[is]=Síðuval / röðunarsía @@ -72,7 +71,6 @@ Comment[uk]=Фільтр вибору/п Comment[uz]=Бетларни танлаш/тартиблаш филтери Comment[ven]=U nanga ha siatari/u vhekanya filithara Comment[xh]=Ukhetho Lwephepha/Isihluzi Sokulungisa kakuhle -Comment[xx]=xxPage Selection/Ordering Filterxx Comment[zh_CN]=页面选择/排序过滤程序 Comment[zh_TW]=紙張選擇/排序過濾器 Comment[zu]=Ukhetho Lwephepha/Ukuthumela Isihlaziya samafayela Index: kdeprint/foomatic/foomatic.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/foomatic/foomatic.print,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -u -3 -p -r1.25 -r1.25.2.1 --- kdeprint/foomatic/foomatic.print 26 Jul 2004 06:59:33 -0000 1.25 +++ kdeprint/foomatic/foomatic.print 24 Aug 2004 06:29:12 -0000 1.25.2.1 @@ -10,6 +10,5 @@ Comment[fa]=Foomatic (CUPS،LPRng،PDQ) Comment[hi]=फूमेटिक (CUPS, LPRng, PDQ) Comment[sq]=Foomatik (CUPS, LPRng, PDQ) Comment[sv]=Foomatic (Cups, LPRng, PDQ) -Comment[xx]=xxFoomatic (CUPS, LPRng, PDQ)xx DetectUris=exec:/foomatic-configure,config:/foomatic/ DetectPrecedence=0 Index: kdeprint/lpd/lpd.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpd/lpd.print,v retrieving revision 1.109 retrieving revision 1.109.2.2 diff -u -3 -p -r1.109 -r1.109.2.2 --- kdeprint/lpd/lpd.print 27 Jul 2004 07:23:18 -0000 1.109 +++ kdeprint/lpd/lpd.print 31 Aug 2004 07:21:18 -0000 1.109.2.2 @@ -23,7 +23,7 @@ Comment[fr]=LPR (système d'impression B Comment[ga]=LPR (Gnáthchóras priontála BSD) Comment[gl]=LPR (Sistema de Impresión Estándar de BSD) Comment[he]=מערכת ההדפסה הסטנדרטית של LPR) BSD) -Comment[hi]=LPR (प्रमाणिक BSD छपाई पद्धत्ति) +Comment[hi]=LPR (मानक BSD छपाई पद्धत्ति) Comment[hr]=LPR (standardni BSD sustav za ispisivanje) Comment[hu]=LPR (BSD-típusú nyomtatórendszer) Comment[is]= LPR (Venjulega BSD prentkerfið) @@ -64,7 +64,6 @@ Comment[ven]=LPR (maitele a u phirintha Comment[vi]=LPR (Hệ thống chuẩn BSD) Comment[wa]=LPR (Sistinme d' imprimaedje BSD standård) Comment[xh]=LPR (Indlela esezantsi yoshicilelo lwe BSD) -Comment[xx]=xxLPR (Standard BSD print system)xx Comment[zh_CN]=LPR (标准 BSD 打印系统) Comment[zh_TW]=LPR (標準 BSD 列印系統) Comment[zu]=LPR (Isistimu yokushicelela evamile ye-BSD) Index: kdeprint/lpdunix/lpdunix.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpdunix/lpdunix.print,v retrieving revision 1.135 retrieving revision 1.135.2.1 diff -u -3 -p -r1.135 -r1.135.2.1 --- kdeprint/lpdunix/lpdunix.print 27 Jul 2004 07:23:18 -0000 1.135 +++ kdeprint/lpdunix/lpdunix.print 24 Aug 2004 06:29:13 -0000 1.135.2.1 @@ -62,7 +62,6 @@ Comment[uz]=Оддий UNIX LPD боси Comment[ven]=Maitele au phirintha a UNIX (default) Comment[wa]=Sistinme d' imprimaedje djenerike LPD po UNIX (prémetou) Comment[xh]=Indlela Yoshicilelo Ngokubanzi ye UNIX LPD (edaliweyo) -Comment[xx]=xxGeneric UNIX LPD Print System (default)xx Comment[zh_CN]=通用 UNIX LPD 打印系统(默认) Comment[zh_TW]=通用 UNIX LPD 列印系統(預設) Comment[zu]=Isistimu Yokushicilela ye-UNIX LPD Kawonke wonke (yokwendalo) Index: kdeprint/lpr/lpr.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/lpr/lpr.print,v retrieving revision 1.102 retrieving revision 1.102.2.1 diff -u -3 -p -r1.102 -r1.102.2.1 --- kdeprint/lpr/lpr.print 27 Jul 2004 07:23:18 -0000 1.102 +++ kdeprint/lpr/lpr.print 24 Aug 2004 06:29:13 -0000 1.102.2.1 @@ -62,7 +62,6 @@ Comment[uz]=LPR/LPRng босиб чиқ Comment[ven]=LPR/Maitele au phirintha a LPRng Comment[wa]=Sistinme d' imprimaedje LPR/LPRng Comment[xh]=LPR/LPRng Indlela Yokushicilela -Comment[xx]=xxLPR/LPRng Print Systemxx Comment[zh_CN]=LPR/LPRng 打印系统 Comment[zh_TW]=LPR/LPRng 列印系統 Comment[zu]=Isistimu Yokushicilela ye-LPR/LRng Index: kdeprint/rlpr/rlpr.print =================================================================== RCS file: /home/kde/kdelibs/kdeprint/rlpr/rlpr.print,v retrieving revision 1.131 retrieving revision 1.131.2.1 diff -u -3 -p -r1.131 -r1.131.2.1 --- kdeprint/rlpr/rlpr.print 27 Jul 2004 07:23:19 -0000 1.131 +++ kdeprint/rlpr/rlpr.print 24 Aug 2004 06:29:13 -0000 1.131.2.1 @@ -60,7 +60,6 @@ Comment[uz]=RLPR муҳити (масо Comment[ven]=Vhupo ha RLPR (dzisiva dza LPD) Comment[wa]=Evironmint d' imprimaedje RLPR (sierveus LPD å lon) Comment[xh]=RLPR Imeko-bume ye RLPR (Abancedisi be LPD ababeka kude) -Comment[xx]=xxRLPR Environment (Remote LPD servers)xx Comment[zh_CN]=RLPR 环境(远程 LPD 服务器) Comment[zh_TW]=RLPR 環境(遠端 LPD 伺服器) Comment[zu]=Ezendalo ze-RLPR (abalekeleli abakude be-LPD) Index: kdeprint/tools/escputil/escputil.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeprint/tools/escputil/escputil.desktop,v retrieving revision 1.39 retrieving revision 1.39.2.1 diff -u -3 -p -r1.39 -r1.39.2.1 --- kdeprint/tools/escputil/escputil.desktop 26 Jul 2004 06:59:35 -0000 1.39 +++ kdeprint/tools/escputil/escputil.desktop 24 Aug 2004 06:29:13 -0000 1.39.2.1 @@ -24,7 +24,6 @@ Name[nso]=InkJetEPSON Name[pt]=Jacto de Tinta da EPSON Name[ta]=EPSON இங்க்ஜெட் Name[th]=เครื่องพิมพ์อิงค์เจตเอปสัน -Name[xx]=xxEPSON InkJetxx Name[zh_TW]=EPSON 噴墨印表機 Type=Service Index: kdeui/kactionclasses.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kactionclasses.cpp,v retrieving revision 1.340 retrieving revision 1.340.2.1 diff -u -3 -p -r1.340 -r1.340.2.1 --- kdeui/kactionclasses.cpp 8 Jul 2004 16:34:15 -0000 1.340 +++ kdeui/kactionclasses.cpp 30 Aug 2004 00:04:47 -0000 1.340.2.1 @@ -1799,7 +1799,6 @@ KToolBarPopupAction::KToolBarPopupAction KToolBarPopupAction::~KToolBarPopupAction() { - if ( m_popup ) delete m_popup; } Index: kdeui/kcmodule.h =================================================================== RCS file: /home/kde/kdelibs/kdeui/kcmodule.h,v retrieving revision 1.45 retrieving revision 1.45.2.2 diff -u -3 -p -r1.45 -r1.45.2.2 --- kdeui/kcmodule.h 18 Jul 2004 23:12:59 -0000 1.45 +++ kdeui/kcmodule.h 23 Aug 2004 22:44:52 -0000 1.45.2.2 @@ -183,6 +183,7 @@ public: /** * This sets the KAboutData returned by aboutData() + * @since 3.3 */ void setAboutData( KAboutData* about ); @@ -230,6 +231,7 @@ protected: * * This function is useful if you need to handle multiple configuration files. * + * @since 3.3 * @return a pointer to the KConfigDialogManager in use * @param config the KConfigSkeleton to use * @param widget the widget to watch @@ -238,6 +240,8 @@ protected: /** * Sets the quick help. + * + * @since 3.3 */ void setQuickHelp( const QString& help ); Index: kdeui/kcolordialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kcolordialog.cpp,v retrieving revision 1.117 retrieving revision 1.117.2.1 diff -u -3 -p -r1.117 -r1.117.2.1 --- kdeui/kcolordialog.cpp 20 Jul 2004 14:25:00 -0000 1.117 +++ kdeui/kcolordialog.cpp 20 Aug 2004 07:23:44 -0000 1.117.2.1 @@ -532,10 +532,17 @@ void KColorPatch::dropEvent( QDropEvent } } +class KPaletteTable::KPaletteTablePrivate +{ +public: + QMap m_namedColorMap; +}; KPaletteTable::KPaletteTable( QWidget *parent, int minWidth, int cols) : QWidget( parent ), mMinWidth(minWidth), mCols(cols) { + d = new KPaletteTablePrivate; + cells = 0; mPalette = 0; i18n_customColors = i18n("* Custom Colors *"); @@ -580,6 +587,7 @@ KPaletteTable::KPaletteTable( QWidget *p KPaletteTable::~KPaletteTable() { delete mPalette; + delete d; } QString @@ -652,7 +660,14 @@ KPaletteTable::readNamedColor( void ) { continue; } - list.append( i18n("color", name.latin1() ) ); + + const QColor color ( red, green, blue ); + if ( color.isValid() ) + { + const QString colorName( i18n("color", name.latin1() ) ); + list.append( colorName ); + d->m_namedColorMap[ colorName ] = color; + } } } @@ -825,7 +840,7 @@ KPaletteTable::slotColorCellDoubleClicke void KPaletteTable::slotColorTextSelected( const QString &colorText ) { - emit colorSelected( QColor (colorText), colorText ); + emit colorSelected( d->m_namedColorMap[ colorText ], colorText ); } Index: kdeui/kdockwidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kdockwidget.cpp,v retrieving revision 1.161 retrieving revision 1.161.2.1 diff -u -3 -p -r1.161 -r1.161.2.1 --- kdeui/kdockwidget.cpp 5 Jun 2004 11:58:07 -0000 1.161 +++ kdeui/kdockwidget.cpp 14 Sep 2004 10:35:13 -0000 1.161.2.1 @@ -2714,7 +2714,7 @@ void KDockManager::readConfig( KConfig* KDockWidget* d2 = getDockWidgetFromName( list.current() ); tabDockGroup = d2->manualDock( d1, KDockWidget::DockCenter ); if ( tabDockGroup ){ - KDockTabGroup* tab = (KDockTabGroup*)tabDockGroup->widget; + KDockTabGroup* tab = dynamic_cast( tabDockGroup->widget ); list.next(); while ( list.current() && tabDockGroup ){ KDockWidget* tabDock = getDockWidgetFromName( list.current() ); @@ -2724,7 +2724,8 @@ void KDockManager::readConfig( KConfig* if ( tabDockGroup ){ tabDockGroup->setName( oname.latin1() ); c->setGroup( group ); - tab->showPage( tab->page( c->readNumEntry( oname+":curTab" ) ) ); + if ( tab ) + tab->showPage( tab->page( c->readNumEntry( oname+":curTab" ) ) ); } } obj = tabDockGroup; Index: kdeui/kfontdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kfontdialog.cpp,v retrieving revision 1.101 retrieving revision 1.101.4.1 diff -u -3 -p -r1.101 -r1.101.4.1 --- kdeui/kfontdialog.cpp 13 Mar 2004 13:56:19 -0000 1.101 +++ kdeui/kfontdialog.cpp 8 Sep 2004 16:54:12 -0000 1.101.4.1 @@ -653,7 +653,7 @@ void KFontChooser::getFontList( QStringL for (QStringList::Iterator it = lstSys.begin(); it != lstSys.end(); ++it) { if ((fontListCriteria & FixedWidthFonts) > 0 && !dbase.isFixedPitch(*it)) continue; - if ((fontListCriteria & (SmoothScalableFonts | ScalableFonts) == ScalableFonts) && + if (((fontListCriteria & (SmoothScalableFonts | ScalableFonts)) == ScalableFonts) && !dbase.isBitmapScalable(*it)) continue; if ((fontListCriteria & SmoothScalableFonts) > 0 && !dbase.isSmoothlyScalable(*it)) continue; lstFonts.append(*it); Index: kdeui/kkeydialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kkeydialog.cpp,v retrieving revision 1.162 retrieving revision 1.162.2.1 diff -u -3 -p -r1.162 -r1.162.2.1 --- kdeui/kkeydialog.cpp 28 Jul 2004 19:51:22 -0000 1.162 +++ kdeui/kkeydialog.cpp 13 Sep 2004 15:29:11 -0000 1.162.2.1 @@ -302,7 +302,7 @@ void KKeyChooser::initGUI( ActionType ty QToolButton *clearSearch = new QToolButton(this); clearSearch->setTextLabel(i18n("Clear Search"), true); - clearSearch->setIconSet(SmallIconSet("locationbar_erase")); + clearSearch->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); searchLayout->addWidget(clearSearch); QLabel* slbl = new QLabel(i18n("&Search:"), this); searchLayout->addWidget(slbl); Index: kdeui/klanguagebutton.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/klanguagebutton.cpp,v retrieving revision 1.13 retrieving revision 1.13.4.1 diff -u -3 -p -r1.13 -r1.13.4.1 --- kdeui/klanguagebutton.cpp 18 Jan 2004 19:44:47 -0000 1.13 +++ kdeui/klanguagebutton.cpp 13 Sep 2004 09:10:20 -0000 1.13.4.1 @@ -104,6 +104,7 @@ void KLanguageButton::setText(const QStr void KLanguageButton::init(const char * name) { + m_current = 0; m_ids = new QStringList; m_popup = 0; m_oldPopup = 0; Index: kdeui/klineedit.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/klineedit.cpp,v retrieving revision 1.181 retrieving revision 1.181.2.1 diff -u -3 -p -r1.181 -r1.181.2.1 --- kdeui/klineedit.cpp 4 Jul 2004 20:01:40 -0000 1.181 +++ kdeui/klineedit.cpp 19 Sep 2004 14:17:43 -0000 1.181.2.1 @@ -836,14 +836,16 @@ void KLineEdit::tripleClickTimeout() possibleTripleClick=false; } +void KLineEdit::contextMenuEvent( QContextMenuEvent * e ) +{ + if ( m_bEnableMenu ) + QLineEdit::contextMenuEvent( e ); +} + QPopupMenu *KLineEdit::createPopupMenu() { enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll }; - // Return if popup menu is not enabled !! - if ( !m_bEnableMenu ) - return 0; - QPopupMenu *popup = QLineEdit::createPopupMenu(); if ( isReadOnly() ) Index: kdeui/klineedit.h =================================================================== RCS file: /home/kde/kdelibs/kdeui/klineedit.h,v retrieving revision 1.117 retrieving revision 1.117.2.1 diff -u -3 -p -r1.117 -r1.117.2.1 --- kdeui/klineedit.h 12 May 2004 06:00:00 -0000 1.117 +++ kdeui/klineedit.h 19 Sep 2004 14:17:43 -0000 1.117.2.1 @@ -500,6 +500,13 @@ protected: /** * Re-implemented for internal reasons. API not affected. * + * See QLineEdit::contextMenuEvent(). + */ + virtual void contextMenuEvent( QContextMenuEvent * ); + + /** + * Re-implemented for internal reasons. API not affected. + * * See QLineEdit::createPopupMenu(). */ virtual QPopupMenu *createPopupMenu(); Index: kdeui/klistview.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/klistview.cpp,v retrieving revision 1.225.2.1 retrieving revision 1.225.2.2 diff -u -3 -p -r1.225.2.1 -r1.225.2.2 --- kdeui/klistview.cpp 9 Aug 2004 04:28:33 -0000 1.225.2.1 +++ kdeui/klistview.cpp 17 Aug 2004 19:40:43 -0000 1.225.2.2 @@ -461,10 +461,7 @@ bool KListView::isExecuteArea( const QPo { QListViewItem* item = itemAt( point ); if ( item ) { - int offset = treeStepSize() * ( item->depth() + ( rootIsDecorated() ? 1 : 0) ); - if (point.x() > (item->width( fontMetrics() , this, 0 ) + offset )) - return false; - return isExecuteArea( point.x() ); + return isExecuteArea( point.x(), item ); } return false; @@ -472,6 +469,11 @@ bool KListView::isExecuteArea( const QPo bool KListView::isExecuteArea( int x ) { + return isExecuteArea( x, 0 ); +} + +bool KListView::isExecuteArea( int x, QListViewItem* item ) +{ if( allColumnsShowFocus() ) return true; else { @@ -483,6 +485,16 @@ bool KListView::isExecuteArea( int x ) offset += columnWidth( header()->mapToSection( index ) ); x += contentsX(); // in case of a horizontal scrollbar + + if ( item ) + { + width = treeStepSize()*( item->depth() + ( rootIsDecorated() ? 1 : 0 ) ); + width += itemMargin(); + int ca = AlignHorizontal_Mask & columnAlignment( 0 ); + if ( ca == AlignRight || ca == AlignAuto ) + width += item->width( fontMetrics(), this, 0 ); + } + return ( x > offset && x < ( offset + width ) ); } } Index: kdeui/klistview.h =================================================================== RCS file: /home/kde/kdelibs/kdeui/klistview.h,v retrieving revision 1.121 retrieving revision 1.121.2.1 diff -u -3 -p -r1.121 -r1.121.2.1 --- kdeui/klistview.h 10 Jul 2004 14:13:47 -0000 1.121 +++ kdeui/klistview.h 17 Aug 2004 19:40:43 -0000 1.121.2.1 @@ -968,6 +968,7 @@ protected: private: class KListViewPrivate; KListViewPrivate *d; + bool isExecuteArea( int x, QListViewItem* item ); }; /** Index: kdeui/kmainwindow.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kmainwindow.cpp,v retrieving revision 1.138 retrieving revision 1.138.2.1 diff -u -3 -p -r1.138 -r1.138.2.1 --- kdeui/kmainwindow.cpp 14 Jul 2004 10:33:15 -0000 1.138 +++ kdeui/kmainwindow.cpp 30 Aug 2004 00:04:47 -0000 1.138.2.1 @@ -267,6 +267,13 @@ KAction *KMainWindow::toolBarMenuAction( return d->toolBarHandler->toolBarMenuAction(); } + +void KMainWindow::setupToolbarMenuActions() +{ + if ( d->toolBarHandler ) + d->toolBarHandler->setupActions(); +} + void KMainWindow::parseGeometry(bool parsewidth) { assert ( !kapp->geometryArgument().isNull() ); @@ -458,7 +465,7 @@ void KMainWindow::setupGUI( int options, if( options & Save ){ // setupGUI() is typically called in the constructor before show(), // so the default window size will be incorrect unless the application - // hard coded the size which they should try not to do (i.e. use + // hard coded the size which they should try not to do (i.e. use // size hints). if(!isShown()) adjustSize(); Index: kdeui/kmainwindow.h =================================================================== RCS file: /home/kde/kdelibs/kdeui/kmainwindow.h,v retrieving revision 1.114 retrieving revision 1.114.2.1 diff -u -3 -p -r1.114 -r1.114.2.1 --- kdeui/kmainwindow.h 16 Jul 2004 15:17:05 -0000 1.114 +++ kdeui/kmainwindow.h 30 Aug 2004 00:04:47 -0000 1.114.2.1 @@ -430,10 +430,10 @@ public: * long/small translations, large toolbars, and other factors. * - Put the setAutoSaveSettings ( or setupGUI() ) call after all widgets * have been created and placed inside the main window (i.e. for 99% of - * apps setCentralWidget()) - * - Widgets that inherit from QWidget (like game boards) should overload + * apps setCentralWidget()) + * - Widgets that inherit from QWidget (like game boards) should overload * "virtual QSize sizeHint() const;" to specify a default size rather - * than letting QWidget::adjust use the default size of 0x0. + * than letting QWidget::adjust use the default size of 0x0. */ void setAutoSaveSettings( const QString & groupName = QString::fromLatin1("MainWindow"), bool saveWindowSize = true ); @@ -557,7 +557,7 @@ public: /** * auto-saves (and loads) the toolbar/menubar/statusbar settings and * window size using the default name. @see setAutoSaveSettings - * + * * Typically you want to let the default window size be determined by * the widgets size hints. Make sure that setupGUI() is called after * all the widgets are created ( including setCentralWidget ) so the @@ -592,6 +592,12 @@ public: */ KAction *toolBarMenuAction(); + /** + * @internal for KToolBar + * @since 3.3.1 + */ + void setupToolbarMenuActions(); + // why do we support old gcc versions? using KXMLGUIBuilder::finalizeGUI; /// @since 3.1 virtual void finalizeGUI( KXMLGUIClient *client ); Index: kdeui/kmenubar.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kmenubar.cpp,v retrieving revision 1.185 retrieving revision 1.185.2.1 diff -u -3 -p -r1.185 -r1.185.2.1 --- kdeui/kmenubar.cpp 29 Jul 2004 11:53:12 -0000 1.185 +++ kdeui/kmenubar.cpp 22 Sep 2004 14:06:16 -0000 1.185.2.1 @@ -222,8 +222,7 @@ void KMenuBar::setTopLevelMenuInternal(b setMargin( d->margin ); setMinimumSize( 0, 0 ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); - menuContentsChanged(); // trigger invalidating calculated size - resize( sizeHint()); // and resize to preferred size + updateMenuBarSize(); if ( parentWidget() ) reparent( parentWidget(), QPoint(0,0), !isHidden()); } @@ -316,9 +315,9 @@ void KMenuBar::updateFallbackSize() d->fallback_mode = false; // KWin::setStrut( winId(), 0, 0, 0, 0 ); KWin will set strut as it will see fit #endif + setMinimumSize( 0, 0 ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); - menuContentsChanged(); - resize( sizeHint()); + updateMenuBarSize(); #if defined Q_WS_X11 && ! defined K_WS_QTONLY } return; @@ -412,7 +411,7 @@ void KMenuBar::checkSize( int& w, int& h h = s.height(); --block_resize; } - // This is not done as setMinimumSize(), becase that would set the minimum + // This is not done as setMinimumSize(), because that would set the minimum // size in WM_NORMAL_HINTS, and KWin would not allow changing to smaller size // anymore w = KMAX( w, d->min_size.width()); @@ -431,14 +430,19 @@ bool KMenuBar::x11Event( XEvent* ev ) // KMenuBar keep the size it wants d->min_size = QSize( ev->xclient.data.l[ 1 ], ev->xclient.data.l[ 2 ] ); // kdDebug() << "MINSIZE:" << d->min_size << endl; - menuContentsChanged(); - resize( sizeHint()); + updateMenuBarSize(); return true; } #endif return QMenuBar::x11Event( ev ); } +void KMenuBar::updateMenuBarSize() + { + menuContentsChanged(); // trigger invalidating calculated size + resize( sizeHint()); // and resize to preferred size + } + void KMenuBar::setFrameStyle( int style ) { if( d->topLevel ) Index: kdeui/kmenubar.h =================================================================== RCS file: /home/kde/kdelibs/kdeui/kmenubar.h,v retrieving revision 1.63 retrieving revision 1.63.2.1 diff -u -3 -p -r1.63 -r1.63.2.1 --- kdeui/kmenubar.h 22 Jun 2004 13:56:18 -0000 1.63 +++ kdeui/kmenubar.h 22 Sep 2004 14:06:16 -0000 1.63.2.1 @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -//$Id: kmenubar.h,v 1.63 2004/06/22 13:56:18 ervin Exp $ +//$Id: kmenubar.h,v 1.63.2.1 2004/09/22 14:06:16 lunakl Exp $ #ifndef _KMENUBAR_H #define _KMENUBAR_H @@ -34,7 +34,7 @@ * QStyle. * * @author Daniel "Mosfet" Duley. - * @version $Id: kmenubar.h,v 1.63 2004/06/22 13:56:18 ervin Exp $ + * @version $Id: kmenubar.h,v 1.63.2.1 2004/09/22 14:06:16 lunakl Exp $ */ class KMenuBar : public QMenuBar @@ -96,6 +96,7 @@ private slots: void selectionTimeout(); private: void setTopLevelMenuInternal(bool top_level); + void updateMenuBarSize(); void checkSize( int& w, int& h ); static int block_resize; protected: Index: kdeui/knuminput.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/knuminput.cpp,v retrieving revision 1.72 retrieving revision 1.72.6.1 diff -u -3 -p -r1.72 -r1.72.6.1 --- kdeui/knuminput.cpp 10 Sep 2003 00:12:13 -0000 1.72 +++ kdeui/knuminput.cpp 17 Sep 2004 13:22:38 -0000 1.72.6.1 @@ -999,6 +999,7 @@ KDoubleSpinBox::KDoubleSpinBox( QWidget editor()->setAlignment( Qt::AlignRight ); d = new Private(); updateValidator(); + connect( this, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)) ); } KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, Index: kdeui/ktabbar.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/ktabbar.cpp,v retrieving revision 1.39 retrieving revision 1.39.2.1 diff -u -3 -p -r1.39 -r1.39.2.1 --- kdeui/ktabbar.cpp 11 Jun 2004 09:47:42 -0000 1.39 +++ kdeui/ktabbar.cpp 12 Sep 2004 19:59:21 -0000 1.39.2.1 @@ -86,6 +86,9 @@ void KTabBar::setTabEnabled( int id, boo void KTabBar::mouseDoubleClickEvent( QMouseEvent *e ) { + if( e->button() != LeftButton ) + return; + QTab *tab = selectTab( e->pos() ); if( tab!= 0L ) { emit( mouseDoubleClick( indexOf( tab->identifier() ) ) ); Index: kdeui/ktabwidget.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/ktabwidget.cpp,v retrieving revision 1.35 retrieving revision 1.35.2.1 diff -u -3 -p -r1.35 -r1.35.2.1 --- kdeui/ktabwidget.cpp 11 Jun 2004 15:34:47 -0000 1.35 +++ kdeui/ktabwidget.cpp 12 Sep 2004 19:59:21 -0000 1.35.2.1 @@ -140,6 +140,9 @@ void KTabWidget::wheelDelta( int delta ) void KTabWidget::mouseDoubleClickEvent( QMouseEvent *e ) { + if( e->button() != LeftButton ) + return; + if ( isEmptyTabbarSpace( e->pos() ) ) { emit( mouseDoubleClick() ); return; @@ -204,7 +207,7 @@ void KTabWidget::moveTab( int from, int QTab * t = new QTab(); t->setText(tablabel); QTabWidget::insertTab( w, t, to ); - + w = page( to ); changeTab( w, tabiconset, tablabel ); setTabToolTip( w, tabtooltip ); Index: kdeui/ktextedit.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/ktextedit.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- kdeui/ktextedit.cpp 13 Jul 2004 20:36:17 -0000 1.21 +++ kdeui/ktextedit.cpp 22 Aug 2004 21:42:37 -0000 1.21.2.1 @@ -111,7 +111,13 @@ void KTextEdit::keyPressEvent( QKeyEvent deleteWordForward(); e->accept(); return; - } + }/* + + HACK HACK! WORK ARROUND! + it looks like there is a bug in qt... commenting these lines fixes + some cursor movement problems with BIDI... please uncomment these + lines after QT is fixed + else if ( KStdAccel::backwardWord().contains( key ) ) { moveCursor(MoveWordBackward, false ); @@ -123,7 +129,7 @@ void KTextEdit::keyPressEvent( QKeyEvent moveCursor( MoveWordForward, false ); e->accept(); return; - } + }*/ else if ( KStdAccel::next().contains( key ) ) { moveCursor( MovePgDown, false ); Index: kdeui/ktoolbar.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/ktoolbar.cpp,v retrieving revision 1.386 retrieving revision 1.386.2.3 diff -u -3 -p -r1.386 -r1.386.2.3 --- kdeui/ktoolbar.cpp 3 Aug 2004 01:26:07 -0000 1.386 +++ kdeui/ktoolbar.cpp 16 Sep 2004 21:30:35 -0000 1.386.2.3 @@ -94,7 +94,6 @@ public: m_enableContext = true; m_xmlguiClient = 0; - m_configurePlugged = false; oldPos = Qt::DockUnmanaged; @@ -117,7 +116,6 @@ public: bool m_honorStyle : 1; bool m_isHorizontal : 1; bool m_enableContext : 1; - bool m_configurePlugged : 1; bool modified : 1; bool positioned : 1; @@ -1098,7 +1096,7 @@ void KToolBar::saveSettings(KConfig *con KMainWindow *kmw = dynamic_cast(mainWindow()); // don't save if there's only one toolbar - // Don't use kmw->toolBarIterator() because you might + // Don't use kmw->toolBarIterator() because you might // mess up someone else's iterator. Make the list on your own QPtrList toolbarList; QPtrList lst; @@ -1115,7 +1113,7 @@ void KToolBar::saveSettings(KConfig *con config->writeEntry("Index", index); else config->revertToDefault("Index"); - + if(!config->hasDefault("Offset") && offset() == d->OffsetDefault ) config->revertToDefault("Offset"); else @@ -1162,7 +1160,11 @@ void KToolBar::mousePressEvent ( QMouseE QMainWindow *mw = mainWindow(); if ( mw->toolBarsMovable() && d->m_enableContext ) { if ( m->button() == RightButton ) { + QGuardedPtr guard( this ); int i = contextMenu()->exec( m->globalPos(), 0 ); + // "Configure Toolbars" recreates toolbars, so we might not exist anymore. + if ( guard ) + slotContextAboutToHide(); switch ( i ) { case -1: return; // popup canceled @@ -1976,7 +1978,6 @@ KPopupMenu *KToolBar::contextMenu() { if ( context ) return context; - // Construct our context popup menu. Name it qt_dockwidget_internal so it // won't be deleted by QToolBar::clear(). context = new KPopupMenu( this, "qt_dockwidget_internal" ); @@ -2052,7 +2053,7 @@ KPopupMenu *KToolBar::contextMenu() break; } } - } + } } context->insertItem( i18n("Orientation"), orient ); @@ -2061,38 +2062,38 @@ KPopupMenu *KToolBar::contextMenu() context->setItemChecked(CONTEXT_ICONS, true); context->insertItem( i18n("Icon Size"), size ); - KMainWindow *kmw = dynamic_cast(mainWindow()); - if ( kmw ) - { - if ( kmw->toolBarMenuAction() && kmw->hasMenuBar() ) - kmw->toolBarMenuAction()->plug(context); - } - connect( context, SIGNAL( aboutToShow() ), this, SLOT( slotContextAboutToShow() ) ); - connect( context, SIGNAL( aboutToHide() ), this, SLOT( slotContextAboutToHide() ) ); + // Unplugging a submenu from abouttohide leads to the popupmenu floating around + // So better simply call that code from after exec() returns (DF) + //connect( context, SIGNAL( aboutToHide() ), this, SLOT( slotContextAboutToHide() ) ); return context; } void KToolBar::slotContextAboutToShow() { - if (!d->m_configurePlugged) - { - // try to find "configure toolbars" action - KXMLGUIClient *xmlGuiClient = d->m_xmlguiClient; - - KMainWindow *kmw = dynamic_cast(mainWindow()); - if ( !xmlGuiClient && kmw ) - xmlGuiClient = kmw; - if ( xmlGuiClient ) - { - KAction *configureAction = xmlGuiClient->actionCollection()->action(KStdAction::stdName(KStdAction::ConfigureToolbars)); - if ( configureAction ) - { - configureAction->plug(context); - d->m_configurePlugged = true; - } - } + // The idea here is to reuse the "static" part of the menu to save time. + // But the "Toolbars" action is dynamic (can be a single action or a submenu) + // and ToolBarHandler::setupActions() deletes it, so better not keep it around. + // So we currently plug/unplug the last two actions of the menu. + // Another way would be to keep around the actions and plug them all into a (new each time) popupmenu. + KMainWindow *kmw = dynamic_cast(mainWindow()); + if ( kmw ) { + kmw->setupToolbarMenuActions(); + // Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar) + KAction *tbAction = kmw->toolBarMenuAction(); + if ( tbAction && tbAction->containerCount() > 0 ) + tbAction->plug(context); } + + // try to find "configure toolbars" action + KAction *configureAction = 0; + const char* actionName = KStdAction::name(KStdAction::ConfigureToolbars); + if ( d->m_xmlguiClient ) + configureAction = d->m_xmlguiClient->actionCollection()->action(actionName); + if ( !configureAction && kmw ) + configureAction = kmw->actionCollection()->action(actionName); + if ( configureAction ) + configureAction->plug(context); KEditToolbar::setDefaultToolbar(QObject::name()); for(int i = CONTEXT_ICONS; i <= CONTEXT_TEXTUNDER; ++i) @@ -2153,6 +2154,23 @@ void KToolBar::slotContextAboutToShow() void KToolBar::slotContextAboutToHide() { + // We have to unplug whatever slotContextAboutToShow plugged into the menu. + // Unplug the toolbar menu action + KMainWindow *kmw = dynamic_cast(mainWindow()); + if ( kmw && kmw->toolBarMenuAction() ) + if ( kmw->toolBarMenuAction()->containerCount() > 1 ) + kmw->toolBarMenuAction()->unplug(context); + + // Unplug the configure toolbars action too, since it's afterwards anyway + KAction *configureAction = 0; + const char* actionName = KStdAction::name(KStdAction::ConfigureToolbars); + if ( d->m_xmlguiClient ) + configureAction = d->m_xmlguiClient->actionCollection()->action(actionName); + if ( !configureAction && kmw ) + configureAction = kmw->actionCollection()->action(actionName); + if ( configureAction ) + configureAction->unplug(context); + QPtrListIterator it( widgets ); QWidget *wdg; while ( ( wdg = it.current() ) != 0 ) { Index: kdeui/kdetrayproxy/kdetrayproxy.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeui/kdetrayproxy/kdetrayproxy.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -3 -p -r1.3 -r1.3.2.1 --- kdeui/kdetrayproxy/kdetrayproxy.cpp 14 Jun 2004 13:22:23 -0000 1.3 +++ kdeui/kdetrayproxy/kdetrayproxy.cpp 24 Sep 2004 00:40:28 -0000 1.3.2.1 @@ -17,32 +17,17 @@ * */ -#if !defined(_POSIX_C_SOURCE) -#define _POSIX_C_SOURCE 199309 -#elif _POSIX_C_SOURCE < 199309 -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 199309 -#endif - #include "kdetrayproxy.h" #include #include #include #include -#include -#include - -// XXX: FreeBSD 4.x has a buggy time.h and doesn't like the _POSIX_C_SOURCE hacks above. -#if defined(__FreeBSD__) -#include -#if __FreeBSD_version < 500042 -#warning FreeBSD 4.x compatibility shims in effect +#include #include -// nanosleep is the protoype crunched by the _POSIX_C_SOURCE hack above -int nanosleep(const struct timespec *, struct timespec *); -#endif -#endif +#include +#include +#include KDETrayProxy::KDETrayProxy() : selection( makeSelectionAtom()) @@ -189,10 +174,10 @@ void KDETrayProxy::withdrawWindow( Windo } if( withdrawn ) return; // ---> - struct timespec tm; + struct timeval tm; tm.tv_sec = 0; - tm.tv_nsec = 10 * 1000 * 1000; // 10ms - nanosleep( &tm, NULL ); + tm.tv_usec = 10 * 1000; // 10ms + select(0, NULL, NULL, NULL, &tm); } } Index: kdeui/kdetrayproxy/kdetrayproxy.desktop =================================================================== RCS file: /home/kde/kdelibs/kdeui/kdetrayproxy/kdetrayproxy.desktop,v retrieving revision 1.35 retrieving revision 1.35.2.4 diff -u -3 -p -r1.35 -r1.35.2.4 --- kdeui/kdetrayproxy/kdetrayproxy.desktop 4 Aug 2004 06:46:49 -0000 1.35 +++ kdeui/kdetrayproxy/kdetrayproxy.desktop 20 Sep 2004 13:53:18 -0000 1.35.2.4 @@ -23,12 +23,14 @@ Name[pa]=KDE ਟਰੇ ਪਰਾਕਸ Name[pl]=Moduł pośrednika tacki systemowej KDE Name[pt]=Módulo de 'Proxy' de Bandeja do KDE Name[pt_BR]=Módulo de Proxy do Painel do KDE +Name[ro]=Modul proxy pentru tava de sistem KDE Name[sk]=Modul pre proxy lišty KDE Name[sr]=Прокси модул KDE-ове касете Name[sr@Latn]=Прокси модул KDE-ове касете Name[sv]=KDE-proxymodul för systembricka +Name[ta]=KDE தட்டு மாற்று பதிலாள் கூறு Name[tg]=Новаи KDE-и модули прокси -Name[xx]=xxKDE Tray Proxy Modulexx +Name[uk]=Модуль посередника для програм в системному лотку Name[zh_CN]=KDE 托盘代理模块 Comment=Proxy enabling KDE systray applications to work without KWin Comment[bg]=Модул, който позволява на програмите от КДЕ да работят в системния поднос с други мениджъри на прозорци @@ -53,13 +55,15 @@ Comment[pa]=KWin ਬਿਨਾਂ ਕੰ Comment[pl]=Pośrednik, umożliwiający działanie aplikacji wymagających tacki systemowej KDE bez KWin Comment[pt]='Proxy' que permite aplicações da bandeja de sistema do KDE funcionarem sem o KWin Comment[pt_BR]=Habilita o funcionamento do proxy em aplicativos sem o KWin +Comment[ro]=Permite aplicaţiilor pentru tava de sistem KDE să lucreze fără suport din partea KWin +Comment[se]=Moduvla mii dagaha ahte KDE:a vuogádatgárcoprográmmat doibmet KWin haga. Comment[sk]=Proxy pre aplikácie z lišty KDE, aby nevyžadovali KWin Comment[sr]=Прокси који омогућава KDE програмима за системску касету да раде без KWin-а Comment[sr@Latn]=Прокси који омогућава KDE програмима за системску касету да раде без KWin-а Comment[sv]=Proxymodul som gör det möjligt för KDE:s program i systembrickan att fungera utan Kwin Comment[ta]=மாற்று பதிலாள் KDE அமைப்பு தட்டு பயன்பாட்டை KWin இல்லாமல் வேலை செய்ய செயல்படுத்துகிறது Comment[tg]=Proxy барномаҳои KDE systray-ро барои корнамоӣ, бидуни KWin фаъол месозад -Comment[xx]=xxProxy enabling KDE systray applications to work without KWinxx +Comment[uk]=Програма посередник яка дозволяє працювати програмам для KDE, що використовують системний лоток без працюючого KWin Comment[zh_CN]=允许 KDE 系统托盘应用程序在没有 KWin 的情况下工作 ServiceTypes=KDEDModule X-KDE-ModuleType=Library Index: kdoctools/meinproc.cpp =================================================================== RCS file: /home/kde/kdelibs/kdoctools/meinproc.cpp,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -u -3 -p -r1.38 -r1.38.2.1 --- kdoctools/meinproc.cpp 11 Jul 2004 22:31:59 -0000 1.38 +++ kdoctools/meinproc.cpp 28 Aug 2004 20:39:00 -0000 1.38.2.1 @@ -77,7 +77,7 @@ static KCmdLineOptions options[] = { "htdig", I18N_NOOP( "Create a ht://dig compatible index" ), 0 }, { "check", I18N_NOOP( "Check the document for validity" ), 0 }, { "cache ", I18N_NOOP( "Create a cache file for the document" ), 0}, - { "srcdir

", I18N_NOOP( "Cet the srcdir, for kdelibs" ), 0}, + { "srcdir ", I18N_NOOP( "Set the srcdir, for kdelibs" ), 0}, { "+xml", I18N_NOOP("The file to transform"), 0}, KCmdLineLastOption // End of options. }; @@ -90,7 +90,7 @@ int main(int argc, char **argv) { // xsltSetGenericDebugFunc(stderr, NULL); KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ), - "$Revision: 1.38 $", + "$Revision: 1.38.2.1 $", I18N_NOOP("KDE Translator for XML")); KCmdLineArgs::init(argc, argv, &aboutData); Index: kdoctools/customization/fr/user.entities =================================================================== RCS file: /home/kde/kdelibs/kdoctools/customization/fr/user.entities,v retrieving revision 1.58 retrieving revision 1.58.2.4 diff -u -3 -p -r1.58 -r1.58.2.4 --- kdoctools/customization/fr/user.entities 3 Aug 2004 19:09:10 -0000 1.58 +++ kdoctools/customization/fr/user.entities 22 Sep 2004 05:15:46 -0000 1.58.2.4 @@ -8,6 +8,9 @@ +DavidAmmouial
Traduction française'> +DavidAmmouial
Relecture de la documentation française'> + ÉricBischoff
e.bischoff@noos.fr
Traduction française'> ÉricBischoff
e.bischoff@noos.fr
Relecture de la documentation française'> @@ -77,6 +80,9 @@ Jean-JacquesFreulon
jeanjacques.freulon@free.fr
Traduction française'> Jean-JacquesFreulon
jeanjacques.freulon@free.fr
Relecture de la documentation française'> +SylvainGarsault
sylvain.garsault@freesbee.fr
Traduction française'> +SylvainGarsault
sylvain.garsault@freesbee.fr
Relecture de la documentation française'> + LudovicGrossard
guilbertph@wanadoo.fr
Traduction française'> LudovicGrossard
guilbertph@wanadoo.fr
Relecture de la documentation française'> @@ -104,6 +110,9 @@ PatrickMichelon
patrick.michelon@free.fr
Traduction française'> PatrickMichelon
patrick.michelon@free.fr
Relecture de la documentation française'> +JulienMorot
julien@momonux.org
Traduction française'> +JulienMorot
ulien@momonux.org
Relecture de la documentation française'> + Pierre-EmmanuelMüller
pem@levillage.org
Traduction française'> Pierre-EmmanelMüller
pem@levillage.org
Relecture de la documentation française'> @@ -134,6 +143,7 @@ +'> e.bischoff@noos.fr'> 01246774@brookes.ac.uk'> ybrenner@chez.com'> @@ -157,6 +167,7 @@ nilsfernandez@yahoo.fr'> frederic.foiry@wanadoo.fr'> jeanjacques.freulon@free.fr'> +sylvain.garsault@freesbee.fr'> grossard@kde.org'> yv_guil@club-internet.fr'> guilbertph@wanadoo.fr'> @@ -166,6 +177,7 @@ clefebvre@netcourrier.com'> annemarie.mahfouf@free.fr'> patrick.michelon@free.fr'> +julien@momonux.org'> pem@levillage.org'> cedric.pasteur@free.fr'> bpinaud@ifrance.com'> Index: kdoctools/customization/it/entities/underFDL.docbook =================================================================== RCS file: /home/kde/kdelibs/kdoctools/customization/it/entities/underFDL.docbook,v retrieving revision 1.2 retrieving revision 1.2.10.1 diff -u -3 -p -r1.2 -r1.2.10.1 --- kdoctools/customization/it/entities/underFDL.docbook 4 Mar 2002 09:42:16 -0000 1.2 +++ kdoctools/customization/it/entities/underFDL.docbook 21 Sep 2004 20:20:00 -0000 1.2.10.1 @@ -1,4 +1,3 @@ -Questa documentazione è concessa in licenza sotto i termini della GNU Free Documentation -License. +Questa documentazione è concessa in licenza sotto i termini della +GNU Free Documentation License. Index: kdoctools/docbook/xsl/common/pt.xml =================================================================== RCS file: /home/kde/kdelibs/kdoctools/docbook/xsl/common/pt.xml,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kdoctools/docbook/xsl/common/pt.xml 28 Jul 2004 22:13:38 -0000 1.8 +++ kdoctools/docbook/xsl/common/pt.xml 1 Sep 2004 19:42:55 -0000 1.8.2.1 @@ -206,6 +206,7 @@ + Index: khtml/ChangeLog =================================================================== RCS file: /home/kde/kdelibs/khtml/ChangeLog,v retrieving revision 1.275 retrieving revision 1.275.2.1 diff -u -3 -p -r1.275 -r1.275.2.1 --- khtml/ChangeLog 5 Aug 2004 00:32:32 -0000 1.275 +++ khtml/ChangeLog 11 Sep 2004 00:32:34 -0000 1.275.2.1 @@ -1,3 +1,8 @@ +2004-09-11 David Faure + + * khtml_part.cpp (defaultEncoding, encoding, createDecoder): + Make default charset latin1 over HTTP, keep default to locale on other protocols. + 2004-08-05 Germain Garand * rendering/render_block.cpp (layoutBlockChildren): when positionning floats, Index: khtml/khtml.desktop =================================================================== RCS file: /home/kde/kdelibs/khtml/khtml.desktop,v retrieving revision 1.201 retrieving revision 1.201.2.2 diff -u -3 -p -r1.201 -r1.201.2.2 --- khtml/khtml.desktop 27 Jul 2004 07:23:23 -0000 1.201 +++ khtml/khtml.desktop 31 Aug 2004 07:21:23 -0000 1.201.2.2 @@ -25,7 +25,7 @@ Comment[fr]=Composant d'affichage HTML i Comment[ga]=Comhpháirt inleabaithe amharctha HTML Comment[gl]=Compoñente embebible de visualización de HTML Comment[he]=רכיב בר-הטבעה לתצוגת HTML -Comment[hi]=अंतरनिहित योग्य HTML दर्शक घटक +Comment[hi]=अंतर्निहित योग्य HTML दर्शक घटक Comment[hr]=HTML komponenta koja se može umetnuti Comment[hu]=Beágyazható HTML-néző komponens Comment[id]=Komponen untuk melihat HTML yang embeddable @@ -67,7 +67,6 @@ Comment[uz]=Ичига ўрнатиб б Comment[ven]=Khomphonente ya HTML yau vhona Comment[vi]=Component đềExem HTML có thềEembeđ được Comment[xh]=Inxenye yemboniselo elungisiweyo ye HTML -Comment[xx]=xxEmbeddable HTML viewing componentxx Comment[zh_CN]=可嵌入的 HTML 查看部件 Comment[zh_TW]=可嵌入的 HTML 檢視元件 Comment[zu]= Ilunga lokubuka le-HTML Eshuthekiwe @@ -76,7 +75,6 @@ Icon=konqueror Name=KHTML Name[af]=Khtml Name[hi]=केएचटीएमएल (KHTML) -Name[xx]=xxKHTMLxx ServiceTypes=KParts/ReadOnlyPart,Browser/View X-KDE-Library=libkhtmlpart InitialPreference=10 Index: khtml/khtml_caret.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/khtml_caret.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- khtml/khtml_caret.cpp 3 Aug 2004 08:35:44 -0000 1.21 +++ khtml/khtml_caret.cpp 7 Sep 2004 12:31:35 -0000 1.21.2.1 @@ -605,7 +605,7 @@ static RenderObject* findRenderer(NodeIm if (r && isUnsuitable(r, trav)) { r = advanceSuitableObject(r, trav, false, base, state); mapTraversalStateToRenderPos(trav, false, outside, outsideEnd); - r_ofs = r->minOffset(); + if (r) r_ofs = r->minOffset(); } #if DEBUG_CARETMODE > 3 kdDebug(6200) << "2r " << r << endl; Index: khtml/khtml_part.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v retrieving revision 1.1015.2.2 retrieving revision 1.1015.2.4 diff -u -3 -p -r1.1015.2.2 -r1.1015.2.4 --- khtml/khtml_part.cpp 8 Aug 2004 16:40:04 -0000 1.1015.2.2 +++ khtml/khtml_part.cpp 11 Sep 2004 00:32:34 -0000 1.1015.2.4 @@ -575,6 +575,7 @@ bool KHTMLPart::openURL( const KURL &url args.xOffset = d->m_view->contentsX(); args.yOffset = d->m_view->contentsY(); d->m_extension->setURLArgs(args); + disconnect(d->m_view, SIGNAL(finishedLayout()), this, SLOT(gotoAnchor())); connect(d->m_view, SIGNAL(finishedLayout()), this, SLOT(restoreScrollPosition())); } @@ -2224,7 +2225,20 @@ QString KHTMLPart::encoding() const if(d->m_decoder && d->m_decoder->encoding()) return QString(d->m_decoder->encoding()); - return(settings()->encoding()); + return defaultEncoding(); +} + +QString KHTMLPart::defaultEncoding() const +{ + QString encoding = settings()->encoding(); + if ( !encoding.isEmpty() ) + return encoding; + // HTTP requires the default encoding to be latin1, when neither + // the user nor the page requested a particular encoding. + if ( url().protocol().startsWith( "http" ) ) + return "iso-8859-1"; + else + return KGlobal::locale()->encoding(); } void KHTMLPart::setUserStyleSheet(const KURL &url) @@ -2241,9 +2255,12 @@ void KHTMLPart::setUserStyleSheet(const void KHTMLPart::gotoAnchor() { - disconnect(d->m_view, SIGNAL(finishedLayout()), this, SLOT(gotoAnchor())); - if ( !gotoAnchor( m_url.encodedHtmlRef()) ) - gotoAnchor( m_url.htmlRef() ); + if ( !d->m_doc || !d->m_doc->parsing() ) { + disconnect(d->m_view, SIGNAL(finishedLayout()), this, SLOT(gotoAnchor())); + } + + if ( !gotoAnchor(m_url.encodedHtmlRef()) ) + gotoAnchor(m_url.htmlRef()); } bool KHTMLPart::gotoAnchor( const QString &name ) @@ -2261,7 +2278,13 @@ bool KHTMLPart::gotoAnchor( const QStrin n = d->m_doc->getElementById( name ); } - if(!n) { + // Implement the rule that "" and "top" both mean top of page as in other browsers. + bool quirkyName = !n && !d->m_doc->inStrictMode() && (name.isEmpty() || name.lower() == "top"); + + if (quirkyName) { + d->m_view->setContentsPos(0, 0); + return true; + } else if (!n) { kdDebug(6050) << "KHTMLPart::gotoAnchor node '" << name << "' not found" << endl; return false; } @@ -6380,7 +6403,7 @@ khtml::Decoder *KHTMLPart::createDecoder if( !d->m_encoding.isNull() ) dec->setEncoding( d->m_encoding.latin1(), true ); else - dec->setEncoding( settings()->encoding().latin1(), d->m_haveEncoding ); + dec->setEncoding( defaultEncoding().latin1(), d->m_haveEncoding ); dec->setAutoDetectLanguage( d->m_autoDetectLanguage ); return dec; Index: khtml/khtml_part.h =================================================================== RCS file: /home/kde/kdelibs/khtml/khtml_part.h,v retrieving revision 1.262 retrieving revision 1.262.2.1 diff -u -3 -p -r1.262 -r1.262.2.1 --- khtml/khtml_part.h 3 Aug 2004 14:34:43 -0000 1.262 +++ khtml/khtml_part.h 11 Sep 2004 00:32:34 -0000 1.262.2.1 @@ -179,7 +179,7 @@ namespace KWallet * * @short HTML Browser Widget * @author Lars Knoll (knoll@kde.org) - * @version $Id: khtml_part.h,v 1.262 2004/08/03 14:34:43 waba Exp $ + * @version $Id: khtml_part.h,v 1.262.2.1 2004/09/11 00:32:34 faure Exp $ * */ class KHTMLPart : public KParts::ReadOnlyPart @@ -1551,6 +1551,7 @@ private: */ bool isExtendingSelection() const; khtml::Decoder *createDecoder(); + QString defaultEncoding() const; /** @internal * generic zoom in Index: khtml/khtml_settings.cc =================================================================== RCS file: /home/kde/kdelibs/khtml/khtml_settings.cc,v retrieving revision 1.103 retrieving revision 1.103.2.1 diff -u -3 -p -r1.103 -r1.103.2.1 --- khtml/khtml_settings.cc 13 Jun 2004 11:50:18 -0000 1.103 +++ khtml/khtml_settings.cc 11 Sep 2004 00:32:34 -0000 1.103.2.1 @@ -322,11 +322,8 @@ void KHTMLSettings::init( KConfig * conf d->fonts = config->readListEntry( "Fonts" ); - if ( reset || config->hasKey( "DefaultEncoding" ) ) { + if ( reset || config->hasKey( "DefaultEncoding" ) ) d->m_encoding = config->readEntry( "DefaultEncoding", "" ); - if ( d->m_encoding.isEmpty() ) - d->m_encoding = KGlobal::locale()->encoding(); - } if ( reset || config->hasKey( "EnforceDefaultCharset" ) ) d->enforceCharset = config->readBoolEntry( "EnforceDefaultCharset", false ); Index: khtml/khtmlimage.desktop =================================================================== RCS file: /home/kde/kdelibs/khtml/khtmlimage.desktop,v retrieving revision 1.146 retrieving revision 1.146.2.2 diff -u -3 -p -r1.146 -r1.146.2.2 --- khtml/khtmlimage.desktop 27 Jul 2004 07:23:23 -0000 1.146 +++ khtml/khtmlimage.desktop 31 Aug 2004 07:21:23 -0000 1.146.2.2 @@ -23,7 +23,7 @@ Comment[fi]=Upotettava kuviennäyttökom Comment[fr]=Composant d'affichage d'images intégrable Comment[gl]=Compoñente de visualización de imaxes embebible Comment[he]=רכיב בר-הטבעה להצגת תמונות -Comment[hi]=अंतरनिहित योग्य छवि दर्शक घटक +Comment[hi]=अंतर्निहित योग्य छवि दर्शक घटक Comment[hr]=Ugradiva komponenta za pregled slika Comment[hu]=Beágyazható képnéző komponens Comment[id]=Komponen melihat gambar yang embeddable @@ -64,7 +64,6 @@ Comment[uz]=Ичига ўрнатиб б Comment[ven]=Khomphonente yau vhona tshifanyiso Comment[vi]=Component đềExem ảnh có thềEembeđ được Comment[xh]=Ingxenye Yemboniselo Yomfanekiso Olungisiweyo -Comment[xx]=xxEmbeddable Image Viewing Componentxx Comment[zh_CN]=可嵌入的图像查看部件 Comment[zh_TW]=可嵌入的影像檢視元件 Comment[zu]=Ilunga Lokubukisa Isithombe Elishuthekayo @@ -92,7 +91,7 @@ Name[fr]=Afficheur d'images intégrable Name[ga]=Amharcán Íomhánna Inleabaithe Name[gl]=Visualizador de Imaxes Embebible Name[he]=מציג תמונות בר-הטבעה -Name[hi]=अंतरनिहित छवि दर्शक +Name[hi]=अंतर्निहित छवि दर्शक Name[hr]=Ugradivi preglednik slika Name[hu]=Beágyazható képnézegető Name[id]=Viewer gambar yang embeddable @@ -134,7 +133,6 @@ Name[ven]=Muvhoni wa tshifanyiso o dzhen Name[vi]=Trình xem ảnh có thềEembeđ được Name[wa]=Ravalé håyneu d' imådjes Name[xh]=Umboniseli Womfanekiso Olungisiweyo -Name[xx]=xxEmbeddable Image Viewerxx Name[zh_CN]=可嵌入的图像查看器 Name[zh_TW]=可嵌入的影像檢視器 Name[zu]=Isithombe Sombukisi Oshuthisekayo Index: khtml/khtmlview.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/khtmlview.cpp,v retrieving revision 1.660.2.2 retrieving revision 1.660.2.3 diff -u -3 -p -r1.660.2.2 -r1.660.2.3 --- khtml/khtmlview.cpp 9 Aug 2004 08:58:11 -0000 1.660.2.2 +++ khtml/khtmlview.cpp 28 Aug 2004 14:05:09 -0000 1.660.2.3 @@ -1935,7 +1935,9 @@ void KHTMLView::displayAccessKeys() lab->setFrameStyle(QFrame::Box | QFrame::Plain); lab->setMargin(3); lab->adjustSize(); - addChild(lab,rec.left()+rec.width()/2,rec.top()+rec.height()/2); + addChild(lab, + KMIN(rec.left()+rec.width()/2, contentsWidth() - lab->width()), + KMIN(rec.top()+rec.height()/2, contentsHeight() - lab->height())); showChild(lab); } } Index: khtml/test_regression.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/test_regression.cpp,v retrieving revision 1.102 retrieving revision 1.102.2.1 diff -u -3 -p -r1.102 -r1.102.2.1 --- khtml/test_regression.cpp 29 Jul 2004 14:09:09 -0000 1.102 +++ khtml/test_regression.cpp 7 Sep 2004 15:27:54 -0000 1.102.2.1 @@ -25,7 +25,9 @@ #include #include #include +#include #include +#include #include #include @@ -373,7 +375,15 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { // forget about any settings - setenv( "KDEHOME", "/var/tmp/non_existant", 1 ); + passwd* pw = getpwuid( getuid() ); + if (!pw) { + fprintf(stderr, "dang, I don't even know who I am.\n"); + exit(1); + } + + QString kh("/var/tmp/%1-khtml_testregression"); + kh = kh.arg( pw->pw_name ); + setenv( "KDEHOME", kh.latin1(), 1 ); setenv( "LC_ALL", "C", 1 ); setenv( "LANG", "C", 1 ); Index: khtml/css/cssstyleselector.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/css/cssstyleselector.cpp,v retrieving revision 1.314 retrieving revision 1.314.2.1 diff -u -3 -p -r1.314 -r1.314.2.1 --- khtml/css/cssstyleselector.cpp 13 Jun 2004 17:08:23 -0000 1.314 +++ khtml/css/cssstyleselector.cpp 26 Sep 2004 17:06:28 -0000 1.314.2.1 @@ -2034,6 +2034,7 @@ void CSSStyleSelector::applyRule( int id case CSS_PROP_UNICODE_BIDI: { HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi) + if(!primitiveValue) break; switch (primitiveValue->getIdent()) { case CSS_VAL_NORMAL: style->setUnicodeBidi(UBNormal); @@ -2052,6 +2053,7 @@ void CSSStyleSelector::applyRule( int id case CSS_PROP_TEXT_TRANSFORM: { HANDLE_INHERIT_AND_INITIAL(textTransform, TextTransform) + if(!primitiveValue) break; if(!primitiveValue->getIdent()) return; ETextTransform tt; @@ -2070,6 +2072,7 @@ void CSSStyleSelector::applyRule( int id { HANDLE_INHERIT_AND_INITIAL(visibility, Visibility) + if(!primitiveValue) break; switch( primitiveValue->getIdent() ) { case CSS_VAL_HIDDEN: style->setVisibility( HIDDEN ); @@ -2087,6 +2090,7 @@ void CSSStyleSelector::applyRule( int id case CSS_PROP_WHITE_SPACE: HANDLE_INHERIT_AND_INITIAL(whiteSpace, WhiteSpace) + if(!primitiveValue) break; if(!primitiveValue->getIdent()) return; EWhiteSpace s; Index: khtml/ecma/kjs_html.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/ecma/kjs_html.cpp,v retrieving revision 1.266 retrieving revision 1.266.2.2 diff -u -3 -p -r1.266 -r1.266.2.2 --- khtml/ecma/kjs_html.cpp 9 Jun 2004 10:31:16 -0000 1.266 +++ khtml/ecma/kjs_html.cpp 7 Sep 2004 15:19:54 -0000 1.266.2.2 @@ -53,6 +53,7 @@ #include "misc/htmlattrs.h" #include "rendering/render_object.h" #include "rendering/render_canvas.h" +#include "rendering/render_layer.h" #include "kmessagebox.h" #include @@ -163,6 +164,7 @@ const ClassInfo KJS::HTMLDocument::info height HTMLDocument::Height DontDelete|ReadOnly width HTMLDocument::Width DontDelete|ReadOnly dir HTMLDocument::Dir DontDelete + compatMode HTMLDocument::CompatMode DontDelete|ReadOnly #IE extension frames HTMLDocument::Frames DontDelete|ReadOnly #potentially obsolete array properties @@ -326,6 +328,9 @@ Value KJS::HTMLDocument::tryGet(ExecStat case CaptureEvents: case ReleaseEvents: return lookupOrCreateFunction( exec, propertyName, this, entry->value, entry->params, entry->attr ); + case CompatMode: + return getString(static_cast(doc.handle())->parseMode() + == DocumentImpl::Compat ? "BackCompat" : "CSS1Compat"); } } // Look for overrides @@ -505,6 +510,7 @@ const ClassInfo KJS::HTMLElement::tablec const ClassInfo KJS::HTMLElement::frameSet_info = { "HTMLFrameSetElement", &KJS::HTMLElement::info, &HTMLFrameSetElementTable, 0 }; const ClassInfo KJS::HTMLElement::frame_info = { "HTMLFrameElement", &KJS::HTMLElement::info, &HTMLFrameElementTable, 0 }; const ClassInfo KJS::HTMLElement::iFrame_info = { "HTMLIFrameElement", &KJS::HTMLElement::info, &HTMLIFrameElementTable, 0 }; +const ClassInfo KJS::HTMLElement::marquee_info = { "HTMLMarqueeElement", &KJS::HTMLElement::info, &HTMLMarqueeElementTable, 0 }; const ClassInfo* KJS::HTMLElement::classInfo() const { @@ -629,6 +635,8 @@ const ClassInfo* KJS::HTMLElement::class return &frame_info; case ID_IFRAME: return &iFrame_info; + case ID_MARQUEE: + return &marquee_info; default: return &info; } @@ -1087,6 +1095,12 @@ const ClassInfo* KJS::HTMLElement::class src KJS::HTMLElement::IFrameSrc DontDelete width KJS::HTMLElement::IFrameWidth DontDelete @end + +@begin HTMLMarqueeElementTable 2 + start KJS::HTMLElement::MarqueeStart DontDelete|Function 0 + stop KJS::HTMLElement::MarqueeStop DontDelete|Function 0 +@end + */ class EmbedLiveConnect : public ObjectImp { @@ -2281,6 +2295,21 @@ Value KJS::HTMLElementFunction::tryCall( } break; } + case ID_MARQUEE: { + if (id == KJS::HTMLElement::MarqueeStart && element.handle()->renderer() && + element.handle()->renderer()->layer() && + element.handle()->renderer()->layer()->marquee()) { + element.handle()->renderer()->layer()->marquee()->start(); + return Undefined(); + } + else if (id == KJS::HTMLElement::MarqueeStop && element.handle()->renderer() && + element.handle()->renderer()->layer() && + element.handle()->renderer()->layer()->marquee()) { + element.handle()->renderer()->layer()->marquee()->stop(); + return Undefined(); + } + break; + } } return Undefined(); Index: khtml/ecma/kjs_html.h =================================================================== RCS file: /home/kde/kdelibs/khtml/ecma/kjs_html.h,v retrieving revision 1.78 retrieving revision 1.78.4.2 diff -u -3 -p -r1.78 -r1.78.4.2 --- khtml/ecma/kjs_html.h 12 Feb 2004 18:02:30 -0000 1.78 +++ khtml/ecma/kjs_html.h 7 Sep 2004 15:19:54 -0000 1.78.4.2 @@ -49,7 +49,7 @@ namespace KJS { Images, Applets, Links, Forms, Anchors, Scripts, All, Clear, Open, Close, Write, WriteLn, GetElementsByName, GetSelection, CaptureEvents, ReleaseEvents, BgColor, FgColor, AlinkColor, LinkColor, VlinkColor, LastModified, - Height, Width, Dir, Frames }; + Height, Width, Dir, Frames, CompatMode }; DOM::Document toDocument() const { return static_cast( node ); } }; @@ -75,7 +75,7 @@ namespace KJS { hr_info, mod_info, a_info, img_info, object_info, param_info, applet_info, map_info, area_info, script_info, table_info, caption_info, col_info, tablesection_info, tr_info, - tablecell_info, frameSet_info, frame_info, iFrame_info; + tablecell_info, frameSet_info, frame_info, iFrame_info, marquee_info; enum { HtmlVersion, HeadProfile, LinkHref, LinkRel, LinkMedia, LinkCharset, LinkDisabled, LinkHrefLang, LinkRev, LinkTarget, LinkType, @@ -145,6 +145,7 @@ namespace KJS { FrameNoResize, IFrameLongDesc, IFrameAlign, IFrameFrameBorder, IFrameSrc, IFrameName, IFrameHeight, IFrameMarginHeight, IFrameMarginWidth, IFrameScrolling, IFrameWidth, IFrameContentDocument, + MarqueeStart, MarqueeStop, ElementInnerHTML, ElementTitle, ElementId, ElementDir, ElementLang, ElementClassName, ElementInnerText, ElementDocument, ElementChildren, ElementAll }; Index: khtml/html/html_elementimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/html/html_elementimpl.cpp,v retrieving revision 1.179 retrieving revision 1.179.2.1 diff -u -3 -p -r1.179 -r1.179.2.1 --- khtml/html/html_elementimpl.cpp 13 Jun 2004 17:08:24 -0000 1.179 +++ khtml/html/html_elementimpl.cpp 7 Sep 2004 10:27:19 -0000 1.179.2.1 @@ -435,7 +435,10 @@ void HTMLElementImpl::removeCSSProperty( DOMString HTMLElementImpl::innerHTML() const { - return toString(); + DOMString result; + for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) + result += child->toString(); + return result; } DOMString HTMLElementImpl::innerText() const Index: khtml/html/html_formimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/html/html_formimpl.cpp,v retrieving revision 1.380.2.1 retrieving revision 1.380.2.5 diff -u -3 -p -r1.380.2.1 -r1.380.2.5 --- khtml/html/html_formimpl.cpp 9 Aug 2004 08:58:12 -0000 1.380.2.1 +++ khtml/html/html_formimpl.cpp 14 Sep 2004 15:01:34 -0000 1.380.2.5 @@ -20,7 +20,7 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id: html_formimpl.cpp,v 1.380.2.1 2004/08/09 08:58:12 coolo Exp $ + * $Id: html_formimpl.cpp,v 1.380.2.5 2004/09/14 15:01:34 binner Exp $ */ #undef FORMS_DEBUG @@ -290,7 +290,16 @@ QByteArray HTMLFormElementImpl::formData memcpy(form_data.data() + old_size + hstr.length(), *it, (*it).size()); form_data[form_data.size()-2] = '\r'; form_data[form_data.size()-1] = '\n'; - } + + // reset unsubmittedFormChange flag + if (current->id() == ID_INPUT && + static_cast(current)->inputType() == HTMLInputElementImpl::TEXT) + static_cast(current)->setUnsubmittedFormChange(false); + + if (current->id() == ID_TEXTAREA) + static_cast(current)->setUnsubmittedFormChange(false); + + } } } } @@ -1106,7 +1115,7 @@ void HTMLInputElementImpl::restoreState( break; default: setValue(DOMString(state.left(state.length()-1))); - m_unsubmittedFormChange = (state.right(1)=="M"); + m_unsubmittedFormChange = state.endsWith("M"); break; } } @@ -2203,6 +2212,7 @@ HTMLTextAreaElementImpl::HTMLTextAreaEle m_cols = 20; m_wrap = ta_Virtual; m_dirtyvalue = true; + m_initialized = false; m_unsubmittedFormChange = false; } @@ -2229,7 +2239,7 @@ QString HTMLTextAreaElementImpl::state( void HTMLTextAreaElementImpl::restoreState(const QString &state) { setDefaultValue(state.left(state.length()-1)); - m_unsubmittedFormChange = (state.right(1)=="M"); + m_unsubmittedFormChange = state.endsWith("M"); // the close() in the rendertree will take care of transferring defaultvalue to 'value' } @@ -2312,10 +2322,12 @@ void HTMLTextAreaElementImpl::reset() DOMString HTMLTextAreaElementImpl::value() { if ( m_dirtyvalue) { - if ( m_render ) + if ( m_render && m_initialized ) m_value = static_cast( m_render )->text(); - else + else { m_value = defaultValue().string(); + m_initialized = true; + } m_dirtyvalue = false; } @@ -2331,6 +2343,7 @@ void HTMLTextAreaElementImpl::setValue(D QString str = _value.string().replace( "\r\n", "\n" ); m_value = str.replace( '\r', '\n' ); m_dirtyvalue = false; + m_initialized = true; setChanged(true); } Index: khtml/html/html_formimpl.h =================================================================== RCS file: /home/kde/kdelibs/khtml/html/html_formimpl.h,v retrieving revision 1.154 retrieving revision 1.154.2.2 diff -u -3 -p -r1.154 -r1.154.2.2 --- khtml/html/html_formimpl.h 12 Jul 2004 19:57:03 -0000 1.154 +++ khtml/html/html_formimpl.h 14 Sep 2004 15:01:34 -0000 1.154.2.2 @@ -20,7 +20,7 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id: html_formimpl.h,v 1.154 2004/07/12 19:57:03 tanton Exp $ + * $Id: html_formimpl.h,v 1.154.2.2 2004/09/14 15:01:34 binner Exp $ */ #ifndef HTML_FORMIMPL_H #define HTML_FORMIMPL_H @@ -292,6 +292,8 @@ public: DOMString altText() const; void activate(); + void setUnsubmittedFormChange(bool unsubmitted) { m_unsubmittedFormChange = unsubmitted; } + protected: DOMString m_value; @@ -530,14 +532,16 @@ public: void focus(); virtual bool isEditable(); + void setUnsubmittedFormChange(bool unsubmitted) { m_unsubmittedFormChange = unsubmitted; } protected: int m_rows; int m_cols; WrapMethod m_wrap; QString m_value; - bool m_dirtyvalue; - bool m_unsubmittedFormChange; + bool m_dirtyvalue: 1; + bool m_unsubmittedFormChange: 1; + bool m_initialized: 1; }; // ------------------------------------------------------------------------- Index: khtml/java/kjavaappletviewer.desktop =================================================================== RCS file: /home/kde/kdelibs/khtml/java/kjavaappletviewer.desktop,v retrieving revision 1.57 retrieving revision 1.57.2.2 diff -u -3 -p -r1.57 -r1.57.2.2 --- khtml/java/kjavaappletviewer.desktop 27 Jul 2004 07:23:24 -0000 1.57 +++ khtml/java/kjavaappletviewer.desktop 31 Aug 2004 07:21:23 -0000 1.57.2.2 @@ -21,7 +21,7 @@ Name[fr]=Afficheur d'applets Java intég Name[ga]=Amharcán Feidhmchláiríní Java Inleabaithe Name[gl]=Visualizador de Applets de Java Incrustado Name[he]=מציג יישומוני Java מוטבע -Name[hi]=अंतरनिहित जावा एप्लेट दर्शक +Name[hi]=अंतर्निहित जावा ऐपलेट दर्शक Name[hr]=Ugrađeni prikazivač Java appleta Name[hu]=Beágyazott megjelenítőprogram Java kisalkalmazásokhoz Name[is]=Ívefjanlegur Java Applet skoðari @@ -54,7 +54,6 @@ Name[tr]=Gömülü Java Aplet Görüntü Name[uk]=Вмонтований переглядач аплетів Java Name[uz]=Ички Java апплетини кўрувчи Name[wa]=Ravalé håyneu d' apliketes Java -Name[xx]=xxEmbedded Java Applet Viewerxx Name[zh_CN]=嵌入的 Java 小程序查看器 Name[zh_TW]=Embedded Java Applet 檢視器 X-KDE-Library=kjavaappletviewer Index: khtml/kmultipart/kmultipart.desktop =================================================================== RCS file: /home/kde/kdelibs/khtml/kmultipart/kmultipart.desktop,v retrieving revision 1.93 retrieving revision 1.93.2.3 diff -u -3 -p -r1.93 -r1.93.2.3 --- khtml/kmultipart/kmultipart.desktop 4 Aug 2004 06:46:51 -0000 1.93 +++ khtml/kmultipart/kmultipart.desktop 12 Sep 2004 13:55:59 -0000 1.93.2.3 @@ -27,13 +27,15 @@ Name[pa]=ਬਹੁਭਾਗੀ/ਰਲਵ Name[pl]=Moduł składowy dla multipart/mixed Name[pt]=Componente Embebido para multipart/mixed Name[pt_BR]=Componente embutido para multipart/mixed +Name[ro]=Componentă înglobată pentru tip MIME multipart/mixed +Name[se]=Vuojuhanláhkái oassi multipart/mixed:a várás Name[sk]=Vložiteľný komponent pre multipart/mixed Name[sr]=Уградива компонента за „multipart/mixed“ Name[sr@Latn]=Уградива компонента за „multipart/mixed“ Name[sv]=Inbyggbar komponent för multipart/mixed +Name[ta]=பலப்பகுதி/கலக்கப்பட்ட பகுதிக்குரிய உட்பொதிந்த பகுதி Name[tg]=Компоненти дарунсохт барои қисматҳои зиёд/омезишшуда Name[uk]=Вбудовна компонента для повідомлень multipart/mixed -Name[xx]=xxEmbeddable Component for multipart/mixedxx Name[zh_CN]=可嵌入的 multipart/mixed 组件 ServiceTypes=KParts/ReadOnlyPart X-KDE-Library=libkmultipart Index: khtml/rendering/font.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/font.cpp,v retrieving revision 1.29 retrieving revision 1.29.2.1 diff -u -3 -p -r1.29 -r1.29.2.1 --- khtml/rendering/font.cpp 23 May 2004 15:42:28 -0000 1.29 +++ khtml/rendering/font.cpp 7 Sep 2004 16:58:02 -0000 1.29.2.1 @@ -20,7 +20,7 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id: font.cpp,v 1.29 2004/05/23 15:42:28 savernik Exp $ + * $Id: font.cpp,v 1.29.2.1 2004/09/07 16:58:02 savernik Exp $ */ #include "config.h" @@ -115,7 +115,7 @@ void Font::drawText( QPainter *p, int x, for( int i = 0; i < len; i++ ) if ( str[i+pos].category() == QChar::Separator_Space ) numSpaces++; - } + } int totWidth = width( str, slen, pos, len ); if ( d == QPainter::RTL ) { @@ -157,7 +157,7 @@ void Font::drawText( QPainter *p, int x, p->fillRect( eff_x, uy, segmentWidth, h, bg ); p->drawText(eff_x, y, segStr.string(), -1, d); if (deco) - drawDecoration(p, eff_x, uy, y - uy, segmentWidth, h, deco); + drawDecoration(p, eff_x, uy, y - uy, segmentWidth - 1, h, deco); return; } @@ -231,10 +231,11 @@ void Font::drawText( QPainter *p, int x, if (d == QPainter::RTL) x -= preSegmentWidth; else x += preSegmentWidth; + int startx = d == QPainter::RTL ? x-segmentWidth : x; + // optionally draw background if ( bg.isValid() ) - p->fillRect( d == QPainter::RTL ? x-segmentWidth : x, - uy, segmentWidth, h, bg ); + p->fillRect( startx, uy, segmentWidth, h, bg ); // second pass: do the actual drawing lastWordBegin = from; @@ -269,8 +270,7 @@ void Font::drawText( QPainter *p, int x, } if (deco) - drawDecoration(p, d == QPainter::RTL ? x-segmentWidth : x, uy, - y - uy, segmentWidth, h, deco); + drawDecoration(p, startx, uy, y - uy, segmentWidth - 1, h, deco); if ( scFont ) p->setFont( f ); Index: khtml/rendering/render_block.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_block.cpp,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -u -3 -p -r1.38 -r1.38.2.1 --- khtml/rendering/render_block.cpp 5 Aug 2004 00:32:33 -0000 1.38 +++ khtml/rendering/render_block.cpp 7 Sep 2004 22:20:23 -0000 1.38.2.1 @@ -556,9 +556,11 @@ void RenderBlock::layoutBlock(bool relay m_maxBottomNegMargin = m_maxBottomPosMargin = 0; } - // Always ensure our overflow width is at least as large as our width. + // Always ensure our overflow width/height is at least as large as our width/height. if (m_overflowWidth < m_width) m_overflowWidth = m_width; + if (m_overflowHeight < m_height) + m_overflowHeight = m_height; // Update our scrollbars if we're overflow:auto/scroll now that we know if // we overflow or not. @@ -991,14 +993,6 @@ void RenderBlock::layoutBlockChildren( b child->setPos(chPos, child->yPos()); m_height += child->height(); - int overflowDelta = - child->height() ; - if ( child->isBlockFlow () && !child->isTable() && child->style()->hidesOverflow() ) - overflowDelta += child->height(); - else - overflowDelta += child->overflowHeight(); - - if (m_height + overflowDelta > m_overflowHeight) - m_overflowHeight = m_height + overflowDelta; if (child->isRenderBlock()) prevFlow = static_cast(child); @@ -1011,8 +1005,28 @@ void RenderBlock::layoutBlockChildren( b // See if this child has made our overflow need to grow. // XXXdwh Work with left overflow as well as right overflow. - int rightChildPos = child->xPos() + kMax(child->overflowWidth(), + int overflowDelta = - child->height() ; + if ( child->isBlockFlow () && !child->isTable() && child->style()->hidesOverflow() ) + overflowDelta += child->height(); + else + overflowDelta += child->overflowHeight(); + + int rightChildPos = child->xPos() + kMax(child->effectiveWidth(), child->width() + child->marginRight()); + if (child->isRelPositioned()) { + // CSS 2.1-9.4.3 - allow access to relatively positioned content + // ### left overflow support + int xoff = 0, yoff = 0; + static_cast(child)->relativePositionOffset(xoff, yoff); + if (xoff>0) + rightChildPos += xoff; + if (yoff>0) + overflowDelta += yoff; + } + + if (m_height + overflowDelta > m_overflowHeight) + m_overflowHeight = m_height + overflowDelta; + if (rightChildPos > m_overflowWidth) m_overflowWidth = rightChildPos; @@ -1099,6 +1113,11 @@ void RenderBlock::layoutPositionedObject r->setLayouted( false ); if ( !r->layouted() ) r->layout(); + if (r->xPos() + r->effectiveWidth() > m_overflowWidth) + m_overflowWidth = r->xPos() + r->effectiveWidth(); + if (r->yPos() + r->effectiveHeight() > m_overflowHeight) + m_overflowHeight = r->yPos() + r->effectiveHeight(); + } } } Index: khtml/rendering/render_box.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_box.cpp,v retrieving revision 1.236 retrieving revision 1.236.2.1 diff -u -3 -p -r1.236 -r1.236.2.1 --- khtml/rendering/render_box.cpp 26 Jun 2004 13:16:32 -0000 1.236 +++ khtml/rendering/render_box.cpp 7 Sep 2004 22:20:23 -0000 1.236.2.1 @@ -577,13 +577,14 @@ void RenderBox::repaint(bool immediate) if( isInline() && !isReplaced() ) { RenderObject* p = parent(); - while( p && p->isInline() && !p->isReplaced() ) + Q_ASSERT(p); + while( p->isInline() && !p->isReplaced() ) p = p->parent(); - p->repaintRectangle( -ow, -ow, p->overflowWidth()+ow*2, p->overflowHeight()+ow*2, immediate); + p->repaintRectangle( -ow, -ow, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, immediate); } else { - repaintRectangle( -ow, -ow, overflowWidth()+ow*2, overflowHeight()+ow*2, immediate); + repaintRectangle( -ow, -ow, effectiveWidth()+ow*2, effectiveHeight()+ow*2, immediate); } } Index: khtml/rendering/render_canvas.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_canvas.cpp,v retrieving revision 1.150 retrieving revision 1.150.2.2 diff -u -3 -p -r1.150 -r1.150.2.2 --- khtml/rendering/render_canvas.cpp 4 Aug 2004 17:16:51 -0000 1.150 +++ khtml/rendering/render_canvas.cpp 8 Sep 2004 13:59:14 -0000 1.150.2.2 @@ -310,8 +310,8 @@ static QRect enclosingPositionedRect (Re enclosingParent->absolutePosition(ox, oy); rect.setX(ox); rect.setY(oy); - rect.setWidth (enclosingParent->width()); - rect.setHeight (enclosingParent->height()); + rect.setWidth (enclosingParent->effectiveWidth()); + rect.setHeight (enclosingParent->effectiveHeight()); } return rect; } @@ -604,40 +604,22 @@ int RenderCanvas::docHeight() const h = m_height; else h = 0; -#if 1 + RenderObject *fc = firstChild(); if(fc) { int dh = fc->overflowHeight() + fc->marginTop() + fc->marginBottom(); - int lowestPos = firstChild()->lowestPosition(); + int lowestPos = firstChild()->lowestPosition(false); +// kdDebug(6040) << "h " << h << " lowestPos " << lowestPos << " dh " << dh << " fc->rh " << fc->effectiveHeight() << " fc->height() " << fc->height() << endl; if( lowestPos > dh ) dh = lowestPos; if( dh > h ) h = dh; } -#endif RenderLayer *layer = m_layer; int y = 0; - while ( layer ) { - h = kMax( h, layer->yPos() + layer->height() ); - h = kMax( h, layer->yPos() + layer->renderer()->overflowHeight() ); - if ( layer->firstChild() ) { - y += layer->yPos(); - layer = layer->firstChild(); - } else if ( layer->nextSibling() ) - layer = layer->nextSibling(); - else { - while ( layer ) { - layer = layer->parent(); - if ( layer ) - y -= layer->yPos(); - if ( layer && layer->nextSibling() ) { - layer = layer->nextSibling(); - break; - } - } - } - } + h = kMax( h, layer->yPos() + layer->height() ); +// kdDebug(6040) << "h " << h << " layer(" << layer->renderer()->renderName() << "@" << layer->renderer() << ")->height " << layer->height() << " lp " << (layer->yPos() + layer->height()) << " height() " << layer->renderer()->height() << " rh " << layer->renderer()->effectiveHeight() << endl; return h; } @@ -649,39 +631,20 @@ int RenderCanvas::docWidth() const else w = 0; -#if 1 RenderObject *fc = firstChild(); if(fc) { - int dw = fc->overflowWidth() + fc->marginLeft() + fc->marginRight(); - int rightmostPos = fc->rightmostPosition(); + int dw = fc->effectiveWidth() + fc->marginLeft() + fc->marginRight(); + int rightmostPos = fc->rightmostPosition(false); +// kdDebug(6040) << "w " << w << " rightmostPos " << rightmostPos << " dw " << dw << " fc->rw " << fc->effectiveWidth() << " fc->width() " << fc->width() << endl; if( rightmostPos > dw ) dw = rightmostPos; if( dw > w ) w = dw; } -#endif RenderLayer *layer = m_layer; int x = 0; - while ( layer ) { - w = kMax( w, layer->xPos() + layer->width() ); - w = kMax( w, layer->xPos() + layer->renderer()->overflowWidth() ); - if ( layer->firstChild() ) { - x += layer->xPos(); - layer = layer->firstChild(); - } else if ( layer->nextSibling() ) - layer = layer->nextSibling(); - else { - while ( layer ) { - layer = layer->parent(); - if ( layer ) - x -= layer->xPos(); - if ( layer && layer->nextSibling() ) { - layer = layer->nextSibling(); - break; - } - } - } - } + w = kMax( w, layer->xPos() + layer->width() ); +// kdDebug(6040) << "w " << w << " layer(" << layer->renderer()->renderName() << ")->width " << layer->width() << " rm " << (layer->xPos() + layer->width()) << " width() " << layer->renderer()->width() << " rw " << layer->renderer()->effectiveWidth() << endl; return w; } Index: khtml/rendering/render_flow.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_flow.cpp,v retrieving revision 1.355 retrieving revision 1.355.2.1 diff -u -3 -p -r1.355 -r1.355.2.1 --- khtml/rendering/render_flow.cpp 22 Jun 2004 03:30:53 -0000 1.355 +++ khtml/rendering/render_flow.cpp 7 Sep 2004 22:20:23 -0000 1.355.2.1 @@ -244,7 +244,7 @@ void RenderFlow::repaint(bool immediate) if (firstLineBox() && firstLineBox()->topOverflow() < 0) { int ow = style() ? style()->outlineWidth() : 0; repaintRectangle(-ow, -ow+firstLineBox()->topOverflow(), - overflowWidth()+ow*2, overflowHeight()+ow*2, immediate); + effectiveWidth()+ow*2, effectiveHeight()+ow*2, immediate); } else return RenderBox::repaint(immediate); Index: khtml/rendering/render_form.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_form.cpp,v retrieving revision 1.269.2.1 retrieving revision 1.269.2.2 diff -u -3 -p -r1.269.2.1 -r1.269.2.2 --- khtml/rendering/render_form.cpp 9 Aug 2004 08:58:12 -0000 1.269.2.1 +++ khtml/rendering/render_form.cpp 7 Sep 2004 10:14:41 -0000 1.269.2.2 @@ -20,7 +20,7 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id: render_form.cpp,v 1.269.2.1 2004/08/09 08:58:12 coolo Exp $ + * $Id: render_form.cpp,v 1.269.2.2 2004/09/07 10:14:41 savernik Exp $ */ #include @@ -1586,8 +1586,10 @@ void RenderTextArea::setStyle(RenderStyl RenderFormElement::setStyle(_style); + widget()->blockSignals(true); widget()->setAlignment( _style->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft ); + widget()->blockSignals(false); scrollbarsStyled = false; Index: khtml/rendering/render_layer.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_layer.cpp,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -u -3 -p -r1.42 -r1.42.2.1 --- khtml/rendering/render_layer.cpp 10 Jul 2004 14:36:35 -0000 1.42 +++ khtml/rendering/render_layer.cpp 7 Sep 2004 14:05:39 -0000 1.42.2.1 @@ -1300,7 +1300,7 @@ void RenderLayer::suspendMarquees() Marquee::Marquee(RenderLayer* l) :m_layer(l), m_currentLoop(0), m_timerId(0), m_start(0), m_end(0), m_speed(0), m_unfurlPos(0), m_reset(false), - m_suspended(false), m_whiteSpace(NORMAL), m_direction(MAUTO) + m_suspended(false), m_stopped(false), m_whiteSpace(NORMAL), m_direction(MAUTO) { } @@ -1399,7 +1399,7 @@ void Marquee::start() if (m_timerId || m_layer->renderer()->style()->marqueeIncrement().value() == 0) return; - if (!m_suspended) { + if (!m_suspended && !m_stopped) { if (isUnfurlMarquee()) { bool forward = direction() == MDOWN || direction() == MRIGHT; bool isReversed = (forward && m_currentLoop % 2) || (!forward && !(m_currentLoop % 2)); @@ -1418,6 +1418,7 @@ void Marquee::start() else m_suspended = false; + m_stopped = false; m_timerId = startTimer(speed()); } @@ -1431,6 +1432,16 @@ void Marquee::suspend() m_suspended = true; } +void Marquee::stop() +{ + if (m_timerId) { + killTimer(m_timerId); + m_timerId = 0; + } + + m_stopped = true; +} + void Marquee::updateMarqueePosition() { bool activate = (m_totalLoops <= 0 || m_currentLoop < m_totalLoops); @@ -1454,7 +1465,7 @@ void Marquee::updateMarqueePosition() m_start = computePosition(direction(), behavior == MALTERNATE); m_end = computePosition(reverseDirection(), behavior == MALTERNATE || behavior == MSLIDE); } - start(); + if (!m_stopped) start(); } } Index: khtml/rendering/render_layer.h =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_layer.h,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -3 -p -r1.21 -r1.21.2.1 --- khtml/rendering/render_layer.h 13 Jun 2004 17:08:25 -0000 1.21 +++ khtml/rendering/render_layer.h 7 Sep 2004 14:05:39 -0000 1.21.2.1 @@ -103,6 +103,7 @@ public: void start(); void suspend(); + void stop(); void updateMarqueeStyle(); void updateMarqueePosition(); @@ -116,8 +117,9 @@ private: int m_end; int m_speed; int m_unfurlPos; - bool m_reset; - bool m_suspended; + bool m_reset:1; + bool m_suspended:1; + bool m_stopped:1; EWhiteSpace m_whiteSpace : 2; EMarqueeDirection m_direction : 4; }; Index: khtml/rendering/render_object.h =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_object.h,v retrieving revision 1.192 retrieving revision 1.192.2.1 diff -u -3 -p -r1.192 -r1.192.2.1 --- khtml/rendering/render_object.h 5 Aug 2004 00:32:33 -0000 1.192 +++ khtml/rendering/render_object.h 7 Sep 2004 22:20:23 -0000 1.192.2.1 @@ -21,7 +21,7 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id: render_object.h,v 1.192 2004/08/05 00:32:33 ggarand Exp $ + * $Id: render_object.h,v 1.192.2.1 2004/09/07 22:20:23 savernik Exp $ */ #ifndef render_object_h #define render_object_h @@ -144,8 +144,8 @@ public: virtual QRect getOverflowClipRect(int /*tx*/, int /*ty*/) { return QRect(0,0,0,0); } virtual QRect getClipRect(int /*tx*/, int /*ty*/) { return QRect(0,0,0,0); } - bool hasClip() { return isPositioned() && style()->hasClip(); } - bool hasOverflowClip() { return style()->hidesOverflow(); } + bool hasClip() const { return isPositioned() && style()->hasClip(); } + bool hasOverflowClip() const { return style()->hidesOverflow(); } virtual int getBaselineOfFirstLineBox() { return -1; } // Tables and blocks implement this. virtual InlineFlowBox* getFirstLineBox() { return 0; } // Tables and blocks implement this. @@ -476,6 +476,17 @@ public: virtual int overflowHeight() const { return height(); } virtual int overflowWidth() const { return width(); } + /** + * Returns the height that is effectively considered when contemplating the + * object as a whole -- usually the overflow height, or the height if clipped. + */ + int effectiveHeight() const { return hasOverflowClip() ? height() : overflowHeight(); } + /** + * Returns the width that is effectively considered when contemplating the + * object as a whole -- usually the overflow width, or the width if clipped. + */ + int effectiveWidth() const { return hasOverflowClip() ? width() : overflowWidth(); } + // IE extensions, heavily used in ECMA virtual short offsetWidth() const { return width(); } virtual int offsetHeight() const { return height(); } Index: khtml/rendering/render_text.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/rendering/render_text.cpp,v retrieving revision 1.249 retrieving revision 1.249.2.1 diff -u -3 -p -r1.249 -r1.249.2.1 --- khtml/rendering/render_text.cpp 22 Jun 2004 03:30:53 -0000 1.249 +++ khtml/rendering/render_text.cpp 7 Sep 2004 20:01:00 -0000 1.249.2.1 @@ -20,7 +20,7 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id: render_text.cpp,v 1.249 2004/06/22 03:30:53 ggarand Exp $ + * $Id: render_text.cpp,v 1.249.2.1 2004/09/07 20:01:00 savernik Exp $ */ //#define DEBUG_LAYOUT @@ -828,9 +828,8 @@ void RenderText::paint( PaintInfo& pI, i int s = m_lines.count() - 1; if ( s < 0 ) return; - // ### incorporate padding/border here! - if ( ty + m_lines[0]->m_y > pI.r.bottom() + 64 ) return; - if ( ty + m_lines[s]->m_y + m_lines[s]->m_baseline + m_lineHeight + 64 < pI.r.top() ) return; + if ( ty + m_lines[0]->m_y > pI.r.bottom() ) return; + if ( ty + m_lines[s]->m_y + m_lines[s]->height() < pI.r.top() ) return; int ow = style()->outlineWidth(); RenderStyle* pseudoStyle = hasFirstLine() ? style()->getPseudoStyle(RenderStyle::FIRST_LINE) : 0; Index: khtml/xml/dom_nodeimpl.cpp =================================================================== RCS file: /home/kde/kdelibs/khtml/xml/dom_nodeimpl.cpp,v retrieving revision 1.236 retrieving revision 1.236.2.1 diff -u -3 -p -r1.236 -r1.236.2.1 --- khtml/xml/dom_nodeimpl.cpp 12 Jun 2004 15:05:03 -0000 1.236 +++ khtml/xml/dom_nodeimpl.cpp 8 Sep 2004 18:08:38 -0000 1.236.2.1 @@ -1350,11 +1350,13 @@ bool NodeBaseImpl::getUpperLeftCorner(in } if((o->isText() && !o->isBR()) || o->isReplaced()) { o->container()->absolutePosition( xPos, yPos ); - if (o->isText()) - xPos += static_cast(o)->minXPos(); - else + if (o->isText()) { + xPos += o->inlineXPos(); + yPos += o->inlineYPos(); + } else { xPos += o->xPos(); - yPos += o->yPos(); + yPos += o->yPos(); + } return true; } } @@ -1392,11 +1394,13 @@ bool NodeBaseImpl::getLowerRightCorner(i } if((o->isText() && !o->isBR()) || o->isReplaced()) { o->container()->absolutePosition(xPos, yPos); - if (o->isText()) - xPos += static_cast(o)->minXPos() + o->width(); - else - xPos += o->xPos()+o->width(); - yPos += o->yPos()+o->height(); + if (o->isText()) { + xPos += o->inlineXPos() + o->width(); + yPos += o->inlineYPos() + o->height(); + } else { + xPos += o->xPos() + o->width(); + yPos += o->yPos() + o->height(); + } return true; } } Index: kimgio/bmp.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/bmp.kimgio,v retrieving revision 1.191 retrieving revision 1.191.2.1 diff -u -3 -p -r1.191 -r1.191.2.1 --- kimgio/bmp.kimgio 30 Jul 2004 07:01:06 -0000 1.191 +++ kimgio/bmp.kimgio 24 Aug 2004 06:29:21 -0000 1.191.2.1 @@ -60,7 +60,6 @@ Name[tr]=BMP Resim Dosyası Name[uk]=Зображення BMP Name[uz]=BMP-расм Name[wa]=Imådje BMP -Name[xx]=xxBMP Imagexx Name[zh_CN]=BMP 图像 Read=true Write=true Index: kimgio/dds.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/dds.kimgio,v retrieving revision 1.25 retrieving revision 1.25.2.3 diff -u -3 -p -r1.25 -r1.25.2.3 --- kimgio/dds.kimgio 4 Aug 2004 06:46:53 -0000 1.25 +++ kimgio/dds.kimgio 12 Sep 2004 13:56:01 -0000 1.25.2.3 @@ -23,6 +23,8 @@ Name[pa]=ਸਿੱਧਾ ਖਿੱਚਿ Name[pl]=Powierzchnia Direct Draw Name[pt]=Superfície Direct Draw Name[pt_BR]=DirectDraw +Name[ro]=Suprafaţă de desenare directă +Name[se]=Guovlu masa sáhttá sárgut dakkaviđe Name[sk]=Povrch Direct Draw Name[sl]=Površina Direct Draw Name[sr]=Површина за директно цртање @@ -31,7 +33,6 @@ Name[sv]=Direktrityta Name[ta]=நேரடியாக வரையும் சூழல் Name[tg]=Кашидани сатҳи мустақим Name[uk]=Поверхня Direct Draw -Name[xx]=xxDirect Draw Surfacexx Name[zh_CN]=DirectDraw 表面 Read=true Write=false Index: kimgio/eps.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/eps.kimgio,v retrieving revision 1.223 retrieving revision 1.223.2.1 diff -u -3 -p -r1.223 -r1.223.2.1 --- kimgio/eps.kimgio 4 Aug 2004 06:46:53 -0000 1.223 +++ kimgio/eps.kimgio 24 Aug 2004 06:29:21 -0000 1.223.2.1 @@ -59,7 +59,6 @@ Name[tr]=Encapsulated PostScript Görün Name[uk]=Вбудоване зображення PostScript Name[uz]=EPS-расм Name[wa]=Imådje PostScript ecapsulêye -Name[xx]=xxEncapsulated PostScript Imagexx Name[zh_CN]=封装后的 Postscript 图像 Name[zh_TW]=Ensapsulated Postscript 影像 Read=true Index: kimgio/exr.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/exr.kimgio,v retrieving revision 1.28 retrieving revision 1.28.2.3 diff -u -3 -p -r1.28 -r1.28.2.3 --- kimgio/exr.kimgio 2 Aug 2004 06:53:24 -0000 1.28 +++ kimgio/exr.kimgio 12 Sep 2004 13:56:01 -0000 1.28.2.3 @@ -18,19 +18,20 @@ Name[is]=ILM EXR mynd Kimgio Name[it]=Immagine Kimgio ILM EXR Name[ja]=ILM EXR イメージ Kimgio Name[nb]=ILM EXR-bilde Kimgio -Name[nl]=ILM EXR Kimgio Afbeeldingen +Name[nl]=ILM EXR Kimgio-afbeelding Name[nn]=ILM EXR-bilete Kimgio Name[pa]=ILM EXR ਚਿੱਤਰ ਕੀਮਗੀਓ Name[pl]=Obrazek ILM EXR Name[pt]=Imagem ILM EXR Kimgio Name[pt_BR]=Imagem ILM EXR do Kimgio +Name[ro]=Imagine ILM EXR +Name[se]=ILM EXR-govva Kimgio Name[sk]=Obrázok ILM EXR KImgio Name[sr]=ILM EXR Kimgio слика Name[sr@Latn]=ILM EXR Kimgio слика Name[sv]=ILM EXR-bild Kimgio Name[ta]=ILM EXR பிம்ப கிம்ஜியோ Name[tg]=Тасвири ILM EXR Kimgio -Name[xx]=xxILM EXR Image Kimgioxx Name[zh_CN]=ILM EXR 图像 Kimgio Read=true Write=false Index: kimgio/g3.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/g3.kimgio,v retrieving revision 1.177 retrieving revision 1.177.2.1 diff -u -3 -p -r1.177 -r1.177.2.1 --- kimgio/g3.kimgio 27 Jul 2004 07:23:26 -0000 1.177 +++ kimgio/g3.kimgio 24 Aug 2004 06:29:21 -0000 1.177.2.1 @@ -51,7 +51,6 @@ Name[tr]=CCITT G3 Faks Name[uk]=Факс CCITT G3 Name[uz]=CCITT G3 факс-файли Name[wa]=Facs CCITT G3 -Name[xx]=xxCCITT G3 Faxxx Name[zh_CN]=CCITT G3 传真 Name[zh_TW]=CCITT G3 傳真 Read=true Index: kimgio/gif.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/gif.kimgio,v retrieving revision 1.194 retrieving revision 1.194.2.1 diff -u -3 -p -r1.194 -r1.194.2.1 --- kimgio/gif.kimgio 30 Jul 2004 07:01:06 -0000 1.194 +++ kimgio/gif.kimgio 24 Aug 2004 06:29:21 -0000 1.194.2.1 @@ -60,7 +60,6 @@ Name[tr]=GIF Resim Dosyası Name[uk]=Зображення GIF Name[uz]=GIF-расм Name[wa]=Imådje GIF -Name[xx]=xxGIF Imagexx Name[zh_CN]=GIF 图像 Name[zh_TW]=GIF 影像 Read=true Index: kimgio/ico.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/ico.kimgio,v retrieving revision 1.161 retrieving revision 1.161.2.2 diff -u -3 -p -r1.161 -r1.161.2.2 --- kimgio/ico.kimgio 30 Jul 2004 07:01:06 -0000 1.161 +++ kimgio/ico.kimgio 31 Aug 2004 07:21:25 -0000 1.161.2.2 @@ -25,7 +25,7 @@ Name[fr]=Icône Windows Name[ga]=Deilbhín MS Windows Name[gl]=Icona de Windows Name[he]=סמלים של Windows -Name[hi]=विंडोस आइकन +Name[hi]=विंडोज़ आइकन Name[hr]=Windows sličica Name[hu]=Windows-ikon Name[id]=Icon Windows @@ -60,7 +60,6 @@ Name[tr]=Windows Simgesi Name[uk]=Піктограма Windows Name[uz]=Windows нишончаси Name[wa]=Imådjete MS-Windows -Name[xx]=xxWindows Iconxx Name[zh_CN]=Windows 图标 Name[zh_TW]=Windows 圖示 Read=true Index: kimgio/jp2.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/jp2.kimgio,v retrieving revision 1.72 retrieving revision 1.72.2.1 diff -u -3 -p -r1.72 -r1.72.2.1 --- kimgio/jp2.kimgio 30 Jul 2004 07:01:06 -0000 1.72 +++ kimgio/jp2.kimgio 24 Aug 2004 06:29:21 -0000 1.72.2.1 @@ -60,7 +60,6 @@ Name[tr]=JPEG 2000 Resim Dosyası Name[uk]=Зображення JPEG 2000 Name[uz]=JPEG 2000-расм Name[wa]=Imådje JPEG 2000 -Name[xx]=xxJPEG 2000 Imagexx Name[zh_CN]=JPEG 2000 图像 Name[zh_TW]=JPEG 2000 影像 Read=true Index: kimgio/jpeg.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/jpeg.kimgio,v retrieving revision 1.185 retrieving revision 1.185.2.1 diff -u -3 -p -r1.185 -r1.185.2.1 --- kimgio/jpeg.kimgio 30 Jul 2004 07:01:06 -0000 1.185 +++ kimgio/jpeg.kimgio 24 Aug 2004 06:29:21 -0000 1.185.2.1 @@ -60,7 +60,6 @@ Name[tr]=JPEG Resim Dosyası Name[uk]=Зображення JPEG Name[uz]=JPEG-расм Name[wa]=Imådje JPEG -Name[xx]=xxJPEG Imagexx Name[zh_CN]=JPEG 图像 Name[zh_TW]=JPEG 影像 Read=true Index: kimgio/pbm.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/pbm.kimgio,v retrieving revision 1.85 retrieving revision 1.85.2.1 diff -u -3 -p -r1.85 -r1.85.2.1 --- kimgio/pbm.kimgio 30 Jul 2004 07:01:06 -0000 1.85 +++ kimgio/pbm.kimgio 24 Aug 2004 06:29:21 -0000 1.85.2.1 @@ -56,7 +56,6 @@ Name[tr]=Taşınabilir Bit Eşlem Resim Name[uk]=Двокольорове зображення у портативному форматі Name[uz]=PBMP-расм Name[wa]=Imådje PBM -Name[xx]=xxPortable Bitmap Imagexx Name[zh_CN]=便携位图图像 Name[zh_TW]=可攜式點陣影像 (PNG) Read=true Index: kimgio/pcx.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/pcx.kimgio,v retrieving revision 1.69 retrieving revision 1.69.2.1 diff -u -3 -p -r1.69 -r1.69.2.1 --- kimgio/pcx.kimgio 30 Jul 2004 07:01:06 -0000 1.69 +++ kimgio/pcx.kimgio 24 Aug 2004 06:29:21 -0000 1.69.2.1 @@ -60,7 +60,6 @@ Name[tr]=PCX Resim Dosyası Name[uk]=Зображення PCX Name[uz]=PCX-расм Name[wa]=Imådje PCX -Name[xx]=xxPCX Imagexx Name[zh_CN]=PCX 图像 Name[zh_TW]=PCX 影像 Read=true Index: kimgio/pgm.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/pgm.kimgio,v retrieving revision 1.84 retrieving revision 1.84.2.1 diff -u -3 -p -r1.84 -r1.84.2.1 --- kimgio/pgm.kimgio 1 Aug 2004 14:40:22 -0000 1.84 +++ kimgio/pgm.kimgio 24 Aug 2004 06:29:21 -0000 1.84.2.1 @@ -58,7 +58,6 @@ Name[tr]=Taşınabilir Gri Resim Dosyas Name[uk]=Чорно-біле зображення у портативному форматі Name[uz]=PGM-расм Name[wa]=Imådje PGM -Name[xx]=xxPortable Graymap Imagexx Name[zh_CN]=便携灰度图像 Read=true Write=true Index: kimgio/png.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/png.kimgio,v retrieving revision 1.183 retrieving revision 1.183.2.1 diff -u -3 -p -r1.183 -r1.183.2.1 --- kimgio/png.kimgio 30 Jul 2004 07:01:06 -0000 1.183 +++ kimgio/png.kimgio 24 Aug 2004 06:29:21 -0000 1.183.2.1 @@ -60,7 +60,6 @@ Name[tr]=PNG Resim Dosyası Name[uk]=Зображення PNG Name[uz]=PNG-расм Name[wa]=Imådje PNG -Name[xx]=xxPNG Imagexx Name[zh_CN]=PNG 图像 Name[zh_TW]=PNG 影像 Read=true Index: kimgio/ppm.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/ppm.kimgio,v retrieving revision 1.85 retrieving revision 1.85.2.1 diff -u -3 -p -r1.85 -r1.85.2.1 --- kimgio/ppm.kimgio 1 Aug 2004 14:40:22 -0000 1.85 +++ kimgio/ppm.kimgio 24 Aug 2004 06:29:21 -0000 1.85.2.1 @@ -57,7 +57,6 @@ Name[tr]=Taşınabilir Bit Eşlem Resim Name[uk]=Растрове зображення у портативному форматі Name[uz]=PPMP-расм Name[wa]=Imådje PPM -Name[xx]=xxPortable Pixmap Imagexx Name[zh_CN]=便携像素图图像 Name[zh_TW]=可攜式像素影像 Read=true Index: kimgio/rgb.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/rgb.kimgio,v retrieving revision 1.41 retrieving revision 1.41.2.2 diff -u -3 -p -r1.41 -r1.41.2.2 --- kimgio/rgb.kimgio 2 Aug 2004 09:36:24 -0000 1.41 +++ kimgio/rgb.kimgio 12 Sep 2004 13:56:01 -0000 1.41.2.2 @@ -33,6 +33,7 @@ Name[pl]=Obrazek SGI (RGB) Name[pt]=Imagem SGI (RGB) Name[pt_BR]=Imagem SGI (RGB) Name[ro]=Imagine SGI (RGB) +Name[se]=SGI-govva (RGB) Name[sk]=SGI obrázok (RGB) Name[sl]=Slika SGI (RGB) Name[sr]=SGI слика (RGB) @@ -43,7 +44,6 @@ Name[tg]=Тасвири SGI (RGB) Name[th]=แฟ้มภาพ SGI (RGB) Name[uk]=Зображення SGI (RGB) Name[uz]=SGI-расм (RGB) -Name[xx]=xxSGI Image (RGB)xx Name[zh_CN]=SGI 图像(RGB) Read=true Write=true Index: kimgio/tga.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/tga.kimgio,v retrieving revision 1.66 retrieving revision 1.66.2.1 diff -u -3 -p -r1.66 -r1.66.2.1 --- kimgio/tga.kimgio 30 Jul 2004 07:01:06 -0000 1.66 +++ kimgio/tga.kimgio 24 Aug 2004 06:29:21 -0000 1.66.2.1 @@ -57,7 +57,6 @@ Name[tr]=Truevision Targa Resim Dosyası Name[uk]=Зображення Truevision Targa Name[uz]=TGA-расм Name[wa]=Imådje Targa -Name[xx]=xxTruevision Targa Imagexx Name[zh_CN]=Truevision Targa 图像 Name[zh_TW]=Truevision Targa 圖形 Read=true Index: kimgio/tiff.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/tiff.kimgio,v retrieving revision 1.183 retrieving revision 1.183.2.1 diff -u -3 -p -r1.183 -r1.183.2.1 --- kimgio/tiff.kimgio 30 Jul 2004 07:01:06 -0000 1.183 +++ kimgio/tiff.kimgio 24 Aug 2004 06:29:21 -0000 1.183.2.1 @@ -60,7 +60,6 @@ Name[tr]=TIFF Resim Dosyası Name[uk]=Зображення TIFF Name[uz]=TIFF-расм Name[wa]=Imådje TIFF -Name[xx]=xxTIFF Imagexx Name[zh_CN]=TIFF 图像 Name[zh_TW]=TIFF 影像 Read=true Index: kimgio/xbm.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/xbm.kimgio,v retrieving revision 1.180 retrieving revision 1.180.2.1 diff -u -3 -p -r1.180 -r1.180.2.1 --- kimgio/xbm.kimgio 30 Jul 2004 07:01:06 -0000 1.180 +++ kimgio/xbm.kimgio 24 Aug 2004 06:29:21 -0000 1.180.2.1 @@ -37,7 +37,7 @@ Name[mn]=X Bitmap зураг Name[ms]=Imej X BitMap Name[nb]=X BitMap-bilde Name[nds]=X BitMap-Bild -Name[nl]=X BitMap-afbeelding +Name[nl]=X Bitmap-afbeelding Name[nn]=X BitMap-bilete Name[pa]=X BitMap ਚਿੱਤਰ Name[pl]=Obrazek X Bitmap @@ -59,7 +59,6 @@ Name[tr]=X BitMap Resim Dosyası Name[uk]=Двокольорове зображення для X Name[uz]=X BMP-расм Name[wa]=Imådje XBM -Name[xx]=xxX BitMap Imagexx Name[zh_CN]=X 位图图像 Name[zh_TW]=X 點陣影像 Read=true Index: kimgio/xpm.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/xpm.kimgio,v retrieving revision 1.177 retrieving revision 1.177.2.1 diff -u -3 -p -r1.177 -r1.177.2.1 --- kimgio/xpm.kimgio 30 Jul 2004 07:01:06 -0000 1.177 +++ kimgio/xpm.kimgio 24 Aug 2004 06:29:21 -0000 1.177.2.1 @@ -37,7 +37,7 @@ Name[mn]=X-Bitmap зураг Name[ms]=Imej X PixMap Name[nb]=X PixMap-bilde Name[nds]=X PixMap-Bild -Name[nl]=X PixMap-afbeelding +Name[nl]=X Pixmap-afbeelding Name[nn]=X PixMap-bilete Name[pa]=X PixMap ਚਿੱਤਰ Name[pl]=Obrazek X PixMap @@ -59,7 +59,6 @@ Name[tr]=X Resim Dosyası Name[uk]=Растрове зображення для X Name[uz]=X PMP-расм Name[wa]=Imådje XPM -Name[xx]=xxX PixMap Imagexx Name[zh_CN]=X 像素图图像 Name[zh_TW]=X 像素影像 Read=true Index: kimgio/xv.kimgio =================================================================== RCS file: /home/kde/kdelibs/kimgio/xv.kimgio,v retrieving revision 1.180 retrieving revision 1.180.2.1 diff -u -3 -p -r1.180 -r1.180.2.1 --- kimgio/xv.kimgio 30 Jul 2004 07:01:06 -0000 1.180 +++ kimgio/xv.kimgio 24 Aug 2004 06:29:21 -0000 1.180.2.1 @@ -61,7 +61,6 @@ Name[tr]=XView Resim Dosyası Name[uk]=Зображення XView Name[uz]=XView-расм Name[wa]=Imådje XView -Name[xx]=xxXView Imagexx Name[zh_CN]=XView 图像 Name[zh_TW]=XView 影像 Read=true Index: kinit/configure.in.in =================================================================== RCS file: /home/kde/kdelibs/kinit/configure.in.in,v retrieving revision 1.1 retrieving revision 1.1.2.3 diff -u -3 -p -r1.1 -r1.1.2.3 --- kinit/configure.in.in 1 Jul 2004 16:05:11 -0000 1.1 +++ kinit/configure.in.in 23 Sep 2004 14:06:34 -0000 1.1.2.3 @@ -3,19 +3,45 @@ dnl check if Qt is linked against Xft KDE_CHECK_LIB(qt-mt,XftInit,[],[KDEINIT_USE_XFT=]) dnl Xft requires freetype to compile +KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) +]) +]) + +if test -n "$PKGCONFIG"; then + vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test -n "$vers" && test "$vers" -ge 1000000 + then + FONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`" + KDEINIT_FONTCONFIG=1 + fi +fi + +if test -n "$FONTCONFIG_CONFIG"; then + vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test -n "$vers" && test "$vers" -ge 1000000 + then + FONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`" + KDEINIT_FONTCONFIG=1 + fi +fi + KDE_FIND_PATH(freetype-config, KDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin]) if test -n "$KDEINIT_FREETYPE_CONFIG"; then - KDEINIT_XFT_INCLUDES=`$KDEINIT_FREETYPE_CONFIG --cflags` + if test -n "$KDEINIT_FREETYPE_CONFIG"; then + KDEINIT_XFT_INCLUDES="`$KDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS" kdeinit_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES" + CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS" KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[KDEINIT_USE_XFT=]) CPPFLAGS=$kdeinit_cppflags - KDE_CHECK_HEADER(fontconfig/fontconfig.h,[],[KDEINIT_USE_XFT=]) + fi else KDEINIT_USE_XFT= fi if test -n "$KDEINIT_USE_XFT"; then AC_DEFINE(KDEINIT_USE_XFT,1,[Use Xft preinitialization in kdeinit]) - AC_SUBST(KDEINIT_XFT_INCLUDES) fi +if test -n "$KDEINIT_FONTCONFIG"; then + AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in kdeinit]) +fi +AC_SUBST(KDEINIT_XFT_INCLUDES) Index: kinit/kinit.cpp =================================================================== RCS file: /home/kde/kdelibs/kinit/kinit.cpp,v retrieving revision 1.141 retrieving revision 1.141.2.1 diff -u -3 -p -r1.141 -r1.141.2.1 --- kinit/kinit.cpp 25 Jul 2004 19:44:05 -0000 1.141 +++ kinit/kinit.cpp 23 Sep 2004 14:06:34 -0000 1.141.2.1 @@ -4,7 +4,7 @@ * (c) 1999 Mario Weilguni * (c) 2001 Lubos Lunak * - * $Id: kinit.cpp,v 1.141 2004/07/25 19:44:05 coolo Exp $ + * $Id: kinit.cpp,v 1.141.2.1 2004/09/23 14:06:34 porten Exp $ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -89,7 +89,7 @@ # endif #endif -#ifdef KDEINIT_USE_XFT +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG) #include extern "C" FcBool XftInitFtLibrary (void); #include @@ -1324,7 +1324,7 @@ static void handle_requests(pid_t waitFo int sock = accept(d.wrapper, (struct sockaddr *)&client, &sClient); if (sock >= 0) { -#ifdef KDEINIT_USE_XFT +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG) if( !FcConfigUptoDate(NULL)) FcInitReinitialize(); #endif @@ -1344,7 +1344,7 @@ static void handle_requests(pid_t waitFo int sock = accept(d.wrapper_old, (struct sockaddr *)&client, &sClient); if (sock >= 0) { -#ifdef KDEINIT_USE_XFT +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG) if( !FcConfigUptoDate(NULL)) FcInitReinitialize(); #endif @@ -1759,7 +1759,7 @@ int main(int argc, char **argv, char **e #endif { -#ifdef KDEINIT_USE_XFT +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG) XftInit(0); XftInitFtLibrary(); #endif Index: kio/application.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/application.desktop,v retrieving revision 1.149 retrieving revision 1.149.2.1 diff -u -3 -p -r1.149 -r1.149.2.1 --- kio/application.desktop 27 Jul 2004 07:23:29 -0000 1.149 +++ kio/application.desktop 24 Aug 2004 06:29:24 -0000 1.149.2.1 @@ -71,7 +71,6 @@ Name[ven]=Apulifikhesheni Name[vi]=Chương trình Name[wa]=Programe Name[xh]=Isicelo -Name[xx]=xxApplicationxx Name[zh_CN]=应用程序 Name[zh_TW]=應用程式 Name[zu]=Umyaleli Index: kio/kcmodule.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kcmodule.desktop,v retrieving revision 1.66 retrieving revision 1.66.2.1 diff -u -3 -p -r1.66 -r1.66.2.1 --- kio/kcmodule.desktop 27 Jul 2004 07:23:29 -0000 1.66 +++ kio/kcmodule.desktop 24 Aug 2004 06:29:24 -0000 1.66.2.1 @@ -64,7 +64,6 @@ Name[uz]=KDE бошқарув модул Name[ven]=Phanele ndangula ya phirinthara Name[wa]=Module di contrôle KDE Name[xh]=Ulawulo Lwesicatshulwa we KDE -Name[xx]=xxKDE Control Modulexx Name[zh_CN]=KDE 控制模块 Name[zh_TW]=KDE 控制模組 Name[zu]=Ingxenye ye-KDE Control Index: kio/kcomprfilter.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kcomprfilter.desktop,v retrieving revision 1.129 retrieving revision 1.129.2.2 diff -u -3 -p -r1.129 -r1.129.2.2 --- kio/kcomprfilter.desktop 27 Jul 2004 07:23:29 -0000 1.129 +++ kio/kcomprfilter.desktop 31 Aug 2004 07:21:29 -0000 1.129.2.2 @@ -25,7 +25,7 @@ Name[fr]=Filtre de compression de KDE Name[ga]=Scagaire Dlúthaithe KDE Name[gl]=Filtro de Compresión de KDE Name[he]=מסנן הדחיסה של KDE -Name[hi]=केडीई कंप्रेशन फिल्टर +Name[hi]=केडीई कंप्रेशन फ़िल्टर Name[hr]=KDE filter za kompresiju Name[hu]=KDE tömörítésszűrő Name[id]=Filter Kompresi KDE @@ -66,7 +66,6 @@ Name[uz]=KDE қисиш филтери Name[ven]=Filithara yau tsikeledza ya KDE Name[vi]=Trình lọc nén của KDE Name[xh]=Isihluzi Sodibaniso se KDE -Name[xx]=xxKDE Compression Filterxx Name[zh_CN]=KDE 压缩过滤程序 Name[zh_TW]=KDE 壓縮過濾器 Name[zu]=Ihluzo Lokunciphisa le-KDE Index: kio/kdatatool.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kdatatool.desktop,v retrieving revision 1.90 retrieving revision 1.90.2.1 diff -u -3 -p -r1.90 -r1.90.2.1 --- kio/kdatatool.desktop 27 Jul 2004 07:23:29 -0000 1.90 +++ kio/kdatatool.desktop 24 Aug 2004 06:29:24 -0000 1.90.2.1 @@ -65,7 +65,6 @@ Comment[uz]=KDE маълумот вос Comment[ven]=Tshishumiswa tsha data tsha KDE Comment[vi]=Công cụ KDE Data Comment[xh]=Isihluzi se Data ye KDE -Comment[xx]=xxKDE Data Toolxx Comment[zh_CN]=KDE 数据工具 Comment[zh_TW]=KDE 資料工具 Comment[zu]=Ithuluzi Ledata le-KDE Index: kio/kfileplugin.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kfileplugin.desktop,v retrieving revision 1.95 retrieving revision 1.95.2.1 diff -u -3 -p -r1.95 -r1.95.2.1 --- kio/kfileplugin.desktop 27 Jul 2004 07:23:29 -0000 1.95 +++ kio/kfileplugin.desktop 24 Aug 2004 06:29:24 -0000 1.95.2.1 @@ -61,7 +61,6 @@ Name[uk]=Втулок метаданих Name[uz]=KFile мета маълумот учун плагин Name[ven]=Meta data pulagini ya faela ya K Name[xh]=Iplagi yangaphakathi ye KFile Meta Data -Name[xx]=xxKFile Meta Data Pluginxx Name[zh_CN]=KFile 元数据插件 Name[zh_TW]=KFile 資料定義外掛程式 Index: kio/kpasswdserver.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kpasswdserver.desktop,v retrieving revision 1.95 retrieving revision 1.95.2.4 diff -u -3 -p -r1.95 -r1.95.2.4 --- kio/kpasswdserver.desktop 5 Aug 2004 06:36:53 -0000 1.95 +++ kio/kpasswdserver.desktop 20 Sep 2004 13:53:21 -0000 1.95.2.4 @@ -63,7 +63,6 @@ Name[uz]=KDED махфий сўз мод Name[ven]=Modulu wa phasewede ya KDED Name[wa]=Module di screts po KDE Name[xh]=Igama lokugqitha le Sicatshulwa se KDED -Name[xx]=xxKDED Password Modulexx Name[zh_CN]=KDED 密码模块 Name[zh_TW]=KDED 密碼模組 Name[zu]=Ingxenye Yegama lokudlula le-KDED @@ -79,7 +78,9 @@ Comment[es]=Soporte de caché de contras Comment[et]=Parooli meelespidamise toetus Comment[fi]=Salasanojen välimuistituki Comment[fr]=Gestion du cache des mots de passe +Comment[he]=תמיכה בשמירת סיסמאות במטמון Comment[hu]=Jelszóelmentési támogatás +Comment[is]=Skyndiminni fyrir lykilorð Comment[it]=Supporto per la memorizzazione temporanea delle password Comment[ja]=パスワードキャッシュサポート Comment[nb]=Støtte for passordlagring @@ -89,13 +90,16 @@ Comment[pa]=ਗੁਪਤ-ਕੋਡ ਕ Comment[pl]=Zapamiętywanie haseł lokalnych Comment[pt]=Suporte a 'cache' de senhas Comment[pt_BR]=Suporte de cache das senhas +Comment[ro]=Suport pentru memorarea parolelor +Comment[se]=Beassansáni gaskarádjama doarjja Comment[sk]=Podpora ukladania hesiel Comment[sl]=Podpora prepomnjenju gesel Comment[sr]=Подршка за кеширање лозинки Comment[sr@Latn]=Подршка за кеширање лозинки Comment[sv]=Stöd för lösenordscache +Comment[ta]=கடவுச்சொல் சேமிக்க ஆதரவு Comment[tg]=Дастгирии Ҳофизаи Гузарвожа -Comment[xx]=xxPassword caching supportxx +Comment[uk]=Підтримка кешування паролів Comment[zh_CN]=密码缓存支持 ServiceTypes=KDEDModule X-KDE-ModuleType=Library Index: kio/kscan.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kscan.desktop,v retrieving revision 1.40 retrieving revision 1.40.2.1 diff -u -3 -p -r1.40 -r1.40.2.1 --- kio/kscan.desktop 26 Jul 2004 06:59:43 -0000 1.40 +++ kio/kscan.desktop 24 Aug 2004 06:29:24 -0000 1.40.2.1 @@ -16,4 +16,3 @@ Name[sv]=Kscan Name[ta]=Kவருடல் Name[th]=สแกนภาพ - K Name[ven]=U nanga ha K -Name[xx]=xxKScanxx Index: kio/kurifilterplugin.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kurifilterplugin.desktop,v retrieving revision 1.160 retrieving revision 1.160.2.1 diff -u -3 -p -r1.160 -r1.160.2.1 --- kio/kurifilterplugin.desktop 27 Jul 2004 07:23:29 -0000 1.160 +++ kio/kurifilterplugin.desktop 24 Aug 2004 06:29:24 -0000 1.160.2.1 @@ -66,7 +66,6 @@ Name[uz]=Тезлаштирилган в Name[ven]=Pulagini ya burausu yo engedzhwaho Name[vi]=Các plugin đềEtănt cường duyệt Name[xh]=Iplagi yangaphakathi Ekhangela iincwadi Enyusiweyo -Name[xx]=xxEnhanced Browsing Pluginxx Name[zh_CN]=增强的浏览插件 Name[zh_TW]=增強的瀏覽外掛程式 Name[zu]=I-plugin Yomcingi Weqophela eliphezulu Index: kio/renamedlgplugin.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/renamedlgplugin.desktop,v retrieving revision 1.82 retrieving revision 1.82.2.2 diff -u -3 -p -r1.82 -r1.82.2.2 --- kio/renamedlgplugin.desktop 4 Aug 2004 06:46:55 -0000 1.82 +++ kio/renamedlgplugin.desktop 31 Aug 2004 07:21:29 -0000 1.82.2.2 @@ -25,7 +25,7 @@ Comment[fi]=Lisäosa uudelleennimeämisi Comment[fr]=Module externe pour la boîte de dialogue de renommage Comment[gl]=Plugin para o Diálogo de Renomeamento Comment[he]=תוסף לדו-שיח שינוי השם -Comment[hi]=रीनेम डायलॉग हेतु प्लगइन +Comment[hi]=रीनेम डायलॉग के लिए प्लगइन Comment[hr]=Dodatak za dijalog za promjenu imena Comment[hu]=Bővítőmodul az átnevezési párbeszédablakhoz Comment[id]=Plugin untuk Dialog Ubah Nama @@ -65,7 +65,6 @@ Comment[ven]=Pulagini uitela u rinulula Comment[vi]=Plugin cho Rename Dialog Comment[wa]=Tchôke-divins pol purnea di rlomaedje Comment[xh]=Iplagi yangaphakathi Yencoko yababini Yokunika igama elitsha -Comment[xx]=xxPlugin for the Rename Dialogxx Comment[zh_CN]=重命名对话的插件 Comment[zh_TW]=更名對話盒的外掛程式 Comment[zu]=I-plugin Yengxoxo Yokuqamba kabusha Index: kio/bookmarks/kbookmarkimporter_crash.cc =================================================================== RCS file: /home/kde/kdelibs/kio/bookmarks/kbookmarkimporter_crash.cc,v retrieving revision 1.22 retrieving revision 1.22.6.1 diff -u -3 -p -r1.22 -r1.22.6.1 --- kio/bookmarks/kbookmarkimporter_crash.cc 12 Jan 2004 18:25:20 -0000 1.22 +++ kio/bookmarks/kbookmarkimporter_crash.cc 19 Sep 2004 16:39:35 -0000 1.22.6.1 @@ -47,7 +47,7 @@ void KCrashBookmarkImporter::parseCrashL ViewMap KCrashBookmarkImporterImpl::parseCrashLog_noemit( const QString & filename, bool del ) { - static const int g_lineLimit = 4096; + static const int g_lineLimit = 16*1024; QFile f( filename ); ViewMap views; Index: kio/bookmarks/kbookmarkimporter_ie.cc =================================================================== RCS file: /home/kde/kdelibs/kio/bookmarks/kbookmarkimporter_ie.cc,v retrieving revision 1.17 retrieving revision 1.17.6.1 diff -u -3 -p -r1.17 -r1.17.6.1 --- kio/bookmarks/kbookmarkimporter_ie.cc 12 Jan 2004 18:25:20 -0000 1.17 +++ kio/bookmarks/kbookmarkimporter_ie.cc 19 Sep 2004 16:39:35 -0000 1.17.6.1 @@ -34,13 +34,13 @@ /* antlarr: KDE 4: Make them const QString & */ void KIEBookmarkImporter::parseIEBookmarks_url_file( QString filename, QString name ) { - static const int g_lineLimit = 4096; + static const int g_lineLimit = 16*1024; QFile f(filename); if(f.open(IO_ReadOnly)) { - QCString s(4096); + QCString s(g_lineLimit); while(f.readLine(s.data(), g_lineLimit)>=0) { if ( s[s.length()-1] != '\n' ) // Gosh, this line is longer than g_lineLimit. Skipping. Index: kio/bookmarks/kbookmarkimporter_ns.cc =================================================================== RCS file: /home/kde/kdelibs/kio/bookmarks/kbookmarkimporter_ns.cc,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -3 -p -r1.16 -r1.16.2.1 --- kio/bookmarks/kbookmarkimporter_ns.cc 3 Aug 2004 03:34:28 -0000 1.16 +++ kio/bookmarks/kbookmarkimporter_ns.cc 19 Sep 2004 16:39:35 -0000 1.16.2.1 @@ -47,7 +47,7 @@ void KNSBookmarkImporterImpl::parse() if(f.open(IO_ReadOnly)) { - static const int g_lineLimit = 4096; + static const int g_lineLimit = 16*1024; QCString s(g_lineLimit); // skip header while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.contains("
")); Index: kio/bookmarks/kbookmarkimporter_opera.cc =================================================================== RCS file: /home/kde/kdelibs/kio/bookmarks/kbookmarkimporter_opera.cc,v retrieving revision 1.12 retrieving revision 1.12.6.1 diff -u -3 -p -r1.12 -r1.12.6.1 --- kio/bookmarks/kbookmarkimporter_opera.cc 12 Jan 2004 18:25:20 -0000 1.12 +++ kio/bookmarks/kbookmarkimporter_opera.cc 19 Sep 2004 16:39:35 -0000 1.12.6.1 @@ -46,9 +46,10 @@ void KOperaBookmarkImporter::parseOperaB int lineno = 0; QString url, name, type; - QCString line(4096); + static const int g_lineLimit = 16*1024; + QCString line(g_lineLimit); - while ( file.readLine(line.data(), 4096) >=0 ) { + while ( file.readLine(line.data(), g_lineLimit) >=0 ) { lineno++; // skip lines that didn't fit in buffer and first two headers lines Index: kio/kfile/kdirselectdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kdirselectdialog.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.2 diff -u -3 -p -r1.21 -r1.21.2.2 --- kio/kfile/kdirselectdialog.cpp 1 Aug 2004 14:02:14 -0000 1.21 +++ kio/kfile/kdirselectdialog.cpp 18 Sep 2004 09:54:49 -0000 1.21.2.2 @@ -37,6 +37,9 @@ #include #include #include +#include +#include +#include #include "kfiletreeview.h" #include "kdirselectdialog.h" @@ -115,9 +118,11 @@ KDirSelectDialog::KDirSelectDialog(const SLOT( slotComboTextChanged( const QString& ) )); m_contextMenu = new QPopupMenu( this ); + KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, this, SLOT( slotMkdir() ), this); + newFolder->plug(m_contextMenu); + m_contextMenu->insertSeparator(); m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, this, SLOT( slotShowHiddenFoldersToggled() ), this); -// m_showHiddenFolders->setCheckedState( i18n("Hide Hidden Folders") ); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); @@ -386,6 +391,45 @@ void KDirSelectDialog::slotContextMenu( m_contextMenu->popup( pos ); } +void KDirSelectDialog::slotMkdir() +{ + bool ok; + QString where = url().prettyURL( +1, KURL::StripFileProtocol ); + QString directory = KIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ), + i18n( "Create new folder in:\n%1" ).arg( where ), + i18n("New Folder"), &ok, this)); + if (!ok) + return; + + bool selectDirectory = true; + bool writeOk = false; + bool exists = false; + KURL folderurl( url() ); + + QStringList dirs = QStringList::split( QDir::separator(), directory ); + QStringList::ConstIterator it = dirs.begin(); + + for ( ; it != dirs.end(); ++it ) + { + folderurl.addPath( *it ); + exists = KIO::NetAccess::exists( folderurl, false, 0 ); + writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() ); + } + + if ( exists ) // url was already existant + { + QString which = folderurl.isLocalFile() ? folderurl.path() : folderurl.prettyURL(); + KMessageBox::sorry(this, i18n("A file or folder named %1 already exists.").arg(which)); + selectDirectory = false; + } + else if ( !writeOk ) { + KMessageBox::sorry(this, i18n("You do not have permission to create that folder." )); + } + else if ( selectDirectory ) { + setCurrentURL( folderurl ); + } +} + void KDirSelectDialog::slotShowHiddenFoldersToggled() { KURL currentURL = url(); Index: kio/kfile/kdirselectdialog.h =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kdirselectdialog.h,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -3 -p -r1.11 -r1.11.2.1 --- kio/kfile/kdirselectdialog.h 10 May 2004 15:57:12 -0000 1.11 +++ kio/kfile/kdirselectdialog.h 18 Sep 2004 09:44:40 -0000 1.11.2.1 @@ -102,6 +102,7 @@ private slots: void slotComboTextChanged( const QString& text ); void slotContextMenu( KListView *, QListViewItem *, const QPoint & ); void slotShowHiddenFoldersToggled(); + void slotMkdir(); private: void readConfig( KConfig *config, const QString& group ); Index: kio/kfile/kfileiconview.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kfileiconview.cpp,v retrieving revision 1.95 retrieving revision 1.95.2.1 diff -u -3 -p -r1.95 -r1.95.2.1 --- kio/kfile/kfileiconview.cpp 5 Apr 2004 15:42:17 -0000 1.95 +++ kio/kfile/kfileiconview.cpp 13 Sep 2004 21:17:40 -0000 1.95.2.1 @@ -686,6 +686,8 @@ void KFileIconView::determineIcon( KFile void KFileIconView::listingCompleted() { + arrangeItemsInGrid(); + // QIconView doesn't set the current item automatically, so we have to do // that. We don't want to emit selectionChanged() tho. if ( !currentItem() ) { Index: kio/kfile/kfiletreeview.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kfiletreeview.cpp,v retrieving revision 1.33.6.1 retrieving revision 1.33.6.2 diff -u -3 -p -r1.33.6.1 -r1.33.6.2 --- kio/kfile/kfiletreeview.cpp 11 Aug 2004 20:26:22 -0000 1.33.6.1 +++ kio/kfile/kfiletreeview.cpp 13 Sep 2004 16:54:43 -0000 1.33.6.2 @@ -44,6 +44,7 @@ KFileTreeView::KFileTreeView( QWidget *p m_wantOpenFolderPixmaps( true ), m_toolTip( this ) { + setDragEnabled(true); setSelectionModeExt( KListView::Single ); m_animationTimer = new QTimer( this ); Index: kio/kfile/kopenwith.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kopenwith.cpp,v retrieving revision 1.99 retrieving revision 1.99.2.2 diff -u -3 -p -r1.99 -r1.99.2.2 --- kio/kfile/kopenwith.cpp 19 Jul 2004 14:57:10 -0000 1.99 +++ kio/kfile/kopenwith.cpp 16 Aug 2004 14:02:32 -0000 1.99.2.2 @@ -101,15 +101,27 @@ void KAppTreeListItem::init(const QPixma } -// ---------------------------------------------------------------------- -// Ensure that dirs are sorted in front of files and case is ignored +/* Ensures that directories sort before non-directories */ +int KAppTreeListItem::compare(QListViewItem *i, int col, bool ascending) const +{ + KAppTreeListItem *other = dynamic_cast(i); + + // Directories sort first + if (directory && !other->directory) + return -1; + + else if (!directory && other->directory) + return 1; + + else // both directories or both not + return QListViewItem::compare(i, col, ascending); +} +// ---------------------------------------------------------------------- +// Ensure that case is ignored QString KAppTreeListItem::key(int column, bool /*ascending*/) const { - if (directory) - return QString::fromLatin1(" ") + text(column).upper(); - else - return text(column).upper(); + return text(column).upper(); } void KAppTreeListItem::activate() @@ -141,6 +153,7 @@ KApplicationTree::KApplicationTree( QWid setRootIsDecorated( true ); addDesktopGroup( QString::null ); + cleanupTree(); connect( this, SIGNAL( currentChanged(QListViewItem*) ), SLOT( slotItemHighlighted(QListViewItem*) ) ); @@ -273,6 +286,40 @@ void KApplicationTree::resizeEvent( QRes KListView::resizeEvent(e); } +// Prune empty directories from the tree +void KApplicationTree::cleanupTree() +{ + QListViewItem *item=firstChild(); + while(item!=0) + { + if(item->isExpandable()) + { + item->setOpen(true); + if(item->childCount()==0) { + QListViewItem *current=item; + item=item->itemBelow(); + delete current; + continue; + } + item=item->itemBelow(); + continue; + } + item=item->itemBelow(); + } + item=firstChild(); + while(item!=0) + { + if(item->isExpandable()) + { + QListViewItem *temp=item->itemBelow(); + if(item->text(0)!=i18n("Applications")) + item->setOpen(false); + item=temp; + continue; + } + item=item->itemBelow(); + } +} /*************************************************************** * @@ -289,7 +336,7 @@ public: }; KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, QWidget* parent ) - :QDialog( parent, 0L, true ) + :QDialog( parent, "openwith", true ) { setCaption( i18n( "Open With" ) ); QString text; @@ -308,7 +355,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL:: KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, const QString&_text, const QString& _value, QWidget *parent) - :QDialog( parent, 0L, true ) + :QDialog( parent, "openwith", true ) { QString caption = KStringHandler::csqueeze( _urls.first().prettyURL() ); if (_urls.count() > 1) @@ -320,7 +367,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL:: KOpenWithDlg::KOpenWithDlg( const QString &serviceType, const QString& value, QWidget *parent) - :QDialog( parent, 0L, true ) + :QDialog( parent, "openwith", true ) { setCaption(i18n("Choose Application for %1").arg(serviceType)); QString text = i18n("Select the program for the file type: %1. " @@ -333,7 +380,7 @@ KOpenWithDlg::KOpenWithDlg( const QStrin } KOpenWithDlg::KOpenWithDlg( QWidget *parent) - :QDialog( parent, 0L, true ) + :QDialog( parent, "openwith", true ) { setCaption(i18n("Choose Application")); QString text = i18n("Select a program. " Index: kio/kfile/kopenwith_p.h =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kopenwith_p.h,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -3 -p -r1.3 -r1.3.6.1 --- kio/kfile/kopenwith_p.h 28 Feb 2003 01:03:58 -0000 1.3 +++ kio/kfile/kopenwith_p.h 14 Aug 2004 22:24:18 -0000 1.3.6.1 @@ -1,4 +1,4 @@ -// "$Id: kopenwith_p.h,v 1.3 2003/02/28 01:03:58 antlarr Exp $" +// "$Id: kopenwith_p.h,v 1.3.6.1 2004/08/14 22:24:18 binner Exp $" /* This file is part of the KDE libraries Copyright (C) 2000 David Faure @@ -45,6 +45,7 @@ class KAppTreeListItem : public QListVie QString exec; protected: + int compare(QListViewItem *i, int col, bool ascending ) const; QString key(int column, bool ascending) const; void init(const QPixmap& pixmap, bool parse, bool dir, const QString &_path, const QString &exec); @@ -84,6 +85,7 @@ public: protected: void resizeEvent( QResizeEvent *_ev ); KAppTreeListItem* currentitem; + void cleanupTree(); public slots: void slotItemHighlighted(QListViewItem* i); Index: kio/kfile/kpropertiesdialog.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kpropertiesdialog.cpp,v retrieving revision 1.314.2.1 retrieving revision 1.314.2.4 diff -u -3 -p -r1.314.2.1 -r1.314.2.4 --- kio/kfile/kpropertiesdialog.cpp 7 Aug 2004 11:00:48 -0000 1.314.2.1 +++ kio/kfile/kpropertiesdialog.cpp 17 Sep 2004 17:07:08 -0000 1.314.2.4 @@ -789,6 +789,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPro KIconButton *iconButton = new KIconButton( d->m_frame ); int bsize = 66 + 2 * iconButton->style().pixelMetric(QStyle::PM_ButtonMargin); iconButton->setFixedSize(bsize, bsize); + iconButton->setIconSize(48); iconButton->setStrictIconSize(false); // This works for everything except Device icons on unmounted devices // So we have to really open .desktop files @@ -814,7 +815,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPro QLabel *iconLabel = new QLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(QStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); - iconLabel->setPixmap( DesktopIcon( iconStr ) ); + iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; } grid->addWidget(iconArea, curRow, 0, AlignLeft); @@ -863,6 +864,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPro connect( button, SIGNAL( clicked() ), SLOT( slotEditFileType() )); + if (!kapp->authorizeKAction("editfiletype")) + button->hide(); grid->addWidget(box, curRow++, 2); } @@ -954,7 +957,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPro l = new QLabel(i18n("Points to:"), d->m_frame ); grid->addWidget(l, curRow, 0); - l = new QLabel(item->linkDest(), d->m_frame ); + l = new KSqueezedTextLabel(item->linkDest(), d->m_frame ); grid->addWidget(l, curRow++, 2); } Index: kio/kfile/kpropsdlgplugin.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kpropsdlgplugin.desktop,v retrieving revision 1.182 retrieving revision 1.182.2.2 diff -u -3 -p -r1.182 -r1.182.2.2 --- kio/kfile/kpropsdlgplugin.desktop 27 Jul 2004 07:23:29 -0000 1.182 +++ kio/kfile/kpropsdlgplugin.desktop 31 Aug 2004 07:21:29 -0000 1.182.2.2 @@ -26,7 +26,7 @@ Comment[fi]=Lisäosa asetusikkunalle Comment[fr]=Module externe pour la boîte de dialogue des propriétés Comment[gl]=Plugin para o Diálogo de Propiedades Comment[he]=תוסף לדו-שיח המאפיינים -Comment[hi]=विशेषता संवाद हेतु प्लगइन +Comment[hi]=विशेषता संवाद के लिए प्लगइन Comment[hr]=Dodatak za dijalog "Vrijednosti" Comment[hu]=Beépülő modul a tulajdonságok párbeszédablakhoz Comment[id]=Plugin untuk Dialog Properties @@ -42,7 +42,7 @@ Comment[ms]=Plugmasuk untuk Dialog Ciri- Comment[mt]=Plugin għad-djalogu tal-propjetajiet Comment[nb]=Programtillegg for dialogvinduet for egenskaper Comment[nds]=Plugin för den Eegenschapen Dialoog -Comment[nl]=Plugin voor het 'Eigenschappen'-dialoog +Comment[nl]=Plugin voor de 'Eigenschappen'-dialoog Comment[nn]=Tillegg til eigenskapar-dialogen Comment[nso]=Tsenyo ya Poledisano ya Dithoto Comment[oc]=Branquament pel dialeg de propietats @@ -68,7 +68,6 @@ Comment[uz]=Хоссалар диало Comment[ven]=U pulaga ha zwishumiswa zwa nyambedzano Comment[vi]=Plugin cho tính chất của hộp thoại Comment[xh]=Iplagi yangaphakathi Yezinto zobumnini Zencoko yababini -Comment[xx]=xxPlugin for the Properties Dialogxx Comment[zh_CN]=属性对话的插件 Comment[zh_TW]=屬性對話盒的外掛程式 Comment[zu]=I-plugin Yengxoxo Yezinkomba zobunini Index: kio/kfile/kurlrequester.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kfile/kurlrequester.cpp,v retrieving revision 1.55.4.1 retrieving revision 1.55.4.2 diff -u -3 -p -r1.55.4.1 -r1.55.4.2 --- kio/kfile/kurlrequester.cpp 10 Aug 2004 15:44:11 -0000 1.55.4.1 +++ kio/kfile/kurlrequester.cpp 18 Sep 2004 17:57:15 -0000 1.55.4.2 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -254,6 +255,20 @@ QString KURLRequester::url() const void KURLRequester::slotOpenDialog() { + KURL newurl; + if ( (d->fileDialogMode & KFile::Directory) && !(d->fileDialogMode & KFile::File) || + /* catch possible fileDialog()->setMode( KFile::Directory ) changes */ + (myFileDialog && ( (myFileDialog->mode() & KFile::Directory) && + (myFileDialog->mode() & (KFile::File | KFile::Files)) == 0 ) ) ) + { + newurl = KDirSelectDialog::selectDirectory(url(), d->fileDialogMode & KFile::LocalOnly); + if ( !newurl.isValid() ) + { + return; + } + } + else + { emit openFileDialog( this ); KFileDialog *dlg = fileDialog(); @@ -264,18 +279,23 @@ void KURLRequester::slotOpenDialog() dlg->setSelection( u.url() ); } - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() != QDialog::Accepted ) { - if ( dlg->selectedURL().isLocalFile() ) + return; + } + + newurl = dlg->selectedURL(); + } + + if ( newurl.isLocalFile() ) { - setURL( dlg->selectedURL().path() ); + setURL( newurl.path() ); } else { - setURL( dlg->selectedURL().prettyURL() ); + setURL( newurl.prettyURL() ); } emit urlSelected( d->url() ); - } } void KURLRequester::setMode(unsigned int mode) Index: kio/kio/kfileitem.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kio/kfileitem.cpp,v retrieving revision 1.158 retrieving revision 1.158.2.1 diff -u -3 -p -r1.158 -r1.158.2.1 --- kio/kio/kfileitem.cpp 26 May 2004 11:52:47 -0000 1.158 +++ kio/kio/kfileitem.cpp 14 Sep 2004 18:48:26 -0000 1.158.2.1 @@ -17,7 +17,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: kfileitem.cpp,v 1.158 2004/05/26 11:52:47 faure Exp $ +// $Id: kfileitem.cpp,v 1.158.2.1 2004/09/14 18:48:26 binner Exp $ #include #include @@ -635,6 +635,7 @@ QString KFileItem::getToolTipText(int ma if (info.isValid() && !info.isEmpty() ) { + tip += "
                    
"; QStringList keys = info.preferredKeys(); // now the rest Index: kio/kio/kfilemetainfo.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kio/kfilemetainfo.cpp,v retrieving revision 1.81 retrieving revision 1.81.2.1 diff -u -3 -p -r1.81 -r1.81.2.1 --- kio/kio/kfilemetainfo.cpp 3 May 2004 06:00:00 -0000 1.81 +++ kio/kio/kfilemetainfo.cpp 24 Aug 2004 22:36:36 -0000 1.81.2.1 @@ -17,7 +17,7 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id: kfilemetainfo.cpp,v 1.81 2004/05/03 06:00:00 pletourn Exp $ + * $Id: kfilemetainfo.cpp,v 1.81.2.1 2004/08/24 22:36:36 mardelle Exp $ */ #include @@ -856,7 +856,7 @@ void KFilePlugin::setUnit(KFileMimeTypeI item->m_suffix = i18n("bpp"); break; case KFileMimeTypeInfo::Hertz: - item->m_suffix = i18n("Hz"); + item->m_suffix = i18n("Hz"); break; case KFileMimeTypeInfo::Millimeters: item->m_suffix = i18n("mm"); Index: kio/kio/kfilterbase.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kio/kfilterbase.cpp,v retrieving revision 1.13 retrieving revision 1.13.6.1 diff -u -3 -p -r1.13 -r1.13.6.1 --- kio/kio/kfilterbase.cpp 20 Oct 2003 22:26:12 -0000 1.13 +++ kio/kio/kfilterbase.cpp 1 Sep 2004 17:30:01 -0000 1.13.6.1 @@ -63,7 +63,7 @@ KFilterBase * KFilterBase::findFilterByM if ( filter ) return filter; } - kdWarning() << "KFilterBase::findFilterByExtension : no filter found for " << mimeType << endl; + kdDebug(7005) << "KFilterBase::findFilterByExtension : no filter found for " << mimeType << endl; return 0L; } Index: kio/kio/kservice.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kio/kservice.cpp,v retrieving revision 1.155 retrieving revision 1.155.4.1 diff -u -3 -p -r1.155 -r1.155.4.1 --- kio/kio/kservice.cpp 20 Jan 2004 19:09:06 -0000 1.155 +++ kio/kio/kservice.cpp 21 Sep 2004 14:40:36 -0000 1.155.4.1 @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. **/ -// $Id: kservice.cpp,v 1.155 2004/01/20 19:09:06 waba Exp $ +// $Id: kservice.cpp,v 1.155.4.1 2004/09/21 14:40:36 waba Exp $ #include @@ -705,6 +705,10 @@ bool KService::noDisplay() const { if (aList.contains("KDE")) return true; } + + if (!kapp->authorizeControlModule(d->menuId)) + return true; + return false; } Index: kio/kio/ktar.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kio/ktar.cpp,v retrieving revision 1.70 retrieving revision 1.70.2.1 diff -u -3 -p -r1.70 -r1.70.2.1 --- kio/kio/ktar.cpp 14 May 2004 18:20:53 -0000 1.70 +++ kio/kio/ktar.cpp 21 Aug 2004 21:07:00 -0000 1.70.2.1 @@ -295,7 +295,6 @@ bool KTar::KTarPrivate::fillTempFile( co return false; } QByteArray buffer(8*1024); - filterDev->close(); if ( ! filterDev->open( IO_ReadOnly ) ) { delete filterDev; Index: kio/kio/kzip.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kio/kzip.cpp,v retrieving revision 1.48 retrieving revision 1.48.2.2 diff -u -3 -p -r1.48 -r1.48.2.2 --- kio/kio/kzip.cpp 30 Apr 2004 16:04:49 -0000 1.48 +++ kio/kio/kzip.cpp 17 Sep 2004 20:35:51 -0000 1.48.2.2 @@ -405,17 +405,23 @@ bool KZip::openArchive( int mode ) ParseFileInfo *pfi = new ParseFileInfo(); pfi_map.insert(filename.data(), pfi); - // read and parse extra field + // read and parse the beginning of the extra field, + // skip rest of extra field in case it is too long + unsigned int extraFieldEnd = dev->at() + extralen; pfi->extralen = extralen; int handledextralen = QMIN(extralen, (int)sizeof buffer); n = dev->readBlock(buffer, handledextralen); // no error msg necessary as we deliberately truncate the extra field if (!parseExtraField(buffer, handledextralen, true, *pfi)) return false; + + // jump to end of extra field + dev->at( extraFieldEnd ); // we have to take care of the 'general purpose bit flag'. // if bit 3 is set, the header doesn't contain the length of - // the file and we look for the signature 'PK\7\8'. + // the file and we look for the signature 'PK\7\8' or another + // PKxx signature. if ( gpf & 8 ) { bool foundSignature = false; @@ -439,14 +445,26 @@ bool KZip::openArchive( int mode ) return false; } + // we have to detect three magic tokens here: + // PK34 for the next local header in case there is no data descriptor + // PK12 for the central header in case there is no data descriptor + // PK78 for the data descriptor in case it is following the compressed data + if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 ) { foundSignature = true; dev->at( dev->at() + 12 ); // skip the 'data_descriptor' } + else if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 ) + || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) ) + { + foundSignature = true; + dev->at( dev->at() - 4 ); // go back 4 bytes, so that the magic bytes can be found + // in the next cycle + } } } - else + else // local header contains the compressed and uncompressed size { // check if this could be a symbolic link if (compression_mode == NoCompression @@ -459,9 +477,58 @@ bool KZip::openArchive( int mode ) kdWarning(7040) << "Invalid ZIP file. Unexpected end of file. (#5)" << endl; return false; } - } else { - - dev->at( dev->at() + compr_size ); + } + else // normal file + { + if ( dev->size() > 0 && compr_size > (Q_LONG)dev->size() ) + { + // here we cannot trust the compressed size, so scan through the compressed + // data to find the next header + bool foundSignature = false; + + while (!foundSignature) + { + n = dev->readBlock( buffer, 1 ); + if (n < 1) + { + kdWarning(7040) << "Invalid ZIP file. Unexpected end of file. (#6)" << endl; + return false; + } + + if ( buffer[0] != 'P' ) + continue; + + n = dev->readBlock( buffer, 3 ); + if (n < 3) + { + kdWarning(7040) << "Invalid ZIP file. Unexpected end of file. (#7)" << endl; + return false; + } + + // we have to detect three magic tokens here: + // PK34 for the next local header in case there is no data descriptor + // PK12 for the central header in case there is no data descriptor + // PK78 for the data descriptor in case it is following the compressed data + + if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 ) + { + foundSignature = true; + dev->at( dev->at() + 12 ); // skip the 'data_descriptor' + } + else if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 ) + || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) ) + { + foundSignature = true; + dev->at( dev->at() - 4 ); + // go back 4 bytes, so that the magic bytes can be found + // in the next cycle... + } + } + } + else + { + dev->at( dev->at() + compr_size ); + } } // here we calculate the length of the file in the zip // with headers and jump to the next header. Index: kio/kio/slave.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/kio/slave.cpp,v retrieving revision 1.61 retrieving revision 1.61.2.1 diff -u -3 -p -r1.61 -r1.61.2.1 --- kio/kio/slave.cpp 30 Apr 2004 11:39:44 -0000 1.61 +++ kio/kio/slave.cpp 8 Sep 2004 12:36:20 -0000 1.61.2.1 @@ -3,7 +3,7 @@ * Copyright (c) 2000 Waldo Bastian * 2000 Stephan Kulow * - * $Id: slave.cpp,v 1.61 2004/04/30 11:39:44 waba Exp $ + * $Id: slave.cpp,v 1.61.2.1 2004/09/08 12:36:20 tilladam Exp $ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -443,8 +443,8 @@ Slave* Slave::holdSlave( const QString & { //kdDebug(7002) << "holdSlave '" << protocol << "' for " << url.prettyURL() << endl; // Firstly take into account all special slaves - if (protocol == "data") // simply return a new one for data protocol - return new DataProtocol(); + if (protocol == "data") + return 0; DCOPClient *client = kapp->dcopClient(); if (!client->isAttached()) Index: kio/misc/kio_uiserver.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/misc/kio_uiserver.desktop,v retrieving revision 1.185 retrieving revision 1.185.2.2 diff -u -3 -p -r1.185 -r1.185.2.2 --- kio/misc/kio_uiserver.desktop 27 Jul 2004 07:23:29 -0000 1.185 +++ kio/misc/kio_uiserver.desktop 31 Aug 2004 07:21:29 -0000 1.185.2.2 @@ -10,7 +10,6 @@ Name[nso]=kio_uiseabi Name[ro]=Kio_uiserver Name[sv]=Kio-gränssnittsserver Name[ta]=kio_uiசேவையகம் -Name[xx]=xxkio_uiserverxx Exec=kio_uiserver Comment=KDE's Progress Info UI server Comment[ar]=خادم معلومات تقدم واجهة كيدي @@ -33,7 +32,7 @@ Comment[fi]=KDE:n edistymispalkin käytt Comment[fr]=Serveur graphique d'infos de progression de KDE Comment[gl]=Servidor UI de Información de Progreso de KDE Comment[he]=שרת ממשק מידע ההתקדמות של KDE -Comment[hi]=केडीई का प्रोग्रेस इन्फो UI सर्वर +Comment[hi]=केडीई का प्रोग्रेस जानकारी UI सर्वर Comment[hr]=KDEov Progess Info UI poslužitelj Comment[hu]=KDE folyamatinformációs kiszolgáló Comment[id]=Perkembangan KDE mengenai info server UI @@ -74,7 +73,6 @@ Comment[uz]=KDE'нинг маълумо Comment[ven]=UI siva ya mafhungo a mwelaphanda a KDE Comment[vi]=Máy chủ xem tiến trình các thông tin vềEUI của KDE Comment[xh]=Umcedisi we UI Wenqubela Yenkcukacha we KDE -Comment[xx]=xxKDE's Progress Info UI serverxx Comment[zh_CN]=KDE 的进度信息用户界面服务器 Comment[zh_TW]=KDE 的進度資訊使用者介面伺服器 Comment[zu]=Umlekeleli we-UI Yolwazi Lwenqubo lwe-KDE Index: kio/misc/uiserver.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/misc/uiserver.cpp,v retrieving revision 1.115 retrieving revision 1.115.2.1 diff -u -3 -p -r1.115 -r1.115.2.1 --- kio/misc/uiserver.cpp 13 Jul 2004 22:10:23 -0000 1.115 +++ kio/misc/uiserver.cpp 20 Aug 2004 14:21:47 -0000 1.115.2.1 @@ -189,7 +189,7 @@ ProgressItem::ProgressItem( ListProgress m_sAppId = app_id; m_iJobId = job_id; m_visible = true; - m_defaultProgressVisible = true; + m_defaultProgressVisible = showDefault; // create dialog, but don't show it defaultProgress = new KIO::DefaultProgress( false ); Index: kio/misc/kpac/eventsrc =================================================================== RCS file: /home/kde/kdelibs/kio/misc/kpac/eventsrc,v retrieving revision 1.67 retrieving revision 1.67.2.2 diff -u -3 -p -r1.67 -r1.67.2.2 --- kio/misc/kpac/eventsrc 30 Jul 2004 07:01:09 -0000 1.67 +++ kio/misc/kpac/eventsrc 31 Aug 2004 07:21:30 -0000 1.67.2.2 @@ -20,7 +20,7 @@ Comment[fi]=Automaattiset proxy-asetukse Comment[fr]=Configuration automatique du proxy Comment[gl]=Configuración Automática do Proxi Comment[he]=הגדרות פרוקסי אוטומטיות -Comment[hi]=स्वचालित प्रॉक्सी कॉन्फ़िगरेटर +Comment[hi]=स्वचलित प्रॉक्सी कॉन्फ़िगरेटर Comment[hr]=Automatsko podešavanje proxyja Comment[hu]=Automatikus proxybeállítás Comment[id]=Konfigurasi Proxi Otomatis @@ -54,7 +54,6 @@ Comment[tr]=Otomatik Vekil Sunucu Yapıl Comment[uk]=Автоматичне визначення проксі сервера Comment[uz]=Проксини автоматик равишда мослаш Comment[wa]=Apontiaedje otomatike do procsi -Comment[xx]=xxAutomatic Proxy Configurationxx Comment[zh_CN]=自动代理配置 Comment[zh_TW]=自動代理組態 @@ -111,7 +110,6 @@ Name[tg]=Дастнависи вакил Name[tr]=Geçersiz vekil sunucu betiği Name[uk]=Неправильний скрипт для проксі Name[uz]=Прокси скрипти ҳақиқий эмас -Name[xx]=xxInvalid proxy scriptxx Name[zh_CN]=无效的代理脚本 Name[zh_TW]=不合法 proxy 命令稿檔案 Comment=The downloaded proxy configuration script is invalid @@ -166,7 +164,6 @@ Comment[tg]=Шакли дастнави Comment[tr]=Vekil sunucu yapılandırma dosyası geçersiz Comment[uk]=Звантажений скрипт для визначення проксі сервера неправильний Comment[uz]=Проксини мослаш учун ёзиб олинган скрипт ҳақиқий эмас -Comment[xx]=xxThe downloaded proxy configuration script is invalidxx Comment[zh_CN]=下载的代理配置脚本是无效的 Comment[zh_TW]=代理組態的 script 檔案語法有誤 default_presentation=16 @@ -225,7 +222,6 @@ Name[tg]=Хатои дастнавис Name[tr]=Betik indirme hatası Name[uk]=Помилка звантаження скрипту Name[uz]=Скриптни ёзиб олишда хато рўй берди -Name[xx]=xxScript download errorxx Name[zh_CN]=脚本下载错误 Name[zh_TW]=Script 下載錯誤 Comment=The proxy configuration script could not be downloaded @@ -280,7 +276,6 @@ Comment[tg]=Шакли дастнави Comment[tr]=Vekil sunucu yapılandırma dosyası indirilemedi Comment[uk]=Не вдається звантажити скрипт для визначення проксі сервера Comment[uz]=Проксини мослаш учун скриптни ёзиб олиб бўлмади -Comment[xx]=xxThe proxy configuration script could not be downloadedxx Comment[zh_CN]=代理配置脚本无法下载 Comment[zh_TW]=無法取得代理組態 script 檔案 default_presentation=16 @@ -338,7 +333,6 @@ Name[tg]=Фикри хатои даст Name[tr]=Betik çalıştırma hatası Name[uk]=Помилка виконання скрипту Name[uz]=Скриптни текширишда хато рўй берди -Name[xx]=xxScript evaluation errorxx Name[zh_CN]=脚本求值错误 Name[zh_TW]=Script 執行錯誤 Comment=There was an error executing the proxy configuration script @@ -394,7 +388,6 @@ Comment[tg]=Хато фаразани д Comment[tr]=Vekil sunucu yapılandırma dosyası çalıştırılamadı Comment[uk]=Виникла помилка при спробі виконати скрипт для визначення проксі сервера Comment[uz]=Проксини мослаш учун скриптни ишга туширишда хато рўй берди -Comment[xx]=xxThere was an error executing the proxy configuration scriptxx Comment[zh_CN]=执行代理配置脚本出现错误 Comment[zh_TW]=proxy 代理組態檔案執行錯誤 default_presentation=0 Index: kio/misc/kpac/proxyscout.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/misc/kpac/proxyscout.desktop,v retrieving revision 1.75 retrieving revision 1.75.2.4 diff -u -3 -p -r1.75 -r1.75.2.4 --- kio/misc/kpac/proxyscout.desktop 5 Aug 2004 06:36:53 -0000 1.75 +++ kio/misc/kpac/proxyscout.desktop 20 Sep 2004 13:53:21 -0000 1.75.2.4 @@ -14,7 +14,6 @@ Name[fa]=پراکسی Scout Name[fi]=Proxy-tiedustelija Name[hi]= प्रॉक्सी स्काउट Name[hr]=Proxy izvidnik -Name[is]=Selleit Name[it]=Esploratore proxy Name[ja]=プロキシを探す Name[ko]=프록시 찾기 @@ -37,7 +36,6 @@ Name[tg]=Разведкачӣ Вакил Name[tr]=Vekil Sunucu Name[uk]=Розвідник проксі сервера Name[uz]=Прокси скаут -Name[xx]=xxProxy Scoutxx Name[zh_CN]=代理搜索 Comment=Automatic proxy configuration Comment[bg]=Автоматично конфигуриране на прокси сървъра @@ -51,7 +49,9 @@ Comment[es]=Configuración automática d Comment[et]=Automaatne proxy konfigureerimine Comment[fi]=Automaattiset proxy-asetukset Comment[fr]=Configuration automatique du proxy +Comment[he]=הגדרות פרוקסי אוטומטיות Comment[hu]=Automatikus proxybeállítás +Comment[is]=Sjálfvirkar stillingar vefsels Comment[it]=Configurazione automatica proxy Comment[ja]=自動プロキシー設定 Comment[nb]=Automatisk mellomtjeneroppsett @@ -61,13 +61,16 @@ Comment[pa]=ਸਵੈ-ਚਾਲਿਤ Comment[pl]=Autokonfiguracja pośrednika Comment[pt]=Configuração automática de 'proxy' Comment[pt_BR]=Configuração automática do proxy +Comment[ro]=Configurare automată pentru proxy +Comment[se]=Automáhtalaš gaskabálváheiveheapmi Comment[sk]=Automatická konfigurácia proxy Comment[sl]=Samodejne nastavitve posrednika Comment[sr]=Аутоматско подешавање проксија Comment[sr@Latn]=Аутоматско подешавање проксија Comment[sv]=Automatisk proxyinställning +Comment[ta]=தானியக்க பதிலாள் வடிவமைப்பு Comment[tg]=Танзими прокси бо автоматикӣ -Comment[xx]=xxAutomatic proxy configurationxx +Comment[uk]=Автоматичне визначення проксі сервера Comment[zh_CN]=自动代理配置 ServiceTypes=KDEDModule X-KDE-ModuleType=Library Index: kio/misc/kssld/kssld.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/misc/kssld/kssld.desktop,v retrieving revision 1.109 retrieving revision 1.109.2.4 diff -u -3 -p -r1.109 -r1.109.2.4 --- kio/misc/kssld/kssld.desktop 5 Aug 2004 06:36:54 -0000 1.109 +++ kio/misc/kssld/kssld.desktop 20 Sep 2004 13:53:21 -0000 1.109.2.4 @@ -67,7 +67,6 @@ Name[uk]=Модуль демону KSSL Name[uz]=KSSL хизматининг модули Name[ven]=Modulu wa Daemon wa KSSL Name[xh]=Isicatshulwa se KSSL Daemon -Name[xx]=xxKSSL Daemon Modulexx Name[zh_CN]=KSSL 守护进程模块 Name[zh_TW]=KSSL 伺服程式模組 Name[zu]=Ingxenye ye-daemon ye-KSSL @@ -83,7 +82,9 @@ Comment[es]=Módulo de demonio KSSL para Comment[et]=KDED KSSL deemoni moodul Comment[fi]=KSSL-palvelinmoduuli KDED:lle Comment[fr]=Module démon KSSL pour KDED +Comment[he]=מודול תהליך רקע של SSL עבור KDED Comment[hu]=KSSL szolgáltatásmodul a KDED-hez +Comment[is]=KSSL þjónseining fyrir KDED Comment[it]=Modulo demone KSSL per KDED Comment[ja]=KDED用のKSSLデーモンモジュール Comment[nb]=KSSL nissemodul for KDED @@ -93,11 +94,14 @@ Comment[pa]=KDED ਲਈ KSSL ਪੇਸ਼ Comment[pl]=Obsługa SSL w KDED Comment[pt]=Módulo servidor de KSSL para o KDED Comment[pt_BR]=Módulo de serviço KSSL para o KDE +Comment[ro]=Modul demon KSSL pentru KDED +Comment[se]=KDED:a KSSL-bálvámoduvla Comment[sk]=Modul démona KSSL pre KDED Comment[sl]=Strežniški modul KSSL za KDED Comment[sr]=KSSL демон модул за KDED Comment[sr@Latn]=KSSL демон модул за KDED Comment[sv]=KSSL-demonmodul för KDED +Comment[ta]=KDEDக்கான KSSL டெமான் பகுதி Comment[tg]=Модули Демон KSSL брои KDED -Comment[xx]=xxKSSL daemon module for KDEDxx +Comment[uk]=Модуль демону KSSL для KDED Comment[zh_CN]=KDED 的 KSSL 守护进程模块 Index: kio/misc/kwalletd/kwalletd.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/misc/kwalletd/kwalletd.desktop,v retrieving revision 1.68 retrieving revision 1.68.2.4 diff -u -3 -p -r1.68 -r1.68.2.4 --- kio/misc/kwalletd/kwalletd.desktop 5 Aug 2004 06:36:54 -0000 1.68 +++ kio/misc/kwalletd/kwalletd.desktop 20 Sep 2004 13:53:22 -0000 1.68.2.4 @@ -58,7 +58,6 @@ Name[tg]=Модули Демон KWallet Name[tr]=KWallet Program Modülü Name[uk]=Модуль демону KWallet Name[uz]=KWallet хизматининг модули -Name[xx]=xxKWallet Daemon Modulexx Name[zh_CN]=KWallet 守护进程模块 Name[zh_TW]=KWAllet 服務程式模組 Comment=KWallet daemon module for KDED @@ -73,7 +72,9 @@ Comment[es]=Módulo de demonio KWallet p Comment[et]=KDED KWalleti deemoni moodul Comment[fi]=KWallet palvelinmoduuli KDED:lle Comment[fr]=Module démon KWallet pour KDED +Comment[he]=מודול תהליך רקע של KWallet עבור KDED Comment[hu]=KWallet szolgáltatásmodul a KDED-hez +Comment[is]=KWallet þjónseining fyrir KDED Comment[it]=Modulo demone KWallet per KDED Comment[ja]=KDED用のKWallet デーモンモジュール Comment[nb]=KWallet nissemodul for KDED @@ -83,11 +84,14 @@ Comment[pa]=KDED ਲਈ KWallet ਪੇ Comment[pl]=Moduł KWallet w KDED Comment[pt]=Módulo servidor do KWallet para o KDED Comment[pt_BR]=Módulo do serviço de carteira para o KDE +Comment[ro]=Modul demon KWallet pentru KDED +Comment[se]=KDED:a KWallet-bálvámoduvla Comment[sk]=Modul démona KWallet pre KDED Comment[sl]=Modul KWallet demon za KDED Comment[sr]=KWallet демон модул за KDED Comment[sr@Latn]=KWallet демон модул за KDED Comment[sv]=Kwallet-demonmodul för KDED +Comment[ta]=KDEDக்கான KWallet Daemon தொகுதி Comment[tg]=Модули Демон KWallet барои KDED -Comment[xx]=xxKWallet daemon module for KDEDxx +Comment[uk]=Модуль демону торбинок KWallet для KDED Comment[zh_CN]=KDED 的 KWallet 守护进程模块 Index: kio/tests/dummymeta.desktop =================================================================== RCS file: /home/kde/kdelibs/kio/tests/dummymeta.desktop,v retrieving revision 1.51 retrieving revision 1.51.2.1 diff -u -3 -p -r1.51 -r1.51.2.1 --- kio/tests/dummymeta.desktop 27 Jul 2004 07:23:30 -0000 1.51 +++ kio/tests/dummymeta.desktop 24 Aug 2004 06:29:26 -0000 1.51.2.1 @@ -36,7 +36,6 @@ Name[tr]=Kukla Meta Name[uk]=Макет метаданих Name[uz]=Маъносиз мета Name[ven]=Meta isa tshili -Name[xx]=xxDummy Metaxx Name[zh_CN]=哑元 Name[zh_TW]=空的資料定義 ServiceTypes=KFilePlugin Index: kio/tests/kurifiltertest.cpp =================================================================== RCS file: /home/kde/kdelibs/kio/tests/kurifiltertest.cpp,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -u -3 -p -r1.42 -r1.42.2.1 --- kio/tests/kurifiltertest.cpp 30 Jul 2004 04:31:46 -0000 1.42 +++ kio/tests/kurifiltertest.cpp 15 Sep 2004 04:02:58 -0000 1.42.2.1 @@ -173,15 +173,25 @@ int main(int argc, char **argv) filter( "linuxtoday.com", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL ); filter( "LINUXTODAY.COM", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL ); filter( "kde.org", "http://kde.org", KURIFilterData::NET_PROTOCOL ); - filter( "ftp.kde.org", "http://ftp.kde.org", KURIFilterData::NET_PROTOCOL ); + filter( "ftp.kde.org", "ftp://ftp.kde.org", KURIFilterData::NET_PROTOCOL ); + filter( "ftp.kde.org:21", "ftp://ftp.kde.org:21", KURIFilterData::NET_PROTOCOL ); filter( "cr.yp.to", "http://cr.yp.to", KURIFilterData::NET_PROTOCOL ); filter( "user@192.168.1.0:3128", "http://user@192.168.1.0:3128", KURIFilterData::NET_PROTOCOL ); filter( "127.0.0.1", "http://127.0.0.1", KURIFilterData::NET_PROTOCOL ); + filter( "127.0.0.1:3128", "http://127.0.0.1:3128", KURIFilterData::NET_PROTOCOL ); + filter( "foo@bar.com", "mailto:foo@bar.com", KURIFilterData::NET_PROTOCOL ); + filter( "www.123.foo", "http://www.123.foo", KURIFilterData::NET_PROTOCOL ); + filter( "user@www.123.foo:3128", "http://user@www.123.foo:3128", KURIFilterData::NET_PROTOCOL ); - // Exotic IPv4 address formats. Really exercises the shorturi filter. + // Exotic IPv4 address formats... filter( "127.1", "http://127.1", KURIFilterData::NET_PROTOCOL ); filter( "127.0.1", "http://127.0.1", KURIFilterData::NET_PROTOCOL ); + // Local domain filter territory - If you uncomment this test, make sure + // you adjust this based on the localhost entry in /etc/hosts. + // filter( "localhost:3128", "http://localhost.localdomain:3128", KURIFilterData::NET_PROTOCOL ); + filter( "localhost", "http://localhost", KURIFilterData::NET_PROTOCOL ); + filter( "/", "/", KURIFilterData::LOCAL_DIR ); filter( "/", "/", KURIFilterData::LOCAL_DIR, "kshorturifilter" ); filter( "~/.kderc", QDir::homeDirPath().local8Bit()+"/.kderc", KURIFilterData::LOCAL_FILE, "kshorturifilter" ); @@ -192,6 +202,8 @@ int main(int argc, char **argv) // Should not be filtered at all. All valid protocols of this form will be ignored. filter( "smb:" , "smb:", KURIFilterData::UNKNOWN ); + filter( "ftp:" , "ftp:", KURIFilterData::UNKNOWN ); + filter( "http:" , "http:", KURIFilterData::UNKNOWN ); /* Automatic searching tests. NOTE: If the Default search engine is set to 'None', @@ -202,18 +214,14 @@ int main(int argc, char **argv) filter( "FTP", 0 , KURIFilterData::NET_PROTOCOL ); // If your default search engine is set to 'Google', you can uncomment the test below. - -/* filter( "gg:", "http://www.google.com/search?q=gg%3A&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); filter( "KDE", "http://www.google.com/search?q=KDE&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); filter( "FTP", "http://www.google.com/search?q=FTP&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); -*/ - // Should be handled by the local domain filter unless the user circumvents is - // by adding their own pattern match.... - filter( "localhost", "http://localhost", KURIFilterData::NET_PROTOCOL ); - // Typing 'ls' in konq's location bar should go to google for ls too. Unless - // Default search engine is set to 'None' in the Web Shortcuts dialog. + + // Typing 'ls' or any other valid unix command in konq's location bar should result in + // a search using the default search engine unless that is set to 'None' in which + // case you should end up with an error message. //filter( "ls", "http://www.google.com/search?q=ls&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // Executable tests - No IKWS in minicli @@ -284,10 +292,6 @@ int main(int argc, char **argv) filter( "../", kdehome, KURIFilterData::LOCAL_DIR, "kshorturifilter", kdehome+"/share" ); filter( "apps", kdehome+"/share/apps", KURIFilterData::LOCAL_DIR, "kshorturifilter", kdehome+"/share" ); - // This test is against the specification of setAbsolutePath !! - // It says a _PATH_ must be used! - // kshorturifilter had code for this, but it broke, since it couldn't check that the resulting URL existed. Disabled. - //filter( "../../index.html", "http://www.kde.org/index.html", KURIFilterData::NET_PROTOCOL, "kshorturifilter", "http://www.kde.org/tes1/tes2/" ); kdDebug() << "All tests done. Go home..." << endl; return 0; } Index: kioslave/bzip2/kbzip2filter.desktop =================================================================== RCS file: /home/kde/kdelibs/kioslave/bzip2/kbzip2filter.desktop,v retrieving revision 1.115 retrieving revision 1.115.2.2 diff -u -3 -p -r1.115 -r1.115.2.2 --- kioslave/bzip2/kbzip2filter.desktop 27 Jul 2004 07:23:32 -0000 1.115 +++ kioslave/bzip2/kbzip2filter.desktop 31 Aug 2004 07:21:32 -0000 1.115.2.2 @@ -25,7 +25,7 @@ Name[fr]=Filtre Bzip2 Name[ga]=Scagaire bzip2 Name[gl]=Filtro BZip2 Name[he]=מסנן BZip2 -Name[hi]=BZip2 फिल्टर +Name[hi]=BZip2 फ़िल्टर Name[hu]=BZip2 szűrő Name[id]=Filter BZip2 Name[is]=BZip2 sía @@ -65,7 +65,6 @@ Name[ven]=Filithara ya BZip2 Name[vi]=Trình lọc BZip2 Name[wa]=Passete BZip2 Name[xh]=Isihluzi se BZip2 -Name[xx]=xxBZip2 Filterxx Name[zh_CN]=BZip2 过滤程序 Name[zh_TW]=BZip2 過濾器 Name[zu]=Ihluzo le-BZip2 Index: kioslave/ftp/ftp.cc =================================================================== RCS file: /home/kde/kdelibs/kioslave/ftp/ftp.cc,v retrieving revision 1.213 retrieving revision 1.213.2.1 diff -u -3 -p -r1.213 -r1.213.2.1 --- kioslave/ftp/ftp.cc 13 Jul 2004 22:10:24 -0000 1.213 +++ kioslave/ftp/ftp.cc 21 Sep 2004 16:17:56 -0000 1.213.2.1 @@ -1701,7 +1701,7 @@ bool Ftp::ftpOpenDir( const QString & pa // We try to change to this directory first to see whether it really is a directory. // (And also to follow symlinks) - QString tmp = path.isEmpty() ? QString("/") : remoteEncoding()->encode(path); + QString tmp = path.isEmpty() ? QString("/") : path; // We get '550', whether it's a file or doesn't exist... if( !ftpFolder(tmp, false) ) Index: kioslave/gzip/kgzipfilter.desktop =================================================================== RCS file: /home/kde/kdelibs/kioslave/gzip/kgzipfilter.desktop,v retrieving revision 1.112 retrieving revision 1.112.2.2 diff -u -3 -p -r1.112 -r1.112.2.2 --- kioslave/gzip/kgzipfilter.desktop 27 Jul 2004 07:23:32 -0000 1.112 +++ kioslave/gzip/kgzipfilter.desktop 31 Aug 2004 07:21:33 -0000 1.112.2.2 @@ -25,7 +25,7 @@ Name[fr]=Filtre Gzip Name[ga]=Scagaire gzip Name[gl]=Filtro GZip Name[he]=מסנן GZip -Name[hi]=GZip फिल्टर +Name[hi]=GZip फ़िल्टर Name[hu]=GZip szűrő Name[id]=Filter Gzip Name[is]=GZip sía @@ -65,7 +65,6 @@ Name[ven]=Filithara ya GZip Name[vi]=Trình lọc Gzip Name[wa]=Passete GZip Name[xh]=Isihluzi se GZip -Name[xx]=xxGZip Filterxx Name[zh_CN]=GZip 过滤程序 Name[zh_TW]=GZip 過濾器 Name[zu]=Ihluzo le-GZip Index: kioslave/http/http.cc =================================================================== RCS file: /home/kde/kdelibs/kioslave/http/http.cc,v retrieving revision 1.621 retrieving revision 1.621.2.2 diff -u -3 -p -r1.621 -r1.621.2.2 --- kioslave/http/http.cc 1 Aug 2004 21:54:30 -0000 1.621 +++ kioslave/http/http.cc 15 Sep 2004 10:08:06 -0000 1.621.2.2 @@ -78,7 +78,8 @@ // Catch uncompatible crap (BR86019) #if defined(GSS_RFC_COMPLIANT_OIDS) && (GSS_RFC_COMPLIANT_OIDS == 0) -#undef HAVE_LIBGSSAPI +#include +#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name #endif #endif /* HAVE_LIBGSSAPI */ @@ -3567,7 +3568,7 @@ bool HTTPProtocol::readHeader() } // Some webservers say "text/plain" when they mean "application/x-bzip2" - else if (m_strMimeType == "text/plain") + else if ((m_strMimeType == "text/plain") || (m_strMimeType == "application/octet-stream")) { QString ext = m_request.url.path().right(4).upper(); if (ext == ".BZ2") @@ -5517,11 +5518,12 @@ QString HTTPProtocol::createDigestAuth ( p+=7; while ( *p == '"' ) p++; // Go past any " mark(s) first while ( p[i] != '"' ) i++; // Read everything until the last " mark - int pos = 0, idx = 0; + int pos; + int idx = 0; QCString uri = QCString(p,i+1); do { - pos = uri.find( ',', pos ); + pos = uri.find( ' ', idx ); if ( pos != -1 ) { KURL u (m_request.url, uri.mid(idx, pos-idx)); Index: kioslave/http/http_cache_cleaner.desktop =================================================================== RCS file: /home/kde/kdelibs/kioslave/http/http_cache_cleaner.desktop,v retrieving revision 1.219 retrieving revision 1.219.2.1 diff -u -3 -p -r1.219 -r1.219.2.1 --- kioslave/http/http_cache_cleaner.desktop 4 Aug 2004 06:46:58 -0000 1.219 +++ kioslave/http/http_cache_cleaner.desktop 24 Aug 2004 06:29:29 -0000 1.219.2.1 @@ -40,7 +40,7 @@ Name[mn]=HTTP-завсрын хадга Name[ms]=Pembersih Penyimpan HTTP Name[mt]=Tindif tal-cache HTTP Name[nb]=HTTP Mellomlagerrenser -Name[nl]=HTTP Cache Opschoner +Name[nl]=HTTP Cache opschonen Name[nn]=HTTP-mellomlageropprensking Name[nso]=Sehlwekisi sa Polokelo ya HTTP Name[oc]=Netejador de cabia HTTP @@ -66,7 +66,6 @@ Name[uz]=HTTP кэш бўшатгич Name[ven]=Tshikulumagi tsha HTTP Cache Name[vi]=Trình xoá HTTP cache Name[xh]=Umcoci wendawo efihlakeleyo yokugcina we HTTP -Name[xx]=xxHTTP Cache Cleanerxx Name[zh_CN]=HTTP 缓存清除程序 Name[zh_TW]=HTTP 快取清除程式 Name[zu]=Umhlanzi we-Cache ye-HTTP @@ -136,7 +135,6 @@ Comment[uz]=HTTP кэшидаги эск Comment[ven]=I kulumaga zwithu zwakale u bva kha HTTP cache Comment[vi]=Xoá các danh mục cũ trong HTTP cache Comment[xh]=Icoca amangeno amadala asuka kwindawo efihlakeleyo yokugcina ye HTTP -Comment[xx]=xxCleans up old entries from the HTTP cachexx Comment[zh_CN]=从 HTTP 缓存中清除旧条目 Comment[zh_TW]=從 HTTP 快取中清除舊的項目 Comment[zu]=Ihlanza izingeniso ezindalam ezisuka kwi-cache ye-HTTP Index: kioslave/http/kcookiejar/kcookiejar.desktop =================================================================== RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookiejar.desktop,v retrieving revision 1.205 retrieving revision 1.205.2.4 diff -u -3 -p -r1.205 -r1.205.2.4 --- kioslave/http/kcookiejar/kcookiejar.desktop 5 Aug 2004 06:36:56 -0000 1.205 +++ kioslave/http/kcookiejar/kcookiejar.desktop 20 Sep 2004 13:53:24 -0000 1.205.2.4 @@ -57,7 +57,6 @@ Name[uk]=Модуль глечика з Name[uz]=KDED куки идиш модули Name[ven]=Modulu wa Jar wa Cookie ya KDED Name[xh]=Isicatshulwa se KDED Cookie Jar -Name[xx]=xxKDED Cookie Jar Modulexx Name[zh_CN]=KDED Cookie Jar 模块 Name[zh_TW]=KDED Cookie Jar 模組 Name[zu]=Ingxenye Yojeke ye-Cookie ye-KDED @@ -73,7 +72,9 @@ Comment[es]=Mantiene registro todas las Comment[et]=Hoiab silma peal kõigil süsteemi küpsistel Comment[fi]=Seuraa järjestelmän evästeitä Comment[fr]=Conserve une trace de tous les cookies dans le système +Comment[he]=מבצע מעקב אחרי כל העוגיות במערכת Comment[hu]=Nyomon követi a rendszerben létrejövő cookie-kat +Comment[is]=Heldur utanum allar smákökur í kerfinu Comment[it]=Tiene traccia di tutti i cookie del sistema Comment[ja]=システムのすべてのクッキーの残します Comment[nb]=Holder rede på alle informasjonskapsler i systemet @@ -83,13 +84,16 @@ Comment[pa]=ਸਿਸਟਮ ਦੇ ਸ Comment[pl]=Przechowuje wszystkie ciasteczka w systemie Comment[pt]=Mantem um registo de todos os 'cookies' no sistema Comment[pt_BR]=Mantém informações sobre todos os cookies do sistema +Comment[ro]=Administrează toate "cookie"-urile din sistem +Comment[se]=Halddaša buot diehtočoahkuid Comment[sk]=Sleduje všetky cookie v systéme Comment[sl]=Opazuje vse piškotke v sistemu Comment[sr]=Води евиденцију о свим колачићима на систему Comment[sr@Latn]=Води евиденцију о свим колачићима на систему Comment[sv]=Håller ordning på alla kakor i systemet +Comment[ta]=கணினியின் எல்லா தற்காலிக நினைவகங்களையும் கண்காணிக்கிறது Comment[tg]=Гузаргоҳи ҳамаша Cookies дар система муҳофизат кунед -Comment[xx]=xxKeeps track of all cookies in the systemxx +Comment[uk]=Стежить за всіма куками в системі Comment[zh_CN]=将全部 cookies 的记录保存在系统中 ServiceTypes=KDEDModule Exec=kcookiejar Index: kioslave/http/kcookiejar/kcookieserver.cpp =================================================================== RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookieserver.cpp,v retrieving revision 1.51 retrieving revision 1.51.2.1 diff -u -3 -p -r1.51 -r1.51.2.1 --- kioslave/http/kcookiejar/kcookieserver.cpp 20 Jul 2004 15:29:24 -0000 1.51 +++ kioslave/http/kcookiejar/kcookieserver.cpp 16 Aug 2004 14:05:11 -0000 1.51.2.1 @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE //---------------------------------------------------------------------------- // // KDE Cookie Server -// $Id: kcookieserver.cpp,v 1.51 2004/07/20 15:29:24 waba Exp $ +// $Id: kcookieserver.cpp,v 1.51.2.1 2004/08/16 14:05:11 lunakl Exp $ #define SAVE_DELAY 3 // Save after 3 minutes @@ -80,6 +80,7 @@ KCookieServer::KCookieServer(const QCStr { mOldCookieServer = new DCOPClient(); // backwards compatibility. mOldCookieServer->registerAs("kcookiejar", false); + mOldCookieServer->setDaemonMode( true ); mCookieJar = new KCookieJar; mPendingCookies = new KHttpCookieList; mPendingCookies->setAutoDelete(true); Index: kparts/browserview.desktop =================================================================== RCS file: /home/kde/kdelibs/kparts/browserview.desktop,v retrieving revision 1.168 retrieving revision 1.168.2.1 diff -u -3 -p -r1.168 -r1.168.2.1 --- kparts/browserview.desktop 27 Jul 2004 07:23:35 -0000 1.168 +++ kparts/browserview.desktop 24 Aug 2004 06:29:31 -0000 1.168.2.1 @@ -65,7 +65,6 @@ Name[uz]=Браузернинг кўри Name[ven]=U vhona ha Burausu Name[vi]=Xem trình duyệt Name[xh]=Imboniselo Yomkhangeli zincwadi -Name[xx]=xxBrowser Viewxx Name[zh_CN]=浏览器视图 Name[zh_TW]=瀏覽器視圖 Name[zu]=Umbonisi Womgcingi Index: kparts/kpart.desktop =================================================================== RCS file: /home/kde/kdelibs/kparts/kpart.desktop,v retrieving revision 1.188 retrieving revision 1.188.2.2 diff -u -3 -p -r1.188 -r1.188.2.2 --- kparts/kpart.desktop 27 Jul 2004 07:23:35 -0000 1.188 +++ kparts/kpart.desktop 31 Aug 2004 07:21:35 -0000 1.188.2.2 @@ -26,7 +26,7 @@ Comment[fr]=Composant de KDE Comment[ga]=Comhpháirt KDE Comment[gl]=Compoñente de KDE Comment[he]=רכיב KDE -Comment[hi]=केडीई अवयव +Comment[hi]=केडीई के घटक Comment[hr]=KDE komponenta Comment[hu]=KDE-komponens Comment[id]=Komponen KDE @@ -68,7 +68,6 @@ Comment[uz]=KDE компоненти Comment[ven]=Khomphonente ya KDE Comment[vi]=KDE Component Comment[xh]=Ingxenye ye KDE -Comment[xx]=xxKDE Componentxx Comment[zh_CN]=KDE 部件 Comment[zh_TW]=KDE 元件 Comment[zu]=Ingxenye ye-KDE Index: kparts/krop.desktop =================================================================== RCS file: /home/kde/kdelibs/kparts/krop.desktop,v retrieving revision 1.176 retrieving revision 1.176.2.2 diff -u -3 -p -r1.176 -r1.176.2.2 --- kparts/krop.desktop 27 Jul 2004 07:23:35 -0000 1.176 +++ kparts/krop.desktop 31 Aug 2004 07:21:35 -0000 1.176.2.2 @@ -27,7 +27,7 @@ Comment[fr]=Composant de KDE Comment[ga]=Comhpháirt KDE Comment[gl]=Compoñente de KDE Comment[he]=רכיב KDE -Comment[hi]=केडीई अवयव +Comment[hi]=केडीई के घटक Comment[hr]=KDE komponenta Comment[hu]=KDE-komponens Comment[id]=Komponen KDE @@ -69,7 +69,6 @@ Comment[uz]=KDE компоненти Comment[ven]=Khomphonente ya KDE Comment[vi]=KDE Component Comment[xh]=Ingxenye ye KDE -Comment[xx]=xxKDE Componentxx Comment[zh_CN]=KDE 部件 Comment[zh_TW]=KDE 元件 Comment[zu]=Ingxenye ye-KDE Index: kparts/krwp.desktop =================================================================== RCS file: /home/kde/kdelibs/kparts/krwp.desktop,v retrieving revision 1.175 retrieving revision 1.175.2.2 diff -u -3 -p -r1.175 -r1.175.2.2 --- kparts/krwp.desktop 27 Jul 2004 07:23:35 -0000 1.175 +++ kparts/krwp.desktop 31 Aug 2004 07:21:35 -0000 1.175.2.2 @@ -27,7 +27,7 @@ Comment[fr]=Composant de KDE Comment[ga]=Comhpháirt KDE Comment[gl]=Compoñente de KDE Comment[he]=רכיב KDE -Comment[hi]=केडीई अवयव +Comment[hi]=केडीई के घटक Comment[hr]=KDE komponenta Comment[hu]=KDE-komponens Comment[id]=Komponen KDE @@ -69,7 +69,6 @@ Comment[uz]=KDE компоненти Comment[ven]=Khomphonente ya KDE Comment[vi]=KDE Component Comment[xh]=Ingxenye ye KDE -Comment[xx]=xxKDE Componentxx Comment[zh_CN]=KDE 部件 Comment[zh_TW]=KDE 元件 Comment[zu]=Ingxenye ye-KDE Index: kparts/mainwindow.cpp =================================================================== RCS file: /home/kde/kdelibs/kparts/mainwindow.cpp,v retrieving revision 1.56 retrieving revision 1.56.6.1 diff -u -3 -p -r1.56 -r1.56.6.1 --- kparts/mainwindow.cpp 21 Jul 2003 08:22:27 -0000 1.56 +++ kparts/mainwindow.cpp 22 Sep 2004 10:39:39 -0000 1.56.6.1 @@ -132,6 +132,9 @@ void MainWindow::createGUI( Part * part GUIActivateEvent ev( true ); QApplication::sendEvent( part, &ev ); + + if ( autoSaveSettings() ) + applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); } setUpdatesEnabled( true ); Index: kparts/tests/notepad.desktop =================================================================== RCS file: /home/kde/kdelibs/kparts/tests/notepad.desktop,v retrieving revision 1.146 retrieving revision 1.146.2.1 diff -u -3 -p -r1.146 -r1.146.2.1 --- kparts/tests/notepad.desktop 27 Jul 2004 07:23:35 -0000 1.146 +++ kparts/tests/notepad.desktop 24 Aug 2004 06:29:31 -0000 1.146.2.1 @@ -64,7 +64,6 @@ Name[uz]=Ён дафтарча (мисо Name[ven]=Hau nwalela notsi (Tsumbo) Name[vi]=notepad(ví dụ) Name[xh]=Iphetshan lokubhala (umzekelo) -Name[xx]=xxNotepad (example)xx Name[zh_CN]=记事本(例子) Name[zh_TW]=記事本(範例) Name[zu]=Incwadi yokubhala (umfanekiso) Index: kresources/kresources.desktop =================================================================== RCS file: /home/kde/kdelibs/kresources/kresources.desktop,v retrieving revision 1.84 retrieving revision 1.84.2.3 diff -u -3 -p -r1.84 -r1.84.2.3 --- kresources/kresources.desktop 2 Aug 2004 06:53:31 -0000 1.84 +++ kresources/kresources.desktop 12 Sep 2004 13:56:08 -0000 1.84.2.3 @@ -31,7 +31,7 @@ Name[fi]=KDE:n resurssiasetukset Name[fr]=Configuration des ressources de KDE Name[gl]=Configuración dos Recursos de KDE Name[he]=תצורת משאבים של KDE -Name[hi]=केडीई रिसोर्सेस कॉन्फ़िगुरेशन +Name[hi]=केडीई संसाधन कॉन्फ़िगुरेशन Name[hr]=Podešavanje KDE resursa Name[hu]=Erőforrás-beállító Name[id]=Konfigurasi Resource KDE @@ -64,7 +64,6 @@ Name[th]=ปรับแต่งทร Name[tr]=KDE Kaynak Yapılandırması Name[uk]=Конфігурація ресурсів KDE Name[uz]=KDE имкониятларини мослаш -Name[xx]=xxKDE Resources Configurationxx Name[zh_CN]=KDE 资源配置 Name[zh_TW]=KDE 資源組態 @@ -88,13 +87,14 @@ Comment[is]=Stilla KDE auðlindir Comment[it]=Configura le risorse di KDE Comment[ja]=KDE リソースの設定 Comment[nb]=Sett opp KDE-ressurser -Comment[nl]=KDE-Hulpbronnen instellen +Comment[nl]=KDE-hulpbronnen instellen Comment[nn]=Set opp KDE-ressursar Comment[pa]=KDE ਸਰੋਤਾਂ ਦੀ ਸੰਰਚਨਾ Comment[pl]=Konfiguracja zasobów KDE Comment[pt]=Configurar Recursos do KDE Comment[pt_BR]=Configura Recursos do KDE Comment[ro]=Configurează resursele KDE +Comment[se]=Heivet KDE-resurssaid Comment[sk]=Nastavenie zdrojov KDE Comment[sl]=Nastavi vire KDE Comment[sr]=Подешавање KDE-ових ресурса @@ -104,7 +104,6 @@ Comment[ta]=KDE மூலங்களை Comment[tg]=Танзими манбаъи истифодашуда тавассути китоби адрес Comment[uk]=Налаштування ресурсів KDE Comment[uz]=KDE манбаларини мослаш -Comment[xx]=xxConfigure KDE Resourcesxx Comment[zh_CN]=配置 KDE 资源 Keywords=resources,konnector resource,contact resource,calendar resource,notes resource,imap @@ -123,7 +122,7 @@ Keywords[hu]=erőforrások,csatoló-erő Keywords[it]=risorse,risorsa konnector,risorsa contatti, risorsa calendario,risorsa note,imap Keywords[ja]=リソース,konnector resource, コネクターリソース,コンタクトリソース,カレンダーリソース, ノートリソース,imap Keywords[nb]=ressurser,konnector-ressurs,kontaktressurs,kalenderressurs, notatressurs,imap -Keywords[nl]=hulpbron,verbindings-hulpbron,contact-hulpbron,kalender-hulpbron,notities-hulpbron,imap,contact,kalender,notitie,verbinding +Keywords[nl]=hulpbron,verbindingshulpbron,contact-hulpbron,kalender-hulpbron,notities-hulpbron,imap,contact,kalender,notitie,verbinding Keywords[nn]=ressursar,konnector-ressurs,kontaktressurs,kalenderressurs,notatressurs,imap Keywords[pl]=zasoby,konnector,zasoby wizytówek,zasoby kalendarze,zasoby notatek,imap Keywords[pt]=recursos,recurso de conector,recurso de contacto,recurso de calendário,recurso de notas,imap @@ -135,7 +134,6 @@ Keywords[sr@Latn]=resources,konnector re Keywords[sv]=resurser,konnector-resurs,kontaktresurs,kalenderresurs,anteckningsresurs,IMAP Keywords[ta]=மூலங்கள்,இணைப்பு மூலம்,தொடர்பு மூலம்,நாள்காட்டி மூலம்,குறிப்புகள் மூலம்e,imap Keywords[uk]=ресурси,ресурс для konnector,ресурс контактів,ресурс календаря,ресурс приміток,imap -Keywords[xx]=xxresources,konnector resource,contact resource,calendar resource,notes resource,imapxx Keywords[zh_CN]=resources,konnector resource,contact resource,calendar resource,notes resource,imap资源,konnector 资源,联系人资源,日历资源,备忘资源 Categories=Qt;KDE;X-KDE-settings-components Index: kresources/kresources_plugin.desktop =================================================================== RCS file: /home/kde/kdelibs/kresources/kresources_plugin.desktop,v retrieving revision 1.52 retrieving revision 1.52.2.1 diff -u -3 -p -r1.52 -r1.52.2.1 --- kresources/kresources_plugin.desktop 30 Jul 2004 07:01:14 -0000 1.52 +++ kresources/kresources_plugin.desktop 24 Aug 2004 06:29:33 -0000 1.52.2.1 @@ -52,7 +52,6 @@ Comment[tg]=Мутассалкунанд Comment[tr]=KResource Eklentisi Comment[uk]=Втулок структури KResource Comment[uz]=KResource тўплам плагини -Comment[xx]=xxKResource Framework Pluginxx Comment[zh_CN]=KResource 框架插件 Comment[zh_TW]=KRsource Framework 外掛程式 Index: ksmartcard/kardimpl/kcardgemsafe.desktop =================================================================== RCS file: /home/kde/kdelibs/ksmartcard/kardimpl/kcardgemsafe.desktop,v retrieving revision 1.104 retrieving revision 1.104.2.4 diff -u -3 -p -r1.104 -r1.104.2.4 --- ksmartcard/kardimpl/kcardgemsafe.desktop 2 Aug 2004 06:53:34 -0000 1.104 +++ ksmartcard/kardimpl/kcardgemsafe.desktop 20 Sep 2004 13:53:26 -0000 1.104.2.4 @@ -33,11 +33,14 @@ Name[pa]=GemSafe ਕਾਰਡ ਸਥਾ Name[pl]=Obsługa karty GemSafe Name[pt]=Implementação da Placa GemSafe Name[pt_BR]=Implementação da Placa GemSafe +Name[ro]=Implementare card GemSafe +Name[se]=GemSafe-goarta implementašuvdna Name[sk]=Implementácia karty GemSafe Name[sl]=Implementacija kartice GemSafe Name[sr]=Имплементација GemSafe картице Name[sr@Latn]=Имплементација GemSafe картице Name[sv]=GemSafe-kortimplementation +Name[ta]=GemSafe அட்டை அமலாக்கம் Name[tg]=Пиёдасозии корти GemSafe -Name[xx]=xxGemSafe Card Implementationxx +Name[uk]=Впровадження карток GemSafe Name[zh_CN]=GemSafe 卡实现 Index: ksmartcard/kardimpl/kcardgsm.desktop =================================================================== RCS file: /home/kde/kdelibs/ksmartcard/kardimpl/kcardgsm.desktop,v retrieving revision 1.103 retrieving revision 1.103.2.3 diff -u -3 -p -r1.103 -r1.103.2.3 --- ksmartcard/kardimpl/kcardgsm.desktop 5 Aug 2004 06:36:58 -0000 1.103 +++ ksmartcard/kardimpl/kcardgsm.desktop 20 Sep 2004 13:53:26 -0000 1.103.2.3 @@ -34,11 +34,13 @@ Name[pl]=Obsługa karty GSM Name[pt]=Implementação da Placa GSM Name[pt_BR]=Implementação da Placa GSM Name[ro]=Implementare card GSM +Name[se]=GSM-goarta implementašuvdna Name[sk]=Implementácia karty GSM Name[sl]=Implementacija kartice GSM Name[sr]=Имплементација GSM картице Name[sr@Latn]=Имплементација GSM картице Name[sv]=GSM-kortimplementation +Name[ta]=GSM அட்டை அமலாக்கம் Name[tg]=Пиёдасозии корти GSM -Name[xx]=xxGSM Card Implementationxx +Name[uk]=Впровадження карток GSM Name[zh_CN]=GSM 卡实现 Index: ksmartcard/kardsvc/kardsvc.desktop =================================================================== RCS file: /home/kde/kdelibs/ksmartcard/kardsvc/kardsvc.desktop,v retrieving revision 1.99 retrieving revision 1.99.2.2 diff -u -3 -p -r1.99 -r1.99.2.2 --- ksmartcard/kardsvc/kardsvc.desktop 5 Aug 2004 06:36:58 -0000 1.99 +++ ksmartcard/kardsvc/kardsvc.desktop 31 Aug 2004 07:21:39 -0000 1.99.2.2 @@ -64,7 +64,6 @@ Name[uz]=KDE Smartcard хизмати Name[ven]=Tshumelo ya garata ya KDE Name[vi]=Dịch vụ smartcard KDE Name[xh]=Inkonzo ye KDE Smartcard -Name[xx]=xxKDE Smartcard Servicexx Name[zh_CN]=KDE 智能卡服务 Name[zh_TW]=KDE 智慧卡服務 Name[zu]=Umsebenzi Wekhadi elihlakaniphile le-KDE @@ -91,7 +90,7 @@ Comment[fr]=Service de cartes à puce po Comment[ga]=Seirbhísí Chárta Cliste le hadhaidh KDE agus Feidhmchláir KDE Comment[gl]=Servicios de Smartcard para KDE e as Aplicacións de KDE Comment[he]=שירות כרטיסים חכמים ל-KDE וליישומים שלו -Comment[hi]=केडीई तथा केडीई अनुप्रयोगों हेतु स्मार्टकार्ड सेवा +Comment[hi]=केडीई तथा केडीई अनुप्रयोगों के लिए स्मार्टकार्ड सेवा Comment[hr]=Smartcard Servisi za KDE i KDE aplikacije Comment[hu]=Smartcard szolgáltatások a KDE-alapú alkalmazásokhoz Comment[id]=Layanan Smarcard untuk KDE dan aplikasinya @@ -130,7 +129,6 @@ Comment[uz]=KDE ва KDE дастурл Comment[ven]=Tshumelo ya garata ya KDE na apulifikhesheni ya KDE Comment[vi]=Dịch vụ Smartcard cho KDE và chương trình KDE Comment[xh]=Iinkonzo ze Smartcard ze KDE kunye Nezicelo ze KDE -Comment[xx]=xxSmartcard Services for KDE and KDE Applicationsxx Comment[zh_CN]=KDE 和 KDE 应用程序的智能卡服务 Comment[zh_TW]=用於 KDE 與 KDE 應用程式的智慧卡服務 Comment[zu]=Imisebenzi Yekhadi elihlakaniphile le-KDE kanye nabayaleli be-KDE Index: kspell2/kspellclient.desktop =================================================================== RCS file: /home/kde/kdelibs/kspell2/kspellclient.desktop,v retrieving revision 1.33 retrieving revision 1.33.2.2 diff -u -3 -p -r1.33 -r1.33.2.2 --- kspell2/kspellclient.desktop 2 Aug 2004 06:53:36 -0000 1.33 +++ kspell2/kspellclient.desktop 12 Sep 2004 13:56:12 -0000 1.33.2.2 @@ -30,6 +30,7 @@ Comment[pl]=Klient KSpell Comment[pt]=Cliente do KSpell Comment[pt_BR]=Cliente KSpell Comment[ro]=Client KSpell +Comment[se]=KSpell-klienta Comment[sk]=Klient KSpell Comment[sl]=Odjemnik KSpell Comment[sr]=KSpell-ов клијент @@ -39,5 +40,4 @@ Comment[ta]=ஓட்டு எழுத Comment[tg]=Клиенти KSpell Comment[uk]=Клієнт KSpell Comment[uz]=KSpell клиенти -Comment[xx]=xxKSpell Clientxx Comment[zh_CN]=KSpell 客户 Index: kspell2/plugins/aspell/kspell_aspell.desktop =================================================================== RCS file: /home/kde/kdelibs/kspell2/plugins/aspell/kspell_aspell.desktop,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -3 -p -r1.7 -r1.7.2.1 --- kspell2/plugins/aspell/kspell_aspell.desktop 26 Jul 2004 06:59:52 -0000 1.7 +++ kspell2/plugins/aspell/kspell_aspell.desktop 24 Aug 2004 06:29:37 -0000 1.7.2.1 @@ -17,4 +17,3 @@ Name[bn]=এ-স্পেল Name[it]=Aspell Name[sv]=Aspell Name[ta]=psதேர்ந்தெடு -Name[xx]=xxASpellxx Index: kspell2/plugins/ispell/kspell_ispell.desktop =================================================================== RCS file: /home/kde/kdelibs/kspell2/plugins/ispell/kspell_ispell.desktop,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- kspell2/plugins/ispell/kspell_ispell.desktop 26 Jul 2004 06:59:52 -0000 1.8 +++ kspell2/plugins/ispell/kspell_ispell.desktop 24 Aug 2004 06:29:37 -0000 1.8.2.1 @@ -18,4 +18,3 @@ Name[it]=Ispell Name[sv]=Ispell Name[ta]=psதேர்ந்தெடு Name[tg]=psselect -Name[xx]=xxISpellxx Index: kstyles/riscos/riscos.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/riscos/riscos.themerc,v retrieving revision 1.107 retrieving revision 1.107.2.1 diff -u -3 -p -r1.107 -r1.107.2.1 --- kstyles/riscos/riscos.themerc 27 Jul 2004 07:23:45 -0000 1.107 +++ kstyles/riscos/riscos.themerc 24 Aug 2004 06:29:40 -0000 1.107.2.1 @@ -243,7 +243,6 @@ Name[tg]=Системаи омили RIS Name[th]=ระบบปฏิบัติการบนชิพ RISC Name[uk]=RISC ОС Name[uz]=RISC ОС -Name[xx]=xxRISC OSxx Name[zu]=IRISC OS Comment=RISC OS-like theme Comment[af]=Risc OS-like tema @@ -308,7 +307,6 @@ Comment[ven]=RISC OS-sa thero Comment[vi]=Theme kiểu RISC OS Comment[wa]=Tinme rishonnant al rivnance do sistinme RISC OS Comment[xh]=RISC OS-Njengo mxholo -Comment[xx]=xxRISC OS-like themexx Comment[zh_CN]=类似 RISC OS 的主题 Comment[zh_TW]=類似 RISC 的風格 Comment[zu]=I-RISC OS-enjenge thimu Index: kstyles/themes/b3.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/b3.themerc,v retrieving revision 1.181 retrieving revision 1.181.2.1 diff -u -3 -p -r1.181 -r1.181.2.1 --- kstyles/themes/b3.themerc 27 Jul 2004 07:23:45 -0000 1.181 +++ kstyles/themes/b3.themerc 24 Aug 2004 06:29:40 -0000 1.181.2.1 @@ -6,7 +6,6 @@ Name[fr]=B3 / KDE Name[hi]=B3/केडीई Name[mk]=Б3/KDE Name[ta]=B3/கேடிஇ -Name[xx]=xxB3/KDExx Comment=B3/Modification of B2 Comment[af]=B3/Verandering van B2 Comment[ar]=B3/تعديل من B2 @@ -71,7 +70,6 @@ Comment[ven]=B3/U lugisela ha B2 Comment[vi]=B3/Modification của B2 Comment[wa]=B3/Modifiadje do B2 Comment[xh]=B3/Uguqulelo kancinane lwe B2 -Comment[xx]=xxB3/Modification of B2xx Comment[zh_CN]=B3/修正的 B2 Comment[zh_TW]=B3/B2 改良版 Comment[zu]=B3/Ukulungisa kwe-B2 Index: kstyles/themes/beos.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/beos.themerc,v retrieving revision 1.238 retrieving revision 1.238.2.1 diff -u -3 -p -r1.238 -r1.238.2.1 --- kstyles/themes/beos.themerc 5 Aug 2004 06:37:00 -0000 1.238 +++ kstyles/themes/beos.themerc 24 Aug 2004 06:29:40 -0000 1.238.2.1 @@ -3,7 +3,6 @@ Name=BeOS Name[af]=Beos Name[hi]=बीईओएस (BeOS) Name[th]=ระบบปฏิบัติการ BeOS -Name[xx]=xxBeOSxx Comment=Unthemed BeOS-like style Comment[az]=Örtüksüz BeOS bənzəri tərz Comment[be]=Стыль падобны на BeOS (бяз тэм) @@ -57,7 +56,6 @@ Comment[tr]=BeOS benzeri temasız stil Comment[uk]=Стиль схожий на BeOS без встановленої теми Comment[uz]=BeOS'га ўхшаш мавзусиз услуб Comment[wa]=Tinme rishonnant al rivnance do sistinme BeOS -Comment[xx]=xxUnthemed BeOS-like stylexx Comment[zh_CN]=无主题的类似 Beos 的风格 Comment[zh_TW]=沒有主題的 BeOS 的風格 [KDE] Index: kstyles/themes/default.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/default.themerc,v retrieving revision 1.218 retrieving revision 1.218.2.1 diff -u -3 -p -r1.218 -r1.218.2.1 --- kstyles/themes/default.themerc 30 Jul 2004 07:01:20 -0000 1.218 +++ kstyles/themes/default.themerc 24 Aug 2004 06:29:40 -0000 1.218.2.1 @@ -49,7 +49,6 @@ Name[th]=คลาสสิคแบบ Name[tr]=Klasik KDE Name[uk]=Типовий для KDE Name[wa]=KDE Classike -Name[xx]=xxKDE Classicxx Name[zh_CN]=KDE 经典 Name[zh_TW]=KDE 預設 Comment=Classic KDE style @@ -110,7 +109,6 @@ Comment[tr]=Klasik KDE stili Comment[uk]=Класичний стиль KDE Comment[uz]=Классик KDE услуби Comment[wa]=Tinme avou l' rivnance «classike» di KDE -Comment[xx]=xxClassic KDE stylexx Comment[zh_CN]=经典的 KDE 风格 Comment[zh_TW]=預設的 KDE 風格 Highcolor=hcstyle.la Index: kstyles/themes/highcolor.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/highcolor.themerc,v retrieving revision 1.229 retrieving revision 1.229.2.1 diff -u -3 -p -r1.229 -r1.229.2.1 --- kstyles/themes/highcolor.themerc 5 Aug 2004 06:37:00 -0000 1.229 +++ kstyles/themes/highcolor.themerc 24 Aug 2004 06:29:40 -0000 1.229.2.1 @@ -50,7 +50,6 @@ Name[tg]=Рангболоии класс Name[th]=รูปแบบปริยาย ความละเอียดสีสูง Name[tr]=Klasik Yüksek Renk Name[uk]=Типовий (64K кольорів) -Name[xx]=xxHighColor Classicxx Name[zh_CN]=高色彩经典 Name[zh_TW]=預設的高彩 Comment=Highcolor version of the classic style @@ -88,7 +87,7 @@ Comment[mn]=64000-Өнгөт-сонго Comment[ms]=Versi warna cerah untuk gaya klasik Comment[nb]=Mangefarget-versjon av klassisk stil Comment[nds]=Highcolor-Verschoon vun de klasssche Stil -Comment[nl]=Hoge-kleuren-versie van de klassieke stijjl +Comment[nl]=Hoge-kleuren-versie van de klassieke stijl Comment[nn]=Klassisk stil med mange fargar Comment[pa]=ਜਿਆਦਾ ਗੂੜੇ ਰੰਗਾਂ ਵਾਲ ਟਕਸਾਲੀ ਸ਼ੈਲੀ Comment[pl]=Wersja stylu klasycznego z wieloma kolorami (HiColor) @@ -109,7 +108,6 @@ Comment[th]=รูปแบบปริ Comment[tr]=Klasik stilin yüksek renk versiyonu Comment[uk]=Версія типового стилю для 64К кольорів та більше Comment[uz]=Классик услубининг юқори рангли нусхаси -Comment[xx]=xxHighcolor version of the classic stylexx Comment[zh_CN]=经典风格的高色彩版本 Comment[zh_TW]=預設風格的高彩版本 [KDE] Index: kstyles/themes/keramik.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/keramik.themerc,v retrieving revision 1.93 retrieving revision 1.93.2.1 diff -u -3 -p -r1.93 -r1.93.2.1 --- kstyles/themes/keramik.themerc 30 Jul 2004 07:01:20 -0000 1.93 +++ kstyles/themes/keramik.themerc 24 Aug 2004 06:29:40 -0000 1.93.2.1 @@ -21,7 +21,6 @@ Name[ta]=கேராமில்க் Name[tg]=Сафолӣ Name[th]=เครามิก - K Name[uz]=Керамика -Name[xx]=xxKeramikxx ConfigPage=kstyle_keramik_config Comment=The default style using alphablending Comment[az]=Alfa şəffaflıq işlədən ön qurğulu tərz @@ -77,7 +76,6 @@ Comment[th]=รูปแบบปริ Comment[tr]=Alpha karışımı kullanan öntanımlı stil Comment[uk]=Стиль з використанням плавного переходу кольорів Comment[uz]=Alphablending'ли андоза услуб -Comment[xx]=xxThe default style using alphablendingxx Comment[zh_CN]=使用 alpha 混和的默认风格 Comment[zh_TW]=使用 alphablending 的預設風格 Index: kstyles/themes/kstep.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/kstep.themerc,v retrieving revision 1.215 retrieving revision 1.215.2.2 diff -u -3 -p -r1.215 -r1.215.2.2 --- kstyles/themes/kstep.themerc 5 Aug 2004 06:37:00 -0000 1.215 +++ kstyles/themes/kstep.themerc 31 Aug 2004 07:21:41 -0000 1.215.2.2 @@ -22,7 +22,6 @@ Name[tg]=Марҳилаи KDE Name[th]=KDE สเต็ป Name[ven]=Tshitaela tsha KDE Name[xh]=Inyathelo le KDE -Name[xx]=xxKDE Stepxx Name[zu]=Isigaba se-KDE Comment=Unthemed Next-like style Comment[af]=Ongetemade Next-tipe styl @@ -46,7 +45,7 @@ Comment[fi]=Teemoittamaton Next:n kaltai Comment[fr]=Style sans thème similaire à NeXT Comment[ga]=Stíl gan téama, cosúil le NeXT Comment[gl]=Estilo tipo Next sen tema -Comment[hi]=अनथीम्ड नेक्स्ट शैली प्रकार +Comment[hi]=अनथीम्ड नेक्स्ट शैली क़िस्म Comment[hr]=Bez teme, u stilu Nexta Comment[hu]=Next-szerű stílus, téma nélkül Comment[id]=Gaya Unthemed Next-like @@ -87,7 +86,6 @@ Comment[uz]=Next'га ўхшаш мав Comment[ven]=Hu songo newaho thero-sa tshitaela Comment[vi]=Kiểu Next chưa dùng theme Comment[xh]=Okulandelayo Okungenamxholo-njengo hlobo -Comment[xx]=xxUnthemed Next-like stylexx Comment[zh_CN]=无主题的类似 Next 的风格 Comment[zh_TW]=沒有主題的類似 Nextstep 的風格 Comment[zu]=Okulandelayo Okungenangqikithi-okunjengesitayela Index: kstyles/themes/light-v2.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/light-v2.themerc,v retrieving revision 1.91 retrieving revision 1.91.2.1 diff -u -3 -p -r1.91 -r1.91.2.1 --- kstyles/themes/light-v2.themerc 4 Aug 2004 06:47:00 -0000 1.91 +++ kstyles/themes/light-v2.themerc 24 Aug 2004 06:29:40 -0000 1.91.2.1 @@ -58,7 +58,6 @@ Name[uz]=Light услуби, иккин Name[ven]=Tshitaela tshisi tshau konda, ndulamiso ya vhuvhili Name[vi]=Light Style, revision thứ 2 Name[xh]=Uhlobo Olukhanyayo, 2nd ukhumbuzo kwakhona -Name[xx]=xxLight Style, 2nd revisionxx Name[zh_CN]=Light 风格，第二版 Name[zh_TW]=輕靈風格，第二版 Name[zu]=Ukubuyekezwa oku-2nd, Kwesitayela Esilula @@ -119,7 +118,6 @@ Comment[uz]=Оддий ва чиройл Comment[ven]=Ndulamiso ya vhuvhili isa kondi na tshitaela tshileluwaho Comment[vi]=Revision thứ 2 của kiểu widget đơn giản Comment[xh]=Ukhumbuzo kwakhona lwesibini lokulula nokubukekayo kwe hlobo lwe widget 'Ekhaphu-khaphu. -Comment[xx]=xxSecond revision of the simple and elegant 'Light' widget style.xx Comment[zh_CN]=简约雅致的“Light”风格，第二版。 Comment[zh_TW]=簡單高雅的“輕靈”界面工具風格的第二版。 Comment[zu]=Ukubuyekezwa kwesibili kwesitayela se-widget 'Esilula' kanye nesiphucuzekile. Index: kstyles/themes/light-v3.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/light-v3.themerc,v retrieving revision 1.92 retrieving revision 1.92.2.1 diff -u -3 -p -r1.92 -r1.92.2.1 --- kstyles/themes/light-v3.themerc 5 Aug 2004 06:37:00 -0000 1.92 +++ kstyles/themes/light-v3.themerc 24 Aug 2004 06:29:40 -0000 1.92.2.1 @@ -58,7 +58,6 @@ Name[uz]=Light услуби, учинч Name[ven]=Tshitaela tshisa kondi, ndovhololo ya vhuraru Name[vi]=Light Style, revision 3 Name[xh]=Uhlobo Olukhanyayo, 3rd ukhumbuzo kwakhona -Name[xx]=xxLight Style, 3rd revisionxx Name[zh_CN]=Light 风格，第三版 Name[zh_TW]=輕靈風格，第三版 Name[zu]=Isitayela Esilula, ukubuyekezwa kwesithathu @@ -120,7 +119,6 @@ Comment[uz]=Оддий ва чиройл Comment[ven]=Ndovhololo ya vhuraru isa kondi na tshitaela tshisa kondi. Comment[vi]=Revision thứ ba của kiểu widget 'Light' đơn giản và thông minh Comment[xh]=Ukhumbuzo kwakhona lwesithathu lokulula kunye nokubukekayo kohlobo lwe widget 'Ekhaphu-khaphu'. -Comment[xx]=xxThird revision of the simple and elegant 'Light' widget style.xx Comment[zh_CN]=简约雅致的“Light”风格，第三版。 Comment[zh_TW]=簡單高雅的“輕靈”界面工具風格的第三版。 Comment[zu]=Ukubuyekezwa kwesithathu kwesitayela se-widget 'Esilula' kanye nokuphucuzekile. Index: kstyles/themes/marble.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/Attic/marble.themerc,v retrieving revision 1.222 retrieving revision 1.222.2.1 diff -u -3 -p -r1.222 -r1.222.2.1 --- kstyles/themes/marble.themerc 27 Jul 2004 07:23:45 -0000 1.222 +++ kstyles/themes/marble.themerc 24 Aug 2004 06:29:40 -0000 1.222.2.1 @@ -208,7 +208,6 @@ Name[tr]=Mermer Name[uk]=Мармур Name[uz]=Мармар Name[ven]=Mavhula -Name[xx]=xxMarblexx Name[zh_CN]=大理石 Name[zh_TW]=大理石 Comment=Light marble themed style @@ -273,7 +272,6 @@ Comment[uz]=Ёруғ мармар мав Comment[ven]=Tshitaela tsha thero ya mavhula usa kondi Comment[vi]=Kiểu marble sáng Comment[xh]=Uhlobo olunomxholo one marble ekhaphu-khaphu -Comment[xx]=xxLight marble themed stylexx Comment[zh_CN]=明亮的大理石主题风格 Comment[zh_TW]=淺色的大理石主題風格 Comment[zu]=Isitayela esilula se-marble esinegqikithi Index: kstyles/themes/mega.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/mega.themerc,v retrieving revision 1.99 retrieving revision 1.99.2.1 diff -u -3 -p -r1.99 -r1.99.2.1 --- kstyles/themes/mega.themerc 4 Aug 2004 06:47:00 -0000 1.99 +++ kstyles/themes/mega.themerc 24 Aug 2004 06:29:40 -0000 1.99.2.1 @@ -54,7 +54,6 @@ Name[uz]=MegaGradient highcolor услу Name[ven]=Tshitaela tsha muvhala wa ntha wa MegaGradient Name[vi]=Kiểu màu sáng Megagradient Name[xh]=Uhlobo lombala ophezulu we MegaGradient -Name[xx]=xxMegaGradient highcolor stylexx Name[zh_CN]=MegaGradient 高色彩风格 Name[zh_TW]=MegaGradient 高彩風格 Name[zu]=Isitayela sombala ophezulu se-MegaGradient Index: kstyles/themes/qtcde.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/qtcde.themerc,v retrieving revision 1.211 retrieving revision 1.211.2.1 diff -u -3 -p -r1.211 -r1.211.2.1 --- kstyles/themes/qtcde.themerc 5 Aug 2004 06:37:00 -0000 1.211 +++ kstyles/themes/qtcde.themerc 24 Aug 2004 06:29:40 -0000 1.211.2.1 @@ -3,7 +3,6 @@ Name=CDE Name[bn]=সি-ডি-ই Name[hi]=सीडीई Name[th]=รูปแบบ CDE -Name[xx]=xxCDExx Comment=Built-in unthemed CDE style Comment[af]=Ingeboude ongetemade Cde styl Comment[ar]=مظهر مضمن مشابه لCDE @@ -67,7 +66,6 @@ Comment[uz]=Ички мавзусиз CD Comment[ven]=Tshitaela tsha CDE tsho fhatelwaho ngomu Comment[vi]=Kiểu CDE chưa dùng theme có sẵn Comment[xh]=Uhlobo olungenamxholo olakhelwe-ngaphakathi lwe CDE -Comment[xx]=xxBuilt-in unthemed CDE stylexx Comment[zh_CN]=内建的无主题 CDE 风格 Comment[zh_TW]=內建的無主題 CDE 風格 Comment[zu]=Isitayela Sokwakheka-ngaphakathi okungenagqikithi Index: kstyles/themes/qtmotif.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/qtmotif.themerc,v retrieving revision 1.209 retrieving revision 1.209.2.1 diff -u -3 -p -r1.209 -r1.209.2.1 --- kstyles/themes/qtmotif.themerc 27 Jul 2004 07:23:45 -0000 1.209 +++ kstyles/themes/qtmotif.themerc 24 Aug 2004 06:29:40 -0000 1.209.2.1 @@ -7,7 +7,6 @@ Name[ko]=모티프 Name[pa]=ਮੋਟੀਫ Name[ta]=மோடிஃப் Name[th]=โมทีฟ -Name[xx]=xxMotifxx Comment=Built-in unthemed Motif style Comment[af]=Ingeboude ongetemade Motif styl Comment[ar]=مظهر مضمن مشابه لMotif @@ -71,7 +70,6 @@ Comment[uz]=Ички мавзусиз Mo Comment[ven]=Tshitaela tsha mothifi tsho fhatelwaho ngomu Comment[vi]=Kiểu Motif chưa dùng theme có sẵn Comment[xh]=Uhlobo lwe Motir olungenamxholo olakhelwe-ngaphakathi -Comment[xx]=xxBuilt-in unthemed Motif stylexx Comment[zh_CN]=内建的无主题 Motif 风格 Comment[zh_TW]=內建的無主題 Motif 風格 Comment[zu]=Ukwakekha-ngaphakathi okungenagqikithi sesitayela se-Motif Index: kstyles/themes/qtmotifplus.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/qtmotifplus.themerc,v retrieving revision 1.154 retrieving revision 1.154.2.1 diff -u -3 -p -r1.154 -r1.154.2.1 --- kstyles/themes/qtmotifplus.themerc 30 Jul 2004 07:01:20 -0000 1.154 +++ kstyles/themes/qtmotifplus.themerc 24 Aug 2004 06:29:41 -0000 1.154.2.1 @@ -13,7 +13,6 @@ Name[nn]=Motif pluss Name[pa]=ਮੋਟੀਫ ਨਵਾਂ Name[ta]=மோடிஃப் ப்ளஸ் Name[th]=โมทีฟพลัส -Name[xx]=xxMotif Plusxx Comment=Built-in enhanced Motif style Comment[af]=Ingeboude verbeterde Motif styl Comment[ar]=مظهر مضمن محسّن مشابه لMotif @@ -76,7 +75,6 @@ Comment[uz]=Кенгайтирилган Comment[ven]=Tshitaela tsho fhatelwaho nga ngomu Comment[vi]=Kiểu Motif cao cấp có sẵn Comment[xh]=Uhlobo lwe Motif olunyusiweyo olwakhelwe-ngaphakathi -Comment[xx]=xxBuilt-in enhanced Motif stylexx Comment[zh_CN]=内建的增强的 Motif 风格 Comment[zh_TW]=內建的增強的 Motif 風格 Comment[zu]=Isitayela se-Mofit esenziwe ngcono Index: kstyles/themes/qtplatinum.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/qtplatinum.themerc,v retrieving revision 1.223 retrieving revision 1.223.2.1 diff -u -3 -p -r1.223 -r1.223.2.1 --- kstyles/themes/qtplatinum.themerc 27 Jul 2004 07:23:45 -0000 1.223 +++ kstyles/themes/qtplatinum.themerc 24 Aug 2004 06:29:41 -0000 1.223.2.1 @@ -18,7 +18,6 @@ Name[sv]=Platina Name[ta]=பிளாட்டினம் Name[th]=แพลตตินัม Name[wa]=Platene -Name[xx]=xxPlatinumxx Name[zh_CN]=白金 Comment=Built-in unthemed Platinum style Comment[af]=Ingeboude ongetemade Platinum styl @@ -83,7 +82,6 @@ Comment[uz]=Ички мавзусиз Pl Comment[ven]=Tshitale tsha pulathinamu tsho fhatelwaho nga ngomu Comment[vi]=Kiểu Platinum chưa dùng theme có sẵn Comment[xh]=Uhloboa lwe Platinum olungenamxholo olwakhelwe-ngaphakathi -Comment[xx]=xxBuilt-in unthemed Platinum stylexx Comment[zh_CN]=内建的无主题白金风格 Comment[zh_TW]=內建的無主題 Platinum 風格 Comment[zu]=Yakhelwe-kuhlobo lwesingenabizogama isitayelaPlatinum Index: kstyles/themes/qtsgi.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/qtsgi.themerc,v retrieving revision 1.140 retrieving revision 1.140.2.1 diff -u -3 -p -r1.140 -r1.140.2.1 --- kstyles/themes/qtsgi.themerc 27 Jul 2004 07:23:45 -0000 1.140 +++ kstyles/themes/qtsgi.themerc 24 Aug 2004 06:29:41 -0000 1.140.2.1 @@ -4,7 +4,6 @@ Name[bn]=এস-জি-আই Name[hi]=एसजीआई Name[nl]=SIG Name[th]=รูปแบบ SGI -Name[xx]=xxSGIxx Comment=Built-in SGI style Comment[af]=Ingeboude Sgi styl Comment[ar]=مظهر مضمن مشابه لSGI @@ -69,7 +68,6 @@ Comment[uz]=Ички SGI услуби Comment[ven]=Tshitaela tsha SGI tsho fhatelwaho nga ngomu Comment[vi]=Kiểu SGI có sẵn Comment[xh]=Uhlobo lwe SGI olwakhelwe-ngaphakathi -Comment[xx]=xxBuilt-in SGI stylexx Comment[zh_CN]=内建的 SGI 风格 Comment[zh_TW]=內建的 SGI 風格 Comment[zu]=Yakhelwe-kwisitayela se SGI Index: kstyles/themes/qtwindows.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/qtwindows.themerc,v retrieving revision 1.221 retrieving revision 1.221.2.2 diff -u -3 -p -r1.221 -r1.221.2.2 --- kstyles/themes/qtwindows.themerc 27 Jul 2004 07:23:45 -0000 1.221 +++ kstyles/themes/qtwindows.themerc 31 Aug 2004 07:21:41 -0000 1.221.2.2 @@ -4,13 +4,12 @@ Name[bn]=এম-এস উইন্ড Name[eo]=Vindozo 9x Name[fa]=مایکروسافت ویندوز 9x Name[gl]=MS Windows 8x -Name[hi]=एमएस विंडोस 9x +Name[hi]=एमएस विंडोज़ 9x Name[ko]=MS 윈도우즈 9x Name[lt]=MSWindows 9x Name[pa]=MS ਵਿੰਡੋ 9x Name[se]=Windows Name[th]=วินโดว์ส 9x -Name[xx]=xxMS Windows 9xxx Comment=Built-in unthemed Windows 9x style Comment[af]=Ingeboude ongetemade Vensters 9x styl Comment[ar]=مظهر مضمن مشابه لويندوز @@ -34,7 +33,7 @@ Comment[fi]=Sisäänrakennettu teemoitta Comment[fr]=Style Windows 9x d'origine sans thème Comment[ga]=Stíl inmheánach gan téama, cosúil le Windows 9x Comment[gl]=Estilo incorporado Windows 9x sen tema -Comment[hi]=अंतर्निर्मित विंडोस 9x शैली +Comment[hi]=अंतर्निर्मित विंडोज़ 9x शैली Comment[hr]=Bez teme, ugrađeni Windows 9x stil Comment[hu]=Beépített Windows 9x-stílus Comment[id]=Gaya unthemed Windows 9x built-in @@ -74,7 +73,6 @@ Comment[uz]=Ички мавзусиз Wi Comment[ven]=Tshitaela tsha 9x tsha windo i songo bulwaho tsho fhatelwaho nga ngomu Comment[vi]=Kiểu Windows 9x chưa dùng theme có sẵn Comment[xh]=Uhlobo lwe Windows 9x olungenamxholo olwakhelwe-ngaphakathi -Comment[xx]=xxBuilt-in unthemed Windows 9x stylexx Comment[zh_CN]=内建的无主题 Windows 9x 风格 Comment[zh_TW]=內建的無主題 Windows 9x 風格 Comment[zu]=Yakhelwe-kuhlobo kwisitayela samawindi 9x Index: kstyles/themes/system.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/Attic/system.themerc,v retrieving revision 1.231 retrieving revision 1.231.2.1 diff -u -3 -p -r1.231 -r1.231.2.1 --- kstyles/themes/system.themerc 27 Jul 2004 07:23:45 -0000 1.231 +++ kstyles/themes/system.themerc 24 Aug 2004 06:29:41 -0000 1.231.2.1 @@ -248,7 +248,6 @@ Name[th]=แบบ System++ Name[tr]=Sistem++ Name[ven]=Sisitemu++ Name[xh]=Indlela yokusebenza++ -Name[xx]=xxSystem++xx Name[zu]=Indlela esetshenziswayo++ Comment=System themed style Comment[af]=Stelsel getemade styl @@ -311,7 +310,6 @@ Comment[uz]=Мавзулик System ус Comment[ven]=Thero ya tshitaela tsha sisitemu Comment[vi]=Kiểu hềEthống đã dùng theme Comment[xh]=Uhlobo olunomxholo lwendlela yokusebenza -Comment[xx]=xxSystem themed stylexx Comment[zh_CN]=系统主题风格 Comment[zh_TW]=系統主題風格 Comment[zu]=Isistimu sesitayela esinebizo gama Index: kstyles/themes/systemalt.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/themes/Attic/systemalt.themerc,v retrieving revision 1.190 retrieving revision 1.190.2.1 diff -u -3 -p -r1.190 -r1.190.2.1 --- kstyles/themes/systemalt.themerc 27 Jul 2004 07:23:45 -0000 1.190 +++ kstyles/themes/systemalt.themerc 24 Aug 2004 06:29:41 -0000 1.190.2.1 @@ -276,7 +276,6 @@ Name[tr]=Sistem Serileri Name[uk]=Родина системних стилів Name[ven]=Serisi ya sisitemu Name[xh]=Indlela yokusebenza-Uthotho -Name[xx]=xxSystem-Seriesxx Name[zh_CN]=系统序列 Name[zh_TW]=系統序列 Comment=System Style 001 @@ -343,7 +342,6 @@ Comment[uz]=System услуби 001 Comment[ven]=Tshitaela tsha sisitemu ya 001 Comment[vi]=Kiểu hềEthống 001 Comment[xh]=Uhlobo 001 Lwendlela yokusebenza -Comment[xx]=xxSystem Style 001xx Comment[zh_CN]=系统风格 001 Comment[zh_TW]=系統風格 001 ScrollBarExtent=14 Index: kstyles/web/web.themerc =================================================================== RCS file: /home/kde/kdelibs/kstyles/web/web.themerc,v retrieving revision 1.104 retrieving revision 1.104.2.1 diff -u -3 -p -r1.104 -r1.104.2.1 --- kstyles/web/web.themerc 27 Jul 2004 07:23:46 -0000 1.104 +++ kstyles/web/web.themerc 24 Aug 2004 06:29:42 -0000 1.104.2.1 @@ -58,7 +58,6 @@ Name[uz]=Веб услуби Name[ven]=Tshitaela tsha webu Name[vi]=Kiểu Web Name[xh]=Uhlobo lwe Web -Name[xx]=xxWeb stylexx Name[zh_CN]=网络风格 Name[zh_TW]=網站風格 Name[zu]=Uhlobo lwe-web @@ -121,7 +120,6 @@ Comment[uz]=Веб услуби Comment[ven]=Tshitaela tsha webe ya Widget Comment[vi]=Kiểu Wed widget Comment[xh]=Uhlobo lwe widget ye Web -Comment[xx]=xxWeb widget stylexx Comment[zh_CN]=网络部件风格 Comment[zh_TW]=Web 元件風格 Comment[zu]=Uhlobo lwe-widget ye-web Index: kutils/kmultitabbar.cpp =================================================================== RCS file: /home/kde/kdelibs/kutils/kmultitabbar.cpp,v retrieving revision 1.55 retrieving revision 1.55.2.1 diff -u -3 -p -r1.55 -r1.55.2.1 --- kutils/kmultitabbar.cpp 6 Jun 2004 21:52:41 -0000 1.55 +++ kutils/kmultitabbar.cpp 28 Aug 2004 13:38:48 -0000 1.55.2.1 @@ -256,6 +256,7 @@ void KMultiTabBarInternal::removeTab(int if (m_tabs.at(pos)->id()==id) { m_tabs.remove(pos); + resizeEvent(0); break; } } Index: kutils/kplugininfo.desktop =================================================================== RCS file: /home/kde/kdelibs/kutils/kplugininfo.desktop,v retrieving revision 1.53 retrieving revision 1.53.2.1 diff -u -3 -p -r1.53 -r1.53.2.1 --- kutils/kplugininfo.desktop 30 Jul 2004 07:01:21 -0000 1.53 +++ kutils/kplugininfo.desktop 24 Aug 2004 06:29:44 -0000 1.53.2.1 @@ -55,7 +55,6 @@ Name[tr]=KDE Eklenti Bilgisi Name[uk]=Інформація про втулок KDE Name[uz]=KDE плагин ҳақида маълумот Name[wa]=Informåcion sol tchôke-divins di KDE -Name[xx]=xxKDE Plugin Informationxx Name[zh_CN]=KDE 打印信息 Name[zh_TW]=KDE 外掛資訊 Index: mimetypes/all.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/all.desktop,v retrieving revision 1.106 retrieving revision 1.106.2.2 diff -u -3 -p -r1.106 -r1.106.2.2 --- mimetypes/all.desktop 30 Jul 2004 07:01:24 -0000 1.106 +++ mimetypes/all.desktop 31 Aug 2004 07:21:44 -0000 1.106.2.2 @@ -23,7 +23,7 @@ Comment[fi]=Kaikki tiedostot ja kansiot Comment[fr]=Tous les fichiers et dossiers Comment[gl]=Tódolos Ficheiros e Cartafois Comment[he]=כל הקבצים והתיקיות -Comment[hi]=सभी फ़ाइलें और फ़ोल्डर्स +Comment[hi]=सभी फ़ाइलें और फ़ोल्डर Comment[hr]=Svi direktoriji i mape Comment[hu]=Minden fájl és könyvtár Comment[is]=Allar skrár og möppur @@ -56,6 +56,5 @@ Comment[tr]=Tüm Dosya ve Dizinler Comment[uk]=Всі файли та теки Comment[uz]=Ҳамма файл ва жилдлар Comment[wa]=Tos les fitchîs et tos les ridants -Comment[xx]=xxAll Files and Foldersxx Comment[zh_CN]=全部文件和文件夹 Comment[zh_TW]=所有的檔案與目錄目錄 Index: mimetypes/allfiles.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/allfiles.desktop,v retrieving revision 1.75 retrieving revision 1.75.2.1 diff -u -3 -p -r1.75 -r1.75.2.1 --- mimetypes/allfiles.desktop 27 Jul 2004 07:23:51 -0000 1.75 +++ mimetypes/allfiles.desktop 24 Aug 2004 06:29:47 -0000 1.75.2.1 @@ -66,7 +66,6 @@ Comment[uz]=Ҳамма файллар Comment[ven]=Faela dzothe Comment[wa]=Tos les fitchîs Comment[xh]=Zonke IifayiIe -Comment[xx]=xxAll Filesxx Comment[zh_CN]=全部文件 Comment[zh_TW]=所有的檔案 Comment[zu]=Wonke Amafayela Index: mimetypes/application/illustrator.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/illustrator.desktop,v retrieving revision 1.81 retrieving revision 1.81.2.1 diff -u -3 -p -r1.81 -r1.81.2.1 --- mimetypes/application/illustrator.desktop 27 Jul 2004 07:23:51 -0000 1.81 +++ mimetypes/application/illustrator.desktop 24 Aug 2004 06:29:47 -0000 1.81.2.1 @@ -69,7 +69,6 @@ Comment[ven]=Manwalwa a u sumbedzisa a A Comment[vi]=Tài liệu Adobe Illustrator Comment[wa]=Documint Adobe Illustrator Comment[xh]=Uxwebhu lwe Adobe Illustrator -Comment[xx]=xxAdobe Illustrator Documentxx Comment[zh_CN]=Adobe Illustrator 文档 Comment[zh_TW]=Adobe Illustrator 文件 Comment[zu]=Umkhombisi Wohlu lwamafayela e-Adobe Index: mimetypes/application/mathml+xml.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/mathml+xml.desktop,v retrieving revision 1.60 retrieving revision 1.60.2.1 diff -u -3 -p -r1.60 -r1.60.2.1 --- mimetypes/application/mathml+xml.desktop 30 Jul 2004 07:01:25 -0000 1.60 +++ mimetypes/application/mathml+xml.desktop 24 Aug 2004 06:29:47 -0000 1.60.2.1 @@ -61,6 +61,5 @@ Comment[tr]=MathML Belgesi Comment[uk]=Документ MathML (математичні формули) Comment[uz]=MathML ҳужжати Comment[wa]=Documint MathML -Comment[xx]=xxMathML Documentxx Comment[zh_CN]=MathML 文档 Comment[zh_TW]=MathML 文件 Index: mimetypes/application/msexcel.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/msexcel.desktop,v retrieving revision 1.233 retrieving revision 1.233.2.1 diff -u -3 -p -r1.233 -r1.233.2.1 --- mimetypes/application/msexcel.desktop 27 Jul 2004 07:23:51 -0000 1.233 +++ mimetypes/application/msexcel.desktop 24 Aug 2004 06:29:47 -0000 1.233.2.1 @@ -65,7 +65,6 @@ Comment[uk]=Таблиця MS Excel Comment[uz]=Microsoft Excel электрон жадвали Comment[ven]=Bammbiri lo navhaho la microsoft Excel Comment[wa]=Fitchî tåvleu Microsoft Excel -Comment[xx]=xxMicrosoft Excel Spreadsheetxx Comment[zh_CN]=Microsoft Excel 电子表格 Comment[zh_TW]=微軟 Excel 表格 Comment[zu]= Ipheshana lesitayela le-Microsoft Excel Index: mimetypes/application/mspowerpoint.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/mspowerpoint.desktop,v retrieving revision 1.240 retrieving revision 1.240.2.1 diff -u -3 -p -r1.240 -r1.240.2.1 --- mimetypes/application/mspowerpoint.desktop 30 Jul 2004 07:01:25 -0000 1.240 +++ mimetypes/application/mspowerpoint.desktop 24 Aug 2004 06:29:47 -0000 1.240.2.1 @@ -57,6 +57,5 @@ Comment[tr]=Microsoft PowerPoint Sunumu Comment[uk]=Презентація MS PowerPoint Comment[uz]=Microsoft PowerPoint намунаси Comment[wa]=Prezintaedje Microsoft PowerPoint -Comment[xx]=xxMicrosoft PowerPoint Presentationxx Comment[zh_CN]=Microsoft PowerPoint 演示文稿 Comment[zh_TW]=微軟 PowerPoint 文件 Index: mimetypes/application/msword.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/msword.desktop,v retrieving revision 1.222 retrieving revision 1.222.2.1 diff -u -3 -p -r1.222 -r1.222.2.1 --- mimetypes/application/msword.desktop 27 Jul 2004 07:23:51 -0000 1.222 +++ mimetypes/application/msword.desktop 24 Aug 2004 06:29:47 -0000 1.222.2.1 @@ -68,7 +68,6 @@ Comment[uz]=Microsoft Word ҳужжат Comment[ven]=Manwalwa a Microsoft Word Comment[wa]=Documint Microsoft Word Comment[xh]=Uxwebhhu LweMicrosoft Word -Comment[xx]=xxMicrosoft Word Documentxx Comment[zh_CN]=Microsoft Word 文档 Comment[zh_TW]=微軟 Word 文件 Comment[zu]=Uhlu Lwamafayela lwe-Microsoft Word Index: mimetypes/application/octet-stream.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/octet-stream.desktop,v retrieving revision 1.198 retrieving revision 1.198.2.1 diff -u -3 -p -r1.198 -r1.198.2.1 --- mimetypes/application/octet-stream.desktop 27 Jul 2004 07:23:51 -0000 1.198 +++ mimetypes/application/octet-stream.desktop 24 Aug 2004 06:29:47 -0000 1.198.2.1 @@ -72,7 +72,6 @@ Comment[ven]=Zwisadivhei Comment[vi]=Không biết Comment[wa]=Nén cnoxhou Comment[xh]=Engaziwayo -Comment[xx]=xxUnknownxx Comment[zh_CN]=未知 Comment[zh_TW]=未知 Comment[zu]=Okungaziwa Index: mimetypes/application/ogg.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/ogg.desktop,v retrieving revision 1.33 retrieving revision 1.33.2.2 diff -u -3 -p -r1.33 -r1.33.2.2 --- mimetypes/application/ogg.desktop 27 Jul 2004 07:23:51 -0000 1.33 +++ mimetypes/application/ogg.desktop 31 Aug 2004 07:21:44 -0000 1.33.2.2 @@ -28,7 +28,7 @@ Comment[fr]=Multimédia Ogg Comment[ga]=Comhad ilmheánach Ogg Comment[gl]=Multimedia Ogg Comment[he]=מדיית Ogg -Comment[hi]=ऑग (Ogg) मल्टीमीडिया +Comment[hi]=ऑग मल्टीमीडिया Comment[hr]=Ogg multimedija Comment[hu]=Ogg hangfájl Comment[is]=Ogg hljóðskrá @@ -63,7 +63,6 @@ Comment[uk]=Ogg-аудіо Comment[uz]=Ogg мултимедиа Comment[ven]=Zwavhukwamani ha Ogg Comment[wa]=Fitchî multimedia Ogg -Comment[xx]=xxOgg Multimediaxx Comment[zh_CN]=Ogg 多媒体 Comment[zh_TW]=Ogg 多媒體 Comment[zu]=Onozindaba be-Ogg Index: mimetypes/application/pdf.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pdf.desktop,v retrieving revision 1.235 retrieving revision 1.235.2.1 diff -u -3 -p -r1.235 -r1.235.2.1 --- mimetypes/application/pdf.desktop 27 Jul 2004 07:23:51 -0000 1.235 +++ mimetypes/application/pdf.desktop 24 Aug 2004 06:29:48 -0000 1.235.2.1 @@ -68,7 +68,6 @@ Comment[uz]=PDF ҳужжати Comment[ven]=Manwalwa a pdf Comment[wa]=Documint PDF Comment[xh]=Uxwebhu lwe PDF -Comment[xx]=xxPDF Documentxx Comment[zh_CN]=PDF 文档 Comment[zh_TW]=PDF 文件 Comment[zu]=Uhlu lwamafayela e-PDF Index: mimetypes/application/pgp-encrypted.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pgp-encrypted.desktop,v retrieving revision 1.106 retrieving revision 1.106.2.2 diff -u -3 -p -r1.106 -r1.106.2.2 --- mimetypes/application/pgp-encrypted.desktop 4 Aug 2004 06:47:02 -0000 1.106 +++ mimetypes/application/pgp-encrypted.desktop 31 Aug 2004 07:21:44 -0000 1.106.2.2 @@ -27,7 +27,7 @@ Comment[fi]=PGP/MIME-salattu viestiotsik Comment[fr]=En-tête de message crypté PGP / MIME Comment[gl]=Cabeceira de Mensaxe Cifrada con PGP/MIME Comment[he]=כותרת הודעה מוצפנת של PGP/MIME -Comment[hi]=PGP/MIME एनक्रिप्टेड मैसेज हेडर +Comment[hi]=पीजीपी/माइम एनक्रिप्टेड मैसेज हेडर Comment[hr]=PGP/MIME kriptirano zaglavlje poruke Comment[hu]=PGP/MIME titkosított üzenetfejléc Comment[is]=PGP/MIME dulritaður skeytahaus @@ -63,7 +63,6 @@ Comment[uz]=PGP/MIME кодланган Comment[ven]=Thoho ya mulaedza ya PGP/MIME Comment[wa]=Tiestire d' on messaedje ecripté avou PGP/MIME Comment[xh]=PGP/MIME Umbhalo ophezulu ephepheni Womyalezo Ofihliweyo -Comment[xx]=xxPGP/MIME Encrypted Message Headerxx Comment[zh_CN]=PGP/MIME 加密邮件头 Comment[zh_TW]=PGP/MIME 加密的郵件檔頭 Comment[zu]=Umyalezo Wenhloko Wolwazi olungaqondakali lwe-PGP/MIME Index: mimetypes/application/pgp-keys.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pgp-keys.desktop,v retrieving revision 1.50 retrieving revision 1.50.2.1 diff -u -3 -p -r1.50 -r1.50.2.1 --- mimetypes/application/pgp-keys.desktop 30 Jul 2004 07:01:25 -0000 1.50 +++ mimetypes/application/pgp-keys.desktop 24 Aug 2004 06:29:48 -0000 1.50.2.1 @@ -52,7 +52,6 @@ Comment[tg]=OpenPGP калиди ҳам Comment[tr]=OpenPGP Anahtar Çifti Comment[uk]=Клунок ключа OpenPGP Comment[uz]=OpenPGP калитлар тўплами -Comment[xx]=xxOpenPGP Key Bundlexx Comment[zh_CN]=OpenPGP 秘钥束 X-KDE-AutoEmbed=true Index: mimetypes/application/pgp-signature.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pgp-signature.desktop,v retrieving revision 1.99 retrieving revision 1.99.2.1 diff -u -3 -p -r1.99 -r1.99.2.1 --- mimetypes/application/pgp-signature.desktop 4 Aug 2004 06:47:02 -0000 1.99 +++ mimetypes/application/pgp-signature.desktop 24 Aug 2004 06:29:48 -0000 1.99.2.1 @@ -62,7 +62,6 @@ Comment[uz]=Алоҳида OpenPGP им Comment[ven]=Tsaino ya tumanywaho na PGP yo vuleaho Comment[wa]=Sinateure OpenPGP distaetcheye Comment[xh]=Utyikityo lwe OpenPGP Olusikiweyo -Comment[xx]=xxDetached OpenPGP Signaturexx Comment[zh_CN]=分离的 OpenPGP 签名 Comment[zh_TW]=分離的 OpenPGP 簽名 Comment[zu]=Uphawu lokusayina lwe-OpenPGP Oluxebukile Index: mimetypes/application/pgp.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pgp.desktop,v retrieving revision 1.54 retrieving revision 1.54.2.1 diff -u -3 -p -r1.54 -r1.54.2.1 --- mimetypes/application/pgp.desktop 4 Aug 2004 06:47:02 -0000 1.54 +++ mimetypes/application/pgp.desktop 24 Aug 2004 06:29:48 -0000 1.54.2.1 @@ -57,6 +57,5 @@ Comment[tr]=PGP ile Şifrelenmiş ya da Comment[uk]=Повідомлення зашифроване або підписане PGP Comment[uz]=PGP билан кодланган ёки имзоланган хабар Comment[wa]=Messaedje ecripté ou siné avou PGP -Comment[xx]=xxPGP Encrypted or Signed Messagexx Comment[zh_CN]=PGP 加密或签名的信件 Comment[zh_TW]=PGP 加密或簽名的訊息 Index: mimetypes/application/pkcs10.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pkcs10.desktop,v retrieving revision 1.78 retrieving revision 1.78.2.1 diff -u -3 -p -r1.78 -r1.78.2.1 --- mimetypes/application/pkcs10.desktop 5 Aug 2004 06:37:02 -0000 1.78 +++ mimetypes/application/pkcs10.desktop 24 Aug 2004 06:29:48 -0000 1.78.2.1 @@ -61,7 +61,6 @@ Comment[uz]=S/MIME сертификат Comment[ven]=Khumbelo ya sethifikheithi tsha PKCS#12 Comment[wa]=Dimande d' acertinaedje S/MIME Comment[xh]=S/MIME Isicelo Soqinisekiso -Comment[xx]=xxS/MIME Certification Requestxx Comment[zh_CN]=S/MIME 认证请求 Comment[zh_TW]=S/MIME 認證請求 Comment[zu]=Isitifiketi Sesicelo se-S/MIME Index: mimetypes/application/pkcs7-mime.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pkcs7-mime.desktop,v retrieving revision 1.75 retrieving revision 1.75.2.1 diff -u -3 -p -r1.75 -r1.75.2.1 --- mimetypes/application/pkcs7-mime.desktop 27 Jul 2004 07:23:51 -0000 1.75 +++ mimetypes/application/pkcs7-mime.desktop 24 Aug 2004 06:29:48 -0000 1.75.2.1 @@ -62,7 +62,6 @@ Comment[uk]=Дані у форматі P Comment[uz]=PKCS#7 (S/MIME) форматланган маълумот Comment[ven]=PKCS#7 (S/MIME) Data yo vhumbeaho Comment[xh]=PKCS#7 (S/MIME) Data Efomatiweyo -Comment[xx]=xxPKCS#7 (S/MIME) Formatted Dataxx Comment[zh_CN]=PKCS#7 (S/MIME) 格式化数据 Comment[zh_TW]=PKCS#7 (S/MIME) 格式資料 Comment[zu]=Idata Efakwe kwisakhelo ye-PKCS#7 (S/MIME) Index: mimetypes/application/pkcs7-signature.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/pkcs7-signature.desktop,v retrieving revision 1.103 retrieving revision 1.103.2.1 diff -u -3 -p -r1.103 -r1.103.2.1 --- mimetypes/application/pkcs7-signature.desktop 4 Aug 2004 06:47:02 -0000 1.103 +++ mimetypes/application/pkcs7-signature.desktop 24 Aug 2004 06:29:48 -0000 1.103.2.1 @@ -63,7 +63,6 @@ Comment[uz]=Алоҳида S/MIME имз Comment[ven]=Tsaino yo tumanywaho ya S/MIME Comment[wa]=Sinateure S/MIME distaetcheye Comment[xh]=Utyikityo lwe S/MIME Esikiweyo -Comment[xx]=xxDetached S/MIME Signaturexx Comment[zh_CN]=分离的 S/MIME 签名 Comment[zh_TW]=分離的 S/MIME 簽名 Comment[zu]=Uphawu lokusayina lwe-S/MIME Oluxebukile Index: mimetypes/application/postscript.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/postscript.desktop,v retrieving revision 1.219 retrieving revision 1.219.2.1 diff -u -3 -p -r1.219 -r1.219.2.1 --- mimetypes/application/postscript.desktop 27 Jul 2004 07:23:51 -0000 1.219 +++ mimetypes/application/postscript.desktop 24 Aug 2004 06:29:48 -0000 1.219.2.1 @@ -74,7 +74,6 @@ Comment[ven]=Manwalwa a tshikiriputi tsh Comment[vi]=Tài liệu PostScript Comment[wa]=Documint PostScript Comment[xh]=Uxwebhu lwe PostScript -Comment[xx]=xxPostScript Documentxx Comment[zh_CN]=PostScript 文档 Comment[zh_TW]=PostScript 文件 Comment[zu]=Uhlu lwamafayela lwe-PostScript Index: mimetypes/application/sieve.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/sieve.desktop,v retrieving revision 1.69 retrieving revision 1.69.2.2 diff -u -3 -p -r1.69 -r1.69.2.2 --- mimetypes/application/sieve.desktop 27 Jul 2004 07:23:52 -0000 1.69 +++ mimetypes/application/sieve.desktop 31 Aug 2004 07:21:44 -0000 1.69.2.2 @@ -24,7 +24,7 @@ Comment[fi]=SIEVE-sähköpostisuodin Comment[fr]=Script de filtre de courrier SIEVE Comment[gl]=Script de Filtro de Correo SIEVE Comment[he]=תסריט מסנן דואר SIEVE -Comment[hi]=SIEVE मेल फिल्टर स्क्रिप्ट +Comment[hi]=SIEVE मेल फ़िल्टर स्क्रिप्ट Comment[hr]=SIEVE filter skripta za poštu Comment[hu]=SIEVE e-mail-szűrő szkript Comment[is]=SIEVE Póstsíu skrifta @@ -60,7 +60,6 @@ Comment[uk]=Сценарій фільт Comment[uz]=SIEVE хатни филтерлаш скрипти Comment[ven]=Tshikiputi tsha filithara ya meili ya SIEVE Comment[xh]=Isihluzi Sombhalo oshicilwe phantsi Seposi se SIEVE -Comment[xx]=xxSIEVE Mail Filter Scriptxx Comment[zh_CN]=SIEVE 邮件过滤脚本 Comment[zh_TW]=SIEVE 郵件過濾程式 Comment[zu]=Isikripti Sohluzo Lweposi le-SIEVE Index: mimetypes/application/smil.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/smil.desktop,v retrieving revision 1.156 retrieving revision 1.156.2.1 diff -u -3 -p -r1.156 -r1.156.2.1 --- mimetypes/application/smil.desktop 18 Jul 2004 06:34:09 -0000 1.156 +++ mimetypes/application/smil.desktop 24 Aug 2004 06:29:48 -0000 1.156.2.1 @@ -60,7 +60,6 @@ Comment[uz]=SMI тили Comment[ven]=Luambo lwo tangananaho lwa zwishumiswa zwa vhudavhidzani Comment[vi]=Ngôn ngữ giải tích đa phương tiện đồng bềEhoá Comment[xh]=Ulwimi oluhamba ngendlela enye lodityaniso lwe Multimedia -Comment[xx]=xxSynchronized Multimedia Integration Languagexx Comment[zh_CN]=同步多媒体集成语言 Comment[zh_TW]=同步多媒體整合式語言 Comment[zu]=Ukuqoqelwa ndawonye Kolimi Lwabasiki bebunda Abahambiswa ndawonye Index: mimetypes/application/vnd.mozilla.xul+xml.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.mozilla.xul+xml.desktop,v retrieving revision 1.66 retrieving revision 1.66.2.4 diff -u -3 -p -r1.66 -r1.66.2.4 --- mimetypes/application/vnd.mozilla.xul+xml.desktop 5 Aug 2004 06:37:02 -0000 1.66 +++ mimetypes/application/vnd.mozilla.xul+xml.desktop 20 Sep 2004 13:53:29 -0000 1.66.2.4 @@ -18,7 +18,9 @@ Comment[es]=Archivo XUL de Mozilla Comment[et]=Mozilla XUL fail Comment[fi]=Mozilla XUL-tiedosto Comment[fr]=Fichier XUL Mozilla +Comment[he]=קובץ XUL של מוזילה Comment[hu]=Mozilla XUL-fájl +Comment[is]=Mozilla XUL skrá Comment[it]=File XUL Mozilla Comment[ja]=Mozilla XUL ファイル Comment[nb]=Mozilla XUL-fil @@ -28,12 +30,15 @@ Comment[pa]=ਮੌਜੀਲਾ XUL ਫ Comment[pl]=Plik XUL Mozilli Comment[pt]=Ficheiro XUL do Mozilla Comment[pt_BR]=Arquivo XUL do Mozilla +Comment[ro]=Fişier XUL Mozilla +Comment[se]=Mozilla XUL-fiila Comment[sk]=Súbor Mozilla XUL Comment[sl]=Datoteka Mozilla XUL Comment[sr]=Mozilla XUL фајл Comment[sr@Latn]=Mozilla XUL фајл Comment[sv]=Mozilla XUL-fil +Comment[ta]=மோசில்லா XUL ஆவணம் Comment[tg]=Файли Mozilla XUL +Comment[uk]=Файл Mozilla XUL Comment[uz]=Mozilla XUL-файли -Comment[xx]=xxMozilla XUL Filexx Comment[zh_CN]=Mozilla XUL 文件 Index: mimetypes/application/vnd.ms-asf.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.ms-asf.desktop,v retrieving revision 1.63 retrieving revision 1.63.2.1 diff -u -3 -p -r1.63 -r1.63.2.1 --- mimetypes/application/vnd.ms-asf.desktop 27 Jul 2004 07:23:52 -0000 1.63 +++ mimetypes/application/vnd.ms-asf.desktop 24 Aug 2004 06:29:48 -0000 1.63.2.1 @@ -54,7 +54,6 @@ Comment[th]=แฟ้มสื่อ ASF Comment[tr]=ASF dosyası Comment[uk]=Носій ASF Comment[uz]=ASF медиа-файли -Comment[xx]=xxASF Mediaxx Comment[zh_CN]=ASF 媒体 Comment[zh_TW]=ASF 媒體 Comment[zu]=Abasiki bebunda be-ASF Index: mimetypes/application/vnd.ms-excel.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.ms-excel.desktop,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -3 -p -r1.17 -r1.17.2.1 --- mimetypes/application/vnd.ms-excel.desktop 27 Jul 2004 07:23:52 -0000 1.17 +++ mimetypes/application/vnd.ms-excel.desktop 24 Aug 2004 06:29:48 -0000 1.17.2.1 @@ -63,7 +63,6 @@ Comment[uk]=Таблиця MS Excel Comment[uz]=Microsoft Excel электрон жадвали Comment[ven]=Bammbiri lo navhaho la microsoft Excel Comment[wa]=Fitchî tåvleu Microsoft Excel -Comment[xx]=xxMicrosoft Excel Spreadsheetxx Comment[zh_CN]=Microsoft Excel 电子表格 Comment[zh_TW]=微軟 Excel 表格 Comment[zu]= Ipheshana lesitayela le-Microsoft Excel Index: mimetypes/application/vnd.ms-word.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.ms-word.desktop,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -3 -p -r1.20 -r1.20.2.1 --- mimetypes/application/vnd.ms-word.desktop 27 Jul 2004 07:23:52 -0000 1.20 +++ mimetypes/application/vnd.ms-word.desktop 24 Aug 2004 06:29:48 -0000 1.20.2.1 @@ -65,7 +65,6 @@ Comment[uz]=Microsoft Word ҳужжат Comment[ven]=Manwalwa a Microsoft Word Comment[wa]=Documint Microsoft Word Comment[xh]=Uxwebhhu LweMicrosoft Word -Comment[xx]=xxMicrosoft Word Documentxx Comment[zh_CN]=Microsoft Word 文档 Comment[zh_TW]=微軟 Word 文件 Comment[zu]=Uhlu Lwamafayela lwe-Microsoft Word Index: mimetypes/application/vnd.palm.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.palm.desktop,v retrieving revision 1.61 retrieving revision 1.61.2.1 diff -u -3 -p -r1.61 -r1.61.2.1 --- mimetypes/application/vnd.palm.desktop 30 Jul 2004 07:01:25 -0000 1.61 +++ mimetypes/application/vnd.palm.desktop 24 Aug 2004 06:29:48 -0000 1.61.2.1 @@ -61,6 +61,5 @@ Comment[tr]=Palm Belgesi Comment[uk]=Документ Palm Comment[uz]=Palm ҳужжати Comment[wa]=Documint Palm -Comment[xx]=xxPalm Documentxx Comment[zh_CN]=Palm 文档 Comment[zh_TW]=Palm 文件 Index: mimetypes/application/vnd.rn-realmedia.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.rn-realmedia.desktop,v retrieving revision 1.49 retrieving revision 1.49.2.1 diff -u -3 -p -r1.49 -r1.49.2.1 --- mimetypes/application/vnd.rn-realmedia.desktop 30 Jul 2004 07:01:25 -0000 1.49 +++ mimetypes/application/vnd.rn-realmedia.desktop 24 Aug 2004 06:29:48 -0000 1.49.2.1 @@ -60,6 +60,5 @@ Comment[tr]=RealMedia Dosyası Comment[uk]=Файл RealMedia Comment[uz]=RealMedia-файли Comment[wa]=Fitchî RealMedia -Comment[xx]=xxRealMedia Filexx Comment[zh_CN]=RealMedia 文件 Comment[zh_TW]=RealMedia 檔案 Index: mimetypes/application/vnd.stardivision.calc.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.stardivision.calc.desktop,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -3 -p -r1.9 -r1.9.2.1 --- mimetypes/application/vnd.stardivision.calc.desktop 2 Aug 2004 06:53:38 -0000 1.9 +++ mimetypes/application/vnd.stardivision.calc.desktop 24 Aug 2004 06:29:48 -0000 1.9.2.1 @@ -60,7 +60,6 @@ Comment[tr]=StarOffice Calc Hesap Tablos Comment[uk]=Електронна таблиця StarOffice Calc Comment[uz]=StarOffice Calc электрон жадвали Comment[ven]=U phadaladza ha bammbiri la Calc ya StarOffice -Comment[xx]=xxStarOffice Calc Spreadsheetxx Comment[zh_CN]=StarOffice Calc 电子表格 Comment[zh_TW]=StarOffice Calc 電子表格 [Property::X-KDE-NativeExtension] Index: mimetypes/application/vnd.stardivision.chart.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.stardivision.chart.desktop,v retrieving revision 1.26 retrieving revision 1.26.2.2 diff -u -3 -p -r1.26 -r1.26.2.2 --- mimetypes/application/vnd.stardivision.chart.desktop 2 Aug 2004 06:53:38 -0000 1.26 +++ mimetypes/application/vnd.stardivision.chart.desktop 12 Sep 2004 13:56:15 -0000 1.26.2.2 @@ -28,6 +28,7 @@ Comment[pl]=Wykres StarOffice Comment[pt]=Gráfico do StarOffice Comment[pt_BR]=Gráficos do StarOffice Comment[ro]=Hartă StarOffice +Comment[se]=StarOffice Calc-diagrámma Comment[sk]=Graf StarOffice Comment[sl]=Preglednica StarOffice Comment[sr]=StarOffice-ов графикон @@ -35,7 +36,6 @@ Comment[sr@Latn]=StarOffice-ов гра Comment[sv]=StarOffice diagram Comment[ta]=ஸ்டார்ஆபீஸ் வரைபடம் Comment[uk]=Діаграма StarOffice -Comment[xx]=xxStarOffice Chartxx Comment[zh_CN]=StarOffice 图表 [Property::X-KDE-NativeExtension] Type=QString Index: mimetypes/application/vnd.stardivision.draw.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.stardivision.draw.desktop,v retrieving revision 1.28 retrieving revision 1.28.2.2 diff -u -3 -p -r1.28 -r1.28.2.2 --- mimetypes/application/vnd.stardivision.draw.desktop 2 Aug 2004 06:53:38 -0000 1.28 +++ mimetypes/application/vnd.stardivision.draw.desktop 12 Sep 2004 13:56:15 -0000 1.28.2.2 @@ -31,6 +31,7 @@ Comment[pl]=Rysunek StarOffice Comment[pt]=Desenho do StarOffice Comment[pt_BR]=Desenho do StarOffice Comment[ro]=Desen vectorial StarOffice +Comment[se]=StarOffice-sárgun Comment[sk]=Kresba StarOffice Comment[sl]=Risanje StarOffice Comment[sr]=StarOffice-ов цртеж @@ -40,7 +41,6 @@ Comment[ta]=மைக்ரோசாப Comment[tg]=Расмкашӣ Microsoft Office Comment[uk]=Малюнок StarOffice Comment[uz]=StarOffice чизмаси -Comment[xx]=xxStarOffice Drawingxx Comment[zh_CN]=StarOffice 绘图 [Property::X-KDE-NativeExtension] Type=QString Index: mimetypes/application/vnd.stardivision.impress.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.stardivision.impress.desktop,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -3 -p -r1.8 -r1.8.2.1 --- mimetypes/application/vnd.stardivision.impress.desktop 27 Jul 2004 07:23:52 -0000 1.8 +++ mimetypes/application/vnd.stardivision.impress.desktop 24 Aug 2004 06:29:48 -0000 1.8.2.1 @@ -58,7 +58,6 @@ Comment[tr]=StarOffice Impress Sunumu Comment[uk]=Презентація StarOffice Impress Comment[uz]=StarOffice Impress намойиши Comment[xh]=Umboniso Wokuphawula we StarOffice -Comment[xx]=xxStarOffice Impress Presentationxx Comment[zh_CN]=StarOffice Impress 演示文稿 Comment[zh_TW]=StarOffice Impress 簡報 Comment[zu]=Ukunikezwa kwe-StarOffice Impress Index: mimetypes/application/vnd.stardivision.math.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.stardivision.math.desktop,v retrieving revision 1.28 retrieving revision 1.28.2.2 diff -u -3 -p -r1.28 -r1.28.2.2 --- mimetypes/application/vnd.stardivision.math.desktop 2 Aug 2004 06:53:38 -0000 1.28 +++ mimetypes/application/vnd.stardivision.math.desktop 12 Sep 2004 13:56:15 -0000 1.28.2.2 @@ -31,6 +31,7 @@ Comment[pl]=Dokument programu StarOffice Comment[pt]=Documento Matemático do StarOffice Comment[pt_BR]=Funções Matemáticas do StarOffice Comment[ro]=Document matematic StarOffice +Comment[se]=StarOffice Math-dokumeanta Comment[sk]=Dokument StarOffice Math Comment[sl]=Dokument StarOffice Math Comment[sr]=StarOffice-ов математички документ @@ -40,7 +41,6 @@ Comment[ta]=ஸ்டார்ஆபீ Comment[tg]=Санади математикии StarOffice Comment[uk]=Документ StarOffice Math Comment[uz]=StarOffice Math ҳужжати -Comment[xx]=xxStarOffice Math Documentxx Comment[zh_CN]=StarOffice Math 文档 [Property::X-KDE-NativeExtension] Type=QString Index: mimetypes/application/vnd.stardivision.writer-global.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.stardivision.writer-global.desktop,v retrieving revision 1.28 retrieving revision 1.28.2.3 diff -u -3 -p -r1.28 -r1.28.2.3 --- mimetypes/application/vnd.stardivision.writer-global.desktop 2 Aug 2004 06:53:38 -0000 1.28 +++ mimetypes/application/vnd.stardivision.writer-global.desktop 20 Sep 2004 13:53:29 -0000 1.28.2.3 @@ -31,6 +31,7 @@ Comment[pl]=Dokument główny StarOffice Comment[pt]=Documento Mestre do Writer do StarOffice Comment[pt_BR]=Documento Texto Mestre do StarOffice Comment[ro]=Document master StarOffice Writer +Comment[se]=StarOffice Writer-váldodokumeanta Comment[sk]=Hlavný dokument StarOffice Writer Comment[sl]=Glavni dokument StarOffice Writer Comment[sr]=StarOffice Writer-ов главни документ @@ -38,8 +39,8 @@ Comment[sr@Latn]=StarOffice Writer-ов Comment[sv]=StarOffice Writer-huvuddokument Comment[ta]=ஸ்டார்ஆபீஸ் ரைட்டர் மூல ஆவணம் Comment[tg]=Санади устоди нависаи StarOffice +Comment[uk]=Головний документ StarOffice Writer Comment[uz]=StarOffice Writer бош ҳужжати -Comment[xx]=xxStarOffice Writer Master Documentxx Comment[zh_CN]=StarOffice Writer 主文档 [Property::X-KDE-NativeExtension] Type=QString Index: mimetypes/application/vnd.stardivision.writer.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.stardivision.writer.desktop,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -3 -p -r1.10 -r1.10.2.1 --- mimetypes/application/vnd.stardivision.writer.desktop 27 Jul 2004 07:23:52 -0000 1.10 +++ mimetypes/application/vnd.stardivision.writer.desktop 24 Aug 2004 06:29:48 -0000 1.10.2.1 @@ -63,7 +63,6 @@ Comment[uk]=Документ StarOffice Comment[uz]=StarOffice Writer ҳужжати Comment[ven]=Manwalwa a munwali wa StarOffice Comment[xh]=Umbhali Woxwebhhu lwe StarOffice -Comment[xx]=xxStarOffice Writer Documentxx Comment[zh_CN]=StarOffice Writer 文档 Comment[zh_TW]=StarOffice Writer 文件 Comment[zu]=Umbhali Wohlu lwamafayela e-StarOffice Index: mimetypes/application/vnd.sun.xml.calc.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.sun.xml.calc.desktop,v retrieving revision 1.57 retrieving revision 1.57.2.1 diff -u -3 -p -r1.57 -r1.57.2.1 --- mimetypes/application/vnd.sun.xml.calc.desktop 1 Aug 2004 06:56:18 -0000 1.57 +++ mimetypes/application/vnd.sun.xml.calc.desktop 24 Aug 2004 06:29:48 -0000 1.57.2.1 @@ -53,7 +53,6 @@ Comment[tr]=OpenOffice.org Hesap Tablosu Comment[uk]=Електронна таблиця OpenOffice.org Comment[uz]=OpenOffice.org электрон жадвали Comment[wa]=Foye di tåvleu OpenOffice.org -Comment[xx]=xxOpenOffice.org Spreadsheetxx Comment[zh_CN]=OpenOffice.org 电子表格 Comment[zh_TW]=OpenOffice.org 試算表 Icon=spreadsheet Index: mimetypes/application/vnd.sun.xml.calc.template.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.sun.xml.calc.template.desktop,v retrieving revision 1.29 retrieving revision 1.29.2.2 diff -u -3 -p -r1.29 -r1.29.2.2 --- mimetypes/application/vnd.sun.xml.calc.template.desktop 2 Aug 2004 06:53:38 -0000 1.29 +++ mimetypes/application/vnd.sun.xml.calc.template.desktop 12 Sep 2004 13:56:15 -0000 1.29.2.2 @@ -28,6 +28,7 @@ Comment[pl]=Szablon arkusza kalkulacyjne Comment[pt]=Modelo de Folha de Cálculo do OpenOffice.org Comment[pt_BR]=Modelo de Planilha do OpenOffice.org Comment[ro]=Model foaie de calcul tabelar OpenOffice.org +Comment[se]=OpenOffice.org rehkenastinárkamálle Comment[sk]=Šablóna tabuľky OpenOffice.org Comment[sl]=Predloga preglednice OpenOffice.org Comment[sr]=OpenOffice.org-ов шаблон табеле @@ -37,7 +38,6 @@ Comment[ta]=ழ-ஓப்பன்ஆப Comment[tg]=Ҷадвали OpenOffice.org Comment[uk]=Шаблон електронної таблиці OpenOffice.org Comment[uz]=OpenOffice.org электрон жадвал намунаси -Comment[xx]=xxOpenOffice.org Spreadsheet Templatexx Comment[zh_CN]=OpenOffice.org 电子表格模板 Icon=spreadsheet Type=MimeType Index: mimetypes/application/vnd.sun.xml.draw.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.sun.xml.draw.desktop,v retrieving revision 1.52 retrieving revision 1.52.2.1 diff -u -3 -p -r1.52 -r1.52.2.1 --- mimetypes/application/vnd.sun.xml.draw.desktop 30 Jul 2004 07:01:25 -0000 1.52 +++ mimetypes/application/vnd.sun.xml.draw.desktop 24 Aug 2004 06:29:48 -0000 1.52.2.1 @@ -51,7 +51,6 @@ Comment[tr]=OpenOffice.org Çizimi Comment[uk]=Малюнок OpenOffice.org Comment[uz]=OpenOffice.org чизма Comment[wa]=Documint di dessinaedje OpenOffice.org -Comment[xx]=xxOpenOffice.org Drawingxx Comment[zh_CN]=OpenOffice.org 绘图 Comment[zh_TW]=StarOffice.org 繪圖 MimeType=application/vnd.sun.xml.draw Index: mimetypes/application/vnd.sun.xml.draw.template.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.sun.xml.draw.template.desktop,v retrieving revision 1.29 retrieving revision 1.29.2.2 diff -u -3 -p -r1.29 -r1.29.2.2 --- mimetypes/application/vnd.sun.xml.draw.template.desktop 2 Aug 2004 06:53:38 -0000 1.29 +++ mimetypes/application/vnd.sun.xml.draw.template.desktop 12 Sep 2004 13:56:15 -0000 1.29.2.2 @@ -28,6 +28,7 @@ Comment[pl]=Szablon rysunku OpenOffice.o Comment[pt]=Modelo de Desenho do OpenOffice.org Comment[pt_BR]=Modelo de Desenhos do OpenOffice.org Comment[ro]=Model desen vectorial OpenOffice.org +Comment[se]=OpenOffice.org-sárgunmálle Comment[sk]=Šablóna kresby OpenOffice.org Comment[sl]=Predloga risanja OpenOffice.org Comment[sr]=OpenOffice.org-ов шаблон цртежа @@ -37,7 +38,6 @@ Comment[ta]=ழ-ஓப்பன்ஆப Comment[tg]=Нақши OpenOffice.org Comment[uk]=Шаблон малюнка OpenOffice.org Comment[uz]=OpenOffice.org чизма намунаси -Comment[xx]=xxOpenOffice.org Drawing Templatexx Comment[zh_CN]=OpenOffice.org 绘图模板 MimeType=application/vnd.sun.xml.draw.template Type=MimeType Index: mimetypes/application/vnd.sun.xml.impress.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.sun.xml.impress.desktop,v retrieving revision 1.62 retrieving revision 1.62.2.1 diff -u -3 -p -r1.62 -r1.62.2.1 --- mimetypes/application/vnd.sun.xml.impress.desktop 1 Aug 2004 06:56:18 -0000 1.62 +++ mimetypes/application/vnd.sun.xml.impress.desktop 24 Aug 2004 06:29:48 -0000 1.62.2.1 @@ -54,7 +54,6 @@ Comment[tr]=OpenOffice.org Sunumu Comment[uk]=Презентація OpenOffice.org Comment[uz]=OpenOffice.org Намойиш Comment[wa]=Documint di prezintaedje OpenOffice.org -Comment[xx]=xxOpenOffice.org Presentationxx Comment[zh_CN]=OpenOffice.org 演示文稿 MimeType=application/vnd.sun.xml.impress Type=MimeType Index: mimetypes/application/vnd.sun.xml.impress.template.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.sun.xml.impress.template.desktop,v retrieving revision 1.29 retrieving revision 1.29.2.2 diff -u -3 -p -r1.29 -r1.29.2.2 --- mimetypes/application/vnd.sun.xml.impress.template.desktop 2 Aug 2004 06:53:38 -0000 1.29 +++ mimetypes/application/vnd.sun.xml.impress.template.desktop 12 Sep 2004 13:56:15 -0000 1.29.2.2 @@ -28,6 +28,7 @@ Comment[pl]=Szablon prezentacji OpenOffi Comment[pt]=Modelo de Apresentação do OpenOffice.org Comment[pt_BR]=Modelo de Apresentações do OpenOffice.org Comment[ro]=Model prezentare OpenOffice.org +Comment[se]=OpenOffice.org presentašuvdnamálle Comment[sk]=Šablóna prezentácie OpenOffice.org Comment[sl]=Predloga predstavitve OpenOffice.org Comment[sr]=OpenOffice.org-ов шаблон презентације @@ -37,7 +38,6 @@ Comment[ta]=ழ-ஓப்பன்ஆப Comment[tg]=Тақдимоти OpenOffice.org Comment[uk]=Шаблон презентації OpenOffice.org Comment[uz]=OpenOffice.org намойиш намунаси -Comment[xx]=xxOpenOffice.org Presentation Templatexx Comment[zh_CN]=OpenOffice.org 演示文稿模板 MimeType=application/vnd.sun.xml.impress.template Type=MimeType Index: mimetypes/application/vnd.sun.xml.writer.desktop =================================================================== RCS file: /home/kde/kdelibs/mimetypes/application/vnd.sun.xml.writer.desktop,v retrieving revision 1.62 retrieving revision 1.62.2.1 diff -u -3 -p -r1.62 -r1.62.2.1 --- mimetypes/application/vnd.sun.xml.writer.desktop 1 Aug 2004 06:56:18 -0000 1.62 +++ mimetypes/application/vnd.sun.xml.writer.desktop 24 Aug 2004 06:29:48 -0000 1.62.2.1 @@ -57,7 +57,6 @@ Comment[tr]=OpenOffice.org Metin Belgesi Comment[uk]=Текстовий документ OpenOffice.org Comment[uz]=OpenOffice.org матн ҳужжати Comment[wa]=Documint tecse OpenOffice.org -Comment[xx]=xxOpenOffice.org Text Documentxx Comment[zh_CN]=OpenOffice.org 文本文档 Comment[zh_TW]=OpenOffice.org Text 文件 MimeType=application/vnd.sun.xm