Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2014-11-11 01:09:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07 15:59:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2014-11-11 01:09:25.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 2 17:47:13 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.4.0 + * Implement support for setting custom labels in file dialogs + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.4.0.php + +------------------------------------------------------------------- Old: ---- frameworkintegration-5.3.0.tar.xz New: ---- frameworkintegration-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.JNI4t2/_old 2014-11-11 01:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.JNI4t2/_new 2014-11-11 01:09:26.000000000 +0100 @@ -18,11 +18,11 @@ %define lname libKF5Style5 Name: frameworkintegration -Version: 5.3.0 +Version: 5.4.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.3.0 +BuildRequires: extra-cmake-modules >= 1.4.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/%{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.4/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ frameworkintegration-5.3.0.tar.xz -> frameworkintegration-5.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/CMakeLists.txt new/frameworkintegration-5.4.0/CMakeLists.txt --- old/frameworkintegration-5.3.0/CMakeLists.txt 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/CMakeLists.txt 2014-11-02 13:04:35.000000000 +0100 @@ -2,7 +2,7 @@ project(FrameworkIntegration) -find_package(ECM 1.3.0 REQUIRED NO_MODULE) +find_package(ECM 1.4.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.3.0") # handled by release scripts -set(KF5_DEP_VERSION "5.3.0") # handled by release scripts +set(KF5_VERSION "5.4.0") # handled by release scripts +set(KF5_DEP_VERSION "5.4.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.3.0/plasma_workspace.notifyrc new/frameworkintegration-5.4.0/plasma_workspace.notifyrc --- old/frameworkintegration-5.3.0/plasma_workspace.notifyrc 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/plasma_workspace.notifyrc 2014-11-02 13:04:35.000000000 +0100 @@ -15,6 +15,7 @@ Comment[pl]=Przestrzeń robocza Plazmy Comment[pt]=Área de Trabalho do Plasma Comment[pt_BR]=Plasma Workspace +Comment[ru]=Среда рабочего стола Plasma Comment[sk]=KDE pracovná plocha Plasma Comment[sl]=Delovni prostor Plasma Comment[sr]=Плазма, радни простор @@ -43,6 +44,7 @@ Name[pl]=Kosz: opróżniony Name[pt]=Lixo: Vazio Name[pt_BR]=Lixeira: Vazia +Name[ru]=Корзина очищена Name[sk]=Kôš: vyprázdnený Name[sl]=Smeti: izpraznjene Name[sr]=Смеће: испражњено @@ -69,6 +71,7 @@ Comment[pl]=Kosz został opróżniony Comment[pt]=O caixote do lixo foi esvaziado Comment[pt_BR]=A Lixeira foi esvaziada +Comment[ru]=Корзина очищена Comment[sk]=Kôš bol vyprázdnený Comment[sl]=Smeti so bile izpraznjene Comment[sr]=Смеће је испражњено @@ -99,6 +102,7 @@ Name[pl]=Uzupełnianie tekstu: obrót Name[pt]=Completação de Texto: Rotação Name[pt_BR]=Complementação de texto: Rotação +Name[ru]=Автодополнение: переход по кругу Name[sk]=Doplnenie textu: rotácia Name[sl]=Dopolnjevanje besedila: kroženje Name[sr]=Допуна текста: ротација @@ -125,6 +129,7 @@ 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 Comment[pt_BR]=O final da lista de ocorrências foi atingido +Comment[ru]=Достигнут конец списка совпадений Comment[sk]=Bol dosiahnutý koniec zoznamu zhôd Comment[sl]=Dosežen je bil konec seznama ujemanj Comment[sr]=Достигнут је крај списка поклапања @@ -155,6 +160,7 @@ Name[pl]=Uzupełnianie tekstu: brak pasujących ciągów znaków Name[pt]=Completação de Texto: Sem Correspondência Name[pt_BR]=Complementação de texto: Nenhuma ocorrência +Name[ru]=Автодополнение: нет совпадений Name[sk]=Doplnenie textu: žiadna zhoda Name[sl]=Dopolnjevanje besedila: ni ujemanja Name[sr]=Допуна текста: нема поклапања @@ -181,6 +187,7 @@ Comment[pl]=Nie znaleziono żadnego uzupełnienia Comment[pt]=Não foi encontrada nenhuma ocorrência correspondente Comment[pt_BR]=Nenhuma ocorrência de complementação foi encontrada +Comment[ru]=Не найдено вариантов автодополнения Comment[sk]=Nebola nájdená žiadna zhoda Comment[sl]=Ni bilo mogoče najti ujemanja za dopolnjevanje Comment[sr]=Није нађено ниједно поклапање за допуну @@ -211,6 +218,7 @@ Name[pl]=Uzupełnianie tekstu: częściowo pasujący ciąg znaków Name[pt]=Completação de Texto: Correspondência Parcial Name[pt_BR]=Complementação de texto: Correspondência parcial +Name[ru]=Автодополнение: частичное совпадение Name[sk]=Doplnenie textu: čiastočná zhoda Name[sl]=Dopolnjevanje besedila: delno ujemanje Name[sr]=Допуна текста: делимично поклапање @@ -237,6 +245,7 @@ Comment[pl]=Istnieje więcej niż jeden pasujący ciąg znaków Comment[pt]=Existe mais de uma ocorrência possível Comment[pt_BR]=Existe mais que uma correspondência possível +Comment[ru]=Доступно более чем одно совпадение Comment[sk]=Existuje viac ako jedna zhoda Comment[sl]=Na voljo je več mogočih ujemanj Comment[sr]=Постоји више од једног могућег поклапања @@ -267,6 +276,7 @@ Name[pl]=Błąd krytyczny Name[pt]=Erro Fatal Name[pt_BR]=Erro fatal +Name[ru]=Критическая ошибка Name[sk]=Fatálna chyba Name[sl]=Usodna napaka Name[sr]=Кобна грешка @@ -293,6 +303,7 @@ 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 Comment[pt_BR]=Ocorreu um erro grave que causou o fechamento do programa +Comment[ru]=Произошла серьёзная ошибка, приведшая к завершению работы программы Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukončenie programu Comment[sl]=Prišlo je do resne napake, zaradi katere se je program končal Comment[sr]=Дошло је до озбиљне грешке због које је програм обустављен @@ -324,6 +335,7 @@ Name[pl]=Powiadomienie Name[pt]=Notificação Name[pt_BR]=Notificação +Name[ru]=Уведомление Name[sk]=Pripomienka Name[sl]=Obvestilo Name[sr]=Обавештење @@ -350,6 +362,7 @@ Comment[pl]=Coś niezwykłego stało się z programem Comment[pt]=Ocorreu algo de especial no programa Comment[pt_BR]=Algo especial aconteceu no programa +Comment[ru]=С программой произошло что-то странное Comment[sk]=V programe sa stalo niečo zvláštne Comment[sl]=V programu se je zgodilo nekaj posebnega Comment[sr]=Нешто посебно се догодило у програму @@ -380,6 +393,7 @@ Name[pl]=Ostrzeżenie Name[pt]=Aviso Name[pt_BR]=Aviso +Name[ru]=Предупреждение Name[sk]=Upozornenie Name[sl]=Opozorilo Name[sr]=Упозорење @@ -406,6 +420,7 @@ Comment[pl]=W programie wystąpił błąd, może powodować problemy Comment[pt]=Ocorreu um erro no programa que poderá provocar problemas Comment[pt_BR]=Ocorreu um erro no programa, que pode causar problemas +Comment[ru]=В программе произошла ошибка, которая может вызвать проблемы Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiť problémy Comment[sl]=V programu je prišlo do napake, ki lahko povzroči težave Comment[sr]=Дошло је до грешке у програму која може изазвати проблеме @@ -436,6 +451,7 @@ Name[pl]=Katastrofa Name[pt]=Catástrofe Name[pt_BR]=Catástrofe +Name[ru]=Катастрофа Name[sk]=Katastrofa Name[sl]=Katastrofa Name[sr]=Катастрофа @@ -462,6 +478,7 @@ 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 Comment[pt_BR]=Um erro muito sério aconteceu, que causou (no mínimo) o fechamento do programa +Comment[ru]=Произошла очень серьёзная ошибка, как минимум, вызвавшая завершение работы программы Comment[sk]=Nastala veľmi vážna chyba, ktorá zapríčinila minimálne ukončenie programu Comment[sl]=Prišlo je do zelo resne napake, zaradi katere se je program končal Comment[sr]=Дошло је до врло озбиљне грешке, због које је бар програм обустављен @@ -493,6 +510,7 @@ Name[pl]=Logowanie Name[pt]=Arranque Name[pt_BR]=Início de sessão +Name[ru]=Вход в систему Name[sk]=Prihlásenie Name[sl]=Prijava Name[sr]=Пријава @@ -519,6 +537,7 @@ Comment[pl]=Nowa sesja rozpoczyna się Comment[pt]=Está a iniciar uma nova sessão Comment[pt_BR]=Uma nova sessão está iniciando +Comment[ru]=Начинается новый сеанс Comment[sk]=Spúšťa sa nové sedenie Comment[sl]=Začenja se nova seja Comment[sr]=Покреће се нова сесија @@ -549,6 +568,7 @@ Name[pl]=Wylogowanie Name[pt]=Encerrar Name[pt_BR]=Encerramento de sessão +Name[ru]=Завершение сеанса Name[sk]=Odhlásenie Name[sl]=Odjava Name[sr]=Одјава @@ -575,6 +595,7 @@ Comment[pl]=Sesja kończy się Comment[pt]=A sessão está a ser encerrada Comment[pt_BR]=A sessão está sendo encerrada +Comment[ru]=Сеанс завершается Comment[sk]=Sedenie sa ukončuje Comment[sl]=Seja se končuje Comment[sr]=Сесија се напушта @@ -605,6 +626,7 @@ Name[pl]=Wylogowanie przerwane Name[pt]=Encerramento Cancelado Name[pt_BR]=Encerramento de sessão cancelado +Name[ru]=Завершение сеанса прервано Name[sk]=Odhlásenie prerušené Name[sl]=Odjava preklicana Name[sr]=Одјава отказана @@ -631,6 +653,7 @@ 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 +Comment[ru]=Выход из сеанса Plasma был отменён Comment[sk]=Odhlásenie Plasma bolo zrušené Comment[sl]=Odjava iz Plasme je bila preklicana Comment[sr]=Плазма одјављивање је отказано @@ -660,6 +683,7 @@ Name[pl]=Błąd drukowania Name[pt]=Erro de Impressão Name[pt_BR]=Erro de impressão +Name[ru]=Ошибка печати Name[sk]=Chyba tlače Name[sl]=Napaka med tiskanjem Name[sr]=Грешка штампања @@ -686,6 +710,7 @@ Comment[pl]=Wystąpił błąd drukowania Comment[pt]=Ocorreu um erro de impressão Comment[pt_BR]=Ocorreu um erro de impressão +Comment[ru]=Произошла ошибка печати Comment[sk]=Nastala chyba tlače Comment[sl]=Prišlo je do napake med tiskanjem Comment[sr]=Дошло је до грешке при штампању @@ -716,6 +741,7 @@ Name[pl]=Wiadomość informacyjna Name[pt]=Mensagem Informativa Name[pt_BR]=Mensagem informativa +Name[ru]=Информационное сообщение Name[sk]=Informačná správa Name[sl]=Sporočilo s podrobnostmi Name[sr]=Информативна порука @@ -742,6 +768,7 @@ Comment[pl]=Wyświetlana jest wiadomość informacyjna Comment[pt]=Está a ser apresentada uma mensagem informativa Comment[pt_BR]=Uma mensagem informativa está sendo mostrada +Comment[ru]=Показывается информационное сообщение Comment[sk]=Zobrazuje sa informačná správa Comment[sl]=Prikazano je bilo sporočilo s podrobnostmi Comment[sr]=Приказана је информативна порука @@ -772,6 +799,7 @@ Name[pl]=Wiadomość ostrzegająca Name[pt]=Mensagem de Aviso Name[pt_BR]=Mensagem de aviso +Name[ru]=Предупредительное сообщение Name[sk]=Varovná správa Name[sl]=Sporočilo z opozorilom Name[sr]=Упозоравајућа порука @@ -798,6 +826,7 @@ Comment[pl]=Wyświetlana jest wiadomość ostrzegająca Comment[pt]=Está a ser apresentada uma mensagem de aviso Comment[pt_BR]=Uma mensagem de aviso está sendo mostrada +Comment[ru]=Показывается сообщение с предупреждением Comment[sk]=Zobrazuje sa varovná správa Comment[sl]=Prikazano je bilo sporočilo z opozorilom Comment[sr]=Приказана је упозоравајућа порука @@ -828,6 +857,7 @@ Name[pl]=Wiadomość krytyczna Name[pt]=Mensagem Crítica Name[pt_BR]=Mensagem crítica +Name[ru]=Критическое сообщение Name[sk]=Kritická správa Name[sl]=Kritično sporočilo Name[sr]=Критична порука @@ -854,6 +884,7 @@ Comment[pl]=Wyświetlana jest wiadomość krytyczna Comment[pt]=Está a ser apresentada uma mensagem crítica Comment[pt_BR]=Uma mensagem crítica está sendo mostrada +Comment[ru]=Показывается критическое сообщение Comment[sk]=Zobrazuje sa kritická správa Comment[sl]=Prikazano je bilo kritično sporočilo Comment[sr]=Приказана је критична порука @@ -884,6 +915,7 @@ Name[pl]=Pytanie Name[pt]=Pergunta Name[pt_BR]=Pergunta +Name[ru]=Вопрос Name[sk]=Otázka Name[sl]=Vprašanje Name[sr]=Питање @@ -910,6 +942,7 @@ Comment[pl]=Zostało zadane pytanie Comment[pt]=Está a ser apresentada uma pergunta Comment[pt_BR]=Uma pergunta está sendo feita +Comment[ru]=Задаётся вопрос Comment[sk]=Kladie sa otázka Comment[sl]=Postavljeno je bilo vprašanje Comment[sr]=Нешто сте упитани @@ -941,6 +974,7 @@ Name[pl]=Sygnał dźwiękowy Name[pt]=Campainha Name[pt_BR]=Alarme sonoro +Name[ru]=Сигнал Name[sk]=Pípnutie Name[sl]=Pisk Name[sr]=Пиштање @@ -967,6 +1001,7 @@ Comment[pl]=Sygnał dźwiękowy Comment[pt]=Campainha de som Comment[pt_BR]=Som da campainha +Comment[ru]=Звуковой сигнал Comment[sk]=Zvuk zvončeka Comment[sl]=Zvonec Comment[sr]=Звучно звоно diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/ar/frameworkintegration5.po new/frameworkintegration-5.4.0/po/ar/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/ar/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/ar/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-06-24 09:35+0300\n" "Last-Translator: Safa Alfulaij <safa1996alful...@gmail.com>\n" "Language-Team: Arabic <d...@arabeyes.org>\n" @@ -17,11 +17,11 @@ "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "يفتح..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "يحفظ..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/ca/frameworkintegration5.po new/frameworkintegration-5.4.0/po/ca/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/ca/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/ca/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -9,7 +9,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-08-08 15:19+0200\n" "Last-Translator: Antoni Bella Pérez <antonibel...@orange.es>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" @@ -21,11 +21,11 @@ "X-Generator: Lokalize 1.5\n" "X-Accelerator-Marker: &\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "S'està obrint..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "S'està desant..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/cs/frameworkintegration5.po new/frameworkintegration-5.4.0/po/cs/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/cs/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/cs/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-16 09:56+0200\n" "Last-Translator: Vít Pelčák <v...@pelcak.org>\n" "Language-Team: Czech <kde-i18n-...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Otevírám..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Ukládám..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/da/frameworkintegration5.po new/frameworkintegration-5.4.0/po/da/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/da/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/da/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+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" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Åbner..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Gemmer..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/de/frameworkintegration5.po new/frameworkintegration-5.4.0/po/de/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/de/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/de/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-15 11:34+0200\n" "Last-Translator: Burkhard Lück <lu...@hube-lueck.de>\n" "Language-Team: German <kde-i18n...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Öffnen ..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Speichern ..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/en_GB/frameworkintegration5.po new/frameworkintegration-5.4.0/po/en_GB/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/en_GB/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/en_GB/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-06-28 13:00+0100\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" "Language-Team: British English <kde-l10n-en...@kde.org>\n" @@ -16,11 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Opening..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Saving..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/es/frameworkintegration5.po new/frameworkintegration-5.4.0/po/es/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/es/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/es/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-18 22:25+0200\n" "Last-Translator: Eloy Cuadra <ecua...@eloihr.net>\n" "Language-Team: Spanish <kde-l10n...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Abriendo..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Guardando..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/fi/frameworkintegration5.po new/frameworkintegration-5.4.0/po/fi/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/fi/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/fi/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-15 21:37+0300\n" "Last-Translator: Lasse Liehu <lasse.li...@gmail.com>\n" "Language-Team: Finnish <lokalisoi...@lists.coss.fi>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Avataan…" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Tallennetaan…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/gl/frameworkintegration5.po new/frameworkintegration-5.4.0/po/gl/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/gl/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/gl/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-05-12 23:11+0200\n" "Last-Translator: Marce Villarino <mvillar...@kde-espana.org>\n" "Language-Team: Galician <kde-i18n-...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Estase a abrir..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Estase a gardar..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/hu/frameworkintegration5.po new/frameworkintegration-5.4.0/po/hu/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/hu/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/hu/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-22 14:51+0200\n" "Last-Translator: Kristóf Kiszel <ulys...@kubuntu.org>\n" "Language-Team: Hungarian <kde-l10n...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Megnyitás…" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Mentés…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/ia/frameworkintegration5.po new/frameworkintegration-5.4.0/po/ia/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/ia/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/ia/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-22 13:55+0200\n" "Last-Translator: G.Sora <g.s...@tiscali.it>\n" "Language-Team: Interlingua <kde-l10n...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Aperiente ..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Salveguardante..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/it/frameworkintegration5.po new/frameworkintegration-5.4.0/po/it/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/it/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/it/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-25 17:05+0200\n" "Last-Translator: Vincenzo Reale <smart2...@baslug.org>\n" "Language-Team: Italian <kde-i18n...@kde.org>\n" @@ -15,13 +15,12 @@ "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 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Apertura in corso..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Salvataggio in corso..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/ja/frameworkintegration5.po new/frameworkintegration-5.4.0/po/ja/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/ja/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/ja/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -2,7 +2,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+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" @@ -14,11 +14,11 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/ko/frameworkintegration5.po new/frameworkintegration-5.4.0/po/ko/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/ko/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/ko/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-28 02:22+0900\n" "Last-Translator: Park Shinjo <k...@peremen.name>\n" "Language-Team: Korean <k...@peremen.name>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "여는 중..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "저장 중..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/lt/frameworkintegration5.po new/frameworkintegration-5.4.0/po/lt/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/lt/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/lt/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -7,7 +7,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-09-29 14:18+0100\n" "Last-Translator: Andrius Štikonas <andr...@stikonas.eu>\n" "Language-Team: none\n" @@ -19,11 +19,11 @@ "%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 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Atveriama..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Įrašoma..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/nds/frameworkintegration5.po new/frameworkintegration-5.4.0/po/nds/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/nds/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/nds/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-22 22:24+0200\n" "Last-Translator: Sönke Dibbern <s_dibb...@web.de>\n" "Language-Team: Low Saxon <kde-i18n-...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Bi to opmaken..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Bi to sekern..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/nl/frameworkintegration5.po new/frameworkintegration-5.4.0/po/nl/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/nl/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/nl/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-15 09:37+0200\n" "Last-Translator: Freek de Kruijf <freekdekru...@kde.nl>\n" "Language-Team: Dutch <kde-i18n...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Bezig met openen..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Bezig met opslaan..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/pa/frameworkintegration5.po new/frameworkintegration-5.4.0/po/pa/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/pa/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/pa/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-07-08 14:13-0500\n" "Last-Translator: A S Alam <aa...@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-us...@lists.sf.net>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "...ਖੋਲ੍ਹਿਆ ਜਾਂਦਾ ਹੈ" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/pl/frameworkintegration5.po new/frameworkintegration-5.4.0/po/pl/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/pl/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/pl/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-16 17:29+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" @@ -18,11 +18,11 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Otwieranie..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Zapisywanie..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/pt/frameworkintegration5.po new/frameworkintegration-5.4.0/po/pt/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/pt/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/pt/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -2,7 +2,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-03-29 12:31+0000\n" "Last-Translator: José Nuno Coelho Pires <zepi...@gmail.com>\n" "Language-Team: Portuguese <kde-i18n...@kde.org>\n" @@ -12,11 +12,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "A abrir..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "A gravar..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/pt_BR/frameworkintegration5.po new/frameworkintegration-5.4.0/po/pt_BR/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/pt_BR/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/pt_BR/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -7,7 +7,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-16 00:00-0300\n" "Last-Translator: André Marcelo Alvarenga <alvare...@kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt...@kde.org>\n" @@ -18,11 +18,11 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Abrindo..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Salvando..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/ro/frameworkintegration5.po new/frameworkintegration-5.4.0/po/ro/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/ro/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/ro/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-05-02 12:07+0300\n" "Last-Translator: Sergiu Bivol <ser...@ase.md>\n" "Language-Team: Romanian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "20)) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Se deschide..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Se salvează..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/ru/frameworkintegration5.po new/frameworkintegration-5.4.0/po/ru/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/ru/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/ru/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-06-25 04:16+0400\n" "Last-Translator: Alexander Potashev <aspotas...@gmail.com>\n" "Language-Team: Russian <kde-russ...@lists.kde.ru>\n" @@ -19,12 +19,12 @@ "X-Generator: Lokalize 1.5\n" # BUGME: "Выбор файла для открытия"? --aspotashev -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Открытие" # BUGME: "Выбор файла для сохранения"? --aspotashev -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Сохранение" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/sk/frameworkintegration5.po new/frameworkintegration-5.4.0/po/sk/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/sk/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/sk/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -4,7 +4,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-16 20:41+0200\n" "Last-Translator: Roman Paholík <wizzar...@gmail.com>\n" "Language-Team: Slovak <kde...@linux.sk>\n" @@ -15,11 +15,11 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Otvára sa..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Ukladám..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/sl/frameworkintegration5.po new/frameworkintegration-5.4.0/po/sl/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/sl/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/sl/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-06-11 11:46+0200\n" "Last-Translator: Andrej Mernik <andr...@ubuntu.si>\n" "Language-Team: Slovenian <lugos-...@lugos.si>\n" @@ -18,11 +18,11 @@ "%100==4 ? 3 : 0);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Odpiranje ..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Shranjevanje ..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/sr/frameworkintegration5.po new/frameworkintegration-5.4.0/po/sr/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/sr/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/sr/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -4,7 +4,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+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:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Отварам..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Уписујем..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/sr@ijekavian/frameworkintegration5.po new/frameworkintegration-5.4.0/po/sr@ijekavian/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/sr@ijekavian/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/sr@ijekavian/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -4,7 +4,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+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:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Отварам..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Уписујем..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/sr@ijekavianlatin/frameworkintegration5.po new/frameworkintegration-5.4.0/po/sr@ijekavianlatin/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -4,7 +4,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+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:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Otvaram..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Upisujem..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/sr@latin/frameworkintegration5.po new/frameworkintegration-5.4.0/po/sr@latin/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/sr@latin/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/sr@latin/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -4,7 +4,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+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:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Otvaram..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Upisujem..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/sv/frameworkintegration5.po new/frameworkintegration-5.4.0/po/sv/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/sv/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/sv/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-15 18:37+0200\n" "Last-Translator: Stefan Asserhäll <stefan.asserh...@bredband.net>\n" "Language-Team: Swedish <kde-i18n-...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Öppnar..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Sparar..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/tr/frameworkintegration5.po new/frameworkintegration-5.4.0/po/tr/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/tr/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/tr/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-06-03 20:33+0200\n" "Last-Translator: Volkan Gezer <volkange...@gmail.com>\n" "Language-Team: Turkish <kde-l10n...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Açılıyor..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Kaydediliyor..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/uk/frameworkintegration5.po new/frameworkintegration-5.4.0/po/uk/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/uk/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/uk/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-15 08:19+0300\n" "Last-Translator: Yuri Chornoivan <yurc...@ukr.net>\n" "Language-Team: Ukrainian <kde-i18n...@kde.org>\n" @@ -20,11 +20,11 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "Відкриття…" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "Збереження…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/zh_CN/frameworkintegration5.po new/frameworkintegration-5.4.0/po/zh_CN/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/zh_CN/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/zh_CN/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-07-16 15:21-0400\n" "Last-Translator: Weng Xuetian <wen...@gmail.com>\n" "Language-Team: Chinese Simplified <kde-i18n-...@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "正在打开..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "正在保存..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/po/zh_TW/frameworkintegration5.po new/frameworkintegration-5.4.0/po/zh_TW/frameworkintegration5.po --- old/frameworkintegration-5.3.0/po/zh_TW/frameworkintegration5.po 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/po/zh_TW/frameworkintegration5.po 2014-11-02 13:04:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-09-06 08:10+0000\n" +"POT-Creation-Date: 2014-10-24 08:06+0000\n" "PO-Revision-Date: 2014-04-22 10:04+0800\n" "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n" "Language-Team: Chinese Traditional <kde...@googlegroups.com>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Opening..." msgstr "開啟中..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:223 +#: platformtheme/kdeplatformfiledialoghelper.cpp:234 msgid "Saving..." msgstr "儲存中..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialoghelper.cpp new/frameworkintegration-5.4.0/src/platformtheme/kdeplatformfiledialoghelper.cpp --- old/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialoghelper.cpp 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/src/platformtheme/kdeplatformfiledialoghelper.cpp 2014-11-02 13:04:35.000000000 +0100 @@ -164,6 +164,17 @@ } } +void KDEPlatformFileDialog::setCustomLabel(QFileDialogOptions::DialogLabel label, const QString &text) +{ + if (label == QFileDialogOptions::Accept) { // OK button + m_fileWidget->okButton()->setText(text); + } else if (label == QFileDialogOptions::Reject) { // Cancel button + m_fileWidget->cancelButton()->setText(text); + } else if (label == QFileDialogOptions::LookIn) { // Location label + m_fileWidget->setLocationLabel(text); + } +} + QString KDEPlatformFileDialog::selectedNameFilter() { return m_fileWidget->filterWidget()->currentFilter(); @@ -228,11 +239,22 @@ dialog->setViewMode(options()->viewMode()); dialog->setFileMode(options()->fileMode()); + // custom labels + if (options()->isLabelExplicitlySet(QFileDialogOptions::Accept)) { // OK button + dialog->setCustomLabel(QFileDialogOptions::Accept, options()->labelText(QFileDialogOptions::Accept)); + } else if (options()->isLabelExplicitlySet(QFileDialogOptions::Reject)) { // Cancel button + dialog->setCustomLabel(QFileDialogOptions::Reject, options()->labelText(QFileDialogOptions::Reject)); + } else if (options()->isLabelExplicitlySet(QFileDialogOptions::LookIn)) { // Location label + dialog->setCustomLabel(QFileDialogOptions::LookIn, options()->labelText(QFileDialogOptions::LookIn)); + } + + // MIME filters QStringList filters = options()->mimeTypeFilters(); if (!filters.isEmpty()) { dialog->m_fileWidget->setMimeFilter(filters); } + // name filters QStringList nameFilters = options()->nameFilters(); if (!nameFilters.isEmpty()) { dialog->m_fileWidget->setFilter(qt2KdeFilter(nameFilters)); @@ -240,6 +262,11 @@ selectNameFilter(options()->initiallySelectedNameFilter()); } } + + // overwrite option + if (options()->testOption(QFileDialogOptions::FileDialogOption::DontConfirmOverwrite)) { + dialog->m_fileWidget->setConfirmOverwrite(false); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialoghelper.h new/frameworkintegration-5.4.0/src/platformtheme/kdeplatformfiledialoghelper.h --- old/frameworkintegration-5.3.0/src/platformtheme/kdeplatformfiledialoghelper.h 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/src/platformtheme/kdeplatformfiledialoghelper.h 2014-11-02 13:04:35.000000000 +0100 @@ -39,6 +39,7 @@ void selectFile(const QUrl &filename) Q_DECL_OVERRIDE; void setViewMode(QFileDialogOptions::ViewMode view); void setFileMode(QFileDialogOptions::FileMode mode); + void setCustomLabel(QFileDialogOptions::DialogLabel label, const QString & text); QString selectedNameFilter() Q_DECL_OVERRIDE; QList<QUrl> selectedFiles() Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.3.0/src/platformtheme/kfiletreeview.cpp new/frameworkintegration-5.4.0/src/platformtheme/kfiletreeview.cpp --- old/frameworkintegration-5.3.0/src/platformtheme/kfiletreeview.cpp 2014-10-04 18:56:48.000000000 +0200 +++ new/frameworkintegration-5.4.0/src/platformtheme/kfiletreeview.cpp 2014-11-02 13:04:35.000000000 +0100 @@ -21,7 +21,7 @@ #include "kfiletreeview_p.h" -#include <QtCore/QDir> +#include <QDir> #include <QContextMenuEvent> #include <QMenu> #include <QUrl> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org