Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2015-03-16 09:34:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sonnet" Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2015-02-16 17:47:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2015-03-16 09:34:22.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Mar 7 16:58:57 UTC 2015 - [email protected] + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php +- Comment out aspell-devel BuildRequires, myspell/hunspell plugin + is prefered +- Added dictionary-locations.patch: find dictionaries in openSUSE + locations + +------------------------------------------------------------------- Old: ---- sonnet-5.7.0.tar.xz New: ---- dictionary-locations.patch sonnet-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.r5g58O/_old 2015-03-16 09:34:23.000000000 +0100 +++ /var/tmp/diff_new_pack.r5g58O/_new 2015-03-16 09:34:23.000000000 +0100 @@ -17,15 +17,15 @@ %define sonum 5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: sonnet Version: %{_tar_path}.0 Release: 0 -BuildRequires: aspell-devel +#BuildRequires: aspell-devel BuildRequires: cmake >= 2.8.12 # Enchant plugin is currently disabled upstream #BuildRequires: enchant-devel -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 @@ -39,6 +39,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE dictionary-locations.patch -- find dictionaries in openSUSE locations +Patch0: dictionary-locations.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -86,6 +88,7 @@ %lang_package -n libKF5SonnetCore%sonum %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ dictionary-locations.patch ++++++ diff --git a/src/plugins/hunspell/hunspellclient.cpp b/src/plugins/hunspell/hunspellclient.cpp index 9e3aa67..bf2ca71 100644 --- a/src/plugins/hunspell/hunspellclient.cpp +++ b/src/plugins/hunspell/hunspellclient.cpp @@ -46,7 +46,7 @@ SpellerPlugin *HunspellClient::createSpeller(const QString &language) QStringList HunspellClient::languages() const { QStringList lst; - QDir dir(QStringLiteral("/usr/share/myspell/dicts/")); + QDir dir(QStringLiteral("/usr/share/hunspell/")); if (dir.exists()) { QStringList lstDic = dir.entryList(QStringList(QStringLiteral("*.dic")), QDir::Files); foreach (const QString &tmp, lstDic) { diff --git a/src/plugins/hunspell/hunspelldict.cpp b/src/plugins/hunspell/hunspelldict.cpp index 621113d..5baa65f 100644 --- a/src/plugins/hunspell/hunspelldict.cpp +++ b/src/plugins/hunspell/hunspelldict.cpp @@ -30,9 +30,9 @@ HunspellDict::HunspellDict(const QString &lang) : SpellerPlugin(lang), m_speller(0) { qDebug() << " HunspellDict::HunspellDict( const QString& lang ):" << lang; - QString dic = QStringLiteral("/usr/share/myspell/dicts/%1.dic").arg(lang); + QString dic = QStringLiteral("/usr/share/hunspell/%1.dic").arg(lang); if (QFileInfo(dic).exists()) { - m_speller = new Hunspell(QStringLiteral("/usr/share/myspell/dicts/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData()); + m_speller = new Hunspell(QStringLiteral("/usr/share/hunspell/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData()); } else { m_speller = 0; } ++++++ sonnet-5.7.0.tar.xz -> sonnet-5.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/CMakeLists.txt new/sonnet-5.8.0/CMakeLists.txt --- old/sonnet-5.7.0/CMakeLists.txt 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/CMakeLists.txt 2015-03-07 15:54:06.000000000 +0100 @@ -3,7 +3,7 @@ project(Sonnet) -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM 1.8.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) @@ -22,7 +22,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.7.0") # handled by release scripts +set(KF5_VERSION "5.8.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX SONNET VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sonnet_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/examples/highlighterexample.h new/sonnet-5.8.0/examples/highlighterexample.h --- old/sonnet-5.7.0/examples/highlighterexample.h 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/examples/highlighterexample.h 2015-03-07 15:54:06.000000000 +0100 @@ -34,7 +34,7 @@ public Q_SLOTS: void slotActivate(); protected: - virtual void contextMenuEvent(QContextMenuEvent *); + void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; Sonnet::Highlighter *hl; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/po/bs/sonnet5_qt.po new/sonnet-5.8.0/po/bs/sonnet5_qt.po --- old/sonnet-5.7.0/po/bs/sonnet5_qt.po 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/po/bs/sonnet5_qt.po 2015-03-07 15:54:06.000000000 +0100 @@ -1,166 +1,99 @@ -# translation of kdelibs4.po to bosanski -# Marko Rosic <[email protected]>, 2003. -# Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2010. -# KDE 4 <[email protected]>, 2011. -# Bosnian translation of kdelibs4 -# Initially converted from translation of kdelibs4.po by -# Samir Ribić <[email protected]> -msgid "" -msgstr "" -"Project-Id-Version: kdelibs4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2013-12-21 17:26+0000\n" -"Last-Translator: Ademovic Saudin <[email protected]>\n" -"Language-Team: bosanski <[email protected]>\n" -"Language: bosnian\n" +msgid "" +msgstr "" +"Project-Id-Version: kde5\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2015-02-24 20:00+0100\n" +"Last-Translator: Samir Ribić <[email protected]>\n" +"Language-Team: Bosnian\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Launchpad (build 16872)\n" -"X-Launchpad-Export-Date: 2013-12-22 05:52+0000\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Environment: kde\n" -"X-Qt-Contexts: true\n" #: core/loader.cpp:149 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "40" msgctxt "Sonnet::Loader|dictionary variant" msgid "40" msgstr "40" #: core/loader.cpp:150 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "60" msgctxt "Sonnet::Loader|dictionary variant" msgid "60" msgstr "60" #: core/loader.cpp:151 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "80" msgctxt "Sonnet::Loader|dictionary variant" msgid "80" msgstr "80" #: core/loader.cpp:152 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "-ise suffixes" msgctxt "Sonnet::Loader|dictionary variant" msgid "-ise suffixes" msgstr "-ise sufiksi" #: core/loader.cpp:153 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "-ize suffixes" msgctxt "Sonnet::Loader|dictionary variant" msgid "-ize suffixes" msgstr "-ize sufiksi" #: core/loader.cpp:154 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "-ise suffixes and with accents" msgctxt "Sonnet::Loader|dictionary variant" msgid "-ise suffixes and with accents" msgstr "-ise sufiksi i sa akcentima" #: core/loader.cpp:155 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "-ise suffixes and without accents" msgctxt "Sonnet::Loader|dictionary variant" msgid "-ise suffixes and without accents" msgstr "-ise sufiksi i bez akcenata" #: core/loader.cpp:156 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "-ize suffixes and with accents" msgctxt "Sonnet::Loader|dictionary variant" msgid "-ize suffixes and with accents" msgstr "-ize sufiksi i sa akcentima" #: core/loader.cpp:157 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "-ize suffixes and without accents" msgctxt "Sonnet::Loader|dictionary variant" msgid "-ize suffixes and without accents" msgstr "-ize sufiksi i bez akcenata" #: core/loader.cpp:158 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "large" msgctxt "Sonnet::Loader|dictionary variant" msgid "large" msgstr "veliki" #: core/loader.cpp:159 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "medium" msgctxt "Sonnet::Loader|dictionary variant" msgid "medium" msgstr "srednji" #: core/loader.cpp:160 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "small" msgctxt "Sonnet::Loader|dictionary variant" msgid "small" msgstr "mali" #: core/loader.cpp:161 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "variant 0" msgctxt "Sonnet::Loader|dictionary variant" msgid "variant 0" msgstr "varijanta 0" #: core/loader.cpp:162 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "variant 1" msgctxt "Sonnet::Loader|dictionary variant" msgid "variant 1" msgstr "varijanta 1" #: core/loader.cpp:163 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "variant 2" msgctxt "Sonnet::Loader|dictionary variant" msgid "variant 2" msgstr "varijanta 2" #: core/loader.cpp:164 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "without accents" msgctxt "Sonnet::Loader|dictionary variant" msgid "without accents" msgstr "bez akcenata" #: core/loader.cpp:165 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "with accents" msgctxt "Sonnet::Loader|dictionary variant" msgid "with accents" msgstr "sa akcentima" @@ -168,30 +101,25 @@ #: core/loader.cpp:166 msgctxt "Sonnet::Loader|dictionary variant" msgid "with ye, modern russian" -msgstr "" +msgstr "sa je, moderni ruski" #: core/loader.cpp:167 msgctxt "Sonnet::Loader|dictionary variant" msgid "with yeyo, modern and old russian" -msgstr "" +msgstr "sa jejo, moderni i stari ruski" #: core/loader.cpp:168 msgctxt "Sonnet::Loader|dictionary variant" msgid "with yo, old russian" -msgstr "" +msgstr "sa jo, stari ruski" #: core/loader.cpp:169 -#, fuzzy -#| msgctxt "dictionary variant" -#| msgid "extended" msgctxt "Sonnet::Loader|dictionary variant" msgid "extended" msgstr "prošireni" #: core/loader.cpp:203 -#, fuzzy, qt-format -#| msgctxt "dictionary name. %1-language, %2-country and %3 variant name" -#| msgid "%1 (%2) [%3]" +#, qt-format msgctxt "" "Sonnet::Loader|dictionary name; %1 = language name, %2 = country name and %3 " "= language variant name" @@ -199,23 +127,17 @@ msgstr "%1 (%2) [%3]" #: core/loader.cpp:206 -#, fuzzy, qt-format -#| msgctxt "name of digit set with digit string, e.g. 'Arabic (0123456789)'" -#| msgid "%1 (%2)" +#, qt-format msgctxt "Sonnet::Loader|dictionary name; %1 = language name, %2 = country name" msgid "%1 (%2)" msgstr "%1 (%2)" #: ui/configdialog.cpp:50 -#, fuzzy -#| msgid "Spell Checking Configuration" msgctxt "Sonnet::ConfigDialog|" msgid "Spell Checking Configuration" msgstr "Konfiguracija kontrole pravopisa" #: ui/configui.ui:32 -#, fuzzy -#| msgid "Options" msgctxt "SonnetConfigUI|" msgid "Options" msgstr "Opcije" @@ -223,137 +145,89 @@ #: ui/configui.ui:38 msgctxt "SonnetConfigUI|" msgid "Enable autodetection of &language" -msgstr "" +msgstr "Uključi autodetekciju &jezika" #: ui/configui.ui:45 -#, fuzzy -#| msgid "Enable &background spellchecking" msgctxt "SonnetConfigUI|" msgid "Enable &background spellchecking" msgstr "Uključi &provjeru pravopisa u pozadini" #: ui/configui.ui:52 -#, fuzzy -#| msgid "&Automatic spell checking enabled by default" msgctxt "SonnetConfigUI|" msgid "&Automatic spell checking enabled by default" msgstr "&Automatska provjera pravopisa podrazumijevano uključena" #: ui/configui.ui:59 -#, fuzzy -#| msgid "Skip all &uppercase words" msgctxt "SonnetConfigUI|" msgid "Skip all &uppercase words" msgstr "Preskoči sve pisano &velikim slovima" #: ui/configui.ui:66 -#, fuzzy -#| msgid "S&kip run-together words" msgctxt "SonnetConfigUI|" msgid "S&kip run-together words" msgstr "Preskoči &spojeno napisane riječi" #: ui/configui.ui:76 -#, fuzzy -#| msgid "Default language:" msgctxt "SonnetConfigUI|" msgid "Default language:" msgstr "Podrazumijevani jezik:" #: ui/configui.ui:86 -#, fuzzy -#| msgid "Ignored Words" msgctxt "SonnetConfigUI|" msgid "Ignored Words:" msgstr "Ignorisane riječi" #: ui/configui.ui:100 -#, fuzzy -#| msgid "&Add" msgctxt "SonnetConfigUI|" msgid "&Add" msgstr "&Dodaj" #: ui/configui.ui:112 -#, fuzzy -#| msgid "&Remove" msgctxt "SonnetConfigUI|" msgid "&Remove" msgstr "&Ukloni" -# >> @title:window #: ui/dialog.cpp:100 ui/dialog.cpp:224 ui/dialog.cpp:433 -#, fuzzy -#| msgid "Check Spelling" msgctxt "Sonnet::Dialog|@title:window" msgid "Check Spelling" msgstr "Provjera pravopisa" #: ui/dialog.cpp:223 -#, fuzzy -#| msgctxt "progress label" -#| msgid "Spell checking in progress..." msgctxt "Sonnet::Dialog|progress label" msgid "Spell checking in progress..." msgstr "Provjera pravopisa u toku..." #: ui/dialog.cpp:244 -#, fuzzy -#| msgid "Spell check stopped." msgctxt "Sonnet::Dialog|" msgid "Spell check stopped." msgstr "Provjera pravopisa zaustavljena." #: ui/dialog.cpp:254 -#, fuzzy -#| msgid "Spell check canceled." msgctxt "Sonnet::Dialog|" msgid "Spell check canceled." msgstr "Provjera pravopisa otkazana." #: ui/dialog.cpp:430 ui/dialog.cpp:433 -#, fuzzy -#| msgid "Spell check complete." msgctxt "Sonnet::Dialog|" msgid "Spell check complete." msgstr "Provjera pravopisa dovršena." #: ui/highlighter.cpp:205 ui/highlighter.cpp:227 -#, fuzzy -#| msgid "As-you-type spell checking enabled." msgctxt "Sonnet::Highlighter|" msgid "As-you-type spell checking enabled." msgstr "Provjera pravopisa pri kucanju uključena." #: ui/highlighter.cpp:208 -#, fuzzy -#| msgid "Too many misspelled words. As-you-type spell checking disabled." msgctxt "Sonnet::Highlighter|" msgid "Too many misspelled words. As-you-type spell checking disabled." msgstr "Isuviše pogrešnih riječi. Provjera pravopisa pri kucanju isključena." #: ui/highlighter.cpp:229 -#, fuzzy -#| msgid "As-you-type spell checking disabled." msgctxt "Sonnet::Highlighter|" msgid "As-you-type spell checking disabled." msgstr "Provjera pravopisa pri kucanju isključena." #: ui/sonnetui.ui:30 ui/sonnetui.ui:46 -#, fuzzy -#| msgid "" -#| "<qt><p>This word was considered to be an \"unknown word\" because it does " -#| "not match any entry in the dictionary currently in use. It may also be a " -#| "word in a foreign language.</p>\n" -#| "<p>If the word is not misspelled, you may add it to the dictionary by " -#| "clicking <b>Add to Dictionary</b>. If you do not want to add the unknown " -#| "word to the dictionary, but you want to leave it unchanged, click " -#| "<b>Ignore</b> or <b>Ignore All</b>.</p>\n" -#| "<p>However, if the word is misspelled, you can try to find the correct " -#| "replacement in the list below. If you cannot find a replacement there, " -#| "you may type it in the text box below, and click <b>Replace</b> or " -#| "<b>Replace All</b>.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt><p>This word was considered to be an \"unknown word\" because it does " @@ -383,32 +257,21 @@ "</qt>" #: ui/sonnetui.ui:36 -#, fuzzy -#| msgid "Unknown word:" msgctxt "SonnetUi|" msgid "Unknown word:" msgstr "Nepoznata riječ:" #: ui/sonnetui.ui:43 -#, fuzzy -#| msgid "Unknown word" msgctxt "SonnetUi|" msgid "Unknown word" msgstr "Nepoznata riječ" #: ui/sonnetui.ui:52 -#, fuzzy -#| msgid "<b>misspelled</b>" msgctxt "SonnetUi|" msgid "<b>misspelled</b>" msgstr "<b>pogrešno napisano</b>" #: ui/sonnetui.ui:59 ui/sonnetui.ui:174 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>Select the language of the document you are proofing here.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -420,29 +283,16 @@ "</qt>" #: ui/sonnetui.ui:64 -#, fuzzy -#| msgid "&Language:" msgctxt "SonnetUi|" msgid "&Language:" msgstr "&Jezik:" #: ui/sonnetui.ui:74 -#, fuzzy -#| msgid "Text excerpt showing the unknown word in its context." msgctxt "SonnetUi|" msgid "Text excerpt showing the unknown word in its context." msgstr "Isječak teksta koji pokazuje nepoznatu riječ u kontekstu." #: ui/sonnetui.ui:77 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>Here you can see a text excerpt showing the unknown word in its " -#| "context. If this information is not sufficient to choose the best " -#| "replacement for the unknown word, you can click on the document you are " -#| "proofing, read a larger part of the text and then return here to continue " -#| "proofing.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -460,23 +310,11 @@ "</qt>" #: ui/sonnetui.ui:85 -#, fuzzy -#| msgid "... the <b>misspelled</b> word shown in context ..." msgctxt "SonnetUi|" msgid "... the <b>misspelled</b> word shown in context ..." msgstr "... <b>pogrešno napisana</b> riječ prikazana u kontekstu ..." #: ui/sonnetui.ui:95 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>The unknown word was detected and considered unknown because it is not " -#| "included in the dictionary.<br>\n" -#| "Click here if you consider the unknown word not to be misspelled, and you " -#| "want to avoid wrongly detecting it again in the future. If you want to " -#| "let it remain as is, but not add it to the dictionary, then click " -#| "<b>Ignore</b> or <b>Ignore All</b> instead.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -498,31 +336,16 @@ "</qt>" #: ui/sonnetui.ui:101 -#, fuzzy -#| msgid "<< Add to Dictionary" msgctxt "SonnetUi|" msgid "<< Add to Dictionary" msgstr "<< Dodaj u rječnik" #: ui/sonnetui.ui:124 -#, fuzzy -#| msgid "Suggestion List" msgctxt "SonnetUi|" msgid "Suggestion List" msgstr "Spisak prijedloga" #: ui/sonnetui.ui:127 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>If the unknown word is misspelled, you should check if the correction " -#| "for it is available and if it is, click on it. If none of the words in " -#| "this list is a good replacement you may type the correct word in the edit " -#| "box above.</p>\n" -#| "<p>To correct this word click <b>Replace</b> if you want to correct only " -#| "this occurrence or <b>Replace All</b> if you want to correct all " -#| "occurrences.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -546,22 +369,11 @@ "</qt>" #: ui/sonnetui.ui:137 -#, fuzzy -#| msgid "Suggested Words" msgctxt "SonnetUi|" msgid "Suggested Words" msgstr "Predložene riječi" #: ui/sonnetui.ui:145 ui/sonnetui.ui:161 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>If the unknown word is misspelled, you should type the correction for " -#| "your misspelled word here or select it from the list below.</p>\n" -#| "<p>You can then click <b>Replace</b> if you want to correct only this " -#| "occurrence of the word or <b>Replace All</b> if you want to correct all " -#| "occurrences.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -581,33 +393,21 @@ "</qt>" #: ui/sonnetui.ui:151 -#, fuzzy -#| msgid "Replace &with:" msgctxt "SonnetUi|" msgid "Replace &with:" msgstr "Zamijeni &sa:" #: ui/sonnetui.ui:171 -#, fuzzy -#| msgid "Language Selection" msgctxt "SonnetUi|" msgid "Language Selection" msgstr "Izbor jezika" #: ui/sonnetui.ui:191 -#, fuzzy -#| msgid "S&uggest" msgctxt "SonnetUi|" msgid "S&uggest" msgstr "Pre&dloži" #: ui/sonnetui.ui:198 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>Click here to replace this occurrence of the unknown text with the " -#| "text in the edit box above (to the left).</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -621,19 +421,11 @@ "</qt>" #: ui/sonnetui.ui:203 -#, fuzzy -#| msgid "&Replace" msgctxt "SonnetUi|" msgid "&Replace" msgstr "&Zamijeni" #: ui/sonnetui.ui:210 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>Click here to replace all occurrences of the unknown text with the " -#| "text in the edit box above (to the left).</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -647,22 +439,11 @@ "</qt>" #: ui/sonnetui.ui:215 -#, fuzzy -#| msgid "R&eplace All" msgctxt "SonnetUi|" msgid "R&eplace All" msgstr "Zamijeni &sve" #: ui/sonnetui.ui:222 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>Click here to let this occurrence of the unknown word remain as is.</" -#| "p>\n" -#| "<p>This action is useful when the word is a name, an acronym, a foreign " -#| "word or any other unknown word that you want to use but not add to the " -#| "dictionary.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -681,22 +462,11 @@ "</qt>" #: ui/sonnetui.ui:228 -#, fuzzy -#| msgid "&Ignore" msgctxt "SonnetUi|" msgid "&Ignore" msgstr "&Ignoriši" #: ui/sonnetui.ui:235 ui/sonnetui.ui:248 -#, fuzzy -#| msgid "" -#| "<qt>\n" -#| "<p>Click here to let all occurrences of the unknown word remain as they " -#| "are.</p>\n" -#| "<p>This action is useful when the word is a name, an acronym, a foreign " -#| "word or any other unknown word that you want to use but not add to the " -#| "dictionary.</p>\n" -#| "</qt>" msgctxt "SonnetUi|" msgid "" "<qt>\n" @@ -716,37 +486,27 @@ "</qt>" #: ui/sonnetui.ui:241 -#, fuzzy -#| msgid "I&gnore All" msgctxt "SonnetUi|" msgid "I&gnore All" msgstr "I&gnoriši sve" #: ui/sonnetui.ui:254 -#, fuzzy -#| msgid "Autocorrect" msgctxt "SonnetUi|" msgid "Autocorrect" -msgstr "Samoispravljanje" +msgstr "Automatska ispravka" -# >> %1 is a misspelled word #: ui/spellcheckdecorator.cpp:137 -#, fuzzy, qt-format -#| msgid "No suggestions for %1" +#, qt-format msgctxt "Sonnet::SpellCheckDecorator|" msgid "No suggestions for %1" msgstr "Nema prijedloga za ‘%1’" #: ui/spellcheckdecorator.cpp:148 -#, fuzzy -#| msgid "Ignore" msgctxt "Sonnet::SpellCheckDecorator|" msgid "Ignore" msgstr "Ignoriši" #: ui/spellcheckdecorator.cpp:149 -#, fuzzy -#| msgid "Add to Dictionary" msgctxt "Sonnet::SpellCheckDecorator|" msgid "Add to Dictionary" msgstr "Dodaj u rječnik" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/po/fr/sonnet5_qt.po new/sonnet-5.8.0/po/fr/sonnet5_qt.po --- old/sonnet-5.7.0/po/fr/sonnet5_qt.po 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/po/fr/sonnet5_qt.po 2015-03-07 15:54:06.000000000 +0100 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-06-29 22:06+0200\n" "Last-Translator: Sebastien Renard <[email protected]>\n" "Language-Team: French <[email protected]>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/po/tr/sonnet5_qt.po new/sonnet-5.8.0/po/tr/sonnet5_qt.po --- old/sonnet-5.7.0/po/tr/sonnet5_qt.po 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/po/tr/sonnet5_qt.po 2015-03-07 15:54:06.000000000 +0100 @@ -15,22 +15,22 @@ # H. İbrahim Güngör <[email protected]>, 2010, 2011. # Ozan Çağlayan <[email protected]>, 2010, 2011. # Serdar SOYTETİR <[email protected]>, 2010, 2012. -# Volkan Gezer <[email protected]>, 2013, 2014. +# Volkan Gezer <[email protected]>, 2013, 2014, 2015. # Kaan Ozdincer <[email protected]>, 2014. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-11-12 00:33+0200\n" -"Last-Translator: Kaan Ozdincer <[email protected]>\n" +"PO-Revision-Date: 2015-02-09 11:36+0100\n" +"Last-Translator: Volkan Gezer <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" #: core/loader.cpp:149 @@ -190,7 +190,7 @@ #: ui/configui.ui:76 msgctxt "SonnetConfigUI|" msgid "Default language:" -msgstr "Varsayılan dil:" +msgstr "Öntanımlı dil:" #: ui/configui.ui:86 msgctxt "SonnetConfigUI|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/core/backgroundchecker_p.h new/sonnet-5.8.0/src/core/backgroundchecker_p.h --- old/sonnet-5.7.0/src/core/backgroundchecker_p.h 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/core/backgroundchecker_p.h 2015-03-07 15:54:06.000000000 +0100 @@ -33,7 +33,7 @@ { Q_OBJECT public: - Private() : mainTokenizer(new SentenceTokenizer) {} + Private() : mainTokenizer(new SentenceTokenizer), sentenceOffset(-1) {} void start(); void continueChecking(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/core/languagefilter_p.h new/sonnet-5.8.0/src/core/languagefilter_p.h --- old/sonnet-5.7.0/src/core/languagefilter_p.h 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/core/languagefilter_p.h 2015-03-07 15:54:06.000000000 +0100 @@ -57,11 +57,11 @@ /** Returns true if there is grammar checker installed for last token's language */ // bool isGrammarCheckable() const; - void setBuffer(const QString& buffer); - bool hasNext() const; - QStringRef next(); - QString buffer() const; - void replace(int position, int len, const QString& newWord); + void setBuffer(const QString& buffer) Q_DECL_OVERRIDE; + bool hasNext() const Q_DECL_OVERRIDE; + QStringRef next() Q_DECL_OVERRIDE; + QString buffer() const Q_DECL_OVERRIDE; + void replace(int position, int len, const QString& newWord) Q_DECL_OVERRIDE; private: LanguageFilterPrivate* const d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/core/speller.cpp new/sonnet-5.8.0/src/core/speller.cpp --- old/sonnet-5.7.0/src/core/speller.cpp 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/core/speller.cpp 2015-03-07 15:54:06.000000000 +0100 @@ -36,7 +36,7 @@ class Speller::Private { public: - Private() : dictCache(MAXLANGUAGES), dict(0) + Private() : dictCache(MAXLANGUAGES), dict(0), settings(0) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/core/tokenizer.cpp new/sonnet-5.8.0/src/core/tokenizer.cpp --- old/sonnet-5.7.0/src/core/tokenizer.cpp 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/core/tokenizer.cpp 2015-03-07 15:54:06.000000000 +0100 @@ -34,9 +34,13 @@ public: enum Type {Words, Sentences}; - BreakTokenizerPrivate(Type s) : - breakFinder(new TextBreaks), - cacheValid(false), type(s), inAddress(false), ignoreUppercase(false) + BreakTokenizerPrivate(Type s) + : breakFinder(new TextBreaks) + , itemPosition(-1) + , cacheValid(false) + , type(s) + , inAddress(false) + , ignoreUppercase(false) {} ~BreakTokenizerPrivate() { delete breakFinder; } TextBreaks::Positions breaks() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/core/tokenizer_p.h new/sonnet-5.8.0/src/core/tokenizer_p.h --- old/sonnet-5.7.0/src/core/tokenizer_p.h 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/core/tokenizer_p.h 2015-03-07 15:54:06.000000000 +0100 @@ -100,11 +100,11 @@ WordTokenizer(const QString& buffer=QString()); ~WordTokenizer(); - void setBuffer(const QString& buffer); - bool hasNext() const; - QStringRef next(); - QString buffer() const; - void replace(int position, int len, const QString& newWord); + void setBuffer(const QString& buffer) Q_DECL_OVERRIDE; + bool hasNext() const Q_DECL_OVERRIDE; + QStringRef next() Q_DECL_OVERRIDE; + QString buffer() const Q_DECL_OVERRIDE; + void replace(int position, int len, const QString& newWord) Q_DECL_OVERRIDE; /** Returns true if this word should be spell checked. This ignores email addresses, URLs and other things according to configuration */ bool isSpellcheckable() const; @@ -127,11 +127,11 @@ public: SentenceTokenizer(const QString& buffer=QString()); ~SentenceTokenizer(); - void setBuffer(const QString& buffer); - bool hasNext() const; - QStringRef next(); - QString buffer() const; - void replace(int position, int len, const QString& newWord); + void setBuffer(const QString& buffer) Q_DECL_OVERRIDE; + bool hasNext() const Q_DECL_OVERRIDE; + QStringRef next() Q_DECL_OVERRIDE; + QString buffer() const Q_DECL_OVERRIDE; + void replace(int position, int len, const QString& newWord) Q_DECL_OVERRIDE; private: BreakTokenizerPrivate* const d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/plugins/hspell/hspellclient.h new/sonnet-5.8.0/src/plugins/hspell/hspellclient.h --- old/sonnet-5.7.0/src/plugins/hspell/hspellclient.h 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/plugins/hspell/hspellclient.h 2015-03-07 15:54:06.000000000 +0100 @@ -44,16 +44,16 @@ explicit HSpellClient(QObject *parent = 0); ~HSpellClient(); - virtual int reliability() const + int reliability() const Q_DECL_OVERRIDE { return 20; } - virtual SpellerPlugin *createSpeller(const QString &language); + SpellerPlugin *createSpeller(const QString &language) Q_DECL_OVERRIDE; - virtual QStringList languages() const; + QStringList languages() const Q_DECL_OVERRIDE; - virtual QString name() const + QString name() const Q_DECL_OVERRIDE { return QString::fromLatin1("HSpell"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/plugins/hspell/hspelldict.h new/sonnet-5.8.0/src/plugins/hspell/hspelldict.h --- old/sonnet-5.7.0/src/plugins/hspell/hspelldict.h 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/plugins/hspell/hspelldict.h 2015-03-07 15:54:06.000000000 +0100 @@ -36,15 +36,15 @@ public: explicit HSpellDict(const QString &lang); ~HSpellDict(); - virtual bool isCorrect(const QString &word) const; + bool isCorrect(const QString &word) const Q_DECL_OVERRIDE; - virtual QStringList suggest(const QString &word) const; + QStringList suggest(const QString &word) const Q_DECL_OVERRIDE; virtual bool storeReplacement(const QString &bad, - const QString &good); + const QString &good) Q_DECL_OVERRIDE; - virtual bool addToPersonal(const QString &word); - virtual bool addToSession(const QString &word); + bool addToPersonal(const QString &word) Q_DECL_OVERRIDE; + bool addToSession(const QString &word) Q_DECL_OVERRIDE; inline bool isInitialized() const { return initialized; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/ui/dialog.cpp new/sonnet-5.8.0/src/ui/dialog.cpp --- old/sonnet-5.7.0/src/ui/dialog.cpp 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/ui/dialog.cpp 2015-03-07 15:54:06.000000000 +0100 @@ -47,7 +47,7 @@ { public: ReadOnlyStringListModel(QObject *parent): QStringListModel(parent) {} - Qt::ItemFlags flags(const QModelIndex &index) const + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE { Q_UNUSED(index); return Qt::ItemIsEnabled | Qt::ItemIsSelectable; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.7.0/src/ui/highlighter.h new/sonnet-5.8.0/src/ui/highlighter.h --- old/sonnet-5.7.0/src/ui/highlighter.h 2015-02-08 16:28:36.000000000 +0100 +++ new/sonnet-5.8.0/src/ui/highlighter.h 2015-03-07 15:54:06.000000000 +0100 @@ -166,11 +166,11 @@ void activeChanged(const QString &description); protected: - virtual void highlightBlock(const QString &text); + void highlightBlock(const QString &text) Q_DECL_OVERRIDE; virtual void setMisspelled(int start, int count); virtual void unsetMisspelled(int start, int count); - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; bool intraWordEditing() const; void setIntraWordEditing(bool editing); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
