diff -Nru kiten-4.7.90/app/kiten.desktop kiten-4.7.95/app/kiten.desktop --- kiten-4.7.90/app/kiten.desktop 2011-09-26 09:44:38.000000000 +0000 +++ kiten-4.7.95/app/kiten.desktop 2011-12-20 19:12:39.000000000 +0000 @@ -19,7 +19,7 @@ GenericName[es]=Herramienta de referencia/estudio del japonés GenericName[et]=Jaapani keele õpiprogramm GenericName[eu]=Japoniera erreferentzia/Ikasketa tresna -GenericName[fa]=ابزار مرجع/مطالعۀ ژاپنی +GenericName[fa]=ابزار مرجع/مطالعه ژاپنی GenericName[fi]=Japanin opiskelutyökalu GenericName[fr]=Un outil d'étude et de référence japonais GenericName[ga]=Uirlis Tagartha/Staidéir don tSeapáinis @@ -79,7 +79,7 @@ Comment[es]=Herramienta de referencia y estudio del japonés Comment[et]=Jaapani keele õpiprogramm Comment[eu]=Japoniera erreferentzia eta ikasketa tresna -Comment[fa]=ابزار مرجع و مطالعۀ ژاپنی +Comment[fa]=ابزار مرجع و مطالعه ژاپنی Comment[fi]=Japanin opiskelutyökalu Comment[fr]=Outil d'étude et de référence japonais Comment[ga]=Uirlis Tagartha/Staidéir don tSeapáinis diff -Nru kiten-4.7.90/debian/changelog kiten-4.7.95/debian/changelog --- kiten-4.7.90/debian/changelog 2011-12-20 23:52:45.000000000 +0000 +++ kiten-4.7.95/debian/changelog 2011-12-27 20:59:04.000000000 +0000 @@ -1,3 +1,13 @@ +kiten (4:4.7.95-0ubuntu1) precise; urgency=low + + [ Philip Muškovac ] + * New upstream release candidate + + [ Felix Geyer ] + * Update symbols files. + + -- Philip Muškovac Sat, 24 Dec 2011 20:28:27 +0100 + kiten (4:4.7.90-0ubuntu1) precise; urgency=low * New upstream beta release diff -Nru kiten-4.7.90/debian/control kiten-4.7.95/debian/control --- kiten-4.7.90/debian/control 2011-12-16 15:35:24.000000000 +0000 +++ kiten-4.7.95/debian/control 2011-12-27 20:26:04.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Kubuntu Developers XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Pino Toscano -Build-Depends: kde-sc-dev-latest (>= 4:4.7.2), +Build-Depends: kde-sc-dev-latest (>= 4:4.7.95), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.7) Standards-Version: 3.9.2 diff -Nru kiten-4.7.90/debian/libkiten4.symbols kiten-4.7.95/debian/libkiten4.symbols --- kiten-4.7.90/debian/libkiten4.symbols 2011-12-16 13:14:29.000000000 +0000 +++ kiten-4.7.95/debian/libkiten4.symbols 2011-12-27 20:26:04.000000000 +0000 @@ -1,7 +1,42 @@ -# SymbolsHelper-Confirmed: 4:4.6.1 amd64 +# SymbolsHelper-Confirmed: 4:4.7.90 amd64 armel armhf i386 powerpc libkiten.so.4 libkiten4 #MINVER# * Build-Depends-Package: libkiten-dev ABI_4_0@ABI_4_0 4:4.6.1 + _ZN10EntryEdict9loadEntryERK7QString@ABI_4_0 4:4.7.90 + _ZN10EntryEdictC1ERK7QString@ABI_4_0 4:4.7.90 + _ZN10EntryEdictC1ERK7QStringS2_@ABI_4_0 4:4.7.90 + _ZN10EntryEdictC2ERK7QString@ABI_4_0 4:4.7.90 + _ZN10EntryEdictC2ERK7QStringS2_@ABI_4_0 4:4.7.90 + _ZN10EntryEdictD0Ev@ABI_4_0 4:4.7.90 + _ZN10EntryEdictD1Ev@ABI_4_0 4:4.7.90 + _ZN10EntryEdictD2Ev@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict10validQueryERK9DictQuery@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict12loadListTypeEP19KConfigSkeletonItemP11QStringListRK4QMapI7QStringS5_E@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict12loadSettingsEP15KConfigSkeleton@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict12loadSettingsEv@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict13displayFieldsE@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict14loadDictionaryERK7QStringS2_@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict17deinflectionLabelE@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict17preferencesWidgetEP15KConfigSkeletonP7QWidget@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict19validDictionaryFileERK7QString@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict8doSearchERK9DictQuery@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict8wordTypeE@ABI_4_0 4:4.7.90 + _ZN13DictFileEdict9makeEntryERK7QString@ABI_4_0 4:4.7.90 + _ZN13DictFileEdictC1Ev@ABI_4_0 4:4.7.90 + _ZN13DictFileEdictC2Ev@ABI_4_0 4:4.7.90 + _ZN13DictFileEdictD0Ev@ABI_4_0 4:4.7.90 + _ZN13DictFileEdictD1Ev@ABI_4_0 4:4.7.90 + _ZN13DictFileEdictD2Ev@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidic9loadEntryERK7QString@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicC1ERK7QString@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicC1ERK7QStringS2_@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicC1ERKS_@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicC2ERK7QString@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicC2ERK7QStringS2_@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicC2ERKS_@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicD0Ev@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicD1Ev@ABI_4_0 4:4.7.90 + _ZN13EntryKanjidicD2Ev@ABI_4_0 4:4.7.90 _ZN14HistoryPtrList10setCurrentEi@ABI_4_0 4:4.6.1 _ZN14HistoryPtrList12toStringListEv@ABI_4_0 4:4.6.1 _ZN14HistoryPtrList16toStringListNextEv@ABI_4_0 4:4.6.1 @@ -17,12 +52,27 @@ _ZN14HistoryPtrListD0Ev@ABI_4_0 4:4.6.1 _ZN14HistoryPtrListD1Ev@ABI_4_0 4:4.6.1 _ZN14HistoryPtrListD2Ev@ABI_4_0 4:4.6.1 + _ZN16DictFileKanjidic10validQueryERK9DictQuery@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic12loadListTypeEP19KConfigSkeletonItemP11QStringListRK4QMapI7QStringS5_E@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic12loadSettingsEP15KConfigSkeleton@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic12loadSettingsEv@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic13displayFieldsE@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic14dumpDictionaryEv@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic14loadDictionaryERK7QStringS2_@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic19validDictionaryFileERK7QString@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidic8doSearchERK9DictQuery@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidicC1Ev@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidicC2Ev@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidicD0Ev@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidicD1Ev@ABI_4_0 4:4.7.90 + _ZN16DictFileKanjidicD2Ev@ABI_4_0 4:4.7.90 _ZN17DictionaryManager12loadSettingsERK7KConfig@ABI_4_0 4:4.6.1 _ZN17DictionaryManager12makeDictFileERK7QString@ABI_4_0 4:4.6.1 _ZN17DictionaryManager13addDictionaryERK7QStringS2_S2_@ABI_4_0 4:4.6.1 _ZN17DictionaryManager16loadDictSettingsERK7QStringP15KConfigSkeleton@ABI_4_0 4:4.6.1 _ZN17DictionaryManager16removeDictionaryERK7QString@ABI_4_0 4:4.6.1 _ZN17DictionaryManager17listDictFileTypesEv@ABI_4_0 4:4.6.1 + _ZN17DictionaryManager21removeAllDictionariesEv@ABI_4_0 4:4.7.90 _ZN17DictionaryManager25generatePreferenceDialogsEP15KConfigSkeletonP7QWidget@ABI_4_0 4:4.6.1 _ZN17DictionaryManager26generateExtendedFieldsListEv@ABI_4_0 4:4.6.1 _ZN17DictionaryManagerC1Ev@ABI_4_0 4:4.6.1 @@ -57,9 +107,11 @@ _ZN9DictQuery12takePropertyERK7QString@ABI_4_0 4:4.6.1 _ZN9DictQuery13charTypeCheckERK5QChar@ABI_4_0 4:4.6.1 _ZN9DictQuery13mainDelimiterE@ABI_4_0 4:4.6.1 + _ZN9DictQuery13setFilterTypeENS_10FilterTypeE@ABI_4_0 4:4.7.90 _ZN9DictQuery14removePropertyERK7QString@ABI_4_0 4:4.6.1 _ZN9DictQuery15setDictionariesERK11QStringList@ABI_4_0 4:4.6.1 _ZN9DictQuery15stringTypeCheckERK7QString@ABI_4_0 4:4.6.1 + _ZN9DictQuery16setMatchWordTypeENS_13MatchWordTypeE@ABI_4_0 4:4.7.90 _ZN9DictQuery16setPronunciationERK7QString@ABI_4_0 4:4.6.1 _ZN9DictQuery17propertySeperatorE@ABI_4_0 4:4.6.1 _ZN9DictQuery5clearEv@ABI_4_0 4:4.6.1 @@ -93,6 +145,53 @@ _ZN9EntryListD2Ev@ABI_4_0 4:4.6.1 _ZN9EntryListaSERKS_@ABI_4_0 4:4.6.1 _ZN9EntryListpLERKS_@ABI_4_0 4:4.6.1 + _ZNK10EntryEdict10isParticleEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict11isAdjectiveEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict11isGodanVerbEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict12getTypesListEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict12isExpressionEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict12kanjiLinkifyERK7QString@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict13isIchidanVerbEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict14isFukisokuVerbEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict15matchesWordTypeERK9DictQuery@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict17getDictionaryTypeEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict5cloneEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict6isNounEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict6isVerbEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict6toHTMLEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict8HTMLWordEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict8getTypesEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict8isAdverbEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict8isCommonEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict8isPrefixEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict8isSuffixEv@ABI_4_0 4:4.7.90 + _ZNK10EntryEdict9dumpEntryEv@ABI_4_0 4:4.7.90 + _ZNK13DictFileEdict14displayOptionsEv@ABI_4_0 4:4.7.90 + _ZNK13DictFileEdict18loadDisplayOptionsEv@ABI_4_0 4:4.7.90 + _ZNK13DictFileEdict22listDictDisplayOptionsE11QStringList@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic11addReadingsERK11QStringList@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic12HTMLReadingsEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic13getKanjiGradeEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic15getStrokesCountEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic15makeReadingLinkERK7QString@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic16HTMLExtendedInfoERK7QString@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic17extendedItemCheckERK7QStringS2_@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic17getDictionaryTypeEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic17getOnyomiReadingsEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic18getInNamesReadingsEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic18getKunyomiReadingsEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic20getAsRadicalReadingsEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic21getOnyomiReadingsListEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic22getInNamesReadingsListEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic22getKunyomiReadingsListEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic24getAsRadicalReadingsListEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic5cloneEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic6toHTMLEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic8HTMLWordEv@ABI_4_0 4:4.7.90 + _ZNK13EntryKanjidic9dumpEntryEv@ABI_4_0 4:4.7.90 + _ZNK16DictFileKanjidic14displayOptionsEv@ABI_4_0 4:4.7.90 + _ZNK16DictFileKanjidic18loadDisplayOptionsEv@ABI_4_0 4:4.7.90 + _ZNK16DictFileKanjidic22listDictDisplayOptionsE11QStringList@ABI_4_0 4:4.7.90 _ZNK17DictionaryManager14doSearchInListERK9DictQueryPK9EntryList@ABI_4_0 4:4.6.1 _ZNK17DictionaryManager16listDictionariesEv@ABI_4_0 4:4.6.1 _ZNK17DictionaryManager18listDictionaryInfoERK7QString@ABI_4_0 4:4.6.1 @@ -125,7 +224,9 @@ _ZNK9DictQuery11getPropertyERK7QString@ABI_4_0 4:4.6.1 _ZNK9DictQuery11hasPropertyERK7QString@ABI_4_0 4:4.6.1 _ZNK9DictQuery12getMatchTypeEv@ABI_4_0 4:4.6.1 + _ZNK9DictQuery13getFilterTypeEv@ABI_4_0 4:4.7.90 _ZNK9DictQuery15getDictionariesEv@ABI_4_0 4:4.6.1 + _ZNK9DictQuery16getMatchWordTypeEv@ABI_4_0 4:4.7.90 _ZNK9DictQuery16getPronunciationEv@ABI_4_0 4:4.6.1 _ZNK9DictQuery16listPropertyKeysEv@ABI_4_0 4:4.6.1 _ZNK9DictQuery5cloneEv@ABI_4_0 4:4.6.1 @@ -141,17 +242,29 @@ _ZNK9EntryList8getQueryEv@ABI_4_0 4:4.6.1 _ZNK9EntryList8toStringEjj@ABI_4_0 4:4.6.1 _ZNK9EntryList8toStringEv@ABI_4_0 4:4.6.1 + _ZTI10EntryEdict@ABI_4_0 4:4.7.90 + _ZTI13DictFileEdict@ABI_4_0 4:4.7.90 + _ZTI13EntryKanjidic@ABI_4_0 4:4.7.90 _ZTI14HistoryPtrList@ABI_4_0 4:4.6.1 + _ZTI16DictFileKanjidic@ABI_4_0 4:4.7.90 _ZTI17DictionaryManager@ABI_4_0 4:4.6.1 _ZTI26DictionaryPreferenceDialog@ABI_4_0 4:4.6.1 _ZTI5Entry@ABI_4_0 4:4.6.1 _ZTI9EntryList@ABI_4_0 4:4.6.1 + _ZTS10EntryEdict@ABI_4_0 4:4.7.90 + _ZTS13DictFileEdict@ABI_4_0 4:4.7.90 + _ZTS13EntryKanjidic@ABI_4_0 4:4.7.90 _ZTS14HistoryPtrList@ABI_4_0 4:4.6.1 + _ZTS16DictFileKanjidic@ABI_4_0 4:4.7.90 _ZTS17DictionaryManager@ABI_4_0 4:4.6.1 _ZTS26DictionaryPreferenceDialog@ABI_4_0 4:4.6.1 _ZTS5Entry@ABI_4_0 4:4.6.1 _ZTS9EntryList@ABI_4_0 4:4.6.1 + _ZTV10EntryEdict@ABI_4_0 4:4.7.90 + _ZTV13DictFileEdict@ABI_4_0 4:4.7.90 + _ZTV13EntryKanjidic@ABI_4_0 4:4.7.90 _ZTV14HistoryPtrList@ABI_4_0 4:4.6.1 + _ZTV16DictFileKanjidic@ABI_4_0 4:4.7.90 _ZTV17DictionaryManager@ABI_4_0 4:4.6.1 _ZTV26DictionaryPreferenceDialog@ABI_4_0 4:4.6.1 _ZTV5Entry@ABI_4_0 4:4.6.1 diff -Nru kiten-4.7.90/debian/not-installed kiten-4.7.95/debian/not-installed --- kiten-4.7.90/debian/not-installed 2011-12-16 15:39:01.000000000 +0000 +++ kiten-4.7.95/debian/not-installed 2011-12-27 20:26:04.000000000 +0000 @@ -1 +1 @@ -usr/share/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf # depend on fonts-kanjistrokeorders +./usr/share/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf # depend on fonts-kanjistrokeorders Binary files /tmp/3QRgTTlpeC/kiten-4.7.90/doc/index.cache.bz2 and /tmp/PzQwzsfpOl/kiten-4.7.95/doc/index.cache.bz2 differ diff -Nru kiten-4.7.90/kanjibrowser/kanjibrowserview.cpp kiten-4.7.95/kanjibrowser/kanjibrowserview.cpp --- kiten-4.7.90/kanjibrowser/kanjibrowserview.cpp 2011-09-26 09:44:38.000000000 +0000 +++ kiten-4.7.95/kanjibrowser/kanjibrowserview.cpp 2011-12-20 19:12:39.000000000 +0000 @@ -202,7 +202,7 @@ _kanjiList->addItems( list ); // Update our status bar with the number of kanji filtered. - statusBarChanged( i18n( "%1 kanji found", _kanjiList->count() ) ); + statusBarChanged( i18np( "%1 kanji found", "%1 kanji found", _kanjiList->count() ) ); } void KanjiBrowserView::searchKanji( QListWidgetItem *item )