Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2015-01-29 12:50:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-21 11:57:51.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2015-01-29 12:50:51.000000000 +0100
@@ -1,0 +2,11 @@
+Sat Jan 3 18:03:16 UTC 2015 - [email protected]
+
+- Update to 5.6.0
+ * Fix handling of palette change events (kde#336813)
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.6.0.php
+- Split the integration plugin into separate package
+- Make sure that the plugin uses exact libQt5Gui5 version it was
+ compiled against, due to usage of private Qt headers
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.5.0.tar.xz
New:
----
frameworkintegration-5.6.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.VO6c0J/_old 2015-01-29 12:50:52.000000000 +0100
+++ /var/tmp/diff_new_pack.VO6c0J/_new 2015-01-29 12:50:52.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package frameworkintegration
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,11 +18,11 @@
%define lname libKF5Style5
Name: frameworkintegration
-Version: 5.5.0
+Version: 5.6.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 1.5.0
+BuildRequires: extra-cmake-modules >= 1.6.0
BuildRequires: fdupes
BuildRequires: kconfig-devel >= %{kf5_version}
BuildRequires: kconfigwidgets-devel >= %{kf5_version}
@@ -42,7 +42,7 @@
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source:
http://download.kde.org/stable/frameworks/5.5/%{name}-%{version}.tar.xz
+Source:
http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -57,7 +57,6 @@
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
Group: System/GUI/KDE
Obsoletes: libKF5Style4
-Provides: frameworkintegration-plugin
Recommends: %lname-lang = %{version}
%description -n %lname
@@ -67,6 +66,19 @@
Applications do not need to link to this directly.
+%package plugin
+Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
+Group: System/GUI/KDE
+Conflicts: %lname < 5.6.0
+%requires_eq libQt5Gui5
+
+%description plugin
+Framework Integration is a set of plugins responsible for better
+integration of Qt applications when running on a
+KDE Plasma workspace.
+
+Applications do not need to link to this directly.
+
%package devel
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
Group: Development/Libraries/KDE
@@ -106,6 +118,10 @@
%defattr(-,root,root)
%doc COPYING* README*
%{_kf5_libdir}/libKF5Style.so.*
+
+%files plugin
+%defattr(-,root,root)
+%doc COPYING* README*
%{_kf5_datadir}/infopage/
%{_kf5_plugindir}/
%{_kf5_notifydir}/
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.VO6c0J/_old 2015-01-29 12:50:52.000000000 +0100
+++ /var/tmp/diff_new_pack.VO6c0J/_new 2015-01-29 12:50:52.000000000 +0100
@@ -1,3 +1,5 @@
libKF5Style5
+frameworkintegration-plugin
+ conflicts "libKF5Style5-<targettype> < 5.6.0"
frameworkintegration-devel
requires "libKF5Style5-<targettype> = <version>"
++++++ frameworkintegration-5.5.0.tar.xz -> frameworkintegration-5.6.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.5.0/CMakeLists.txt
new/frameworkintegration-5.6.0/CMakeLists.txt
--- old/frameworkintegration-5.5.0/CMakeLists.txt 2014-12-06
13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/CMakeLists.txt 2015-01-03
12:59:57.000000000 +0100
@@ -2,7 +2,7 @@
project(FrameworkIntegration)
-find_package(ECM 1.5.0 REQUIRED NO_MODULE)
+find_package(ECM 1.6.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.5.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.5.0") # handled by release scripts
+set(KF5_VERSION "5.6.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.6.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.5.0/autotests/kfiledialog_unittest.cpp
new/frameworkintegration-5.6.0/autotests/kfiledialog_unittest.cpp
--- old/frameworkintegration-5.5.0/autotests/kfiledialog_unittest.cpp
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/autotests/kfiledialog_unittest.cpp
2015-01-03 12:59:57.000000000 +0100
@@ -73,37 +73,42 @@
QCOMPARE(dialog.directory().absolutePath(), QDir::rootPath());
}
- void testSetView_data()
+ void testViewMode()
{
- QTest::addColumn<QFileDialog::ViewMode>("qtViewMode");
- QTest::addColumn<KFile::FileView>("kdeViewMode");
- QTest::newRow("detail") << QFileDialog::Detail << KFile::Detail;
- QTest::newRow("list") << QFileDialog::List << KFile::Simple;
- }
-
- void testSetView()
- {
- QFETCH(QFileDialog::ViewMode, qtViewMode);
- QFETCH(KFile::FileView, kdeViewMode);
- QFileDialog dialog;
- dialog.setViewMode(qtViewMode);
- dialog.show();
-
- foreach (QWidget *widget, QApplication::topLevelWidgets()) {
- KFileWidget * fw = widget->findChild<KFileWidget *>();
- if(fw) {
- QCOMPARE(fw->dirOperator()->viewMode(), kdeViewMode);
- }
+ // Open a file dialog, and change view mode to tree
+ {
+ QFileDialog dialog;
+ dialog.show();
+
+ KFileWidget *fw = findFileWidget();
+ QVERIFY(fw);
+ fw->setViewMode(KFile::Tree);
+ fw->slotCancel(); // the saving happens there
+ }
+ // Open another one, and check that the view mode is now tree, change
it to simple
+ {
+ QFileDialog dialog;
+ dialog.show();
+
+ KFileWidget *fw = findFileWidget();
+ QVERIFY(fw);
+ KDirOperator *op = fw->dirOperator();
+ QCOMPARE(fileViewToString(op->viewMode()),
fileViewToString(KFile::Tree));
+ fw->setViewMode(KFile::Simple);
+ fw->slotCancel();
+ }
+ // Open another one, and check that the view mode is now simple
+ {
+ QFileDialog dialog;
+ dialog.show();
+
+ KFileWidget *fw = findFileWidget();
+ QVERIFY(fw);
+ KDirOperator *op = fw->dirOperator();
+ QCOMPARE(fileViewToString(op->viewMode()),
fileViewToString(KFile::Simple));
+ fw->setViewMode(KFile::Detail);
+ fw->slotCancel();
}
-
-/*
- * Disabled because of a bug in Qt that causes the wrong viewMode value to be
returned. A patch
- * is in Qt's gerrit: https://codereview.qt-project.org/#change,84137 and is
in Qt since 5.3.1.
- * TODO: remove the version check once this project requires Qt 5.3.1 or
higher.
- */
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 1))
- QCOMPARE(dialog.viewMode(), qtViewMode);
-#endif
}
void testSetFileMode_data()
@@ -124,14 +129,41 @@
dialog.setFileMode(qtFileMode);
dialog.show();
+ KFileWidget *fw = findFileWidget();
+ QVERIFY(fw);
+ QCOMPARE(fw->mode(), kdeFileMode);
+
+ QCOMPARE(dialog.fileMode(), qtFileMode);
+ }
+private:
+ static QString fileViewToString(KFile::FileView fv)
+ {
+ switch (fv) {
+ case KFile::Detail:
+ return QStringLiteral("Detail");
+ case KFile::Simple:
+ return QStringLiteral("Simple");
+ case KFile::Tree:
+ return QStringLiteral("Tree");
+ case KFile::DetailTree:
+ return QStringLiteral("DetailTree");
+ default:
+ break;
+ }
+ return QStringLiteral("ERROR");
+ }
+
+ static KFileWidget *findFileWidget()
+ {
+ QList<KFileWidget *> widgets;
foreach (QWidget *widget, QApplication::topLevelWidgets()) {
- KFileWidget * fw = widget->findChild<KFileWidget *>();
- if(fw) {
- QCOMPARE(fw->mode(), kdeFileMode);
+ KFileWidget *fw = widget->findChild<KFileWidget *>();
+ if (fw) {
+ widgets.append(fw);
}
}
-
- QCOMPARE(dialog.fileMode(), qtFileMode);
+ Q_ASSERT(widgets.count() == 1);
+ return (widgets.count() == 1) ? widgets.first() : Q_NULLPTR;
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.5.0/plasma_workspace.notifyrc
new/frameworkintegration-5.6.0/plasma_workspace.notifyrc
--- old/frameworkintegration-5.5.0/plasma_workspace.notifyrc 2014-12-06
13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/plasma_workspace.notifyrc 2015-01-03
12:59:57.000000000 +0100
@@ -8,8 +8,10 @@
Comment[en_GB]=Plasma Workspace
Comment[es]=Espacio de trabajo Plasma
Comment[fi]=Plasma-työtila
+Comment[gd]=Rum-obrach Plasma
Comment[hu]=Plasma munkaterület
Comment[it]=Spazio di lavoro Plasma
+Comment[ko]=Plasma 작업 공간
Comment[lt]=Plasma darbastalio erdvė
Comment[nb]=Plasma-arbeidsområde
Comment[nds]=Plasma-Arbeitrebeet
@@ -40,8 +42,10 @@
Name[en_GB]=Wastebin: Emptied
Name[es]=Papelera: vacía
Name[fi]=Roskakori: Tyhjennetty
+Name[gd]=An sgudal: falamh
Name[hu]=Kuka: kiürítve
Name[it]=Cestino: svuotato
+Name[ko]=휴지통: 비워짐
Name[lt]=Šiukšliadėžė: ištuštinta
Name[nb]=Papirkurv: tømt
Name[nds]=Affalltünn leddig maakt
@@ -70,8 +74,10 @@
Comment[en_GB]=The wastebin has been emptied
Comment[es]=Se ha vaciado la papelera
Comment[fi]=Roskakori on tyhjennetty
+Comment[gd]=Chaidh an sgudal fhalamhachadh
Comment[hu]=A kuka kiürült
Comment[it]=Il cestino è stato svuotato
+Comment[ko]=휴지통이 비워짐
Comment[lt]=Šiukšliadėžė buvo ištuštinta
Comment[nb]=Papirkurven er blitt tømt
Comment[nds]=De Affalltünn wöör leddig maakt
@@ -104,8 +110,10 @@
Name[en_GB]=Textcompletion: Rotation
Name[es]=Terminación de texto: rotación
Name[fi]=Tekstin täydennys: kiertävä
+Name[gd]=Coileanadh teacsa: cuairteachadh
Name[hu]=Szövegkiegészítés: rotáció
Name[it]=Completamento del testo: rotazione
+Name[ko]=텍스트 완성: 회전
Name[lt]=Teksto užpildymas: sukimas
Name[nb]=Tekstfullføring: rotasjon
Name[nds]=Textkompletteren: Dreihen
@@ -133,7 +141,10 @@
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[gd]=Ràinig thu an deireadh de na tha de sheisean ann
Comment[hu]=A találatok végére értem
+Comment[it]=La fine dell'elenco di corrispondenze è stata raggiunta
+Comment[ko]=일치하는 항목 목록의 끝에 도달함
Comment[lt]=Pasiektas atitikmenų sąrašo galas
Comment[nb]=Kom til slutten av lista over treff
Comment[nds]=Bi't Enn vun list mit Drepers anlangt
@@ -165,8 +176,10 @@
Name[en_GB]=Textcompletion: No Match
Name[es]=Terminación de texto: ninguna coincidencia
Name[fi]=Tekstin täydennys: Ei sopivia
+Name[gd]=Coileanadh teacsa: cha do lorg sinn gin
Name[hu]=Szövegkiegészítés: nincs találat
Name[it]=Completamento del testo: nessuna corrispondenza
+Name[ko]=텍스트 완성: 일치하는 것 없음
Name[lt]=Teksto užpildymas: nėra atitikmens
Name[nb]=Tekstfullføring: ingen treff
Name[nds]=Textkompletteren: keen Dreper
@@ -194,7 +207,10 @@
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[gd]=Cha deach coileanadh a fhreagras a lorg
Comment[hu]=Nincs illeszthető szó
+Comment[it]=Non è stato trovato alcun completamento corrispondente
+Comment[ko]=일치하는 항목을 찾을 수 없음
Comment[lt]=Nerasta atitinkanti pabaiga
Comment[nb]=Fant ingen tekstfullføring som passet
Comment[nds]=Dor findt sik keen passen Kompletteren
@@ -226,8 +242,10 @@
Name[en_GB]=Textcompletion: Partial Match
Name[es]=Terminación de texto: coincidencia parcial
Name[fi]=Tekstin täydennys: Osittainen osuma
+Name[gd]=Coileanadh teacsa: pàirt dheth co-ionnann
Name[hu]=Szövegkiegészítés: részleges találat
Name[it]=Completamento del testo: corrispondenza parziale
+Name[ko]=텍스트 완성: 부분적 일치
Name[lt]=Teksto užpildymas: tinka dalinai
Name[nb]=Tekstfullføring:delvis treff
Name[nds]=Textkompletteren: Deeldreper
@@ -255,7 +273,10 @@
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[gd]=Lorg sinn barrachd air aon nì a fhreagradh
Comment[hu]=Egynél több szó illeszkedik
+Comment[it]=C'è più di una corrispondenza possibile
+Comment[ko]=하나 이상의 일치하는 항목이 있음
Comment[lt]=Yra daugiau negu vienas galimas atitikmuo
Comment[nb]=Det er mer enn ett mulig treff
Comment[nds]=Dat gifft mehr as een mööglichen Dreper
@@ -287,8 +308,10 @@
Name[en_GB]=Fatal Error
Name[es]=Error fatal
Name[fi]=Vakava virhe
+Name[gd]=Mearachd mharbhtach
Name[hu]=Végzetes hiba
Name[it]=Errore grave
+Name[ko]=치명적 오류
Name[lt]=Lemtinga klaida
Name[nb]=Kritisk feil
Name[nds]=Swoor Fehler
@@ -316,7 +339,10 @@
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[gd]=Chaidh am prògram fhàgail ri linn mearachd dona
Comment[hu]=Olyan hiba történt a programban, melynek hatására a program futása
befejeződött
+Comment[it]=Si è verificato un errore grave, che ha causato la chiusura del
programma
+Comment[ko]=프로그램이 종료될 정도의 큰 오류가 발생함
Comment[lt]=Įvyko rimta klaida, privertusi programą užbaigti darbą
Comment[nb]=Det oppsto en alvorlig feil som gjorde at programmet avsluttet
Comment[nds]=Dat geev en swoor Fehler, dat Programm is utstegen
@@ -349,12 +375,15 @@
Name[en_GB]=Notification
Name[es]=Notificación
Name[fi]=Ilmoitus
+Name[gd]=Brath
Name[hu]=Értesítés
Name[it]=Notifica
+Name[ko]=알림
Name[lt]=Pranešimas
Name[nb]=Varsling
Name[nds]=Bescheed
Name[nl]=Melding
+Name[pa]=ਸੂਚਨਾ
Name[pl]=Powiadomienie
Name[pt]=Notificação
Name[pt_BR]=Notificação
@@ -378,7 +407,10 @@
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[gd]=Thachair rudeigin sònraichte sa phrògram
Comment[hu]=Valamilyen esemény következett be a programban
+Comment[it]=Si è verificato qualcosa di speciale nel programma
+Comment[ko]=프로그램에서 특별한 일이 발생함
Comment[lt]=Kažkoks specialus įvykis programoje
Comment[nb]=Det hendte noe spesielt i programmet
Comment[nds]=Dat geev en afsünnerlich Begeefnis binnen dat Programm
@@ -410,12 +442,15 @@
Name[en_GB]=Warning
Name[es]=Advertencia
Name[fi]=Varoitus
+Name[gd]=Rabhadh
Name[hu]=Figyelmeztetés
Name[it]=Avviso
+Name[ko]=경고
Name[lt]=Perspėjimas
Name[nb]=Advarsel
Name[nds]=Wohrschoen
Name[nl]=Waarschuwing
+Name[pa]=ਚੇਤਾਵਨੀ
Name[pl]=Ostrzeżenie
Name[pt]=Aviso
Name[pt_BR]=Aviso
@@ -439,7 +474,10 @@
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[gd]=Bha mearachd sa phrògram a dh'adhbharaicheas trioblaid ma
dh'fhaoidte
Comment[hu]=Hiba történt a programban, de a program futása folytatódhat
+Comment[it]=Si è verificato un errore nel programma che potrebbe causare
problemi
+Comment[ko]=프로그램에 문제를 가져올 수 있는 오류가 발생함
Comment[lt]=Įvyko programos klaida, galinti sukelti problemų
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
@@ -471,8 +509,10 @@
Name[en_GB]=Catastrophe
Name[es]=Catástrofe
Name[fi]=Katastrofi
+Name[gd]=Tubaist
Name[hu]=Súlyos hiba
Name[it]=Catastrofe
+Name[ko]=중대한 오류
Name[lt]=Katastrofa
Name[nb]=Katastrofe
Name[nds]=Groot Malöör
@@ -500,7 +540,10 @@
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[gd]=Thachair mearachd glè dhona agus chaidh am prògram fhàgail air a
char as lugha
Comment[hu]=Hiba történt a programban, a program futása befejeződött
+Comment[it]=Si è verificato un errore molto grave, che ha causato almeno la
chiusura del programma
+Comment[ko]=프로그램이 종료될 정도의 매우 큰 오류가 발생함
Comment[lt]=Įvyko labai rimta klaida, privertusi programą bent jau baigti
darbą.
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
@@ -533,11 +576,15 @@
Name[en_GB]=Login
Name[es]=Inicio de sesión
Name[fi]=Kirjautuminen
+Name[gd]=Logadh a-steach
Name[hu]=Bejelentkezés
+Name[it]=Accesso
+Name[ko]=로그인
Name[lt]=Prisijungimas
Name[nb]=Logg inn
Name[nds]=Anmellen
Name[nl]=Aanmelden
+Name[pa]=ਲਾਗਇਨ
Name[pl]=Logowanie
Name[pt]=Arranque
Name[pt_BR]=Início de sessão
@@ -561,7 +608,10 @@
Comment[en_GB]=A new session is starting
Comment[es]=Está iniciando una nueva sesión
Comment[fi]=Uusi istunto alkaa
+Comment[gd]=Tha seisean ùr a' tòiseachadh
Comment[hu]=Egy új munkamenet kezdődött
+Comment[it]=Una nuova sessione sta per essere iniziata
+Comment[ko]=새 세션이 시작됨
Comment[lt]=Paleidžiama nauja sesija
Comment[nb]=En ny økt starter
Comment[nds]=En nieg Törn fangt an
@@ -593,11 +643,15 @@
Name[en_GB]=Logout
Name[es]=Cierre de sesión
Name[fi]=Uloskirjautuminen
+Name[gd]=Logadh a-mach
Name[hu]=Kijelentkezés
+Name[it]=Chiudi sessione
+Name[ko]=로그아웃
Name[lt]=Atsijungimas
Name[nb]=Logg ut
Name[nds]=Afmellen
Name[nl]=Afmelden
+Name[pa]=ਲਾਗਆਉਟ
Name[pl]=Wylogowanie
Name[pt]=Encerrar
Name[pt_BR]=Encerramento de sessão
@@ -621,11 +675,15 @@
Comment[en_GB]=Session is exiting
Comment[es]=Está saliendo de la sesión
Comment[fi]=Istunto päättyy
+Comment[gd]=Tha an seisean 'ga fhàgail
Comment[hu]=A munkamenet létezik
+Comment[it]=La sessione sta per essere terminata
+Comment[ko]=세션이 종료됨
Comment[lt]=Sesija uždaroma
Comment[nb]=Økt avslutter
Comment[nds]=Törn warrt utmaakt
Comment[nl]=Sessie is bezig zich af te sluiten
+Comment[pa]=ਸ਼ੈਸ਼ਨ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ
Comment[pl]=Sesja kończy się
Comment[pt]=A sessão está a ser encerrada
Comment[pt_BR]=A sessão está sendo encerrada
@@ -653,11 +711,15 @@
Name[en_GB]=Logout Cancelled
Name[es]=Cierre de sesión cancelado
Name[fi]=Uloskirjautuminen peruttu
+Name[gd]=Chaidh sgur dhen logadh a-mach
Name[hu]=Kijelentkezés megszakítva
+Name[it]=Chiusura della sessione annullata
+Name[ko]=로그아웃 취소됨
Name[lt]=Atsijungimas atšauktas
Name[nb]=Utlogging avbrutt
Name[nds]=Afmellen afbraken
Name[nl]=Afmelden geannuleerd
+Name[pa]=ਲਾਗਆਉਟ ਰੱਦ ਕਰੋ
Name[pl]=Wylogowanie przerwane
Name[pt]=Encerramento Cancelado
Name[pt_BR]=Encerramento de sessão cancelado
@@ -681,11 +743,15 @@
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[gd]=Chaidh sgur dhen logadh a-mach à Plasma
Comment[hu]=A KDE kijelentkezési folyamata megszakadt
+Comment[it]=La chiusura di Plasma è stata annullata
+Comment[ko]=Plasma 로그아웃 취소됨
Comment[lt]=Plasma išsiregistravimas buvo nutrauktas
Comment[nb]=Plasma-utlogging ble avbrutt
Comment[nds]=Afmellen vun Plasma wöör afbraken
Comment[nl]=Afmelden bij plasma is geannuleerd
+Comment[pa]=ਪਲਾਜ਼ਮਾ ਲਾਗਆਉਟ ਰੱਦ ਕੀਤਾ
Comment[pl]=Wylogowanie z Plazmy zostało przerwane
Comment[pt]=O encerramento do Plasma foi cancelado
Comment[pt_BR]=O encerramento do Plasma foi cancelado
@@ -712,12 +778,15 @@
Name[en_GB]=Print Error
Name[es]=Error de impresión
Name[fi]=Tulostusvirhe
+Name[gd]=Mearachd clò-bhualaidh
Name[hu]=Nyomtatási hiba
Name[it]=Errore di stampa
+Name[ko]=인쇄 오류
Name[lt]=Spausdinimo klaida
Name[nb]=Utskriftsfeil
Name[nds]=Druckfehler
Name[nl]=Afdrukfout
+Name[pa]=ਪਰਿੰਟ ਗਲਤੀ
Name[pl]=Błąd drukowania
Name[pt]=Erro de Impressão
Name[pt_BR]=Erro de impressão
@@ -741,7 +810,10 @@
Comment[en_GB]=A print error has occurred
Comment[es]=Ha ocurrido un error de impresión
Comment[fi]=Tapahtui tulostusvirhe
+Comment[gd]=Thachair mearachd leis a' chlò-bhualadh
Comment[hu]=Nyomtatási hiba történt
+Comment[it]=Si è verificato un errore di stampa
+Comment[ko]=인쇄 오류가 발생함
Comment[lt]=Įvyko spausdinimo klaida
Comment[nb]=Det oppsto en utskriftsfeil
Comment[nds]=Dat geev en Fehler bi't Drucken
@@ -773,12 +845,15 @@
Name[en_GB]=Information Message
Name[es]=Mensaje de información
Name[fi]=Tiedottava viesti
+Name[gd]=Teachdaireachd fiosrachaidh
Name[hu]=Tájékoztató üzenet
Name[it]=Messaggio informativo
+Name[ko]=정보 메시지
Name[lt]=Informacinis pranešimas
Name[nb]=Informasjonsmelding
Name[nds]=Informatschoon
Name[nl]=Informatiebericht
+Name[pa]=ਜਾਣਕਾਰੀ ਸੁਨੇਹਾ
Name[pl]=Wiadomość informacyjna
Name[pt]=Mensagem Informativa
Name[pt_BR]=Mensagem informativa
@@ -802,7 +877,10 @@
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[gd]=Tha teachdaireachd fiosrachaidh 'ga sealltainn
Comment[hu]=Tájékoztató üzenet jelenik meg
+Comment[it]=Un messaggio informativo viene mostrato
+Comment[ko]=정보 메시지가 표시됨
Comment[lt]=Rodomas informacinis pranešimas
Comment[nb]=Det vises en informasjonsmelding
Comment[nds]=En Informatschoon warrt wiest
@@ -834,12 +912,15 @@
Name[en_GB]=Warning Message
Name[es]=Mensaje de advertencia
Name[fi]=Varoitusviesti
+Name[gd]=Teachdaireachd rabhaidh
Name[hu]=Figyelmeztető üzenet
Name[it]=Messaggio di avviso
+Name[ko]=경고 메시지
Name[lt]=Įspėjantis pranešimas
Name[nb]=Advarselsmelding
Name[nds]=Wohrschoen
Name[nl]=Waarschuwingsbericht
+Name[pa]=ਚੇਤਾਵਨੀ ਸੁਨੇਹਾ
Name[pl]=Wiadomość ostrzegająca
Name[pt]=Mensagem de Aviso
Name[pt_BR]=Mensagem de aviso
@@ -863,7 +944,10 @@
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[gd]=Tha teachdaireachd rabhaidh 'ga sealltainn
Comment[hu]=Figyelmeztető üzenet jelenik meg
+Comment[it]=Un messaggio di avviso viene mostrato
+Comment[ko]=경고 메시지가 표시됨
Comment[lt]=Rodomas perspėjantis pranešimas
Comment[nb]=Det vises en advarselsmelding
Comment[nds]=En Wohrschoen warrt wiest
@@ -895,12 +979,15 @@
Name[en_GB]=Critical Message
Name[es]=Mensaje crítico
Name[fi]=Kriittinen viesti
+Name[gd]=Teachdaireachd èiginneach
Name[hu]=Kritikus fontosságú üzenet
Name[it]=Messaggio critico
+Name[ko]=치명적 오류 메시지
Name[lt]=Kritinis pranešimas
Name[nb]=Kritisk melding
Name[nds]=Eernst Mellen
Name[nl]=Kritiek bericht
+Name[pa]=ਘਾਤਕ ਸੁਨੇਹਾ
Name[pl]=Wiadomość krytyczna
Name[pt]=Mensagem Crítica
Name[pt_BR]=Mensagem crítica
@@ -924,8 +1011,10 @@
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[gd]=Tha teachdaireachd èiginneach 'ga sealltainn
Comment[hu]=Kritikus fontosságú hibaüzenet jelenik meg
Comment[it]=Un messaggio critico è stato mostrato
+Comment[ko]=치명적 오류 메시지가 표시됨
Comment[lt]=Rodomas kritinis pranešimas
Comment[nb]=Det vises en kritisk melding
Comment[nds]=En eernst Mellen warrt wiest
@@ -957,11 +1046,15 @@
Name[en_GB]=Question
Name[es]=Pregunta
Name[fi]=Kysymys
+Name[gd]=Ceist
Name[hu]=Kérdés
+Name[it]=Domanda
+Name[ko]=질문
Name[lt]=Klausimas
Name[nb]=Spørsmål
Name[nds]=Fraag
Name[nl]=Vraag
+Name[pa]=ਸਵਾਲ
Name[pl]=Pytanie
Name[pt]=Pergunta
Name[pt_BR]=Pergunta
@@ -985,7 +1078,10 @@
Comment[en_GB]=A question is being asked
Comment[es]=Se está haciendo una pregunta
Comment[fi]=Esitetään kysymys
+Comment[gd]=Tha ceist 'ga fhaighneachd
Comment[hu]=Kérdés jelenik meg
+Comment[it]=Una domanda viene posta
+Comment[ko]=질문을 해 오고 있음
Comment[lt]=Užduodamas klausimas
Comment[nb]=Det stilles et spørsmål
Comment[nds]=En Fraag warrt wiest
@@ -1018,11 +1114,15 @@
Name[en_GB]=Beep
Name[es]=Pitido
Name[fi]=Äänimerkki
+Name[gd]=Bìd
Name[hu]=Csipogás
+Name[it]=Bip
+Name[ko]=삑 소리
Name[lt]=Pyptelėjimas
Name[nb]=Pip
Name[nds]=Tüüt
Name[nl]=Geluidssignaal
+Name[pa]=ਬੀਪ
Name[pl]=Sygnał dźwiękowy
Name[pt]=Campainha
Name[pt_BR]=Alarme sonoro
@@ -1046,7 +1146,10 @@
Comment[en_GB]=Sound bell
Comment[es]=Campana de sonido
Comment[fi]=Äänimerkki
+Comment[gd]=Fuaim cluig
Comment[hu]=Hangjelzés
+Comment[it]=Campanella
+Comment[ko]=소리 벨
Comment[lt]=Garsinis skambutis
Comment[nb]=Lydsignal
Comment[nds]=Klangpingel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/po/ca/frameworkintegration5.po
new/frameworkintegration-5.6.0/po/ca/frameworkintegration5.po
--- old/frameworkintegration-5.5.0/po/ca/frameworkintegration5.po
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/po/ca/frameworkintegration5.po
2015-01-03 12:59:57.000000000 +0100
@@ -4,7 +4,7 @@
# version 3 or later versions approved by the membership of KDE e.V.
#
# Josep Ma. Ferrer <[email protected]>, 2014.
-# Antoni Bella Pérez <[email protected]>, 2014.
+# Antoni Bella Pérez <[email protected]>, 2014.
msgid ""
msgstr ""
"Project-Id-Version: frameworkintegration5\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/po/da/frameworkintegration5.po
new/frameworkintegration-5.6.0/po/da/frameworkintegration5.po
--- old/frameworkintegration-5.5.0/po/da/frameworkintegration5.po
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/po/da/frameworkintegration5.po
2015-01-03 12:59:57.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
-"PO-Revision-Date: 2014-09-21 15:59+0200\n"
+"PO-Revision-Date: 2014-12-29 20:00+0100\n"
"Last-Translator: Martin Schlander <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
"Language: da\n"
@@ -28,32 +28,32 @@
#: platformtheme/kdeplatformtheme.cpp:227
msgctxt "@action:button"
msgid "Save All"
-msgstr ""
+msgstr "Gem alle"
#: platformtheme/kdeplatformtheme.cpp:233
msgctxt "@action:button"
msgid "Yes to All"
-msgstr ""
+msgstr "Ja til alle"
#: platformtheme/kdeplatformtheme.cpp:237
msgctxt "@action:button"
msgid "No to All"
-msgstr ""
+msgstr "Nej til alle"
#: platformtheme/kdeplatformtheme.cpp:240
msgctxt "@action:button"
msgid "Abort"
-msgstr ""
+msgstr "Afbryd"
#: platformtheme/kdeplatformtheme.cpp:242
msgctxt "@action:button"
msgid "Retry"
-msgstr ""
+msgstr "Prøv igen"
#: platformtheme/kdeplatformtheme.cpp:244
msgctxt "@action:button"
msgid "Ignore"
-msgstr ""
+msgstr "Ignorér"
#: platformtheme/kdirselectdialog.cpp:132
msgctxt "folder name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/po/gd/frameworkintegration5.po
new/frameworkintegration-5.6.0/po/gd/frameworkintegration5.po
--- old/frameworkintegration-5.5.0/po/gd/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-5.6.0/po/gd/frameworkintegration5.po
2015-01-03 12:59:57.000000000 +0100
@@ -0,0 +1,126 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# GunChleoc <[email protected]>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: frameworkintegration5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
+"POT-Creation-Date: 2014-12-02 09:50+0000\n"
+"PO-Revision-Date: 2014-12-07 14:59+0100\n"
+"Last-Translator: GunChleoc <[email protected]>\n"
+"Language-Team: Fòram na Gàidhlig\n"
+"Language: gd\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 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
+"(n > 2 && n < 20) ? 2 : 3;\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: kde\n"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:234
+msgid "Opening..."
+msgstr "'Ga fhosgladh..."
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:234
+msgid "Saving..."
+msgstr "'Ga shàbhaladh..."
+
+#: platformtheme/kdeplatformtheme.cpp:227
+msgctxt "@action:button"
+msgid "Save All"
+msgstr "Sàbhail na h-uile"
+
+#: platformtheme/kdeplatformtheme.cpp:233
+msgctxt "@action:button"
+msgid "Yes to All"
+msgstr "Dèan seo leis na h-uile"
+
+#: platformtheme/kdeplatformtheme.cpp:237
+msgctxt "@action:button"
+msgid "No to All"
+msgstr "Na dèan seo le gin dhiubh"
+
+#: platformtheme/kdeplatformtheme.cpp:240
+msgctxt "@action:button"
+msgid "Abort"
+msgstr "Sguir dheth"
+
+#: platformtheme/kdeplatformtheme.cpp:242
+msgctxt "@action:button"
+msgid "Retry"
+msgstr "Feuch ris a-rithist"
+
+#: platformtheme/kdeplatformtheme.cpp:244
+msgctxt "@action:button"
+msgid "Ignore"
+msgstr "Leig seachad"
+
+#: platformtheme/kdirselectdialog.cpp:132
+msgctxt "folder name"
+msgid "New Folder"
+msgstr "Pasgan ùr"
+
+#: platformtheme/kdirselectdialog.cpp:137
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr "Pasgan ùr"
+
+#: platformtheme/kdirselectdialog.cpp:138
+#, kde-format
+msgctxt "@label:textbox"
+msgid ""
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"Cruthaich pasgan ùr an-seo:\n"
+"%1"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Tha faidhle no pasgan air a bheil %1 ann mar-thà."
+
+#: platformtheme/kdirselectdialog.cpp:171
+msgid "You do not have permission to create that folder."
+msgstr "Chan eil cead agad gus am pasgan seo a chruthachadh."
+
+#: platformtheme/kdirselectdialog.cpp:285
+msgctxt "@title:window"
+msgid "Select Folder"
+msgstr "Tagh pasgan"
+
+#: platformtheme/kdirselectdialog.cpp:294
+msgctxt "@action:button"
+msgid "New Folder..."
+msgstr "Pasgan ùr..."
+
+#: platformtheme/kdirselectdialog.cpp:340
+msgctxt "@action:inmenu"
+msgid "New Folder..."
+msgstr "Pasgan ùr..."
+
+#: platformtheme/kdirselectdialog.cpp:347
+msgctxt "@action:inmenu"
+msgid "Move to Trash"
+msgstr "Gluais dhan sgudal"
+
+#: platformtheme/kdirselectdialog.cpp:354
+msgctxt "@action:inmenu"
+msgid "Delete"
+msgstr "Sguab às"
+
+#: platformtheme/kdirselectdialog.cpp:363
+msgctxt "@option:check"
+msgid "Show Hidden Folders"
+msgstr "Seall pasganan falaichte"
+
+#: platformtheme/kdirselectdialog.cpp:370
+msgctxt "@action:inmenu"
+msgid "Properties"
+msgstr "Roghainnean"
+
+#: platformtheme/kfiletreeview.cpp:192
+msgid "Show Hidden Folders"
+msgstr "Seall pasganan falaichte"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/po/ko/frameworkintegration5.po
new/frameworkintegration-5.6.0/po/ko/frameworkintegration5.po
--- old/frameworkintegration-5.5.0/po/ko/frameworkintegration5.po
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/po/ko/frameworkintegration5.po
2015-01-03 12:59:57.000000000 +0100
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Park Shinjo <[email protected]>, 2014.
+# Park Shinjo <[email protected]>, 2014, 2015.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
-"PO-Revision-Date: 2014-04-28 02:22+0900\n"
+"PO-Revision-Date: 2015-01-02 03:23+0900\n"
"Last-Translator: Park Shinjo <[email protected]>\n"
"Language-Team: Korean <[email protected]>\n"
"Language: ko\n"
@@ -28,32 +28,32 @@
#: platformtheme/kdeplatformtheme.cpp:227
msgctxt "@action:button"
msgid "Save All"
-msgstr ""
+msgstr "모두 저장"
#: platformtheme/kdeplatformtheme.cpp:233
msgctxt "@action:button"
msgid "Yes to All"
-msgstr ""
+msgstr "모두 예"
#: platformtheme/kdeplatformtheme.cpp:237
msgctxt "@action:button"
msgid "No to All"
-msgstr ""
+msgstr "모두 아니요"
#: platformtheme/kdeplatformtheme.cpp:240
msgctxt "@action:button"
msgid "Abort"
-msgstr ""
+msgstr "중지"
#: platformtheme/kdeplatformtheme.cpp:242
msgctxt "@action:button"
msgid "Retry"
-msgstr ""
+msgstr "다시 시도"
#: platformtheme/kdeplatformtheme.cpp:244
msgctxt "@action:button"
msgid "Ignore"
-msgstr ""
+msgstr "무시"
#: platformtheme/kdirselectdialog.cpp:132
msgctxt "folder name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/po/pa/frameworkintegration5.po
new/frameworkintegration-5.6.0/po/pa/frameworkintegration5.po
--- old/frameworkintegration-5.5.0/po/pa/frameworkintegration5.po
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/po/pa/frameworkintegration5.po
2015-01-03 12:59:57.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
-"PO-Revision-Date: 2014-07-08 14:13-0500\n"
+"PO-Revision-Date: 2014-12-23 18:20-0600\n"
"Last-Translator: A S Alam <[email protected]>\n"
"Language-Team: Punjabi/Panjabi <[email protected]>\n"
"Language: pa\n"
@@ -28,32 +28,32 @@
#: platformtheme/kdeplatformtheme.cpp:227
msgctxt "@action:button"
msgid "Save All"
-msgstr ""
+msgstr "ਸਭ ਸੰਭਾਲੋ"
#: platformtheme/kdeplatformtheme.cpp:233
msgctxt "@action:button"
msgid "Yes to All"
-msgstr ""
+msgstr "ਸਭ ਲਈ ਹਾਂ"
#: platformtheme/kdeplatformtheme.cpp:237
msgctxt "@action:button"
msgid "No to All"
-msgstr ""
+msgstr "ਸਭ ਲਈ ਨਹੀਂ"
#: platformtheme/kdeplatformtheme.cpp:240
msgctxt "@action:button"
msgid "Abort"
-msgstr ""
+msgstr "ਅਧੂਰਾ ਛੱਡੋ"
#: platformtheme/kdeplatformtheme.cpp:242
msgctxt "@action:button"
msgid "Retry"
-msgstr ""
+msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
#: platformtheme/kdeplatformtheme.cpp:244
msgctxt "@action:button"
msgid "Ignore"
-msgstr ""
+msgstr "ਅਣਡਿੱਠਾ"
#: platformtheme/kdirselectdialog.cpp:132
msgctxt "folder name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/po/ru/frameworkintegration5.po
new/frameworkintegration-5.6.0/po/ru/frameworkintegration5.po
--- old/frameworkintegration-5.5.0/po/ru/frameworkintegration5.po
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/po/ru/frameworkintegration5.po
2015-01-03 12:59:57.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
-"PO-Revision-Date: 2014-06-25 04:16+0400\n"
+"PO-Revision-Date: 2014-12-07 01:08+0400\n"
"Last-Translator: Alexander Potashev <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
@@ -31,32 +31,32 @@
#: platformtheme/kdeplatformtheme.cpp:227
msgctxt "@action:button"
msgid "Save All"
-msgstr ""
+msgstr "Сохранить все"
#: platformtheme/kdeplatformtheme.cpp:233
msgctxt "@action:button"
msgid "Yes to All"
-msgstr ""
+msgstr "Да для всех"
#: platformtheme/kdeplatformtheme.cpp:237
msgctxt "@action:button"
msgid "No to All"
-msgstr ""
+msgstr "Нет для всех"
#: platformtheme/kdeplatformtheme.cpp:240
msgctxt "@action:button"
msgid "Abort"
-msgstr ""
+msgstr "Прервать"
#: platformtheme/kdeplatformtheme.cpp:242
msgctxt "@action:button"
msgid "Retry"
-msgstr ""
+msgstr "Повторить"
#: platformtheme/kdeplatformtheme.cpp:244
msgctxt "@action:button"
msgid "Ignore"
-msgstr ""
+msgstr "Пропустить"
#: platformtheme/kdirselectdialog.cpp:132
msgctxt "folder name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/po/sv/frameworkintegration5.po
new/frameworkintegration-5.6.0/po/sv/frameworkintegration5.po
--- old/frameworkintegration-5.5.0/po/sv/frameworkintegration5.po
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/po/sv/frameworkintegration5.po
2015-01-03 12:59:57.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-12-02 09:50+0000\n"
-"PO-Revision-Date: 2014-04-15 18:37+0200\n"
+"PO-Revision-Date: 2014-12-30 09:12+0100\n"
"Last-Translator: Stefan Asserhäll <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
"Language: sv\n"
@@ -15,7 +15,7 @@
"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"
#: platformtheme/kdeplatformfiledialoghelper.cpp:234
msgid "Opening..."
@@ -28,32 +28,32 @@
#: platformtheme/kdeplatformtheme.cpp:227
msgctxt "@action:button"
msgid "Save All"
-msgstr ""
+msgstr "Spara alla"
#: platformtheme/kdeplatformtheme.cpp:233
msgctxt "@action:button"
msgid "Yes to All"
-msgstr ""
+msgstr "Ja till alla"
#: platformtheme/kdeplatformtheme.cpp:237
msgctxt "@action:button"
msgid "No to All"
-msgstr ""
+msgstr "Nej till alla"
#: platformtheme/kdeplatformtheme.cpp:240
msgctxt "@action:button"
msgid "Abort"
-msgstr ""
+msgstr "Avbryt"
#: platformtheme/kdeplatformtheme.cpp:242
msgctxt "@action:button"
msgid "Retry"
-msgstr ""
+msgstr "Försök igen"
#: platformtheme/kdeplatformtheme.cpp:244
msgctxt "@action:button"
msgid "Ignore"
-msgstr ""
+msgstr "Ignorera"
#: platformtheme/kdirselectdialog.cpp:132
msgctxt "folder name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
new/frameworkintegration-5.6.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
---
old/frameworkintegration-5.5.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
2014-12-06 13:30:42.000000000 +0100
+++
new/frameworkintegration-5.6.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
2015-01-03 12:59:57.000000000 +0100
@@ -91,7 +91,9 @@
{
if (SystemTrayMenuItem *ours =
qobject_cast<SystemTrayMenuItem*>(menuItem)) {
m_items.removeOne(ours);
- m_menu->removeAction(ours->action());
+ if (ours->action()) {
+ m_menu->removeAction(ours->action());
+ }
}
}
@@ -320,7 +322,7 @@
if (!m_sni) {
return;
}
- m_sni->showMessage(title, msg, icon.themeName(), secs);
+ m_sni->showMessage(title, msg, icon.name(), secs);
}
bool KDEPlatformSystemTrayIcon::isSystemTrayAvailable() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.5.0/src/platformtheme/khintssettings.cpp
new/frameworkintegration-5.6.0/src/platformtheme/khintssettings.cpp
--- old/frameworkintegration-5.5.0/src/platformtheme/khintssettings.cpp
2014-12-06 13:30:42.000000000 +0100
+++ new/frameworkintegration-5.6.0/src/platformtheme/khintssettings.cpp
2015-01-03 12:59:57.000000000 +0100
@@ -206,9 +206,16 @@
switch (type) {
case PaletteChanged: {
loadPalettes();
- QEvent ev(QEvent::ApplicationPaletteChange);
- QGuiApplication::sendEvent(QGuiApplication::instance(), &ev);
- } break;
+
+ //QApplication::setPalette and QGuiApplication::setPalette are
different functions
+ //and non virtual. Call the correct one
+ if (qobject_cast<QApplication *>(QCoreApplication::instance())) {
+
QApplication::setPalette(*m_palettes[QPlatformTheme::SystemPalette]);
+ } else if (qobject_cast<QGuiApplication
*>(QCoreApplication::instance())) {
+
QGuiApplication::setPalette(*m_palettes[QPlatformTheme::SystemPalette]);
+ }
+ break;
+ }
case SettingsChanged: {
SettingsCategory category = static_cast<SettingsCategory>(arg);
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
