Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2014-10-07 15:59:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration" Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2014-10-01 11:22:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2014-10-07 15:59:30.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Oct 4 17:59:33 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.3.0 + * Fixed for compilation with Qt 5.4 + * Fixed a few standard shortcuts + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php +- Drop patches merged upstream: + 0001-default-to-breeze.patch and 0002-colorscheme-in-General.patch + +------------------------------------------------------------------- Old: ---- 0001-default-to-breeze.patch 0002-colorscheme-in-General.patch frameworkintegration-5.2.0.tar.xz New: ---- frameworkintegration-5.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.UZJwsc/_old 2014-10-07 15:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.UZJwsc/_new 2014-10-07 15:59:31.000000000 +0200 @@ -18,11 +18,11 @@ %define lname libKF5Style5 Name: frameworkintegration -Version: 5.2.0 +Version: 5.3.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.2.0 +BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kconfigwidgets-devel >= %{kf5_version} @@ -44,10 +44,6 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-default-to-breeze.patch -Patch0: 0001-default-to-breeze.patch -# PATCH-FIX-UPSTREAM 0002-colorscheme-in-General.patch -Patch1: 0002-colorscheme-in-General.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -89,8 +85,6 @@ %lang_package -n %lname %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build ++++++ frameworkintegration-5.2.0.tar.xz -> frameworkintegration-5.3.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/CMakeLists.txt new/frameworkintegration-5.3.0/CMakeLists.txt --- old/frameworkintegration-5.2.0/CMakeLists.txt 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/CMakeLists.txt 2014-10-04 18:56:48.000000000 +0200 @@ -2,7 +2,7 @@ project(FrameworkIntegration) -find_package(ECM 1.2.0 REQUIRED NO_MODULE) +find_package(ECM 1.3.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -19,8 +19,8 @@ set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -set(KF5_VERSION "5.2.0") # handled by release scripts -set(KF5_DEP_VERSION "5.2.0") # handled by release scripts +set(KF5_VERSION "5.3.0") # handled by release scripts +set(KF5_DEP_VERSION "5.3.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/autotests/kdeplatformtheme_unittest.cpp new/frameworkintegration-5.3.0/autotests/kdeplatformtheme_unittest.cpp --- old/frameworkintegration-5.2.0/autotests/kdeplatformtheme_unittest.cpp 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/autotests/kdeplatformtheme_unittest.cpp 2014-10-04 18:56:48.000000000 +0200 @@ -136,7 +136,7 @@ QVERIFY(!iconThemeSearchPaths.isEmpty()); QStringList styles; - styles << "non-existent-widget-style" << "oxygen" << "fusion" << "windows"; + styles << "non-existent-widget-style" << "breeze" << "oxygen" << "fusion" << "windows"; QCOMPARE(m_qpa->themeHint(QPlatformTheme::StyleNames).toStringList(), styles); QCOMPARE(m_qpa->themeHint(QPlatformTheme::DialogButtonBoxLayout).toInt(), (int) QDialogButtonBox::KdeLayout); QCOMPARE(m_qpa->themeHint(QPlatformTheme::DialogButtonBoxButtonsHaveIcons).toBool(), false); @@ -235,7 +235,7 @@ m_loop.exec(); QStringList styles; - styles << "another-non-existent-widget-style" << "oxygen" << "fusion" << "windows"; + styles << "another-non-existent-widget-style" << "breeze" << "oxygen" << "fusion" << "windows"; QCOMPARE(m_qpa->themeHint(QPlatformTheme::StyleNames).toStringList(), styles); sendNotifyChange(KHintsSettings::SettingsChanged, KHintsSettings::SETTINGS_STYLE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/plasma_workspace.notifyrc new/frameworkintegration-5.3.0/plasma_workspace.notifyrc --- old/frameworkintegration-5.2.0/plasma_workspace.notifyrc 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/plasma_workspace.notifyrc 2014-10-04 18:56:48.000000000 +0200 @@ -3,10 +3,14 @@ Comment=Plasma Workspace Comment[ca]=Espai de treball del Plasma Comment[cs]=Pracovní plocha Plasma +Comment[da]=Plasma arbejdsområde Comment[de]=KDE-Plasma-Arbeitsbereich Comment[en_GB]=Plasma Workspace Comment[es]=Espacio de trabajo Plasma +Comment[fi]=Plasma-työtila Comment[hu]=Plasma munkaterület +Comment[nb]=Plasma-arbeidsområde +Comment[nds]=Plasma-Arbeitrebeet Comment[nl]=Plasma-werkgebied Comment[pl]=Przestrzeń robocza Plazmy Comment[pt]=Área de Trabalho do Plasma @@ -20,15 +24,21 @@ Comment[sv]=Plasma arbetsområde Comment[uk]=Робочий простір Плазми Comment[x-test]=xxPlasma Workspacexx +Comment[zh_CN]=Plasma 工作空间 +Comment[zh_TW]=Plasma 工作空間 [Event/Trash: emptied] Name=Trash: Emptied Name[ca]=Paperera: s'ha buidat Name[cs]=Koš: vyprázdněn +Name[da]=Affald: Tømt Name[de]=Papierkorb: geleert Name[en_GB]=Wastebin: Emptied Name[es]=Papelera: vacía +Name[fi]=Roskakori: Tyhjennetty Name[hu]=Kuka: kiürítve +Name[nb]=Papirkurv: tømt +Name[nds]=Affalltünn leddig maakt Name[nl]=Prullenbak: geleegd Name[pl]=Kosz: opróżniony Name[pt]=Lixo: Vazio @@ -42,13 +52,19 @@ Name[sv]=Papperskorg: tömd Name[uk]=Смітник: спорожнено Name[x-test]=xxTrash: Emptiedxx +Name[zh_CN]=回收站:空的 +Name[zh_TW]=資源回收筒:已清空 Comment=The trash has been emptied Comment[ca]=S'ha buidat la paperera Comment[cs]=Koš byl vyprázdněn +Comment[da]=Affaldet er blevet tømt Comment[de]=Der Papierkorb ist geleert worden Comment[en_GB]=The wastebin has been emptied Comment[es]=Se ha vaciado la papelera +Comment[fi]=Roskakori on tyhjennetty Comment[hu]=A kuka kiürült +Comment[nb]=Papirkurven er blitt tømt +Comment[nds]=De Affalltünn wöör leddig maakt Comment[nl]=De prullenbak is geleegd Comment[pl]=Kosz został opróżniony Comment[pt]=O caixote do lixo foi esvaziado @@ -62,6 +78,8 @@ Comment[sv]=Papperskorgen har tömts Comment[uk]=Смітник спорожнено Comment[x-test]=xxThe trash has been emptiedxx +Comment[zh_CN]=回收站已经被清空 +Comment[zh_TW]=資源回收筒已被清空 Action=Sound Sound=Oxygen-Sys-Trash-Emptied.ogg @@ -69,10 +87,14 @@ Name=Textcompletion: Rotation Name[ca]=Compleció de text: rotació Name[cs]=Doplňování textu: rotace +Name[da]=Tekstfuldførelse: Rotation Name[de]=Textvervollständigung: Drehung Name[en_GB]=Textcompletion: Rotation Name[es]=Terminación de texto: rotación +Name[fi]=Tekstin täydennys: kiertävä Name[hu]=Szövegkiegészítés: rotáció +Name[nb]=Tekstfullføring: rotasjon +Name[nds]=Textkompletteren: Dreihen Name[nl]=Tekstaanvulling: rotatie Name[pl]=Uzupełnianie tekstu: obrót Name[pt]=Completação de Texto: Rotação @@ -86,13 +108,19 @@ Name[sv]=Textkomplettering: rotation Name[uk]=Доповнення тексту: циклічний перехід Name[x-test]=xxTextcompletion: Rotationxx +Name[zh_CN]=文本补全:旋转 +Name[zh_TW]=文字補完:循環 Comment=The end of the list of matches has been reached Comment[ca]=S'ha arribat al final de la llista de coincidències Comment[cs]=Bylo dosaženo konce seznamu shod +Comment[da]=Afslutningen på listen over matches er blevet nået Comment[de]=Das Ende der Liste der Übereinstimmungen ist erreicht worden Comment[en_GB]=The end of the list of matches has been reached Comment[es]=Se ha alcanzado el final de la lista de coincidencias +Comment[fi]=Sopivien sanojen luettelo on käyty läpi Comment[hu]=A találatok végére értem +Comment[nb]=Kom til slutten av lista over treff +Comment[nds]=Bi't Enn vun list mit Drepers anlangt Comment[nl]=Het einde van de lijst met overeenkomsten is bereikt Comment[pl]=Został osiągnięty koniec spisu pasujących ciągów znaków Comment[pt]=Atingiu-se o fim da lista de correspondências @@ -106,6 +134,8 @@ Comment[sv]=Slutet av listan med träffar har nåtts Comment[uk]=Досягнено кінця списку відповідників Comment[x-test]=xxThe end of the list of matches has been reachedxx +Comment[zh_CN]=已经到达匹配列表的末尾 +Comment[zh_TW]=到達符合清單的尾端 Action= Sound=Oxygen-Sys-List-End.ogg @@ -113,10 +143,14 @@ Name=Textcompletion: No Match Name[ca]=Compleció de text: sense coincidència Name[cs]=Doplňování textu: žádná shoda +Name[da]=Tekstfuldførelse: Ingen match Name[de]=Textvervollständigung: keine Übereinstimmung Name[en_GB]=Textcompletion: No Match Name[es]=Terminación de texto: ninguna coincidencia +Name[fi]=Tekstin täydennys: Ei sopivia Name[hu]=Szövegkiegészítés: nincs találat +Name[nb]=Tekstfullføring: ingen treff +Name[nds]=Textkompletteren: keen Dreper Name[nl]=Tekstaanvulling: geen overeenkomst Name[pl]=Uzupełnianie tekstu: brak pasujących ciągów znaków Name[pt]=Completação de Texto: Sem Correspondência @@ -130,13 +164,19 @@ Name[sv]=Textkomplettering: ingen träff Name[uk]=Доповнення тексту: немає відповідників Name[x-test]=xxTextcompletion: No Matchxx +Name[zh_CN]=文本补全:没有匹配 +Name[zh_TW]=文字補完:沒有符合 Comment=No matching completion was found Comment[ca]=No s'ha trobat cap compleció coincident Comment[cs]=Nebyla nalezena žádná shoda +Comment[da]=Ingen matchende fuldstændiggørelse blev fundet Comment[de]=Es ist keine mögliche Vervollständigung gefunden worden Comment[en_GB]=No matching completion was found Comment[es]=No se ha encontrado ninguna coincidencia de terminación +Comment[fi]=Sopivaa täydennystä ei löytynyt Comment[hu]=Nincs illeszthető szó +Comment[nb]=Fant ingen tekstfullføring som passet +Comment[nds]=Dor findt sik keen passen Kompletteren Comment[nl]=Geen overeenkomende aanvulling gevonden Comment[pl]=Nie znaleziono żadnego uzupełnienia Comment[pt]=Não foi encontrada nenhuma ocorrência correspondente @@ -150,6 +190,8 @@ Comment[sv]=Ingen matchande komplettering hittades Comment[uk]=Не знайдено завершення, яке б було відповідним Comment[x-test]=xxNo matching completion was foundxx +Comment[zh_CN]=没有发现匹配的补全 +Comment[zh_TW]=找不到符合的補完清單 Action= Sound=Oxygen-Sys-List-Match-No.ogg @@ -157,10 +199,14 @@ Name=Textcompletion: Partial Match Name[ca]=Compleció de text: coincidència parcial Name[cs]=Doplňování textu: částčná shoda +Name[da]=Tekstfuldførelse: Delvis match Name[de]=Textvervollständigung: teilweise Übereinstimmung Name[en_GB]=Textcompletion: Partial Match Name[es]=Terminación de texto: coincidencia parcial +Name[fi]=Tekstin täydennys: Osittainen osuma Name[hu]=Szövegkiegészítés: részleges találat +Name[nb]=Tekstfullføring:delvis treff +Name[nds]=Textkompletteren: Deeldreper Name[nl]=Tekstaanvulling: gedeeltelijke overeenkomst Name[pl]=Uzupełnianie tekstu: częściowo pasujący ciąg znaków Name[pt]=Completação de Texto: Correspondência Parcial @@ -174,13 +220,19 @@ Name[sv]=Textkomplettering: delvis träff Name[uk]=Завершення тексту: частковий збіг Name[x-test]=xxTextcompletion: Partial Matchxx +Name[zh_CN]=文本补全:部分匹配 +Name[zh_TW]=文字補完:部份符合 Comment=There is more than one possible match Comment[ca]=Hi ha més d'una possible coincidència Comment[cs]=Existuje více než jedna shoda +Comment[da]=Der er mere end et mulig match Comment[de]=Es gibt mehr als eine mögliche Übereinstimmung Comment[en_GB]=There is more than one possible match Comment[es]=Existe más de una posible coincidencia +Comment[fi]=Löytyi useampi kuin yksi mahdollinen osuma Comment[hu]=Egynél több szó illeszkedik +Comment[nb]=Det er mer enn ett mulig treff +Comment[nds]=Dat gifft mehr as een mööglichen Dreper Comment[nl]=Er is meer dan één mogelijke overeenkomst Comment[pl]=Istnieje więcej niż jeden pasujący ciąg znaków Comment[pt]=Existe mais de uma ocorrência possível @@ -194,6 +246,8 @@ Comment[sv]=Det finns mer än en möjlig träff Comment[uk]=Є більше, ніж один збіг Comment[x-test]=xxThere is more than one possible matchxx +Comment[zh_CN]=有超过一个可能的匹配 +Comment[zh_TW]=有一個以上符合 Action= Sound=Oxygen-Sys-List-Match-Multiple.ogg @@ -201,10 +255,14 @@ Name=Fatal Error Name[ca]=Error fatal Name[cs]=Kritická chyba +Name[da]=Fatal fejl Name[de]=Schwerer Fehler Name[en_GB]=Fatal Error Name[es]=Error fatal +Name[fi]=Vakava virhe Name[hu]=Végzetes hiba +Name[nb]=Kritisk feil +Name[nds]=Swoor Fehler Name[nl]=Fatale fout Name[pl]=Błąd krytyczny Name[pt]=Erro Fatal @@ -218,13 +276,19 @@ Name[sv]=Allvarligt fel Name[uk]=Критична помилка Name[x-test]=xxFatal Errorxx +Name[zh_CN]=致命错误 +Name[zh_TW]=嚴重錯誤 Comment=There was a serious error causing the program to exit Comment[ca]=S'ha produït un error seriós que ha provocat la sortida del programa Comment[cs]=Nastala závažná chyba, v důsledku které byl program ukončen +Comment[da]=Der var en alvorlig fejl som forårsagede at programmet afsluttede Comment[de]=Es ist ein schwerer Fehler aufgetreten, woraufhin das Programm beendet wurde. Comment[en_GB]=There was a serious error causing the program to exit Comment[es]=Ha ocurrido un error serio que ha causado la salida del programa +Comment[fi]=Vakava virhe aiheutti ohjelman päättymisen Comment[hu]=Olyan hiba történt a programban, melynek hatására a program futása befejeződött +Comment[nb]=Det oppsto en alvorlig feil som gjorde at programmet avsluttet +Comment[nds]=Dat geev en swoor Fehler, dat Programm is utstegen Comment[nl]=Er deed zich een serieuze fout voor die het programma deed afsluiten Comment[pl]=Wystąpił poważny błąd i program zakończył działanie Comment[pt]=Ocorreu um erro sério que fez com que o programa saísse @@ -238,6 +302,8 @@ Comment[sv]=Ett allvarligt fel uppstod vilket fick programmet att avslutas Comment[uk]=Трапилась серйозна помилка, що призвела до закриття програми Comment[x-test]=xxThere was a serious error causing the program to exitxx +Comment[zh_CN]=有一个严重错误导致程序退出 +Comment[zh_TW]=程式發生了嚴重錯誤,必須離開 Action=Popup|Sound Sound=Oxygen-Sys-App-Error-Serious.ogg @@ -246,10 +312,14 @@ Name=Notification Name[ca]=Notificació Name[cs]=Upozornění +Name[da]=Bekendtgørelse Name[de]=Benachrichtigung Name[en_GB]=Notification Name[es]=Notificación +Name[fi]=Ilmoitus Name[hu]=Értesítés +Name[nb]=Varsling +Name[nds]=Bescheed Name[nl]=Melding Name[pl]=Powiadomienie Name[pt]=Notificação @@ -263,13 +333,19 @@ Name[sv]=Underrättelse Name[uk]=Сповіщення Name[x-test]=xxNotificationxx +Name[zh_CN]=通知 +Name[zh_TW]=通知 Comment=Something special happened in the program Comment[ca]=Quelcom especial ha passat en el programa Comment[cs]=Něco zvláštního se stalo s programem +Comment[da]=Noget specielt skete i programmet Comment[de]=Im Programm ist ein besonderes Ereignis eingetreten Comment[en_GB]=Something special happened in the program Comment[es]=Ha ocurrido algo especial en el programa +Comment[fi]=Ohjelmassa tapahtui jotakin erikoista Comment[hu]=Valamilyen esemény következett be a programban +Comment[nb]=Det hendte noe spesielt i programmet +Comment[nds]=Dat geev en afsünnerlich Begeefnis binnen dat Programm Comment[nl]=Er gebeurde iets bijzonders in het programma Comment[pl]=Coś niezwykłego stało się z programem Comment[pt]=Ocorreu algo de especial no programa @@ -283,6 +359,8 @@ Comment[sv]=Någonting speciellt inträffade i programmet Comment[uk]=Щось особливе сталось у програмі Comment[x-test]=xxSomething special happened in the programxx +Comment[zh_CN]=这个程序中发生了特殊的事情 +Comment[zh_TW]=程式中發生了特殊事件 Action=Sound|Popup Sound=Oxygen-Sys-Special.ogg @@ -290,10 +368,14 @@ Name=Warning Name[ca]=Avís Name[cs]=Varování +Name[da]=Advarsel Name[de]=Warnung Name[en_GB]=Warning Name[es]=Advertencia +Name[fi]=Varoitus Name[hu]=Figyelmeztetés +Name[nb]=Advarsel +Name[nds]=Wohrschoen Name[nl]=Waarschuwing Name[pl]=Ostrzeżenie Name[pt]=Aviso @@ -307,13 +389,19 @@ Name[sv]=Varning Name[uk]=Попередження Name[x-test]=xxWarningxx +Name[zh_CN]=警告 +Name[zh_TW]=警告 Comment=There was an error in the program which may cause problems Comment[ca]=S'ha produït un error en el programa que pot provocar problemes Comment[cs]=V programu nastala chyba, která může způsobit problémy +Comment[da]=Der var en fejl i program som kan volde problemer Comment[de]=Im Programm ist ein Fehler aufgetreten, der Probleme verursachen könnte Comment[en_GB]=There was an error in the program which may cause problems Comment[es]=Ha ocurrido un error en el programa que puede causar problemas +Comment[fi]=Ohjelmassa oli virhe, joka voi aiheuttaa ongelmia Comment[hu]=Hiba történt a programban, de a program futása folytatódhat +Comment[nb]=I programmet oppsto det en feil som kan gi vanskeligheter +Comment[nds]=Dat geev en Fehler binnen dat Programm, villicht suert dor Problemen bi rut Comment[nl]=Er deed zich een fout voor in het programma dat problemen kan veroorzaken Comment[pl]=W programie wystąpił błąd, może powodować problemy Comment[pt]=Ocorreu um erro no programa que poderá provocar problemas @@ -327,6 +415,8 @@ Comment[sv]=Det uppstod ett fel i programmet vilket kan orsaka problem Comment[uk]=В програмі трапилась помилка, яка може спричинити проблеми Comment[x-test]=xxThere was an error in the program which may cause problemsxx +Comment[zh_CN]=程序中有一个错误,它可能导致一些问题 +Comment[zh_TW]=程式中發生錯誤,可能造成問題 Action=Popup|Sound Sound=Oxygen-Sys-App-Error.ogg @@ -334,10 +424,14 @@ Name=Catastrophe Name[ca]=Catàstrofe Name[cs]=Katastrofa +Name[da]=Katastrofe Name[de]=Katastrophe Name[en_GB]=Catastrophe Name[es]=Catástrofe +Name[fi]=Katastrofi Name[hu]=Súlyos hiba +Name[nb]=Katastrofe +Name[nds]=Groot Malöör Name[nl]=Catastrofe Name[pl]=Katastrofa Name[pt]=Catástrofe @@ -351,13 +445,19 @@ Name[sv]=Katastrof Name[uk]=Катастрофа Name[x-test]=xxCatastrophexx +Name[zh_CN]=严重故障 +Name[zh_TW]=發生大災難 Comment=A very serious error occurred, at least causing the program to exit Comment[ca]=S'ha produït un error molt seriós, com a mínim ha provocat la sortida del programa Comment[cs]=Nastala velmi závažná chyba, která má za následek minimálně ukončení programu +Comment[da]=En meget alvorlig fejl opstod, som mindst forårsagede at programmet afsluttede Comment[de]=Ein sehr schwerer Fehler ist aufgetreten, der wenigstens das Programm zum Beenden bringt Comment[en_GB]=A very serious error occurred, at least causing the program to exit Comment[es]=Ha ocurrido un error muy serio que ha causado, al menos, la salida del programa +Comment[fi]=Tapahtui erittäin vakava virhe, joka aiheutti ainakin ohjelman päättymisen Comment[hu]=Hiba történt a programban, a program futása befejeződött +Comment[nb]=Det oppsto en meget alvorlig feil som minst førte til at programmet stoppet +Comment[nds]=Dat geev en groot Malöör, tominnst dat Programm is utstegen Comment[nl]=Er deed zich een serieuze fout voor dat er op zijn minst voor zorgde dat het programma werd afgesloten Comment[pl]=Wystąpił bardzo poważny błąd, co najmniej nastąpiło zakończenie pracy programu Comment[pt]=Ocorreu um erro muito sério, que fez pelo menos com que o programa saísse @@ -371,6 +471,8 @@ Comment[sv]=Ett mycket allvarligt fel uppstod, som åtminstone fick programmet att avslutas Comment[uk]=трапилась дуже серйозна помилка, яка призвела до закриття програми Comment[x-test]=xxA very serious error occurred, at least causing the program to exitxx +Comment[zh_CN]=发生了一个非常严重的错误,至少已经导致了这个程序退出 +Comment[zh_TW]=發生了非常嚴重的問題,至少造成程式被迫結束 Action=Popup|Sound Sound=Oxygen-Sys-App-Error-Serious.ogg @@ -379,10 +481,14 @@ Name=Login Name[ca]=Entrada Name[cs]=Přihlášení +Name[da]=Login Name[de]=Anmeldung Name[en_GB]=Login Name[es]=Inicio de sesión +Name[fi]=Kirjautuminen Name[hu]=Bejelentkezés +Name[nb]=Logg inn +Name[nds]=Anmellen Name[nl]=Aanmelden Name[pl]=Logowanie Name[pt]=Arranque @@ -396,13 +502,19 @@ Name[sv]=Inloggning Name[uk]=Вхід Name[x-test]=xxLoginxx +Name[zh_CN]=登录 +Name[zh_TW]=登入 Comment=A new session is starting Comment[ca]=S'està iniciat una sessió nova Comment[cs]=Spouští se nové sezení +Comment[da]=En ny session er ved at starte Comment[de]=Eine neue Sitzung wurde gestartet Comment[en_GB]=A new session is starting Comment[es]=Está iniciando una nueva sesión +Comment[fi]=Uusi istunto alkaa Comment[hu]=Egy új munkamenet kezdődött +Comment[nb]=En ny økt starter +Comment[nds]=En nieg Törn fangt an Comment[nl]=Een nieuwe sessie is bezig te starten Comment[pl]=Nowa sesja rozpoczyna się Comment[pt]=Está a iniciar uma nova sessão @@ -416,6 +528,8 @@ Comment[sv]=En ny session startas Comment[uk]=Розпочинається новий сеанс Comment[x-test]=xxA new session is startingxx +Comment[zh_CN]=正在开启一个新会话 +Comment[zh_TW]=新的工作階段啟動中 Action= Sound=Oxygen-Sys-Log-In-Short.ogg @@ -423,10 +537,14 @@ Name=Logout Name[ca]=Sortida Name[cs]=Odhlášení +Name[da]=Log ud Name[de]=Abmeldung Name[en_GB]=Logout Name[es]=Cierre de sesión +Name[fi]=Uloskirjautuminen Name[hu]=Kijelentkezés +Name[nb]=Logg ut +Name[nds]=Afmellen Name[nl]=Afmelden Name[pl]=Wylogowanie Name[pt]=Encerrar @@ -440,13 +558,19 @@ Name[sv]=Logga ut Name[uk]=Вихід Name[x-test]=xxLogoutxx +Name[zh_CN]=注销 +Name[zh_TW]=登出 Comment=Session is exiting Comment[ca]=La sessió està finalitzant Comment[cs]=Sezení se ukončuje +Comment[da]=Sessionen er ved at afslutte Comment[de]=Die Sitzung wird beendet Comment[en_GB]=Session is exiting Comment[es]=Está saliendo de la sesión +Comment[fi]=Istunto päättyy Comment[hu]=A munkamenet létezik +Comment[nb]=Økt avslutter +Comment[nds]=Törn warrt utmaakt Comment[nl]=Sessie is bezig zich af te sluiten Comment[pl]=Sesja kończy się Comment[pt]=A sessão está a ser encerrada @@ -460,6 +584,8 @@ Comment[sv]=Sessionen avslutas Comment[uk]=Сеанс завершується Comment[x-test]=xxSession is exitingxx +Comment[zh_CN]=会话正在退出 +Comment[zh_TW]=工作階段結束中 Action= Sound=Oxygen-Sys-Log-Out.ogg @@ -467,10 +593,14 @@ Name=Logout Canceled Name[ca]=S'ha cancel·lat la sortida Name[cs]=Odhlášení přerušeno +Name[da]=Log ud annulleret Name[de]=Abmeldung abgebrochen Name[en_GB]=Logout Cancelled Name[es]=Cierre de sesión cancelado +Name[fi]=Uloskirjautuminen peruttu Name[hu]=Kijelentkezés megszakítva +Name[nb]=Utlogging avbrutt +Name[nds]=Afmellen afbraken Name[nl]=Afmelden geannuleerd Name[pl]=Wylogowanie przerwane Name[pt]=Encerramento Cancelado @@ -484,13 +614,19 @@ Name[sv]=Utloggning avbruten Name[uk]=Вихід скасовано Name[x-test]=xxLogout Canceledxx +Name[zh_CN]=注销取消了 +Name[zh_TW]=登出已取消 Comment=Plasma logout was canceled Comment[ca]=S'ha cancel·lat la sortida del Plasma Comment[cs]=Odhlášení z Plazmy bylo zrušeno +Comment[da]=Plasma log ud blev annulleret Comment[de]=Der Abmeldevorgang aus Plasma ist abgebrochen worden Comment[en_GB]=Plasma logout was cancelled Comment[es]=Se ha cancelado el cierre de sesión de Plasma +Comment[fi]=Plasmasta uloskirjautuminen on peruttu Comment[hu]=A KDE kijelentkezési folyamata megszakadt +Comment[nb]=Plasma-utlogging ble avbrutt +Comment[nds]=Afmellen vun Plasma wöör afbraken Comment[nl]=Afmelden bij plasma is geannuleerd Comment[pl]=Wylogowanie z Plazmy zostało przerwane Comment[pt]=O encerramento do Plasma foi cancelado @@ -504,16 +640,22 @@ Comment[sv]=Utloggning från Plasma avbröts Comment[uk]=Вихід з Плазми скасовано Comment[x-test]=xxPlasma logout was canceledxx +Comment[zh_CN]=Plasma 注销被取消了 +Comment[zh_TW]=登出的動作已被取消 Action=Popup [Event/printerror] Name=Print Error Name[ca]=Error d'impressió Name[cs]=Chyba tisku +Name[da]=Udskriftsfejl Name[de]=Druckfehler Name[en_GB]=Print Error Name[es]=Error de impresión +Name[fi]=Tulostusvirhe Name[hu]=Nyomtatási hiba +Name[nb]=Utskriftsfeil +Name[nds]=Druckfehler Name[nl]=Afdrukfout Name[pl]=Błąd drukowania Name[pt]=Erro de Impressão @@ -527,13 +669,19 @@ Name[sv]=Skrivarfel Name[uk]=Помилка друку Name[x-test]=xxPrint Errorxx +Name[zh_CN]=打印错误 +Name[zh_TW]=列印錯誤 Comment=A print error has occurred Comment[ca]=S'ha produït un error d'impressió Comment[cs]=Nastala chyba v tisku +Comment[da]=En udskriftsfejl opstod Comment[de]=Ein Fehler beim Drucken ist aufgetreten Comment[en_GB]=A print error has occurred Comment[es]=Ha ocurrido un error de impresión +Comment[fi]=Tapahtui tulostusvirhe Comment[hu]=Nyomtatási hiba történt +Comment[nb]=Det oppsto en utskriftsfeil +Comment[nds]=Dat geev en Fehler bi't Drucken Comment[nl]=Er deed zich een printerfout voor Comment[pl]=Wystąpił błąd drukowania Comment[pt]=Ocorreu um erro de impressão @@ -547,6 +695,8 @@ Comment[sv]=Utskriftsfel har inträffat Comment[uk]=Трапилась помилка друку Comment[x-test]=xxA print error has occurredxx +Comment[zh_CN]=发生了一个打印错误 +Comment[zh_TW]=發生了列印錯誤 Action=Popup|Sound Sound=Oxygen-Sys-Error-Printing.ogg @@ -554,10 +704,14 @@ Name=Information Message Name[ca]=Missatge d'informació Name[cs]=Informační zpráva +Name[da]=Informationsbesked Name[de]=Informationsmeldung Name[en_GB]=Information Message Name[es]=Mensaje de información +Name[fi]=Tiedottava viesti Name[hu]=Tájékoztató üzenet +Name[nb]=Informasjonsmelding +Name[nds]=Informatschoon Name[nl]=Informatiebericht Name[pl]=Wiadomość informacyjna Name[pt]=Mensagem Informativa @@ -571,13 +725,19 @@ Name[sv]=Informationsmeddelande Name[uk]=Інформаційне повідомлення Name[x-test]=xxInformation Messagexx +Name[zh_CN]=信息消息 +Name[zh_TW]=資訊訊息 Comment=An information message is being shown Comment[ca]=Es mostra un missatge d'informació Comment[cs]=Je zobrazována informační zpráva +Comment[da]=En informationsbesked vises Comment[de]=Eine Informationsmeldung wird angezeigt Comment[en_GB]=An information message is being shown Comment[es]=Se está mostrando un mensaje de información +Comment[fi]=Näytetään tiedottava viesti Comment[hu]=Tájékoztató üzenet jelenik meg +Comment[nb]=Det vises en informasjonsmelding +Comment[nds]=En Informatschoon warrt wiest Comment[nl]=Er wordt een informatiebericht getoond Comment[pl]=Wyświetlana jest wiadomość informacyjna Comment[pt]=Está a ser apresentada uma mensagem informativa @@ -591,6 +751,8 @@ Comment[sv]=Ett informationsmeddelande visas Comment[uk]=Показане інформаційне повідомлення Comment[x-test]=xxAn information message is being shownxx +Comment[zh_CN]=正在显示一条信息消息 +Comment[zh_TW]=將顯示資訊訊息 Sound=Oxygen-Sys-App-Message.ogg Action=Sound|Taskbar @@ -598,10 +760,14 @@ Name=Warning Message Name[ca]=Missatge d'avís Name[cs]=Varovná zpráva +Name[da]=Advarselsbesked Name[de]=Warnmeldung Name[en_GB]=Warning Message Name[es]=Mensaje de advertencia +Name[fi]=Varoitusviesti Name[hu]=Figyelmeztető üzenet +Name[nb]=Advarselsmelding +Name[nds]=Wohrschoen Name[nl]=Waarschuwingsbericht Name[pl]=Wiadomość ostrzegająca Name[pt]=Mensagem de Aviso @@ -615,13 +781,19 @@ Name[sv]=Varningsmeddelande Name[uk]=Повідомлення попередження Name[x-test]=xxWarning Messagexx +Name[zh_CN]=警告消息 +Name[zh_TW]=警告訊息 Comment=A warning message is being shown Comment[ca]=Es mostra un missatge d'avís Comment[cs]=Je zobrazována výstražná zpráva +Comment[da]=En advarselsbesked vises Comment[de]=Eine Warnmeldung wird angezeigt Comment[en_GB]=A warning message is being shown Comment[es]=Se está mostrando un mensaje de advertencia +Comment[fi]=Näytetään varoitusviesti Comment[hu]=Figyelmeztető üzenet jelenik meg +Comment[nb]=Det vises en advarselsmelding +Comment[nds]=En Wohrschoen warrt wiest Comment[nl]=Er wordt een waarschuwingsbericht getoond Comment[pl]=Wyświetlana jest wiadomość ostrzegająca Comment[pt]=Está a ser apresentada uma mensagem de aviso @@ -635,6 +807,8 @@ Comment[sv]=Ett varningsmeddelande visas Comment[uk]=Показане попередження Comment[x-test]=xxA warning message is being shownxx +Comment[zh_CN]=正在显示一条警告消息 +Comment[zh_TW]=將顯示警告訊息 Sound=Oxygen-Sys-Warning.ogg Action=Sound|Taskbar @@ -642,10 +816,14 @@ Name=Critical Message Name[ca]=Missatge crític Name[cs]=Kritická zpráva +Name[da]=Kritisk besked Name[de]=Kritische Meldung Name[en_GB]=Critical Message Name[es]=Mensaje crítico +Name[fi]=Kriittinen viesti Name[hu]=Kritikus fontosságú üzenet +Name[nb]=Kritisk melding +Name[nds]=Eernst Mellen Name[nl]=Kritiek bericht Name[pl]=Wiadomość krytyczna Name[pt]=Mensagem Crítica @@ -659,13 +837,19 @@ Name[sv]=Kritiskt meddelande Name[uk]=Критичне повідомлення Name[x-test]=xxCritical Messagexx +Name[zh_CN]=严重消息 +Name[zh_TW]=嚴重訊息 Comment=A critical message is being shown Comment[ca]=Es mostra un missatge crític Comment[cs]=Je zobrazována kritická zpráva +Comment[da]=En kritisk besked vises Comment[de]=Eine kritische Fehlermeldung wird angezeigt Comment[en_GB]=A critical message is being shown Comment[es]=Se está mostrando un mensaje crítico +Comment[fi]=Näytetään kriittinen viesti Comment[hu]=Kritikus fontosságú hibaüzenet jelenik meg +Comment[nb]=Det vises en kritisk melding +Comment[nds]=En eernst Mellen warrt wiest Comment[nl]=Er wordt een kritiek bericht getoond Comment[pl]=Wyświetlana jest wiadomość krytyczna Comment[pt]=Está a ser apresentada uma mensagem crítica @@ -679,6 +863,8 @@ Comment[sv]=Ett kritiskt meddelande visas Comment[uk]=Показано критичне повідомлення Comment[x-test]=xxA critical message is being shownxx +Comment[zh_CN]=正在显示一条重要消息 +Comment[zh_TW]=將顯示嚴重訊息 Sound=Oxygen-Sys-App-Error-Critical.ogg Action=Sound|Taskbar @@ -686,10 +872,14 @@ Name=Question Name[ca]=Pregunta Name[cs]=Dotaz +Name[da]=Spørgsmål Name[de]=Frage Name[en_GB]=Question Name[es]=Pregunta +Name[fi]=Kysymys Name[hu]=Kérdés +Name[nb]=Spørsmål +Name[nds]=Fraag Name[nl]=Vraag Name[pl]=Pytanie Name[pt]=Pergunta @@ -703,13 +893,19 @@ Name[sv]=Fråga Name[uk]=Питання Name[x-test]=xxQuestionxx +Name[zh_CN]=问题 +Name[zh_TW]=詢問 Comment=A question is being asked Comment[ca]=Es pregunta una qüestió Comment[cs]=Je položen dotaz +Comment[da]=Et spørgsmål stilles Comment[de]=Eine Frage wird gestellt Comment[en_GB]=A question is being asked Comment[es]=Se está haciendo una pregunta +Comment[fi]=Esitetään kysymys Comment[hu]=Kérdés jelenik meg +Comment[nb]=Det stilles et spørsmål +Comment[nds]=En Fraag warrt wiest Comment[nl]=Er wordt een vraag gesteld Comment[pl]=Zostało zadane pytanie Comment[pt]=Está a ser apresentada uma pergunta @@ -723,6 +919,8 @@ Comment[sv]=En fråga ställs Comment[uk]=Задане питання Comment[x-test]=xxA question is being askedxx +Comment[zh_CN]=正在询问一个问题 +Comment[zh_TW]=將詢問使用者問題 Sound=Oxygen-Sys-Question.ogg Action=Sound|Taskbar @@ -731,10 +929,14 @@ Name=Beep Name[ca]=Timbre Name[cs]=Pípnutí +Name[da]=Bip Name[de]=Signalton Name[en_GB]=Beep Name[es]=Pitido +Name[fi]=Äänimerkki Name[hu]=Csipogás +Name[nb]=Pip +Name[nds]=Tüüt Name[nl]=Geluidssignaal Name[pl]=Sygnał dźwiękowy Name[pt]=Campainha @@ -748,13 +950,19 @@ Name[sv]=Ljudsignal Name[uk]=Гудок Name[x-test]=xxBeepxx +Name[zh_CN]=响铃 +Name[zh_TW]=嗶聲 Comment=Sound bell Comment[ca]=So de campana Comment[cs]=Zvonek +Comment[da]=Lad klokke lyde Comment[de]=Signalton Comment[en_GB]=Sound bell Comment[es]=Campana de sonido +Comment[fi]=Äänimerkki Comment[hu]=Hangjelzés +Comment[nb]=Lydsignal +Comment[nds]=Klangpingel Comment[nl]=Geluidssignaal Comment[pl]=Sygnał dźwiękowy Comment[pt]=Campainha de som @@ -768,5 +976,7 @@ Comment[sv]=Ge ljudsignal Comment[uk]=Дати гудок Comment[x-test]=xxSound bellxx +Comment[zh_CN]=响铃 +Comment[zh_TW]=音效鈴聲 Action=Sound Sound=Oxygen-Sys-App-Message.ogg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/da/frameworkintegration5.po new/frameworkintegration-5.3.0/po/da/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/da/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.3.0/po/da/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -0,0 +1,94 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Martin Schlander <mschlan...@opensuse.org>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"PO-Revision-Date: 2014-09-21 15:59+0200\n" +"Last-Translator: Martin Schlander <mschlan...@opensuse.org>\n" +"Language-Team: Danish <kde-i18n-...@kde.org>\n" +"Language: da\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.5\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Opening..." +msgstr "Åbner..." + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Saving..." +msgstr "Gemmer..." + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "Ny mappe" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "Ny mappe" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"Opret ny mappe i:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "En fil eller mappe ved navn %1 eksisterer allerede." + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "Du har ikke rettigheder til at oprette den mappe." + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "Vælg mappe" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "Ny mappe..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "Ny mappe..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "Flyt til affald" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "Slet" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "Vis skjulte mapper" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "Egenskaber" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "Vis skjulte mapper" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/ja/frameworkintegration5.po new/frameworkintegration-5.3.0/po/ja/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/ja/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.3.0/po/ja/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -0,0 +1,89 @@ +msgid "" +msgstr "" +"Project-Id-Version: frameworkintegration5\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"PO-Revision-Date: 2014-05-01 01:02-0700\n" +"Last-Translator: Japanese KDE translation team <kde...@kde.org>\n" +"Language-Team: Japanese <kde...@kde.org>\n" +"Language: \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-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Opening..." +msgstr "" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Saving..." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/lt/frameworkintegration5.po new/frameworkintegration-5.3.0/po/lt/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/lt/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.3.0/po/lt/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -0,0 +1,96 @@ +# Lithuanian translations for trunk-kf package. +# Copyright (C) 2014 This_file_is_part_of_KDE +# This file is distributed under the same license as the trunk-kf package. +# Automatically generated, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: trunk-kf 5\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"PO-Revision-Date: 2014-09-29 14:18+0100\n" +"Last-Translator: Andrius Štikonas <andr...@stikonas.eu>\n" +"Language-Team: none\n" +"Language: lt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" +"X-Generator: Poedit 1.5.5\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Opening..." +msgstr "Atveriama..." + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Saving..." +msgstr "Įrašoma..." + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "Naujas aplankas" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "Naujas aplankas" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"Sukurti naują aplanką esantį:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "Failas ar aplankas pavadinimu %1 jau egzistuoja." + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "Neturite leidimo sukurti šio aplanko." + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "Pasirinkti aplanką" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "Naujas aplankas..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "Naujas aplankas..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "Perkelti į šiukšlinę" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "Trinti" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "Rodyti paslėptus aplankus" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "Savybės" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "Rodyti paslėptus aplankus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/nb/frameworkintegration5.po new/frameworkintegration-5.3.0/po/nb/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/nb/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.3.0/po/nb/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -0,0 +1,96 @@ +# Translation of frameworkintegration5 to Norwegian Bokmål +# +# Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"PO-Revision-Date: 2014-09-14 22:12+0200\n" +"Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" +"Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" +"Language: nb\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.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Opening..." +msgstr "Åpner …" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +msgid "Saving..." +msgstr "Lagrer …" + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "Ny mappe" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "Ny mappe" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"Lag ny mappe i:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "En fil eller mappe med navnet %1 finnes fra før." + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "Du har ikke rettighet til å lage den mappa." + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "Velg mappe" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "Ny mappe …" + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "Ny mappe …" + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "Flytt til papirkurven" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "Slett" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "Vis skjulte mapper" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "Egenskaper" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "Vis skjulte mapper" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/sr/frameworkintegration5.po new/frameworkintegration-5.3.0/po/sr/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/sr/frameworkintegration5.po 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/po/sr/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-08-03 08:16+0000\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Opening..." msgstr "Отварам..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Saving..." msgstr "Уписујем..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/sr@ijekavian/frameworkintegration5.po new/frameworkintegration-5.3.0/po/sr@ijekavian/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/sr@ijekavian/frameworkintegration5.po 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/po/sr@ijekavian/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-08-03 08:16+0000\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Opening..." msgstr "Отварам..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Saving..." msgstr "Уписујем..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/sr@ijekavianlatin/frameworkintegration5.po new/frameworkintegration-5.3.0/po/sr@ijekavianlatin/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-08-03 08:16+0000\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Opening..." msgstr "Otvaram..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Saving..." msgstr "Upisujem..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/po/sr@latin/frameworkintegration5.po new/frameworkintegration-5.3.0/po/sr@latin/frameworkintegration5.po --- old/frameworkintegration-5.2.0/po/sr@latin/frameworkintegration5.po 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/po/sr@latin/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-08-03 08:16+0000\n" +"POT-Creation-Date: 2014-09-06 08:10+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Opening..." msgstr "Otvaram..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:222 +#: platformtheme/kdeplatformfiledialoghelper.cpp:223 msgid "Saving..." msgstr "Upisujem..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/integrationplugin/frameworkintegrationplugin.h new/frameworkintegration-5.3.0/src/integrationplugin/frameworkintegrationplugin.h --- old/frameworkintegration-5.2.0/src/integrationplugin/frameworkintegrationplugin.h 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/integrationplugin/frameworkintegrationplugin.h 2014-10-04 18:56:48.000000000 +0200 @@ -32,13 +32,13 @@ KMessageBoxDontAskAgainConfigStorage() : KMessageBox_againConfig(0) {} virtual ~KMessageBoxDontAskAgainConfigStorage() {} - virtual bool shouldBeShownYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode &result); - virtual bool shouldBeShownContinue(const QString &dontShowAgainName); - virtual void saveDontShowAgainYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode result); - virtual void saveDontShowAgainContinue(const QString &dontShowAgainName); - virtual void enableAllMessages(); - virtual void enableMessage(const QString &dontShowAgainName); - virtual void setConfig(KConfig *cfg) + virtual bool shouldBeShownYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode &result) Q_DECL_OVERRIDE; + virtual bool shouldBeShownContinue(const QString &dontShowAgainName) Q_DECL_OVERRIDE; + virtual void saveDontShowAgainYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode result) Q_DECL_OVERRIDE; + virtual void saveDontShowAgainContinue(const QString &dontShowAgainName) Q_DECL_OVERRIDE; + virtual void enableAllMessages() Q_DECL_OVERRIDE; + virtual void enableMessage(const QString &dontShowAgainName) Q_DECL_OVERRIDE; + virtual void setConfig(KConfig *cfg) Q_DECL_OVERRIDE { KMessageBox_againConfig = cfg; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/kstyle/kstyle.cpp new/frameworkintegration-5.3.0/src/kstyle/kstyle.cpp --- old/frameworkintegration-5.2.0/src/kstyle/kstyle.cpp 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/kstyle/kstyle.cpp 2014-10-04 18:56:48.000000000 +0200 @@ -67,7 +67,7 @@ static const QStyle::StyleHint SH_KCustomStyleElement = (QStyle::StyleHint)0xff000001; static const int X_KdeBase = 0xff000000; -static const char *s_schemePropertyName = "KDE_COLOR_SCHEME_PATH"; +static const char s_schemePropertyName[] = "KDE_COLOR_SCHEME_PATH"; /** * An event filter intended to be used for all toplevel QWidgets. @@ -462,6 +462,14 @@ : buttonStyle == QLatin1String("textonly") ? Qt::ToolButtonTextOnly : Qt::ToolButtonIconOnly; } + + case SH_KCustomStyleElement: + if (!widget) { + return 0; + } + + return d->styleElements.value(widget->objectName(), 0); + default: break; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformfiledialogbase_p.h new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialogbase_p.h --- old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformfiledialogbase_p.h 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialogbase_p.h 2014-10-04 18:56:48.000000000 +0200 @@ -49,9 +49,8 @@ void filterSelected(const QString &filter); protected: - void closeEvent(QCloseEvent *e); + void closeEvent(QCloseEvent *e) Q_DECL_OVERRIDE; QDialogButtonBox *m_buttons; - }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformfiledialoghelper.h new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialoghelper.h --- old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformfiledialoghelper.h 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialoghelper.h 2014-10-04 18:56:48.000000000 +0200 @@ -33,14 +33,14 @@ friend class KDEPlatformFileDialogHelper; explicit KDEPlatformFileDialog(); - QUrl directory(); - void selectNameFilter(const QString &filter); - void setDirectory(const QUrl &directory); - void selectFile(const QUrl &filename); + QUrl directory() Q_DECL_OVERRIDE; + void selectNameFilter(const QString &filter) Q_DECL_OVERRIDE; + void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE; + void selectFile(const QUrl &filename) Q_DECL_OVERRIDE; void setViewMode(QFileDialogOptions::ViewMode view); void setFileMode(QFileDialogOptions::FileMode mode); - QString selectedNameFilter(); - QList<QUrl> selectedFiles(); + QString selectedNameFilter() Q_DECL_OVERRIDE; + QList<QUrl> selectedFiles() Q_DECL_OVERRIDE; protected: KFileWidget *m_fileWidget; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformsystemtrayicon.cpp new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformsystemtrayicon.cpp --- old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformsystemtrayicon.cpp 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformsystemtrayicon.cpp 2014-10-04 18:56:48.000000000 +0200 @@ -24,6 +24,9 @@ #include <QMenu> #include <QRect> #include <QApplication> +#include <QDBusConnection> +#include <QDBusConnectionInterface> +#include <QDBusReply> #if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) SystemTrayMenu::SystemTrayMenu() @@ -212,6 +215,11 @@ m_action->setVisible(isVisible); } +void SystemTrayMenuItem::setIconSize(int size) +{ + Q_UNUSED(size); +} + quintptr SystemTrayMenuItem::tag() const { return m_tag; @@ -317,8 +325,8 @@ bool KDEPlatformSystemTrayIcon::isSystemTrayAvailable() const { - // TODO: check on DBus - return true; + QDBusReply<bool> reply = QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.StatusNotifierWatcher"); + return reply.value(); } bool KDEPlatformSystemTrayIcon::supportsMessages() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformsystemtrayicon.h new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformsystemtrayicon.h --- old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformsystemtrayicon.h 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformsystemtrayicon.h 2014-10-04 18:56:48.000000000 +0200 @@ -76,6 +76,7 @@ void setText(const QString &text) Q_DECL_OVERRIDE; void setVisible(bool isVisible) Q_DECL_OVERRIDE; quintptr tag() const Q_DECL_OVERRIDE; + void setIconSize(int size) /*Q_DECL_OVERRIDE*/; //enable when depending on Qt5.4 QAction *action() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformtheme.cpp new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformtheme.cpp --- old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformtheme.cpp 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformtheme.cpp 2014-10-04 18:56:48.000000000 +0200 @@ -177,7 +177,7 @@ case QKeySequence::MoveToEndOfLine: return KStandardShortcut::shortcut(KStandardShortcut::EndOfLine); case QKeySequence::MoveToStartOfDocument: - return KStandardShortcut::shortcut(KStandardShortcut::Home); + return KStandardShortcut::shortcut(KStandardShortcut::Begin); case QKeySequence::MoveToEndOfDocument: return KStandardShortcut::shortcut(KStandardShortcut::End); case QKeySequence::SaveAs: @@ -190,6 +190,14 @@ return KStandardShortcut::shortcut(KStandardShortcut::FullScreen); case QKeySequence::Deselect: return KStandardShortcut::shortcut(KStandardShortcut::Deselect); + case QKeySequence::DeleteStartOfWord: + return KStandardShortcut::shortcut(KStandardShortcut::DeleteWordBack); + case QKeySequence::DeleteEndOfWord: + return KStandardShortcut::shortcut(KStandardShortcut::DeleteWordForward); + case QKeySequence::NextChild: + return KStandardShortcut::shortcut(KStandardShortcut::TabNext); + case QKeySequence::PreviousChild: + return KStandardShortcut::shortcut(KStandardShortcut::TabPrev); default: return QPlatformTheme::keyBindings(key); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformtheme.h new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformtheme.h --- old/frameworkintegration-5.2.0/src/platformtheme/kdeplatformtheme.h 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kdeplatformtheme.h 2014-10-04 18:56:48.000000000 +0200 @@ -37,14 +37,14 @@ KdePlatformTheme(); ~KdePlatformTheme(); - virtual QVariant themeHint(ThemeHint hint) const; - virtual const QPalette *palette(Palette type = SystemPalette) const; - virtual const QFont *font(Font type) const; - virtual QIconEngine *createIconEngine(const QString &iconName) const; - virtual QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const; + virtual QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; + virtual const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; + virtual const QFont *font(Font type) const Q_DECL_OVERRIDE; + virtual QIconEngine *createIconEngine(const QString &iconName) const Q_DECL_OVERRIDE; + virtual QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const Q_DECL_OVERRIDE; - virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; - virtual bool usePlatformNativeDialog(DialogType type) const; + virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const Q_DECL_OVERRIDE; + virtual bool usePlatformNativeDialog(DialogType type) const Q_DECL_OVERRIDE; virtual QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kdirselectdialog_p.h new/frameworkintegration-5.3.0/src/platformtheme/kdirselectdialog_p.h --- old/frameworkintegration-5.2.0/src/platformtheme/kdirselectdialog_p.h 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kdirselectdialog_p.h 2014-10-04 18:56:48.000000000 +0200 @@ -92,12 +92,12 @@ */ QUrl startDir() const; - virtual QUrl directory(); - virtual void selectNameFilter(const QString &filter); - virtual void setDirectory(const QUrl &directory); - virtual void selectFile(const QUrl &filename); - virtual QString selectedNameFilter(); - virtual QList<QUrl> selectedFiles(); + virtual QUrl directory() Q_DECL_OVERRIDE; + virtual void selectNameFilter(const QString &filter) Q_DECL_OVERRIDE; + virtual void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE; + virtual void selectFile(const QUrl &filename) Q_DECL_OVERRIDE; + virtual QString selectedNameFilter() Q_DECL_OVERRIDE; + virtual QList<QUrl> selectedFiles() Q_DECL_OVERRIDE; public Q_SLOTS: /** @@ -111,7 +111,7 @@ /** * Reimplemented for saving the dialog geometry. */ - virtual void hideEvent(QHideEvent *event); + virtual void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/kfiletreeview_p.h new/frameworkintegration-5.3.0/src/platformtheme/kfiletreeview_p.h --- old/frameworkintegration-5.2.0/src/platformtheme/kfiletreeview_p.h 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/kfiletreeview_p.h 2014-10-04 18:56:48.000000000 +0200 @@ -73,7 +73,7 @@ /** * @reimplemented */ - QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; public Q_SLOTS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.2.0/src/platformtheme/khintssettings.cpp new/frameworkintegration-5.3.0/src/platformtheme/khintssettings.cpp --- old/frameworkintegration-5.2.0/src/platformtheme/khintssettings.cpp 2014-09-09 01:39:56.000000000 +0200 +++ new/frameworkintegration-5.3.0/src/platformtheme/khintssettings.cpp 2014-10-04 18:56:48.000000000 +0200 @@ -77,6 +77,7 @@ QStringList styleNames; styleNames << cg.readEntry("widgetStyle", QString()) + << "breeze" << "oxygen" << "fusion" << "windows"; @@ -239,6 +240,7 @@ QStringList styleNames; styleNames << cg.readEntry("widgetStyle", QString()) + << "breeze" << "oxygen" << "fusion" << "windows"; @@ -346,7 +348,7 @@ return; } - const QString scheme = readConfigValue("KDE", "ColorScheme", "Breeze").toString(); + const QString scheme = readConfigValue("General", "ColorScheme", "Breeze").toString(); path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/" + scheme + ".colors"); if (!path.isEmpty()) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org