Hello community, here is the log from the commit of package kdeedu3 checked in at Tue Aug 8 14:46:27 CEST 2006. -------- --- KDE/kdeedu3/kdeedu3.changes 2006-07-28 15:15:28.000000000 +0200 +++ kdeedu3/kdeedu3.changes 2006-08-08 09:03:24.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 8 09:03:16 CEST 2006 - dmueller@suse.de + +- update branch diff + +------------------------------------------------------------------- New: ---- 3_5_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu3.spec ++++++ --- /var/tmp/diff_new_pack.PGMffM/_old 2006-08-08 14:45:38.000000000 +0200 +++ /var/tmp/diff_new_pack.PGMffM/_new 2006-08-08 14:45:38.000000000 +0200 @@ -16,13 +16,13 @@ Group: System/GUI/KDE Summary: Education Applications Version: 3.5.4 -Release: 1 +Release: 2 Url: http://www.kde.org Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Provides: kgeo,keduca,kalzium Obsoletes: kgeo,keduca,kalzium Source0: kdeedu-%{version}.tar.bz2 -#Patch0: 3_5_BRANCH.diff +Patch0: 3_5_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,7 +53,7 @@ %prep %setup -n kdeedu-%{version} -q -#%patch0 +%patch0 . /etc/opt/kde3/common_options update_admin @@ -136,6 +136,8 @@ /opt/kde3/share/mimelnk/application/x-* %changelog -n kdeedu3 +* Tue Aug 08 2006 - dmueller@suse.de +- update branch diff * Mon Jul 24 2006 - coolo@suse.de - update to KDE 3.5.4: * kig: allow to edit a Python script once constructed ++++++ 3_5_BRANCH.diff ++++++ package: kdeedu-3.5.4.tar.bz2 kdemod: kdeedu svn di between /tags/KDE/3.5.4 and /branches/KDE//branches/KDE/3.5 Index: kanagram/src/kanagram.desktop =================================================================== --- kanagram/src/kanagram.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ kanagram/src/kanagram.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -26,6 +26,7 @@ Comment[nl]=Letters ordenen Comment[pl]=Gra w układanie liter dla KDE Comment[pt]=Jogo de Ordenação de Letras do KDE Comment[pt_BR]=Jogo de Ordenação de Letras do KDE +Comment[ru]=Игра с перестановкой букв Comment[sk]=KDE hra o usporiadaní písmen Comment[sl]=Igra vrstnega reda črk Comment[sr]=Игра редоследа слова за KDE Index: kanagram/data/worldcapitals.kvtml =================================================================== --- kanagram/data/worldcapitals.kvtml (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ kanagram/data/worldcapitals.kvtml (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -165,7 +165,7 @@ Valid xml means: <o r="Capital of Hungary" >budapest</o> </e> <e> - <o r="Capital of Turkey" >istanbul</o> + <o r="Capital of Turkey" >ankara</o> </e> <e> <o r="Capital of Indonesia" >jakarta</o> Index: khangman/khangman/khangman.desktop =================================================================== --- khangman/khangman/khangman.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ khangman/khangman/khangman.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -79,6 +79,7 @@ Comment[nl]=Het spel Galgje voor KDE Comment[pl]=Gra w wisielca dla KDE Comment[pt]=Jogo da Forca do KDE Comment[pt_BR]=Jogo da Forca do KDE +Comment[ru]=Игра "Виселица" Comment[sk]=KDE hra Hangman Comment[sl]=Igra vislic Comment[sr]=KDE-ова игра вешала Index: khangman/khangman/khangman.cpp =================================================================== --- khangman/khangman/khangman.cpp (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ khangman/khangman/khangman.cpp (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -142,8 +142,8 @@ void KHangMan::slotChangeLevel() static const char *levelStrings[] = { I18N_NOOP("Animals"), I18N_NOOP("Easy"), - I18N_NOOP("Hard"), I18N_NOOP("Medium"), + I18N_NOOP("Hard"), }; currentLevel = m_levelAction->currentItem(); levelString = levels[currentLevel]; @@ -310,7 +310,18 @@ void KHangMan::loadLevels() } //TODO else tell no files had been found } + + // Sort easy, medium, hard at bottom, with the other categories at the top levels.sort(); + QString replace[3] = { "Easy", "Medium", "Hard" }; + for ( int i = 0; i < 3; ++i ) + { + if ( levels.findIndex( replace[i] ) > -1 ) + { + levels.remove( replace[i] ); + levels.append( replace[i] ); + } + } //find duplicated entries in KDEDIR and KDEHOME QString last; Index: keduca/resources/keduca.desktop =================================================================== --- keduca/resources/keduca.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ keduca/resources/keduca.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -75,6 +75,7 @@ Comment[nl]=KDE-programma voor tests en Comment[pl]=Program do testów i egzaminów dla KDE Comment[pt]=Programa de Testes & Exames do KDE Comment[pt_BR]=Programa de Testes & Exames do KDE +Comment[ru]=Простая программа для проведения тестов Comment[sk]=KDE testovacie a skúšacie programy Comment[sl]=Program za izdelavo testov Comment[sr]=KDE програм за тестове и испите Index: klettres/klettres/klettres.desktop =================================================================== --- klettres/klettres/klettres.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ klettres/klettres/klettres.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -25,6 +25,7 @@ Comment[nl]=Een KDE-programma waarmee he Comment[pl]=Program do nauki alfabetu dla KDE Comment[pt]=Um programa do KDE para aprender o alfabeto Comment[pt_BR]=Um programa do KDE para aprender o alfabeto +Comment[ru]=Программа для изучения алфавита Comment[sk]=KDE program pre výuku abecedy Comment[sl]=Program za učenje abecede Comment[sr]=KDE програм за учење алфабета Index: kwordquiz/src/x-kwordquiz.desktop =================================================================== --- kwordquiz/src/x-kwordquiz.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ kwordquiz/src/x-kwordquiz.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -24,6 +24,7 @@ Comment[is]=KWordQuiz orðaforði Comment[it]=Vocabolario KWordQuiz Comment[ja]=KWordQuiz 単語集 Comment[mk]=KWordQuiz Речник +Comment[ms]=Perbendaharaan Kata KWordQuiz Comment[nb]=KWordQuiz-vokabular Comment[nl]=KWordQuiz-woordenschat Comment[nn]=KWordQuiz-vokabular Index: kwordquiz/src/eventsrc =================================================================== --- kwordquiz/src/eventsrc (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ kwordquiz/src/eventsrc (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -212,6 +212,7 @@ Comment[is]=Villa Comment[it]=Errore di sintassi Comment[ja]=構文上のエラー Comment[mk]=Грешка во синтаксата +Comment[ms]=Ralat dalam sintaks Comment[nb]=Feil i syntaks Comment[nl]=Fout in syntaxis Comment[nn]=Feil i syntaks Index: kig/kig/kig.desktop =================================================================== --- kig/kig/kig.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ kig/kig/kig.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -72,6 +72,7 @@ Comment[nl]=Ruimtelijke constructies ver Comment[pl]=Zabawa konstrukcjami geometrycznymi Comment[pt]=Explorar Construções Geométricas Comment[pt_BR]=Explorar Construções Geométricas +Comment[ru]=Работа с геометрическими построениями Comment[sk]=Prieskum geometrických konštrukcií Comment[sl]=Raziskovanje geometrijskih konstrukcij Comment[sr]=Истражујте геометријске конструкције Index: kiten/kiten.desktop =================================================================== --- kiten/kiten.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ kiten/kiten.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -29,7 +29,7 @@ GenericName[lt]=Japoniškas žinynas/stu GenericName[lv]=Japāņu Valodas Mācību/References Rīks GenericName[mk]=Јапонски Прирачник/Алатка за учење GenericName[mn]=Япон хэлний сурах программ -GenericName[ms]=Alat Rujukan/Belajar orang Jepun +GenericName[ms]=Alat Rujukan/Pembelajaran Bahasa Jepun GenericName[nb]=Japansk oppslagsverk/læremiddel GenericName[nl]=Japans referentie-/studiehulpprogramma GenericName[nn]=Japansk språkverktøy Index: kalzium/src/kalzium.desktop =================================================================== --- kalzium/src/kalzium.desktop (.../tags/KDE/3.5.4/kdeedu) (revision 570938) +++ kalzium/src/kalzium.desktop (.../branches/KDE/3.5/kdeedu) (revision 570938) @@ -24,6 +24,7 @@ Comment[nl]=Periodieke Tabel der Element Comment[pl]=Układ okresowy pierwiastków dla KDE Comment[pt]=Tabela Periódica de Elementos do KDE Comment[pt_BR]=Tabela Periódica de Elementos do KDE +Comment[ru]=Периодическая система Менделеева Comment[sk]=KDE Periodická tabuľka prvkov Comment[sl]=Periodni sistem elementov Comment[sr]=Периодни систем елемената за KDE Property changes on: . ___________________________________________________________________ Name: svn:externals + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...