Hello community, here is the log from the commit of package oxygen5 for openSUSE:Factory checked in at 2014-12-21 11:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen5 (Old) and /work/SRC/openSUSE:Factory/.oxygen5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen5" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen5/oxygen5.changes 2014-11-13 09:22:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen5.new/oxygen5.changes 2014-12-21 12:00:06.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Dec 11 18:00:04 UTC 2014 - [email protected] + +- Update to 5.1.2: + * Bugfix release + * Fixed color role for accelerator + * Added inputWidgetEngine, for abstract item views, line editors, + spinboxes and comboboxes it is needed to avoid animation + conflicts between lists and buttons (when, e.g. there is a + checkbox inside a list) + * Removed support for Q3ListView + * Manually calculate viewport update rect on header hover change + * Remove mnemonic underlines when alt-tabbing + * CMake: use the kde4workspace include dir + * CMake: fix searching for pkg-config + * Fixed member initialization removed unused headers + backported from breeze + * For more details please see: + https://www.kde.org/announcements/plasma-5.1.2.php + +------------------------------------------------------------------- Old: ---- oxygen-5.1.1.tar.xz New: ---- oxygen-5.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen5.spec ++++++ --- /var/tmp/diff_new_pack.w4S2Mr/_old 2014-12-21 12:00:09.000000000 +0100 +++ /var/tmp/diff_new_pack.w4S2Mr/_new 2014-12-21 12:00:09.000000000 +0100 @@ -19,7 +19,7 @@ %define kwin_deco 1 Name: oxygen5 -Version: 5.1.1 +Version: 5.1.2 Release: 0 Summary: Oxygen style, KWin decoration, cursors and sounds License: GPL-2.0+ ++++++ oxygen-5.1.1.tar.xz -> oxygen-5.1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/CMakeLists.txt new/oxygen-5.1.2/CMakeLists.txt --- old/oxygen-5.1.1/CMakeLists.txt 2014-11-06 16:44:33.000000000 +0100 +++ new/oxygen-5.1.2/CMakeLists.txt 2014-12-11 14:07:35.000000000 +0100 @@ -1,5 +1,5 @@ project(oxygen) -set(PROJECT_VERSION "5.1.1") +set(PROJECT_VERSION "5.1.2") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) @@ -38,7 +38,7 @@ ) ### XCB - include(FindPkgConfig) + find_package(PkgConfig) pkg_check_modules(XCB xcb x11-xcb) set(OXYGEN_HAVE_X11 ${XCB_FOUND}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/animations/oxygenanimations.cpp new/oxygen-5.1.2/kstyle/animations/oxygenanimations.cpp --- old/oxygen-5.1.1/kstyle/animations/oxygenanimations.cpp 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/animations/oxygenanimations.cpp 2014-12-11 13:53:39.000000000 +0100 @@ -70,6 +70,7 @@ registerEngine( _menuBarEngine = new MenuBarEngineV1( this ) ); registerEngine( _menuEngine = new MenuEngineV1( this ) ); registerEngine( _scrollBarEngine = new ScrollBarEngine( this ) ); + registerEngine( _inputWidgetEngine = new WidgetStateEngine( this ) ); registerEngine( _splitterEngine = new SplitterEngine( this ) ); registerEngine( _tabBarEngine = new TabBarEngine( this ) ); registerEngine( _toolBarEngine = new ToolBarEngine( this ) ); @@ -90,6 +91,7 @@ // enability _widgetEnabilityEngine->setEnabled( animationsEnabled && StyleConfigData::genericAnimationsEnabled() ); _widgetStateEngine->setEnabled( animationsEnabled && StyleConfigData::genericAnimationsEnabled() ); + _inputWidgetEngine->setEnabled( animationsEnabled && StyleConfigData::genericAnimationsEnabled() ); _comboBoxEngine->setEnabled( animationsEnabled && StyleConfigData::genericAnimationsEnabled() ); _toolButtonEngine->setEnabled( animationsEnabled && StyleConfigData::genericAnimationsEnabled() ); _toolBoxEngine->setEnabled( animationsEnabled && StyleConfigData::genericAnimationsEnabled() ); @@ -207,6 +209,7 @@ // durations _widgetEnabilityEngine->setDuration( StyleConfigData::genericAnimationsDuration() ); _widgetStateEngine->setDuration( StyleConfigData::genericAnimationsDuration() ); + _inputWidgetEngine->setDuration( StyleConfigData::genericAnimationsDuration() ); _comboBoxEngine->setDuration( StyleConfigData::genericAnimationsDuration() ); _toolButtonEngine->setDuration( StyleConfigData::genericAnimationsDuration() ); _toolBoxEngine->setDuration( StyleConfigData::genericAnimationsDuration() ); @@ -308,24 +311,24 @@ // editors else if( qobject_cast<QComboBox*>( widget ) ) { _comboBoxEngine->registerWidget( widget, AnimationHover ); - _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); + _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } else if( qobject_cast<QSpinBox*>( widget ) ) { _spinBoxEngine->registerWidget( widget ); - _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); + _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } - else if( qobject_cast<QLineEdit*>( widget ) ) { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } - else if( qobject_cast<QTextEdit*>( widget ) ) { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } - else if( widget->inherits( "KTextEditor::View" ) ) { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + else if( qobject_cast<QLineEdit*>( widget ) ) { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + else if( qobject_cast<QTextEdit*>( widget ) ) { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + else if( widget->inherits( "KTextEditor::View" ) ) { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } // lists - else if( qobject_cast<QAbstractItemView*>( widget ) || widget->inherits("Q3ListView") ) - { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + else if( qobject_cast<QAbstractItemView*>( widget ) ) + { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } // scrollarea else if( QAbstractScrollArea* scrollArea = qobject_cast<QAbstractScrollArea*>( widget ) ) { if( scrollArea->frameShadow() == QFrame::Sunken && (widget->focusPolicy()&Qt::StrongFocus) ) - { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/animations/oxygenanimations.h new/oxygen-5.1.2/kstyle/animations/oxygenanimations.h --- old/oxygen-5.1.1/kstyle/animations/oxygenanimations.h 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/animations/oxygenanimations.h 2014-12-11 13:53:39.000000000 +0100 @@ -85,6 +85,10 @@ WidgetStateEngine& toolButtonEngine( void ) const { return *_toolButtonEngine; } + //! item view engine + WidgetStateEngine& inputWidgetEngine( void ) const + { return *_inputWidgetEngine; } + //! splitter engine SplitterEngine& splitterEngine( void ) const { return *_splitterEngine; } @@ -170,6 +174,9 @@ //! mennu toolbutton arrow hover effect WidgetStateEngine* _toolButtonEngine; + //! item view engine + WidgetStateEngine* _inputWidgetEngine; + //! QSplitter engine SplitterEngine* _splitterEngine; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/animations/oxygenbusyindicatorengine.cpp new/oxygen-5.1.2/kstyle/animations/oxygenbusyindicatorengine.cpp --- old/oxygen-5.1.1/kstyle/animations/oxygenbusyindicatorengine.cpp 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/animations/oxygenbusyindicatorengine.cpp 2014-12-11 13:53:39.000000000 +0100 @@ -35,7 +35,8 @@ //_______________________________________________ BusyIndicatorEngine::BusyIndicatorEngine( QObject* object ): BaseEngine( object ), - _animation( new Animation( duration(), this ) ) + _animation( new Animation( duration(), this ) ), + _value( 0 ) { // setup animation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/animations/oxygenheaderviewdata.cpp new/oxygen-5.1.2/kstyle/animations/oxygenheaderviewdata.cpp --- old/oxygen-5.1.1/kstyle/animations/oxygenheaderviewdata.cpp 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/animations/oxygenheaderviewdata.cpp 2014-12-11 13:53:39.000000000 +0100 @@ -30,6 +30,7 @@ #include "oxygenheaderviewdata.moc" #include <QHoverEvent> +#include <QTextStream> namespace Oxygen { @@ -39,8 +40,6 @@ AnimationData( parent, target ) { - target->installEventFilter( this ); - _current._animation = new Animation( duration, this ); setupAnimation( currentIndexAnimation(), "currentOpacity" ); currentIndexAnimation().data()->setDirection( Animation::Forward ); @@ -60,7 +59,7 @@ const QHeaderView* local( qobject_cast<const QHeaderView*>( target().data() ) ); if( !local ) return false; - int index( local->logicalIndexAt( position ) ); + const int index( local->logicalIndexAt( position ) ); if( index < 0 ) return false; if( hovered ) @@ -135,4 +134,29 @@ } + + //__________________________________________________________ + void HeaderViewData::setDirty( void ) const + { + QHeaderView* header = qobject_cast<QHeaderView*>( target().data() ); + if( !header ) return; + + // get first and last index, sorted + const int lastIndex( qMax( previousIndex(), currentIndex() ) ); + if( lastIndex < 0 ) return; + + int firstIndex( qMin( previousIndex(), currentIndex() ) ); + if( firstIndex < 0 ) firstIndex = lastIndex; + + // find relevant rectangle to be updated, in viewport coordinate + QWidget* viewport( header->viewport() ); + const int left = header->sectionViewportPosition( firstIndex ); + const int right = header->sectionViewportPosition( lastIndex ) + header->sectionSize( lastIndex ); + + // trigger update + if( header->orientation() == Qt::Horizontal ) viewport->update( left, 0, right-left, header->height() ); + else viewport->update( 0, left, header->width(), right-left ); + + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/animations/oxygenheaderviewdata.h new/oxygen-5.1.2/kstyle/animations/oxygenheaderviewdata.h --- old/oxygen-5.1.1/kstyle/animations/oxygenheaderviewdata.h 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/animations/oxygenheaderviewdata.h 2014-12-11 13:53:39.000000000 +0100 @@ -131,7 +131,7 @@ protected: //! dirty - inline virtual void setDirty( void ) const; + virtual void setDirty( void ) const; private: @@ -159,20 +159,6 @@ }; - - //__________________________________________________________ - void HeaderViewData::setDirty( void ) const - { - if( QHeaderView* header = qobject_cast<QHeaderView*>( target().data() ) ) - { - const int firstIndex( qMin( previousIndex(), currentIndex() ) ); - const int lastIndex( qMax( previousIndex(), currentIndex() ) ); - if( firstIndex >= 0 ) header->headerDataChanged( header->orientation(), firstIndex, lastIndex ); - else if( lastIndex >= 0 ) header->headerDataChanged( header->orientation(), lastIndex, lastIndex ); - } - } - - } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/animations/oxygentoolboxengine.h new/oxygen-5.1.2/kstyle/animations/oxygentoolboxengine.h --- old/oxygen-5.1.1/kstyle/animations/oxygentoolboxengine.h 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/animations/oxygentoolboxengine.h 2014-12-11 13:53:39.000000000 +0100 @@ -34,7 +34,7 @@ namespace Oxygen { - //! QToolBox animation engine + //* QToolBox animation engine class ToolBoxEngine: public BaseEngine { @@ -42,45 +42,45 @@ public: - //! constructor + //* constructor explicit ToolBoxEngine( QObject* parent ): BaseEngine( parent ) {} - //! destructor + //* destructor virtual ~ToolBoxEngine( void ) {} - //! enability + //* enability virtual void setEnabled( bool value ) { BaseEngine::setEnabled( value ); _data.setEnabled( value ); } - //! duration + //* duration virtual void setDuration( int value ) { BaseEngine::setDuration( value ); _data.setDuration( value ); } - //! register widget + //* register widget virtual bool registerWidget( QWidget* ); - //! true if widget hover state is changed + //* true if widget hover state is changed virtual bool updateState( const QPaintDevice*, bool ); - //! true if widget is animated + //* true if widget is animated virtual bool isAnimated( const QPaintDevice* ); - //! animation opacity + //* animation opacity virtual qreal opacity( const QPaintDevice* object ) { return isAnimated( object ) ? data( object ).data()->opacity(): AnimationData::OpacityInvalid; } public Q_SLOTS: - //! remove widget from map + //* remove widget from map virtual bool unregisterWidget( QObject* data ) { @@ -94,19 +94,13 @@ protected: - //! returns data associated to widget + //* returns data associated to widget PaintDeviceDataMap<WidgetStateData>::Value data( const QPaintDevice* object ) { return _data.find( object ).data(); } private: - //! engine enability - bool _enabled; - - //! animation duration - int _duration; - - //! map + //* map PaintDeviceDataMap<WidgetStateData> _data; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/oxygenframeshadow.cpp new/oxygen-5.1.2/kstyle/oxygenframeshadow.cpp --- old/oxygen-5.1.1/kstyle/oxygenframeshadow.cpp 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/oxygenframeshadow.cpp 2014-12-11 13:53:39.000000000 +0100 @@ -282,7 +282,7 @@ // grab viewport widget QWidget *viewport( FrameShadowBase::viewport() ); - if( !viewport && parentWidget() && parentWidget()->inherits( "Q3ListView" ) ) + if( !viewport && parentWidget() ) { viewport = parentWidget(); } // set cursor from viewport diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/oxygenmnemonics.cpp new/oxygen-5.1.2/kstyle/oxygenmnemonics.cpp --- old/oxygen-5.1.1/kstyle/oxygenmnemonics.cpp 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/oxygenmnemonics.cpp 2014-12-11 13:53:39.000000000 +0100 @@ -74,6 +74,12 @@ { setEnabled( false ); } break; + #if QT_VERSION >= 0x050000 + case QEvent::ApplicationStateChange: + { setEnabled( false ); } + break; + #endif + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kstyle/oxygenstyle.cpp new/oxygen-5.1.2/kstyle/oxygenstyle.cpp --- old/oxygen-5.1.1/kstyle/oxygenstyle.cpp 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kstyle/oxygenstyle.cpp 2014-12-11 13:53:39.000000000 +0100 @@ -3139,15 +3139,15 @@ const bool hasFocus( enabled && isInputWidget && ( state & State_HasFocus ) ); // assume focus takes precedence over hover - _animations->widgetStateEngine().updateState( widget, AnimationFocus, hasFocus ); - _animations->widgetStateEngine().updateState( widget, AnimationHover, mouseOver && !hasFocus ); + _animations->inputWidgetEngine().updateState( widget, AnimationFocus, hasFocus ); + _animations->inputWidgetEngine().updateState( widget, AnimationHover, mouseOver && !hasFocus ); if( state & State_Sunken ) { // retrieve animation mode and opacity - const AnimationMode mode( _animations->widgetStateEngine().frameAnimationMode( widget ) ); - const qreal opacity( _animations->widgetStateEngine().frameOpacity( widget ) ); + const AnimationMode mode( _animations->inputWidgetEngine().frameAnimationMode( widget ) ); + const qreal opacity( _animations->inputWidgetEngine().frameOpacity( widget ) ); if( _frameShadowFactory->isRegistered( widget ) ) { @@ -3205,12 +3205,12 @@ const bool hasFocus( enabled && ( state & State_HasFocus ) ); // assume focus takes precedence over hover - _animations->widgetStateEngine().updateState( widget, AnimationFocus, hasFocus ); - _animations->widgetStateEngine().updateState( widget, AnimationHover, mouseOver && !hasFocus ); + _animations->inputWidgetEngine().updateState( widget, AnimationFocus, hasFocus ); + _animations->inputWidgetEngine().updateState( widget, AnimationHover, mouseOver && !hasFocus ); // retrieve animation mode and opacity - const AnimationMode mode( _animations->widgetStateEngine().frameAnimationMode( widget ) ); - const qreal opacity( _animations->widgetStateEngine().frameOpacity( widget ) ); + const AnimationMode mode( _animations->inputWidgetEngine().frameAnimationMode( widget ) ); + const qreal opacity( _animations->inputWidgetEngine().frameOpacity( widget ) ); // fill painter->setPen( Qt::NoPen ); @@ -5154,7 +5154,7 @@ { QString accelerator( text.mid( tabPosition + 1 ) ); text = text.left( tabPosition ); - drawItemText( painter, textRect, Qt::AlignRight | Qt::AlignVCenter | _mnemonics->textFlags(), palette, enabled, accelerator, QPalette::WindowText ); + drawItemText( painter, textRect, Qt::AlignRight | Qt::AlignVCenter | _mnemonics->textFlags(), palette, enabled, accelerator, textRole ); } // render text @@ -6876,8 +6876,8 @@ // editable combobox. Make it look like a LineEdit // focus takes precedence over hover - _animations->widgetStateEngine().updateState( widget, AnimationFocus, hasFocus ); - _animations->widgetStateEngine().updateState( widget, AnimationHover, mouseOver && !hasFocus ); + _animations->inputWidgetEngine().updateState( widget, AnimationFocus, hasFocus ); + _animations->inputWidgetEngine().updateState( widget, AnimationHover, mouseOver && !hasFocus ); // input area painter->setRenderHint( QPainter::Antialiasing ); @@ -6901,11 +6901,11 @@ // non editable combobox. Make it look like a PushButton // hover takes precedence over focus - _animations->widgetStateEngine().updateState( widget, AnimationHover, mouseOver ); - _animations->widgetStateEngine().updateState( widget, AnimationFocus, hasFocus && !mouseOver ); + _animations->inputWidgetEngine().updateState( widget, AnimationHover, mouseOver ); + _animations->inputWidgetEngine().updateState( widget, AnimationFocus, hasFocus && !mouseOver ); - const AnimationMode mode( _animations->widgetStateEngine().buttonAnimationMode( widget ) ); - const qreal opacity( _animations->widgetStateEngine().buttonOpacity( widget ) ); + const AnimationMode mode( _animations->inputWidgetEngine().buttonAnimationMode( widget ) ); + const qreal opacity( _animations->inputWidgetEngine().buttonOpacity( widget ) ); // blend button color to the background const QColor buttonColor( _helper->backgroundColor( palette.color( QPalette::Button ), widget, rect.center() ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/kwin-decoration/CMakeLists.txt new/oxygen-5.1.2/kwin-decoration/CMakeLists.txt --- old/oxygen-5.1.1/kwin-decoration/CMakeLists.txt 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/kwin-decoration/CMakeLists.txt 2014-12-11 13:53:39.000000000 +0100 @@ -4,6 +4,7 @@ if(OXYGEN_USE_KDE4) include_directories(${CMAKE_SOURCE_DIR}/liboxygen) include_directories(${CMAKE_BINARY_DIR}/liboxygen) + include_directories(${KDE4WORKSPACE_INCLUDE_DIR}) endif() add_subdirectory(config) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/lookandfeel/metadata.desktop new/oxygen-5.1.2/lookandfeel/metadata.desktop --- old/oxygen-5.1.1/lookandfeel/metadata.desktop 2014-11-06 16:31:45.000000000 +0100 +++ new/oxygen-5.1.2/lookandfeel/metadata.desktop 2014-12-11 13:53:39.000000000 +0100 @@ -8,6 +8,8 @@ Comment[es]=Lenguaje de diseño del escritorio Oxígeno Comment[fi]=Työpöydän design-kieli Oxygen Comment[hu]=Oxygen asztali designnyelv +Comment[it]=Linguaggio di progettazione del desktop Oxygen +Comment[lt]=Oxygen darbastalio dizaino kalba Comment[nb]=Oxygen språk for skrivebordsdesign Comment[nl]=Ontwerptaal van Oxygen bureaublad Comment[pl]=Tlen - język projektowania pulpitu @@ -24,29 +26,26 @@ Comment[x-test]=xxOxygen Desktop Design Languagexx Comment[zh_CN]=Oxygen 桌面设计语言 Encoding=UTF-8 -Keywords=Desktop, Workspace, Appearance, Look and Feel, Logout, Lock, Suspend, Shutdown, Hibernate, -Keywords[ca]=Escriptori, Espai de treball, Aparença, Aparença i comportament, Sortida, Bloqueig, Suspensió, Aturada, Hibernació, -Keywords[de]=Desktop,Arbeitsfläche,Erscheinungsbild,Erscheinungsbild und Verhalten,Abmelden,Sperren,Ruhezustand,Tiefschlaf,Herunterfahren -Keywords[el]=Επιφάνεια εργασίας, Χώρος εργασίας, Εμφάνιση, Όψη και Αίσθηση, Αποσύνδεση, Κλείδωμα, Αναστολή, Τερματισμός, Νάρκη, -Keywords[en_GB]=Desktop, Workspace, Appearance, Look and Feel, Logout, Lock, Suspend, Shutdown, Hibernate, -Keywords[es]=Escritorio, Espacio de trabajo, Apariencia, Aspecto, Cerrar sesión, Bloquear, Suspender, Apagar, Hibernar, -Keywords[fi]=Desktop, Workspace, Appearance, Look and Feel, Logout, Lock, Suspend, Shutdown, Hibernate, Työpöytä, Työtila, Ulkoasu, Ulkoasu ja tuntuma, Kirjaudu ulos, Lukitse, Valmiustila, Sammuta, Lepotila -Keywords[hu]=Asztal, Munkaterület, Megjelenés, Kinézet, Kijelentkezés, Zárolás, Felfüggesztés, Leállítás, Hibernálás -Keywords[nb]=Skrivebord, Arbeidsflate, Utseende, Utseende og oppførsel, Logg ut, Lås, Hvile, Slå av, Dvale, -Keywords[nl]=Bureaublad, werkruimte, uiterlijk, uiterlijk en gedrag, afmelden, vergrendelen, onderbreken, afsluiten, slapen, -Keywords[pl]=Pulpit, Przestrzeń robocza, Wygląd, Wygląd i Odczucia, Wylogowanie, Zablokowanie , Wstrzymanie, Zamknięcie, Hibernowanie, -Keywords[pt_BR]=Área de trabalho, Espaço de trabalho, Aparência, Visual, Sair, Bloquear, Suspender, Desligar, Hibernar, -Keywords[ru]=Desktop, Workspace, Appearance, Look and Feel, Logout, Lock, Suspend, Shutdown, Hibernate, рабочий стол, рабочая среда, внешний вид, визуальное представление, выход, завершение сеанса, блокировка, приостановка работы, завершение работы, выключение, спящий режим, ждущий режим -Keywords[sk]=Plocha, pracovná plocha, vzhľad, nastavenie, odhlásenie, zamknutie, uspanie, vypnutie, hibernácia, -Keywords[sl]=Namizje, delovni prostor, videz, videz in občutek, odjava, zaklep, pripravljenost, izklop, mirovanje, -Keywords[sr]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;површ;радни простор;изглед;осећај;одјава;закључавање;суспендовање;гашење;искључивање;спавање -Keywords[sr@ijekavian]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;површ;радни простор;изглед;осећај;одјава;закључавање;суспендовање;гашење;искључивање;спавање -Keywords[sr@ijekavianlatin]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;površ;radni prostor;izgled;osećaj;odjava;zaključavanje;suspendovanje;gašenje;isključivanje;spavanje -Keywords[sr@latin]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;površ;radni prostor;izgled;osećaj;odjava;zaključavanje;suspendovanje;gašenje;isključivanje;spavanje -Keywords[sv]=Skrivbord, Arbetsområde, Utseende, Utseende och känsla, Utloggning, Lås, Viloläge, Avstängning, Dvala, -Keywords[uk]=Desktop,Workspace,Appearance,Look and Feel,Logout,Lock,Suspend,Shutdown,Hibernate,стільниця,робочий простір,воркспейс,вигляд,вигляд і поведінка,вихід,вийти,заблокувати,замкнути,призупинити,вимкнути,приспати, -Keywords[x-test]=xxDesktop, Workspace, Appearance, Look and Feel, Logout, Lock, Suspend, Shutdown, Hibernate,xx -Keywords[zh_CN]=Desktop, Workspace, Appearance, Look and Feel, Logout, Lock, Suspend, Shutdown, Hibernate, 桌面,工作空间,外观,观感,注销,锁定,待机,关机,休眠 +Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate; +Keywords[ca]=Escriptori;Espai de treball;Aparença;Aparença i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació; +Keywords[de]=Desktop;Arbeitsfläche;Erscheinungsbild;Erscheinungsbild und Verhalten;Abmelden;Sperren;Ruhezustand;Tiefschlaf;Herunterfahren; +Keywords[el]=Επιφάνεια εργασίας;Χώρος εργασίας; Εμφάνιση;Όψη και Αίσθηση;Αποσύνδεση;Κλείδωμα;Αναστολή;Τερματισμός;Νάρκη; +Keywords[en_GB]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate; +Keywords[es]=Escritorio;Espacio de trabajo;Apariencia;Aspecto;Cerrar sesión;Bloquear;Suspender;Apagar;Hibernar; +Keywords[fi]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;Työpöytä;Työtila;Ulkoasu;Ulkoasu ja tuntuma;Kirjaudu ulos;Lukitse;Valmiustila;Sammuta;Lepotila; +Keywords[it]=Desktop;spazio di lavoro;aspetto;chiusura della sessione;blocco;sospensione;spegnimento;ibernazione; +Keywords[nl]=Bureaublad;Werkruimte;Uiterlijk;Uiterlijk en gedrag;Afmelden;Vergrendelen;Onderbreken;Afsluiten;Slapen; +Keywords[pl]=Pulpit;Przestrzeń robocza;Wygląd;Wygląd i Odczucia;Wylogowanie;Zablokowanie ;Wstrzymanie;Zamknięcie;Hibernowanie; +Keywords[pt_BR]=Área de trabalho;Espaço de trabalho;Aparência;Aparência e Comportamento;Encerrar sessão;Bloquear;Suspender;Desligar;Hibernar; +Keywords[sk]=Plocha;pracovná plocha;vzhľad;nastavenie;odhlásenie;zamknutie;uspanie;vypnutie;hibernácia; +Keywords[sl]=Namizje;delovni prostor;videz;videz in občutek;odjava;zaklep;pripravljenost;izklop;mirovanje; +Keywords[sr]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;површ;радни простор;изглед;осећај;одјава;закључавање;суспендовање;гашење;искључивање;спавање; +Keywords[sr@ijekavian]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;површ;радни простор;изглед;осећај;одјава;закључавање;суспендовање;гашење;искључивање;спавање; +Keywords[sr@ijekavianlatin]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;površ;radni prostor;izgled;osećaj;odjava;zaključavanje;suspendovanje;gašenje;isključivanje;spavanje; +Keywords[sr@latin]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;površ;radni prostor;izgled;osećaj;odjava;zaključavanje;suspendovanje;gašenje;isključivanje;spavanje; +Keywords[uk]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;стільниця;робочий простір;воркспейс;вигляд;вигляд і поведінка;вихід;вийти;заблокувати;замкнути;призупинити;вимкнути;приспати; +Keywords[x-test]=xxDesktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;xx +Keywords[zh_CN]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;桌面;工作空间;外观;观感;注销;锁定;待机;关机;休眠 Name=Oxygen Name[af]=Oxygen Name[ar]=أكسجين diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/po/fi/oxygen_style_config.po new/oxygen-5.1.2/po/fi/oxygen_style_config.po --- old/oxygen-5.1.1/po/fi/oxygen_style_config.po 2014-11-06 16:36:29.000000000 +0100 +++ new/oxygen-5.1.2/po/fi/oxygen_style_config.po 2014-12-11 13:56:54.000000000 +0100 @@ -16,7 +16,7 @@ "POT-Creation-Date: 2014-10-01 08:56+0000\n" "PO-Revision-Date: 2014-10-29 17:33+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" -"Language-Team: Finnish <[email protected]>\n" +"Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/po/fi/oxygen_style_demo.po new/oxygen-5.1.2/po/fi/oxygen_style_demo.po --- old/oxygen-5.1.1/po/fi/oxygen_style_demo.po 2014-11-06 16:36:29.000000000 +0100 +++ new/oxygen-5.1.2/po/fi/oxygen_style_demo.po 2014-12-11 13:56:54.000000000 +0100 @@ -16,7 +16,7 @@ "POT-Creation-Date: 2014-09-27 09:14+0000\n" "PO-Revision-Date: 2014-10-29 17:33+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" -"Language-Team: Finnish <[email protected]>\n" +"Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/po/lt/oxygen_style_demo.po new/oxygen-5.1.2/po/lt/oxygen_style_demo.po --- old/oxygen-5.1.1/po/lt/oxygen_style_demo.po 2014-11-06 16:38:54.000000000 +0100 +++ new/oxygen-5.1.2/po/lt/oxygen_style_demo.po 2014-12-11 14:00:34.000000000 +0100 @@ -3,14 +3,14 @@ # Donatas Glodenis <[email protected]>, 2005. # Tomas Straupis <[email protected]>, 2011. # Remigijus Jarmalavičius <[email protected]>, 2011. -# Liudas Ališauskas <[email protected]>, 2012, 2013. +# Liudas Ališauskas <[email protected]>, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: kstyle_config\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-09-27 09:14+0000\n" -"PO-Revision-Date: 2013-04-29 00:03+0300\n" -"Last-Translator: Liudas Ališauskas <[email protected]>\n" +"PO-Revision-Date: 2014-11-11 07:22+0200\n" +"Last-Translator: Liudas Ališauskas <[email protected]>\n" "Language-Team: Lithuanian <[email protected]>\n" "Language: lt\n" "MIME-Version: 1.0\n" @@ -112,13 +112,11 @@ #: oxygendemodialog.cpp:142 msgid "MDI Windows" -msgstr "" +msgstr "MDI langai" #: oxygendemodialog.cpp:144 -#, fuzzy -#| msgid "Shows the appearance of tab widgets" msgid "Shows the appearance of MDI windows" -msgstr "Rodo kortelių elementų išvaizdą" +msgstr "Rodo MDI langų išvaizdą" #: oxygendemodialog.cpp:152 msgid "Sliders" @@ -146,7 +144,7 @@ #: oxygenmdidemowidget.cpp:50 msgid "Layout" -msgstr "" +msgstr "Išdėstymas" #: oxygenmdidemowidget.cpp:51 msgid "Tile" @@ -157,10 +155,8 @@ msgstr "Laiptuotai" #: oxygenmdidemowidget.cpp:54 -#, fuzzy -#| msgid "Toolbox" msgid "Tools" -msgstr "Įrankinė" +msgstr "Įrankiai" #: oxygenmdidemowidget.cpp:56 msgid "Select Next Window" @@ -236,10 +232,8 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioButton_3) #: ui/oxygenbuttondemowidget.ui:110 -#, fuzzy -#| msgid "Third Choice" msgid "&Third Choice" -msgstr "Trečias pasirinkimas" +msgstr "&Trečias pasirinkimas" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: ui/oxygenbuttondemowidget.ui:135 @@ -347,8 +341,6 @@ #. i18n: ectx: property (text), widget (QLabel, label_2) #. i18n: ectx: property (text), widget (QLabel, label_11) #: ui/oxygenbuttondemowidget.ui:438 ui/oxygentabdemowidget.ui:81 -#, fuzzy -#| msgid "Text position:" msgid "Te&xt position:" msgstr "Teksto pozicija:" @@ -377,8 +369,6 @@ #. i18n: ectx: property (text), widget (QLabel, label_12) #: ui/oxygenbuttondemowidget.ui:488 -#, fuzzy -#| msgid "Icon size:" msgid "Icon si&ze:" msgstr "Piktogramos dydis:" @@ -409,10 +399,8 @@ #. i18n: ectx: property (text), widget (QLabel, label) #: ui/oxygenframedemowidget.ui:31 -#, fuzzy -#| msgid "Layout direction:" msgid "&Layout direction:" -msgstr "Išdėstymo kryptis:" +msgstr "&Išdėstymo kryptis:" #. i18n: ectx: property (text), item, widget (KComboBox, directionComboBox) #: ui/oxygenframedemowidget.ui:45 @@ -452,8 +440,6 @@ #. i18n: ectx: property (text), widget (QRadioButton, sunkenFrameRadioButton) #: ui/oxygenframedemowidget.ui:124 -#, fuzzy -#| msgid "Sunken" msgid "S&unken" msgstr "Nuleistas" @@ -758,10 +744,8 @@ #. i18n: ectx: property (text), widget (QLabel, label) #: ui/oxygentabdemowidget.ui:31 -#, fuzzy -#| msgid "Tab position:" msgid "&Tab position:" -msgstr "Kortelių pozicija:" +msgstr "&Kortelės pozicija:" #. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox) #: ui/oxygentabdemowidget.ui:45 @@ -795,10 +779,8 @@ #. i18n: ectx: property (text), widget (QCheckBox, tabCloseButtonsCheckBox) #: ui/oxygentabdemowidget.ui:129 -#, fuzzy -#| msgid "Show Corner Buttons" msgid "Show Tab Close Buttons" -msgstr "Rodyti centravimo mygtukus" +msgstr "Rodyti kortelės uždarymo mygtukus" #. i18n: ectx: property (text), widget (QCheckBox, tabBarVisibilityCheckBox) #: ui/oxygentabdemowidget.ui:136 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/po/nb/oxygen_kwin_deco.po new/oxygen-5.1.2/po/nb/oxygen_kwin_deco.po --- old/oxygen-5.1.1/po/nb/oxygen_kwin_deco.po 2014-11-06 16:39:20.000000000 +0100 +++ new/oxygen-5.1.2/po/nb/oxygen_kwin_deco.po 2014-12-11 14:02:07.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kwin_clients\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-09-27 09:14+0000\n" +"POT-Creation-Date: 2014-10-23 09:23+0000\n" "PO-Revision-Date: 2013-11-04 09:57+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -69,19 +69,25 @@ msgid "Animations" msgstr "Animasjoner" -#: config/oxygenexceptionlistwidget.cpp:197 -msgid "Question - Oxygen Settings" -msgstr "Spørsmål – innstillinger for Oxygen" +#: config/oxygenexceptionlistwidget.cpp:198 +msgid "Question - Breeze Settings" +msgstr "" -#: config/oxygenexceptionlistwidget.cpp:197 +#: config/oxygenexceptionlistwidget.cpp:198 msgid "Remove selected exception?" msgstr "Fjern det valgte unntaket?" -#: config/oxygenexceptionlistwidget.cpp:338 +#. i18n: ectx: property (text), widget (QPushButton, removeButton) +#: config/oxygenexceptionlistwidget.cpp:199 +#: config/ui/oxygenexceptionlistwidget.ui:79 +msgid "Remove" +msgstr "Fjern" + +#: config/oxygenexceptionlistwidget.cpp:343 msgid "Warning - Oxygen Settings" msgstr "Advarsel – Oxygen-innstillinger" -#: config/oxygenexceptionlistwidget.cpp:338 +#: config/oxygenexceptionlistwidget.cpp:343 msgid "Regular Expression syntax is incorrect" msgstr "Syntaksfeil i regulært uttrykk" @@ -119,63 +125,72 @@ #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:53 config/ui/oxygenexceptiondialog.ui:177 +#: config/ui/oxygenconfigurationui.ui:53 +#: config/ui/oxygenexceptiondialog.ui:177 msgctxt "@item:inlistbox Border size:" msgid "No Border" msgstr "Ingen kanter" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:58 config/ui/oxygenexceptiondialog.ui:182 +#: config/ui/oxygenconfigurationui.ui:58 +#: config/ui/oxygenexceptiondialog.ui:182 msgctxt "@item:inlistbox Border size:" msgid "No Side Borders" msgstr "Ingen sidekanter" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:63 config/ui/oxygenexceptiondialog.ui:187 +#: config/ui/oxygenconfigurationui.ui:63 +#: config/ui/oxygenexceptiondialog.ui:187 msgctxt "@item:inlistbox Border size:" msgid "Tiny" msgstr "Bitteliten" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:68 config/ui/oxygenexceptiondialog.ui:192 +#: config/ui/oxygenconfigurationui.ui:68 +#: config/ui/oxygenexceptiondialog.ui:192 msgctxt "@item:inlistbox Border size:" msgid "Normal" msgstr "Normal" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:73 config/ui/oxygenexceptiondialog.ui:197 +#: config/ui/oxygenconfigurationui.ui:73 +#: config/ui/oxygenexceptiondialog.ui:197 msgctxt "@item:inlistbox Border size:" msgid "Large" msgstr "Stor" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:78 config/ui/oxygenexceptiondialog.ui:202 +#: config/ui/oxygenconfigurationui.ui:78 +#: config/ui/oxygenexceptiondialog.ui:202 msgctxt "@item:inlistbox Border size:" msgid "Very Large" msgstr "Svært stor" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:83 config/ui/oxygenexceptiondialog.ui:207 +#: config/ui/oxygenconfigurationui.ui:83 +#: config/ui/oxygenexceptiondialog.ui:207 msgctxt "@item:inlistbox Border size:" msgid "Huge" msgstr "Enorm" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:88 config/ui/oxygenexceptiondialog.ui:212 +#: config/ui/oxygenconfigurationui.ui:88 +#: config/ui/oxygenexceptiondialog.ui:212 msgctxt "@item:inlistbox Border size:" msgid "Very Huge" msgstr "Veldig enorm" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:93 config/ui/oxygenexceptiondialog.ui:217 +#: config/ui/oxygenconfigurationui.ui:93 +#: config/ui/oxygenexceptiondialog.ui:217 msgctxt "@item:inlistbox Border size:" msgid "Oversized" msgstr "Forstørret" @@ -443,11 +458,6 @@ msgid "Add" msgstr "Legg til" -#. i18n: ectx: property (text), widget (QPushButton, removeButton) -#: config/ui/oxygenexceptionlistwidget.ui:79 -msgid "Remove" -msgstr "Fjern" - #. i18n: ectx: property (text), widget (QPushButton, editButton) #: config/ui/oxygenexceptionlistwidget.ui:86 msgid "Edit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/po/nn/oxygen_kwin_deco.po new/oxygen-5.1.2/po/nn/oxygen_kwin_deco.po --- old/oxygen-5.1.1/po/nn/oxygen_kwin_deco.po 2014-11-06 16:39:51.000000000 +0100 +++ new/oxygen-5.1.2/po/nn/oxygen_kwin_deco.po 2014-12-11 14:02:52.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kwin_clients\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-09-27 09:14+0000\n" +"POT-Creation-Date: 2014-10-23 09:23+0000\n" "PO-Revision-Date: 2010-01-24 16:24+0100\n" "Last-Translator: Eirik U. Birkeland <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -67,19 +67,25 @@ msgid "Animations" msgstr "Animasjonar" -#: config/oxygenexceptionlistwidget.cpp:197 -msgid "Question - Oxygen Settings" +#: config/oxygenexceptionlistwidget.cpp:198 +msgid "Question - Breeze Settings" msgstr "" -#: config/oxygenexceptionlistwidget.cpp:197 +#: config/oxygenexceptionlistwidget.cpp:198 msgid "Remove selected exception?" msgstr "Vil du fjerna det valde uttrykket?" -#: config/oxygenexceptionlistwidget.cpp:338 +#. i18n: ectx: property (text), widget (QPushButton, removeButton) +#: config/oxygenexceptionlistwidget.cpp:199 +#: config/ui/oxygenexceptionlistwidget.ui:79 +msgid "Remove" +msgstr "Fjern" + +#: config/oxygenexceptionlistwidget.cpp:343 msgid "Warning - Oxygen Settings" msgstr "" -#: config/oxygenexceptionlistwidget.cpp:338 +#: config/oxygenexceptionlistwidget.cpp:343 msgid "Regular Expression syntax is incorrect" msgstr "Syntaksen i det regulære uttrykket er feil" @@ -117,63 +123,72 @@ #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:53 config/ui/oxygenexceptiondialog.ui:177 +#: config/ui/oxygenconfigurationui.ui:53 +#: config/ui/oxygenexceptiondialog.ui:177 msgctxt "@item:inlistbox Border size:" msgid "No Border" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:58 config/ui/oxygenexceptiondialog.ui:182 +#: config/ui/oxygenconfigurationui.ui:58 +#: config/ui/oxygenexceptiondialog.ui:182 msgctxt "@item:inlistbox Border size:" msgid "No Side Borders" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:63 config/ui/oxygenexceptiondialog.ui:187 +#: config/ui/oxygenconfigurationui.ui:63 +#: config/ui/oxygenexceptiondialog.ui:187 msgctxt "@item:inlistbox Border size:" msgid "Tiny" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:68 config/ui/oxygenexceptiondialog.ui:192 +#: config/ui/oxygenconfigurationui.ui:68 +#: config/ui/oxygenexceptiondialog.ui:192 msgctxt "@item:inlistbox Border size:" msgid "Normal" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:73 config/ui/oxygenexceptiondialog.ui:197 +#: config/ui/oxygenconfigurationui.ui:73 +#: config/ui/oxygenexceptiondialog.ui:197 msgctxt "@item:inlistbox Border size:" msgid "Large" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:78 config/ui/oxygenexceptiondialog.ui:202 +#: config/ui/oxygenconfigurationui.ui:78 +#: config/ui/oxygenexceptiondialog.ui:202 msgctxt "@item:inlistbox Border size:" msgid "Very Large" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:83 config/ui/oxygenexceptiondialog.ui:207 +#: config/ui/oxygenconfigurationui.ui:83 +#: config/ui/oxygenexceptiondialog.ui:207 msgctxt "@item:inlistbox Border size:" msgid "Huge" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:88 config/ui/oxygenexceptiondialog.ui:212 +#: config/ui/oxygenconfigurationui.ui:88 +#: config/ui/oxygenexceptiondialog.ui:212 msgctxt "@item:inlistbox Border size:" msgid "Very Huge" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:93 config/ui/oxygenexceptiondialog.ui:217 +#: config/ui/oxygenconfigurationui.ui:93 +#: config/ui/oxygenexceptiondialog.ui:217 msgctxt "@item:inlistbox Border size:" msgid "Oversized" msgstr "" @@ -441,11 +456,6 @@ msgid "Add" msgstr "Legg til" -#. i18n: ectx: property (text), widget (QPushButton, removeButton) -#: config/ui/oxygenexceptionlistwidget.ui:79 -msgid "Remove" -msgstr "Fjern" - #. i18n: ectx: property (text), widget (QPushButton, editButton) #: config/ui/oxygenexceptionlistwidget.ui:86 msgid "Edit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.1.1/po/se/oxygen_kwin_deco.po new/oxygen-5.1.2/po/se/oxygen_kwin_deco.po --- old/oxygen-5.1.1/po/se/oxygen_kwin_deco.po 2014-11-06 16:42:13.000000000 +0100 +++ new/oxygen-5.1.2/po/se/oxygen_kwin_deco.po 2014-12-11 14:04:32.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kwin_clients\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-09-27 09:14+0000\n" +"POT-Creation-Date: 2014-10-23 09:23+0000\n" "PO-Revision-Date: 2005-01-29 18:47+0100\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -65,19 +65,25 @@ msgid "Animations" msgstr "Animašuvnnat" -#: config/oxygenexceptionlistwidget.cpp:197 -msgid "Question - Oxygen Settings" +#: config/oxygenexceptionlistwidget.cpp:198 +msgid "Question - Breeze Settings" msgstr "" -#: config/oxygenexceptionlistwidget.cpp:197 +#: config/oxygenexceptionlistwidget.cpp:198 msgid "Remove selected exception?" msgstr "" -#: config/oxygenexceptionlistwidget.cpp:338 +#. i18n: ectx: property (text), widget (QPushButton, removeButton) +#: config/oxygenexceptionlistwidget.cpp:199 +#: config/ui/oxygenexceptionlistwidget.ui:79 +msgid "Remove" +msgstr "" + +#: config/oxygenexceptionlistwidget.cpp:343 msgid "Warning - Oxygen Settings" msgstr "" -#: config/oxygenexceptionlistwidget.cpp:338 +#: config/oxygenexceptionlistwidget.cpp:343 msgid "Regular Expression syntax is incorrect" msgstr "" @@ -115,63 +121,72 @@ #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:53 config/ui/oxygenexceptiondialog.ui:177 +#: config/ui/oxygenconfigurationui.ui:53 +#: config/ui/oxygenexceptiondialog.ui:177 msgctxt "@item:inlistbox Border size:" msgid "No Border" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:58 config/ui/oxygenexceptiondialog.ui:182 +#: config/ui/oxygenconfigurationui.ui:58 +#: config/ui/oxygenexceptiondialog.ui:182 msgctxt "@item:inlistbox Border size:" msgid "No Side Borders" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:63 config/ui/oxygenexceptiondialog.ui:187 +#: config/ui/oxygenconfigurationui.ui:63 +#: config/ui/oxygenexceptiondialog.ui:187 msgctxt "@item:inlistbox Border size:" msgid "Tiny" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:68 config/ui/oxygenexceptiondialog.ui:192 +#: config/ui/oxygenconfigurationui.ui:68 +#: config/ui/oxygenexceptiondialog.ui:192 msgctxt "@item:inlistbox Border size:" msgid "Normal" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:73 config/ui/oxygenexceptiondialog.ui:197 +#: config/ui/oxygenconfigurationui.ui:73 +#: config/ui/oxygenexceptiondialog.ui:197 msgctxt "@item:inlistbox Border size:" msgid "Large" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:78 config/ui/oxygenexceptiondialog.ui:202 +#: config/ui/oxygenconfigurationui.ui:78 +#: config/ui/oxygenexceptiondialog.ui:202 msgctxt "@item:inlistbox Border size:" msgid "Very Large" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:83 config/ui/oxygenexceptiondialog.ui:207 +#: config/ui/oxygenconfigurationui.ui:83 +#: config/ui/oxygenexceptiondialog.ui:207 msgctxt "@item:inlistbox Border size:" msgid "Huge" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:88 config/ui/oxygenexceptiondialog.ui:212 +#: config/ui/oxygenconfigurationui.ui:88 +#: config/ui/oxygenexceptiondialog.ui:212 msgctxt "@item:inlistbox Border size:" msgid "Very Huge" msgstr "" #. i18n: ectx: property (text), item, widget (KComboBox, frameBorderComboBox) #. i18n: ectx: property (text), item, widget (KComboBox, frameBorder) -#: config/ui/oxygenconfigurationui.ui:93 config/ui/oxygenexceptiondialog.ui:217 +#: config/ui/oxygenconfigurationui.ui:93 +#: config/ui/oxygenexceptiondialog.ui:217 msgctxt "@item:inlistbox Border size:" msgid "Oversized" msgstr "" @@ -439,11 +454,6 @@ msgid "Add" msgstr "" -#. i18n: ectx: property (text), widget (QPushButton, removeButton) -#: config/ui/oxygenexceptionlistwidget.ui:79 -msgid "Remove" -msgstr "" - #. i18n: ectx: property (text), widget (QPushButton, editButton) #: config/ui/oxygenexceptionlistwidget.ui:86 msgid "Edit" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
