diff options
Diffstat (limited to 'src-qt5/core')
122 files changed, 3367 insertions, 1272 deletions
diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro index 4878b1f3..0f635960 100644 --- a/src-qt5/core/core.pro +++ b/src-qt5/core/core.pro @@ -8,9 +8,10 @@ SUBDIRS+= lumina-desktop \ lumina-session \ lumina-open \ lumina-info \ - $${PWD}/../../icon-theme -# lumina-wm-INCOMPLETE \ + $${PWD}/../../icon-theme \ + lumina-theme-engine # lumina-checkpass +# lumina-desktop-unified #Also install any special menu scripts scripts.path = $${L_SHAREDIR}/lumina-desktop/menu-scripts diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index 4454d29b..b79f777d 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -16,7 +16,7 @@ static QStringList fav; QString LDesktopUtils::LuminaDesktopVersion(){ - QString ver = "1.3.1"; + QString ver = "1.3.2"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif diff --git a/src-qt5/core/libLumina/LIconCache.cpp b/src-qt5/core/libLumina/LIconCache.cpp index 38367cef..70c360fb 100644 --- a/src-qt5/core/libLumina/LIconCache.cpp +++ b/src-qt5/core/libLumina/LIconCache.cpp @@ -55,9 +55,9 @@ QString LIconCache::findFile(QString icon){ if(icon.isEmpty()){ return ""; } //Get the currently-set theme QString cTheme = QIcon::themeName(); - if(cTheme.isEmpty()){ - QIcon::setThemeName("material-design-light"); - cTheme = "material-design-light"; + if(cTheme.isEmpty()){ + QIcon::setThemeName("material-design-light"); + cTheme = "material-design-light"; } //Make sure the current search paths correspond to this theme if( QDir::searchPaths("icontheme").filter("/"+cTheme+"/").isEmpty() ){ @@ -80,7 +80,7 @@ QString LIconCache::findFile(QString icon){ fall << getChildIconDirs(paths[i]+"hicolor"); //XDG fallback (apps add to this) } //Now load all the icon theme dependencies in order (Theme1 -> Theme2 -> Theme3 -> Fallback) - + //fall << LOS::AppPrefix()+"share/pixmaps"; //always use this as well as a final fallback QDir::setSearchPaths("icontheme", theme); QDir::setSearchPaths("default", oxy); @@ -121,6 +121,10 @@ QString LIconCache::findFile(QString icon){ void LIconCache::loadIcon(QAbstractButton *button, QString icon, bool noThumb){ if(icon.isEmpty()){ return; } + if(isThemeIcon(icon)){ + button->setIcon( iconFromTheme(icon)); + return ; + } //See if the icon has already been loaded into the HASH bool needload = !HASH.contains(icon); if(!needload){ @@ -138,6 +142,10 @@ void LIconCache::loadIcon(QAbstractButton *button, QString icon, bool noThumb){ void LIconCache::loadIcon(QAction *action, QString icon, bool noThumb){ if(icon.isEmpty()){ return; } + if(isThemeIcon(icon)){ + action->setIcon( iconFromTheme(icon)); + return ; + } //See if the icon has already been loaded into the HASH bool needload = !HASH.contains(icon); if(!needload){ @@ -155,6 +163,10 @@ void LIconCache::loadIcon(QAction *action, QString icon, bool noThumb){ void LIconCache::loadIcon(QLabel *label, QString icon, bool noThumb){ if(icon.isEmpty()){ return; } + if(isThemeIcon(icon)){ + label->setPixmap( iconFromTheme(icon).pixmap(label->sizeHint()) ); + return ; + } //See if the icon has already been loaded into the HASH bool needload = !HASH.contains(icon); if(!needload){ @@ -164,7 +176,7 @@ void LIconCache::loadIcon(QLabel *label, QString icon, bool noThumb){ //Need to load the icon icon_data idata; if(HASH.contains(icon)){ idata = HASH.value(icon); } - else { idata = createData(icon); + else { idata = createData(icon); if(idata.fullpath.isEmpty()){ return; } //nothing to do } idata.pendingLabels << QPointer<QLabel>(label); //save this QLabel for later @@ -183,6 +195,8 @@ void LIconCache::clearIconTheme(){ QIcon LIconCache::loadIcon(QString icon, bool noThumb){ if(icon.isEmpty()){ return QIcon(); } + if(isThemeIcon(icon)){ return iconFromTheme(icon); } + if(HASH.contains(icon)){ if(!HASH[icon].icon.isNull()){ return HASH[icon].icon; } else if(!HASH[icon].thumbnail.isNull() && !noThumb){ return HASH[icon].thumbnail; } @@ -217,7 +231,7 @@ QStringList LIconCache::getChildIconDirs(QString path){ QDir D(path); QStringList out; QStringList dirs = D.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - if(!dirs.isEmpty() && (dirs.contains("32x32") || dirs.contains("scalable")) ){ + if(!dirs.isEmpty() && (dirs.contains("32x32") || dirs.contains("scalable")) ){ //Need to sort these directories by image size //qDebug() << " - Parent:" << parent << "Dirs:" << dirs; for(int i=0; i<dirs.length(); i++){ @@ -290,6 +304,19 @@ void LIconCache::ReadFile(LIconCache *obj, QString id, QString path){ obj->emit InternalIconLoaded(id, cdt, BA); } +bool LIconCache::isThemeIcon(QString id){ + return (!id.contains("/") && !id.contains(".") && !id.contains("libreoffice") ); +} + +QIcon LIconCache::iconFromTheme(QString id){ + QIcon ico = QIcon::fromTheme(id); + if(ico.isNull()){ + //icon missing in theme? run the old icon-finder system + ico = QIcon(findFile(id)); + } + return ico; +} + // === PRIVATE SLOTS === void LIconCache::IconLoaded(QString id, QDateTime sync, QByteArray *data){ //qDebug() << "Icon Loaded:" << id << HASH.contains(id); diff --git a/src-qt5/core/libLumina/LIconCache.h b/src-qt5/core/libLumina/LIconCache.h index f58a5510..428ffcab 100644 --- a/src-qt5/core/libLumina/LIconCache.h +++ b/src-qt5/core/libLumina/LIconCache.h @@ -67,6 +67,9 @@ private: void startReadFile(QString id, QString path); void ReadFile(LIconCache *obj, QString id, QString path); + bool isThemeIcon(QString id); + QIcon iconFromTheme(QString id); + private slots: void IconLoaded(QString id, QDateTime sync, QByteArray *data); diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index 8da39564..01b3305e 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -723,7 +723,7 @@ QList<XDGDesktop*> LXDG::sortDesktopNames(QList<XDGDesktop*> apps){ //Sort the list by name of the application QHash<QString, XDGDesktop*> sorter; for(int i=0; i<apps.length(); i++){ - sorter.insert(apps[i]->name.toLower(), apps[i]); + sorter.insert(apps[i]->name.toLower(), apps[i]); } QStringList keys = sorter.keys(); keys.sort(); @@ -746,16 +746,25 @@ void LXDG::setEnvironmentVars(){ } QIcon LXDG::findIcon(QString iconName, QString fallback){ + //With the addition of the Lumina theme engine (8/3/17), switch back to using the Qt icon from theme method for apps + QIcon tmp; + if(!iconName.contains("libreoffice")){ //libreoffice is stupid - their svg icons are un-renderable with Qt + tmp = QIcon::fromTheme(iconName); + if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); } + } + if(!tmp.isNull()){ return tmp; } //found one in the theme + + //NOTE: This was re-written on 11/10/15 to avoid using the QIcon::fromTheme() framework // -- Too many issues with SVG files and/or search paths with the built-in system - + //Check if the icon is an absolute path and exists bool DEBUG =false; if(DEBUG){ qDebug() << "[LXDG] Find icon for:" << iconName; } if(QFile::exists(iconName) && iconName.startsWith("/")){ return QIcon(iconName); } else if(iconName.startsWith("/")){ iconName.section("/",-1); } //Invalid absolute path, just look for the icon //Check if the icon is actually given - if(iconName.isEmpty()){ + if(iconName.isEmpty()){ if(fallback.isEmpty()){ return QIcon(); } else{ return LXDG::findIcon(fallback, ""); } } @@ -763,9 +772,9 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ if(DEBUG){ qDebug() << "[LXDG] Start search for icon"; } //Get the currently-set theme QString cTheme = QIcon::themeName(); - if(cTheme.isEmpty()){ - QIcon::setThemeName("material-design-light"); - cTheme = "material-design-light"; + if(cTheme.isEmpty()){ + QIcon::setThemeName("material-design-light"); + cTheme = "material-design-light"; } //Make sure the current search paths correspond to this theme if( QDir::searchPaths("icontheme").filter("/"+cTheme+"/").isEmpty() ){ diff --git a/src-qt5/core/libLumina/NativeEmbedWidget.cpp b/src-qt5/core/libLumina/NativeEmbedWidget.cpp index ed0fd89c..487d1040 100644 --- a/src-qt5/core/libLumina/NativeEmbedWidget.cpp +++ b/src-qt5/core/libLumina/NativeEmbedWidget.cpp @@ -16,6 +16,8 @@ #include <xcb/composite.h> #include <X11/extensions/Xdamage.h> +#define DISABLE_COMPOSITING true + #define NORMAL_WIN_EVENT_MASK (XCB_EVENT_MASK_BUTTON_PRESS | \ XCB_EVENT_MASK_BUTTON_RELEASE | \ XCB_EVENT_MASK_POINTER_MOTION | \ @@ -27,6 +29,7 @@ XCB_EVENT_MASK_ENTER_WINDOW| \ XCB_EVENT_MASK_PROPERTY_CHANGE) + inline void registerClientEvents(WId id){ uint32_t value_list[1] = {NORMAL_WIN_EVENT_MASK}; xcb_change_window_attributes(QX11Info::connection(), id, XCB_CW_EVENT_MASK, value_list); @@ -62,15 +65,14 @@ void NativeEmbedWidget::showWindow(){ } QImage NativeEmbedWidget::windowImage(QRect geom){ - //if(paused){ return QImage(); } //Pull the XCB pixmap out of the compositing layer xcb_pixmap_t pix = xcb_generate_id(QX11Info::connection()); xcb_composite_name_window_pixmap(QX11Info::connection(), WIN->id(), pix); - if(pix==0){ return QImage(); } + if(pix==0){ qDebug() << "Got blank pixmap!"; return QImage(); } //Convert this pixmap into a QImage xcb_image_t *ximg = xcb_image_get(QX11Info::connection(), pix, geom.x(), geom.y(), geom.width(), geom.height(), ~0, XCB_IMAGE_FORMAT_Z_PIXMAP); - if(ximg == 0){ return QImage(); } + if(ximg == 0){ qDebug() << "Got blank image!"; return QImage(); } QImage img(ximg->data, ximg->width, ximg->height, ximg->stride, QImage::Format_ARGB32_Premultiplied); img = img.copy(); //detach this image from the XCB data structures xcb_image_destroy(ximg); @@ -111,23 +113,26 @@ bool NativeEmbedWidget::embedWindow(NativeWindow *window){ xcb_send_event(QX11Info::connection(), 0, WIN->id(), XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (const char *) &event); */ //Now setup any redirects and return - xcb_composite_redirect_window(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); - xcb_composite_redirect_subwindows(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); - - //Now create/register the damage handler - // -- XCB (Note: The XCB damage registration is completely broken at the moment - 9/15/15, Ken Moore) - // -- Retested 6/29/17 (no change) Ken Moore - //xcb_damage_damage_t dmgID = xcb_generate_id(QX11Info::connection()); //This is a typedef for a 32-bit unsigned integer - //xcb_damage_create(QX11Info::connection(), dmgID, WIN->id(), XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES); - // -- XLib (Note: This is only used because the XCB routine above does not work - needs to be fixed upstream in XCB itself). - Damage dmgID = XDamageCreate(QX11Info::display(), WIN->id(), XDamageReportRawRectangles); - - WIN->addDamageID( (uint) dmgID); //save this for later + if(!DISABLE_COMPOSITING){ + xcb_composite_redirect_window(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); + xcb_composite_redirect_subwindows(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); + + //Now create/register the damage handler + // -- XCB (Note: The XCB damage registration is completely broken at the moment - 9/15/15, Ken Moore) + // -- Retested 6/29/17 (no change) Ken Moore + //xcb_damage_damage_t dmgID = xcb_generate_id(QX11Info::connection()); //This is a typedef for a 32-bit unsigned integer + //xcb_damage_create(QX11Info::connection(), dmgID, WIN->id(), XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES); + // -- XLib (Note: This is only used because the XCB routine above does not work - needs to be fixed upstream in XCB itself). + Damage dmgID = XDamageCreate(QX11Info::display(), WIN->id(), XDamageReportRawRectangles); + + WIN->addDamageID( (uint) dmgID); //save this for later + } WIN->addFrameWinID(this->winId()); connect(WIN, SIGNAL(VisualChanged()), this, SLOT(repaintWindow()) ); //make sure we repaint the widget on visual change registerClientEvents(WIN->id()); registerClientEvents(this->winId()); + qDebug() << "Events Registered:" << WIN->id() << this->winId(); return true; } @@ -185,16 +190,17 @@ void NativeEmbedWidget::resyncWindow(){ xcb_configure_window(QX11Info::connection(), WIN->id(), mask, valList); xcb_flush(QX11Info::connection()); syncWinSize(); - QTimer::singleShot(0, this, SLOT(repaintWindow()) ); + QTimer::singleShot(10, this, SLOT(repaintWindow()) ); } void NativeEmbedWidget::repaintWindow(){ + if(DISABLE_COMPOSITING){ return; } //qDebug() << "Update Window Image:" << !paused; if(paused){ return; } QImage tmp = windowImage( QRect(QPoint(0,0), this->size()) ); if(!tmp.isNull()){ winImage = tmp; - }//else{ qDebug() << "Got Null Image!!"; } + }else{ qDebug() << "Got Null Image!!"; } this->parentWidget()->update(); } // ============== @@ -218,7 +224,7 @@ void NativeEmbedWidget::hideEvent(QHideEvent *ev){ } void NativeEmbedWidget::paintEvent(QPaintEvent *ev){ - if(WIN==0){ QWidget::paintEvent(ev); return; } + if(WIN==0 || DISABLE_COMPOSITING){ QWidget::paintEvent(ev); return; } else if( winImage.isNull() ){ /*QTimer::singleShot(0, this, SLOT(repaintWindow()) );*/ return; } else if(paused){ return; } //else if(this->size()!=winSize){ QTimer::singleShot(0,this, SLOT(syncWinSize())); return; } //do not paint here - waiting to re-sync the sizes diff --git a/src-qt5/core/libLumina/NativeEventFilter.cpp b/src-qt5/core/libLumina/NativeEventFilter.cpp index d6c2da50..354dbe76 100644 --- a/src-qt5/core/libLumina/NativeEventFilter.cpp +++ b/src-qt5/core/libLumina/NativeEventFilter.cpp @@ -65,7 +65,7 @@ static xcb_ewmh_connection_t EWMH; static xcb_atom_t _NET_SYSTEM_TRAY_OPCODE = 0; inline void ParsePropertyEvent(xcb_property_notify_event_t *ev, NativeEventFilter *obj){ - //qDebug() << "Got Property Event:" << ev->window << ev->atom; + qDebug() << "Got Property Event:" << ev->window << ev->atom; NativeWindow::Property prop = NativeWindow::None; //Now determine which properties are getting changed, and update the native window as appropriate if(ev->atom == EWMH._NET_WM_NAME){ prop = NativeWindow::Title; } @@ -76,13 +76,36 @@ inline void ParsePropertyEvent(xcb_property_notify_event_t *ev, NativeEventFilte else if( ev->atom == EWMH._NET_WM_STATE){ prop = NativeWindow::States; } //Send out the signal if necessary if(prop!=NativeWindow::None){ - if(DEBUG){ qDebug() << "Detected Property Change:" << ev->window << prop; } + //if(DEBUG){ + qDebug() << "Detected Property Change:" << ev->window << prop; + //} obj->emit WindowPropertyChanged(ev->window, prop); }else{ //qDebug() << "Unknown Property Change:" << ev->window << ev->atom; } } +inline void ParseClientMessageEvent(xcb_client_message_event_t *ev, NativeEventFilter *obj){ + NativeWindow::Property prop = NativeWindow::None; + QVariant val; + if(ev->type==EWMH._NET_WM_NAME){ prop = NativeWindow::Title; } + else if(ev->type==EWMH._NET_WM_ICON){ prop = NativeWindow::Icon; } + else if(ev->type==EWMH._NET_WM_ICON_NAME){ prop = NativeWindow::ShortTitle; } + else if(ev->type==EWMH._NET_WM_DESKTOP){ + prop = NativeWindow::Workspace; + val = QVariant( (int) ev->data.data32[0] ); + }else if(ev->type==EWMH._NET_WM_WINDOW_TYPE){ prop = NativeWindow::WinTypes; } + else if(ev->type==EWMH._NET_WM_STATE){ prop = NativeWindow::States; } + + if(prop!=NativeWindow::None){ + //if(DEBUG){ + qDebug() << "Detected Property Change Request:" << ev->window << prop; //} + if(val.isNull()){ obj->emit WindowPropertyChanged(ev->window, prop); } + else{ obj->emit RequestWindowPropertyChange(ev->window, prop, val); } + } + +} + //Constructor for the Event Filter wrapper NativeEventFilter::NativeEventFilter() : QObject(){ @@ -222,7 +245,9 @@ bool EventFilter::nativeEventFilter(const QByteArray &eventType, void *message, //addTrayApp( ((xcb_client_message_event_t*)ev)->data.data32[2] ); } //Ignore the System Tray messages at the moment - } + }else if(((xcb_client_message_event_t*)ev)->window != QX11Info::appRootWindow()){ + ParseClientMessageEvent((xcb_client_message_event_t*)ev, obj); + } break; //============================== case XCB_CONFIGURE_NOTIFY: diff --git a/src-qt5/core/libLumina/NativeWindow.h b/src-qt5/core/libLumina/NativeWindow.h index 47359b7d..d04815ce 100644 --- a/src-qt5/core/libLumina/NativeWindow.h +++ b/src-qt5/core/libLumina/NativeWindow.h @@ -30,22 +30,22 @@ public: enum Property{ /*QVariant Type*/ None=0, /*null*/ - MinSize, /*QSize*/ - MaxSize, /*QSize*/ - Size, /*QSize*/ - GlobalPos, /*QPoint*/ - Title, /*QString*/ - ShortTitle, /*QString*/ - Icon, /*QIcon*/ - Name, /*QString*/ - Workspace, /*int*/ - States, /*QList<NativeWindow::State> : Current state of the window */ - WinTypes, /*QList<NativeWindow::Type> : Current type of window (typically does not change)*/ - WinActions, /*QList<NativeWindow::Action> : Current actions that the window allows (Managed/set by the WM)*/ - FrameExtents, /*QList<int> : [Left, Right, Top, Bottom] in pixels */ - RelatedWindows, /* QList<WId> - better to use the "isRelatedTo(WId)" function instead of reading this directly*/ - Active, /*bool*/ - Visible /*bool*/ + MinSize=1, /*QSize*/ + MaxSize=2, /*QSize*/ + Size=3, /*QSize*/ + GlobalPos=4, /*QPoint*/ + Title=5, /*QString*/ + ShortTitle=6, /*QString*/ + Icon=7, /*QIcon*/ + Name=8, /*QString*/ + Workspace=9, /*int*/ + States=10, /*QList<NativeWindow::State> : Current state of the window */ + WinTypes=11, /*QList<NativeWindow::Type> : Current type of window (typically does not change)*/ + WinActions=12, /*QList<NativeWindow::Action> : Current actions that the window allows (Managed/set by the WM)*/ + FrameExtents=13, /*QList<int> : [Left, Right, Top, Bottom] in pixels */ + RelatedWindows=14, /* QList<WId> - better to use the "isRelatedTo(WId)" function instead of reading this directly*/ + Active=15, /*bool*/ + Visible=16 /*bool*/ }; static QList<NativeWindow::Property> allProperties(){ diff --git a/src-qt5/core/libLumina/NativeWindowSystem.cpp b/src-qt5/core/libLumina/NativeWindowSystem.cpp index e0f3fe91..71e95a0e 100644 --- a/src-qt5/core/libLumina/NativeWindowSystem.cpp +++ b/src-qt5/core/libLumina/NativeWindowSystem.cpp @@ -254,7 +254,8 @@ void NativeWindowSystem::stop(){ NativeWindow* NativeWindowSystem::findWindow(WId id, bool checkRelated){ //qDebug() << "Find Window:" << id; for(int i=0; i<NWindows.length(); i++){ - if(id==NWindows[i]->id() || id==NWindows[i]->frameId() ){ return NWindows[i]; } + if(id==NWindows[i]->id() ){ return NWindows[i]; } + else if(id==NWindows[i]->frameId() ){ qDebug() << "Matched Frame:" << id; return NWindows[i]; } //if(checkRelated && NWindows[i]->isRelatedTo(id)){ return NWindows[i]; } //else if(!checkRelated && id==NWindows[i]->id()){ return NWindows[i]; } } @@ -496,7 +497,7 @@ void NativeWindowSystem::ChangeWindowProperties(NativeWindow* win, QList< Native valList.y = win->property(NativeWindow::GlobalPos).toPoint().y(); }*/ uint16_t mask = 0; - mask = mask | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y; + mask = mask | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;// | XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y; qDebug() << "Configure window Geometry:" << sz; xcb_configure_window_aux(QX11Info::connection(), win->id(), mask, &valList); } @@ -667,7 +668,7 @@ void NativeWindowSystem::NewWindowDetected(WId id){ registerClientEvents(win->id()); NWindows << win; UpdateWindowProperties(win, NativeWindow::allProperties()); - qDebug() << "New Window [& associated ID's]:" << win->id() << win->property(NativeWindow::RelatedWindows); + qDebug() << "New Window [& associated ID's]:" << win->id() << win->frameId() << win->property(NativeWindow::RelatedWindows); //Now setup the connections with this window connect(win, SIGNAL(RequestClose(WId)), this, SLOT(RequestClose(WId)) ); connect(win, SIGNAL(RequestKill(WId)), this, SLOT(RequestKill(WId)) ); @@ -707,13 +708,13 @@ void NativeWindowSystem::NewTrayWindowDetected(WId id){ void NativeWindowSystem::WindowCloseDetected(WId id){ NativeWindow *win = findWindow(id, false); - qDebug() << "Got Window Closed" << id << win; + //qDebug() << "Got Window Closed" << id << win; //qDebug() << "Old Window List:" << NWindows.length(); if(win!=0){ NWindows.removeAll(win); //RequestReparent(id, QX11Info::appRootWindow(), QPoint(0,0)); win->emit WindowClosed(id); - qDebug() << "Visible Window Closed!!!"; + //qDebug() << "Visible Window Closed!!!"; //win->deleteLater(); }else{ win = findTrayWindow(id); diff --git a/src-qt5/core/libLumina/RootSubWindow.cpp b/src-qt5/core/libLumina/RootSubWindow.cpp index 322e524f..6341f923 100644 --- a/src-qt5/core/libLumina/RootSubWindow.cpp +++ b/src-qt5/core/libLumina/RootSubWindow.cpp @@ -41,6 +41,10 @@ WId RootSubWindow::id(){ return WIN->id(); } +NativeWindow* RootSubWindow::nativeWindow(){ + return WIN; +} + // === PRIVATE === RootSubWindow::ModState RootSubWindow::getStateAtPoint(QPoint pt, bool setoffset){ //Note: pt should be in widget-relative coordinates, not global diff --git a/src-qt5/core/libLumina/RootSubWindow.h b/src-qt5/core/libLumina/RootSubWindow.h index 079a6201..0af77009 100644 --- a/src-qt5/core/libLumina/RootSubWindow.h +++ b/src-qt5/core/libLumina/RootSubWindow.h @@ -29,6 +29,7 @@ public: ~RootSubWindow(); WId id(); + NativeWindow* nativeWindow(); private: //Window status diff --git a/src-qt5/core/libLumina/RootWindow-mgmt.cpp b/src-qt5/core/libLumina/RootWindow-mgmt.cpp index e00ce9ce..00b3e336 100644 --- a/src-qt5/core/libLumina/RootWindow-mgmt.cpp +++ b/src-qt5/core/libLumina/RootWindow-mgmt.cpp @@ -19,16 +19,31 @@ void RootWindow::arrangeWindows(RootSubWindow *primary, QString type){ // ================ // Public slots for starting the arrangement routine(s) above // ================ -void RootWindow::ArrangeWindows(WId *primary, QString type){ - +void RootWindow::ArrangeWindows(WId primary, QString type){ + RootSubWindow* win = windowForId(primary); + if(type.isEmpty()){ type = ""; } //grab the default arrangement format + arrangeWindows(win, type); } -void RootWindow::TileWindows(WId *primary, QString type){ - +void RootWindow::TileWindows(WId primary, QString type){ + RootSubWindow* win = windowForId(primary); + if(type.isEmpty()){ type = ""; } //grab the default arrangement format for tiling + arrangeWindows(win, type); } -void RootWindow::CheckWindowPosition(WId, bool newwindow){ +void RootWindow::CheckWindowPosition(WId id, bool newwindow){ //used after a "drop" to validate/snap/re-arrange window(s) as needed // if "newwindow" is true, then this is the first-placement routine for a window before it initially appears - + RootSubWindow* win = windowForId(id); + if(win==0){ return; } //invalid window + QRect geom = win->nativeWindow()->geometry(); + bool changed = false; + //Make sure it is on the screen (quick check) + if(geom.x() < 0){ changed = true; geom.moveLeft(0); } + if(geom.y() < 0){ changed = true; geom.moveTop(0); } + if(geom.width() < 20){ changed = true; geom.setWidth(100); } + if(geom.height() < 20){ changed = true; geom.setHeight(100); } + if(changed){ win->setGeometry(geom); } + //Now run it through the window arrangement routine + ArrangeWindows(id); } diff --git a/src-qt5/core/libLumina/RootWindow.cpp b/src-qt5/core/libLumina/RootWindow.cpp index 596755df..48c37c86 100644 --- a/src-qt5/core/libLumina/RootWindow.cpp +++ b/src-qt5/core/libLumina/RootWindow.cpp @@ -100,6 +100,14 @@ void RootWindow::updateScreenPixmap(screeninfo *info){ info->wallpaper = pix; } +RootSubWindow* RootWindow::windowForId(WId id){ + RootSubWindow *tmp = 0; + for(int i=0; i<WINDOWS.length() && tmp==0; i++){ + if(WINDOWS[i]->id() == id){ tmp = WINDOWS[i]; } + } + return tmp; +} + // === PUBLIC SLOTS === void RootWindow::ResizeRoot(){ if(DEBUG){ qDebug() << "Resize Root..."; } @@ -202,6 +210,7 @@ void RootWindow::CloseWindow(WId win){ // === PROTECTED === void RootWindow::paintEvent(QPaintEvent *ev){ //qDebug() << "RootWindow: PaintEvent:" << ev->rect(); //<< QDateTime::currentDateTime()->toString(QDateTime::ShortDate); + QWidget::paintEvent(ev); bool found = false; QPainter painter(this); QRect geom = ev->rect(); @@ -214,7 +223,7 @@ void RootWindow::paintEvent(QPaintEvent *ev){ } } painter.end(); - if(!found){ + /*if(!found){ QWidget::paintEvent(ev); - } + }*/ } diff --git a/src-qt5/core/libLumina/RootWindow.h b/src-qt5/core/libLumina/RootWindow.h index 2fd76cea..9b1334dc 100644 --- a/src-qt5/core/libLumina/RootWindow.h +++ b/src-qt5/core/libLumina/RootWindow.h @@ -50,6 +50,7 @@ private: //Window Management QList<RootSubWindow*> WINDOWS; + RootSubWindow* windowForId(WId id); void arrangeWindows(RootSubWindow *primary = 0, QString type = ""); public slots: @@ -61,8 +62,8 @@ public slots: void CloseWindow(WId); //automatically connected for any new native window //Window arrangement functions - defined in "RootWindow-mgmt.cpp" - void ArrangeWindows(WId *primary = 0, QString type = ""); - void TileWindows(WId *primary = 0, QString type = ""); + void ArrangeWindows(WId primary = 0, QString type = ""); + void TileWindows(WId primary = 0, QString type = ""); void CheckWindowPosition(WId, bool newwindow = false); //used after a "drop" to validate/snap/re-arrange window(s) as needed private slots: diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h index 92f895c2..8b8cd16c 100644 --- a/src-qt5/core/lumina-desktop-unified/global-includes.h +++ b/src-qt5/core/lumina-desktop-unified/global-includes.h @@ -34,6 +34,7 @@ #include <QAnimationGroup> #include <QParallelAnimationGroup> #include <QSequentialAnimationGroup> +#include <QGraphicsOpacityEffect> #include <QWindow> #include <QWidget> #include <QWidgetAction> @@ -47,6 +48,8 @@ #include <QThread> #include <QMediaObject> #include <QMediaPlayer> +#include <QVideoWidget> +#include <QMediaPlaylist> // libLumina includes #include <LuminaX11.h> diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro index 79f2ba6f..04d5b602 100644 --- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro @@ -1,7 +1,7 @@ include($${PWD}/../../OS-detect.pri) QT += core gui network -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia multimediawidgets concurrent svg diff --git a/src-qt5/core/lumina-desktop-unified/main.cpp b/src-qt5/core/lumina-desktop-unified/main.cpp index 8e40f7eb..ef15cfcd 100644 --- a/src-qt5/core/lumina-desktop-unified/main.cpp +++ b/src-qt5/core/lumina-desktop-unified/main.cpp @@ -29,7 +29,7 @@ int main(int argc, char ** argv) setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); setenv("QT_NO_GLIB", "1", 1); //Disable the glib event loop within Qt at runtime (performance hit + bugs) - unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... + //unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //need exact-pixel measurements (no fake scaling) //Startup the session diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp index 2c36af80..39a7b596 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp @@ -151,10 +151,12 @@ void LScreenSaver::HideScreenSaver(){ emit ClosingScreenSaver(); emit LockStatusChanged(false); } + qDebug() << "Stop ScreenSavers"; for(int i=0; i<BASES.length(); i++){ - qDebug() << "Stop ScreenSaver:" << i; BASES[i]->stopPainting(); BASES[i]->hide(); + BASES.takeAt(i)->deleteLater(); + i--; } UpdateTimers(); } diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp index aaae8b41..c8a248c0 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp @@ -12,6 +12,8 @@ #include "Grav.h" #include "SampleAnimation.h" #include "Text.h" +#include "ImageSlideshow.h" +#include "VideoSlideshow.h" //============================== // PLUGIN LOADING/LISTING @@ -24,6 +26,10 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti return (new GravAnimation(parent, set)); }else if(type == "text") { return (new TextAnimation(parent, set)); + }else if(type == "imageSlideshow") { + return (new ImageAnimation(parent, set)); + }else if(type == "videoSlideshow") { + return (new VideoAnimation(parent, set)); }else { //Unknown screensaver, return a blank animation group return (new BaseAnimGroup(parent, set)); @@ -31,5 +37,5 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti } QStringList BaseAnimGroup::KnownAnimations(){ - return (QStringList() << "grav"); + return (QStringList() << "imageSlideshow" /*<< "grav" << "text" << "imageSlideshow" << "fireflies"*/); } diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h index ec1de914..50d733e9 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h @@ -9,10 +9,8 @@ //PI is equal to 2*pi #define PI 6.2832 - #include "global-includes.h" #include "BaseAnimGroup.h" -#include <QParallelAnimationGroup> #include <QtMath> #include <QMatrix> @@ -32,44 +30,53 @@ private: radius = qSqrt( (qPow(start.x()-ref->x(),2) + qPow(start.y()-ref->y(),2) )); //Number of frames in animation. Increase for smother motion - double step = 1000.0; + double step = 300.0; //Random values that give the eliptical pattern to the orbit. Between 0.4 and 2.3 - double xrand = (qrand()%20+4)/10.0; - double yrand = (qrand()%20+4)/10.0; - - QPoint firstP = QPoint(ref->x() + xrand*start.x()*(qCos(0/step) -qSin(0/step)), ref->y() + yrand*start.y()*(qCos(0/step) -qSin(0/step))); - QPoint lastP = QPoint(ref->x() + xrand*start.x()*(qCos(PI/step) -qSin(PI/step)), ref->y() + yrand*start.y()*(qCos(PI/step) -qSin(PI/step))); - orbit->setKeyValueAt(0, firstP); - orbit->setKeyValueAt(1, lastP); + double xrand = 0.4; //(qrand()%10+4)/10.0; + double yrand = 0.4; //(qrand()%10+4)/10.0; + + double theta = 1.5707963; + //double theta = aTan((start.x() - ref->x())/(start.y() - ref->y())); + QMatrix rotation = QMatrix(qCos(theta), qSin(theta), -qSin(theta), qCos(theta), -ref->x(), -ref->y()); + qDebug() << rotation; + //qDebug() << "Starting Point" << start; + //qDebug() << "Angle" << theta; + //qDebug() << "Distance" << radius; + //qDebug() << "Center" << *ref; + + QPoint firstP = (QPoint(ref->x() + xrand*start.x()*(qCos(0/step) -qSin(0/step)), ref->y() + yrand*start.y()*(qCos(0/step) -qSin(0/step)))); + QPoint rotFP = rotation.map(firstP); + qDebug() << "First Point" << firstP; + qDebug() << "Rotation by Matrix" << rotFP; + QPoint lastP = (QPoint(ref->x() + xrand*start.x()*(qCos(PI/step) -qSin(PI/step)), ref->y() + yrand*start.y()*(qCos(PI/step) -qSin(PI/step)))); + orbit->setKeyValueAt(0, firstP); + orbit->setKeyValueAt(1, lastP); //path.push_back(firstP); //Loops through all steps and creates all the points of the orbit for(int i=1; i<step; i++) { //Calculates the new point, including gravitational pull and eccentricity. Goes from 0 to 2PI in steps. - double newX = ref->x() + xrand*start.x()*(qCos((PI*i)/step) -qSin((PI*i)/step)); - double newY = ref->y() + yrand*start.y()*(qSin((PI*i)/step) + qCos((PI*i)/step)); - - //Calculates the radius from the sun as the distance between the points - radius = (qSqrt( (qPow(newX-ref->x(),2) + qPow(newY-ref->y(),2) ))); + double newX = ref->x() + xrand*start.x()*(qCos((PI*i)/step) - qSin((PI*i)/step)); + double newY = ref->y() + yrand*start.y()*(qSin((PI*i)/step) + qCos((PI*i)/step)); //Creates a new point and creates a key as part of the animation - QPoint newLoc = QPoint(newX, newY); - orbit->setKeyValueAt(i/step, newLoc); + QPoint newLoc = (QPoint(newX, newY)); + orbit->setKeyValueAt(i/step, newLoc); //path.push_back(newLoc); } //Sets the time for a full orbit. Increasing makes the orbit slower. //path.push_back(lastP); } private slots: - void LoopChanged(int loop){ + /*void LoopChanged(int loop){ //Adjust the orbit animation a bit - /*if(loop >= 0) { + if(loop >= 0) { orbit->setStartValue(orbit->endValue()); //start at the previous end point orbit->setEndValue(path.at(loop%1000)); orbit->setDuration(10); - }*/ - } + } + }*/ void stopped(){ qDebug() << "Planet stopped"; planet->hide();} public: @@ -96,22 +103,18 @@ public: QRect invalid = QRect(center+QPoint(-50,-50), center+QPoint(50,50)); QPoint tmp = center; while(invalid.contains(tmp)){ - int randwidth = qrand()%(range.width() - 2*planet_radius) + planet_radius; - int randheight= qrand()%(range.height()- 2*planet_radius) + planet_radius; + int randwidth = qrand()%(range.width() - 2*planet_radius) + planet_radius; + int randheight = qrand()%(range.height()- 2*planet_radius) + planet_radius; tmp = QPoint(randwidth, randheight); } - /*double tmpDistance = qSqrt((qPow((tmp.x()-center.x()), 2) + qPow((tmp.y()-center.y()), 2))); - double theta = qAsin(qAbs(tmp.y()-center.y())/tmpDistance); - QMatrix rotation = QMatrix(qCos(theta), qSin(theta), -qSin(theta), qCos(theta), -center.x(), -center.y());*/ - //Creates all frames for the animation setupLoop(tmp, ¢er); this->addAnimation(orbit); planet->show(); //Ensures the screensaver will not stop until the user wishes to login or it times out - this->setLoopCount(5); //number of orbits + this->setLoopCount(1); //number of orbits orbit->setDuration( qrand() %1000 + 19000); //20 second orbits //orbit->setEndValue(path.at(0)); //LoopChanged(0); //load initial values @@ -138,13 +141,14 @@ private slots: for(int i=0; i<this->animationCount(); i++){ if(this->animationAt(i)->state()==QAbstractAnimation::Running){ running++; } } - if(running<=1){ wobble->stop(); emit wobble->finished();} + if(running<=1){ wobble->stop(); emit wobble->finished();} } public: GravAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){} ~GravAnimation(){ - //this->stop(); + sun->deleteLater(); + while(planets.length()>0){ planets.takeAt(0)->deleteLater(); } } void LoadAnimations(){ @@ -152,8 +156,8 @@ public: sun = new QWidget(canvas); QPoint center = canvas->geometry().center(); QString sunstyle = QStringLiteral("background-color:qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:0.5, fx:0.5, fy:0.5, ") + - QStringLiteral("stop:0 rgba(0, 0, 0, 0), stop:0.38 rgba(0, 0, 0, 0), stop:0.4 rgba(82, 121, 76, 33), stop:0.5 rgba(159, 235, 148, 64), ") + - QStringLiteral("stop:0.6 rgba(255, 238, 150, 129), stop:0.7 rgba(0, 0, 0, 0));"); + QStringLiteral("stop:0 rgba(0, 0, 0, 0), stop:0.38 rgba(0, 0, 0, 0), stop:0.4 rgba(82, 121, 76, 33), stop:0.5 rgba(159, 235, 148, 64), ") + + QStringLiteral("stop:0.6 rgba(255, 238, 150, 129), stop:0.7 rgba(0, 0, 0, 0));"); sun->setStyleSheet(sunstyle); //Creates the sun's pulsing animation @@ -170,7 +174,6 @@ public: this->addAnimation(wobble); sun->show(); sun->setGeometry(initgeom); - while(planets.length()>0){ planets.takeAt(0)->deleteLater(); } //Gives the screensaver a black background canvas->setStyleSheet("background: black;"); diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h new file mode 100644 index 00000000..a64144ac --- /dev/null +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h @@ -0,0 +1,155 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2015, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_IMAGESLIDESHOW_ANIMATION_H +#define _LUMINA_DESKTOP_SCREEN_SAVER_IMAGESLIDESHOW_ANIMATION_H + +#include "global-includes.h" +#include "BaseAnimGroup.h" + +class ImageSlideshow: public QParallelAnimationGroup{ + Q_OBJECT +private: + QLabel *image; + QPropertyAnimation *bounce, *fading; + QPixmap pixmap; + QStringList imageFiles; + QString imagePath, scriptPath; + QSize screenSize; + bool animate, scriptLoad; + +private: + void setupAnimation() { + //Choose between starting from top or bottom at random + if(qrand() % 2) { + bounce->setKeyValueAt(0, QPoint(0,screenSize.height()-image->height())); + bounce->setKeyValueAt(0.25, QPoint((screenSize.width()-image->width())/2,0)); + bounce->setKeyValueAt(0.5, QPoint(screenSize.width()-image->width(),screenSize.height()-image->height())); + bounce->setKeyValueAt(0.75, QPoint((screenSize.width()-image->width())/2,0)); + bounce->setKeyValueAt(1, QPoint(0,screenSize.height()-image->height())); + }else{ + bounce->setKeyValueAt(0, QPoint(0,0)); + bounce->setKeyValueAt(0.25, QPoint((screenSize.width()-image->width())/2,screenSize.height()-image->height())); + bounce->setKeyValueAt(0.5, QPoint(screenSize.width()-image->width(),0)); + bounce->setKeyValueAt(0.75, QPoint((screenSize.width()-image->width())/2,screenSize.height()-image->height())); + bounce->setKeyValueAt(1, QPoint(0,0)); + } + } + + void chooseImage() { + QString randomFile = imagePath+imageFiles[qrand() % imageFiles.size()]; + + //Choose a new file if the chosen one is not an image + while(QImageReader::imageFormat(randomFile).isEmpty()) + randomFile = imagePath+imageFiles[qrand() % imageFiles.size()]; + if(scriptLoad){ + QProcess process; + process.start("/home/zwelch/test.sh"); + process.waitForFinished(1000); + QByteArray output = process.readAllStandardOutput(); + qDebug() << output; + pixmap.load(imagePath+imageFiles[qrand() % imageFiles.size()]); + }else{ + pixmap.load(imagePath+imageFiles[qrand() % imageFiles.size()]); + } + + //If the image is larger than the screen, then shrink the image down to 3/4 it's size (so there's still some bounce) + //Scale the pixmap to keep the aspect ratio instead of resizing the label itself + if(pixmap.width() > screenSize.width() or pixmap.height() > screenSize.height()) + pixmap = pixmap.scaled(screenSize*(3.0/4.0), Qt::KeepAspectRatio); + + //Set pixmap to the image label + image->setPixmap(pixmap); + image->resize(pixmap.size()); + } + +private slots: + void LoopChanged(){ + //Load a new random image. Resize the label based on the image's size + chooseImage(); + setupAnimation(); + } + void stopped(){ qDebug() << "Image Stopped"; image->hide();} + +public: + ImageSlideshow(QWidget *parent, QString path, bool animate, bool scriptLoad, QString scriptPath) : QParallelAnimationGroup(parent){ + imagePath = path; + image = new QLabel(parent); + screenSize = parent->size(); + this->animate = animate; + this->scriptLoad = scriptLoad; + this->scriptPath = scriptPath; + + //Generate the list of files in the directory + imageFiles = QDir(imagePath).entryList(QDir::Files); + if(imageFiles.empty()) + qDebug() << "Current image file path has no files."; + + //Change some default settings for the image. If scaledContents is false, the image will be cut off if resized + image->setScaledContents(true); + image->setAlignment(Qt::AlignHCenter); + + //Load a random initial image + chooseImage(); + + //Create the animation that moves the image across the screen + bounce = new QPropertyAnimation(image, "pos", parent); + + //Add the animation that fades the image in and out + QGraphicsOpacityEffect *eff = new QGraphicsOpacityEffect(parent); + image->setGraphicsEffect(eff); + fading = new QPropertyAnimation(eff,"opacity"); + fading->setKeyValueAt(0, 0); + fading->setKeyValueAt(0.20, 1); + fading->setKeyValueAt(0.80, 1); + fading->setKeyValueAt(1, 0); + this->addAnimation(fading); + + setupAnimation(); + image->show(); + //Only add the animation if set in the configuration file + if(animate) + this->addAnimation(bounce); + else + //If no animation, center the image in the middle of the screen + image->move(QPoint((parent->width()-image->width())/2,(parent->height()-image->height())/2)); + + //Loop through 30 times for a total for 4 minutes + this->setLoopCount(30); + bounce->setDuration(8000); + fading->setDuration(8000); + + connect(this, SIGNAL(currentLoopChanged(int)), this, SLOT(LoopChanged()) ); + connect(this, SIGNAL(finished()), this, SLOT(stopped()) ); + } + ~ImageSlideshow(){} + +}; + +class ImageAnimation: public BaseAnimGroup{ + Q_OBJECT +public: + ImageAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){} + ~ImageAnimation(){ + this->stop(); + } + + void LoadAnimations(){ + canvas->setStyleSheet("background: black;"); + //Load the path of the images from the configuration file (default /usr/local/backgrounds/) + QString imagePath = settings->value("imageSlideshow/path","/usr/local/backgrounds/").toString(); + //Load whether to animate the image (default true) + bool animate = settings->value("imageSlideshow/animate", true).toBool(); + bool scriptLoad = settings->value("imageSlideshow/scriptLoad", true).toBool(); + QString scriptPath; + if(scriptLoad) + scriptPath = settings->value("imageSlideshow/scriptPath", "/usr/local/backgrounds/script.sh").toString(); + ImageSlideshow *tmp = new ImageSlideshow(canvas, imagePath, animate, scriptLoad, scriptPath); + this->addAnimation(tmp); + } + +}; +#endif diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h index a4c49692..3ec0af82 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h @@ -4,11 +4,8 @@ // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== -#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_Text_ANIMATION_H -#define _LUMINA_DESKTOP_SCREEN_SAVER_Text_ANIMATION_H - -//PI is equal to 2*pi -#define PI 6.2832 +#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_TEXT_ANIMATION_H +#define _LUMINA_DESKTOP_SCREEN_SAVER_TEXT_ANIMATION_H #include "global-includes.h" #include "BaseAnimGroup.h" @@ -38,7 +35,7 @@ private slots: currLoc.setY(currLoc.y() + v.y()); movement->setEndValue(currLoc); } - void stopped(){ qDebug() << "text stopped"; text->hide();} + void stopped(){ qDebug() << "Text Stopped"; text->hide();} public: Text(QWidget *parent) : QParallelAnimationGroup(parent){ diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h new file mode 100644 index 00000000..cc3c1b83 --- /dev/null +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h @@ -0,0 +1,104 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2015, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_VIDEOSLIDESHOW_ANIMATION_H +#define _LUMINA_DESKTOP_SCREEN_SAVER_VIDEOSLIDESHOW_ANIMATION_H + +#include "global-includes.h" +#include "BaseAnimGroup.h" + +class VideoSlideshow: public QPropertyAnimation{ + Q_OBJECT +public: + VideoSlideshow(QWidget *parent, QVideoWidget *videoWidget) : QPropertyAnimation(videoWidget, "pos", parent){ + this->setKeyValueAt(0,QPoint(0,0)); + this->setKeyValueAt(1,QPoint(0,0)); + this->setDuration(1000000); + this->setLoopCount(-1); + } + ~VideoSlideshow(){} + +}; + +class VideoAnimation: public BaseAnimGroup{ + Q_OBJECT +private: + QString videoPath; + VideoSlideshow *tmp; + QVideoWidget *videoWidget; + QMediaPlayer *video; + QStringList videoFiles; + bool multimonitor; + +private slots: + void startVideo(QAbstractAnimation::State state) { + qDebug() << "Status: " << video->mediaStatus() << "New Animation State:" << state; + if(state==QAbstractAnimation::Running){ + video->setVolume(100); + video->play(); + } + if(state==QAbstractAnimation::Stopped && video->state()!=QMediaPlayer::StoppedState){ + video->stop(); + } + } + + void stopVideo() { + if(video->state() == QMediaPlayer::StoppedState) { + qDebug() << "Stopping Animation"; + //this->deleteLater(); + videoWidget->hide(); + tmp->stop(); + //tmp->deleteLater(); + videoWidget->deleteLater(); + video->deleteLater(); + } + } + +public: + VideoAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){} + + ~VideoAnimation(){ + this->stop(); + } + + void LoadAnimations(){ + canvas->setStyleSheet("background: black;"); + + //Load the path of the videos from the configuration file (default /usr/local/videos/) + videoPath = settings->value("videoSlideshow/path","/usr/local/videos").toString(); + if(!videoPath.endsWith("/")){ videoPath.append("/"); } + + //Set whether to copy videos on two monitors or play different videos + multimonitor = settings->value("videoSlideshow/multimonitor",true).toBool(); + + video = new QMediaPlayer(canvas, QMediaPlayer::VideoSurface); + videoWidget = new QVideoWidget(canvas); + videoWidget->setGeometry(QRect(QPoint(0,0), canvas->size())); + + tmp = new VideoSlideshow(canvas, videoWidget); + this->addAnimation(tmp); + + //Generate the list of files in the directory + videoFiles = QDir(videoPath).entryList(QDir::Files); + if(videoFiles.empty()) + qDebug() << "Current video file path has no files."; + + this->setLoopCount(1); + + QUrl url = QUrl::fromLocalFile(videoPath+videoFiles[qrand() % videoFiles.size()]); + video->setMedia(url); + qDebug() << url; + video->setVideoOutput(videoWidget); + videoWidget->show(); + + qDebug() << "VideoWidget Displayed"; + connect(tmp, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)), this, SLOT(startVideo(QAbstractAnimation::State)) ); + //connect(video, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)), this, SLOT(startVideo()) ); + connect(video, SIGNAL(stateChanged(QMediaPlayer::State)), this, SLOT(stopVideo()) ); + } + +}; +#endif diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri index 35141a0e..fdc75717 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri @@ -4,5 +4,7 @@ HEADERS += $$PWD/BaseAnimGroup.h \ $$PWD/SampleAnimation.h \ $${PWD}/Fireflies.h \ $${PWD}/Grav.h \ + $${PWD}/ImageSlideshow.h \ + $${PWD}/VideoSlideshow.h \ $${PWD}/Text.h #FORMS += diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 93318b0f..bbed6d79 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -49,6 +49,7 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu lastActiveWin = 0; cleansession = true; TrayStopping = false; + xchange = false; ICONS = new LIconCache(this); screenTimer = new QTimer(this); screenTimer->setSingleShot(true); @@ -91,6 +92,7 @@ void LSession::setupSession(){ //Seed random number generator (if needed) qsrand( QTime::currentTime().msec() ); + currTranslator = LUtils::LoadTranslation(this, "lumina-desktop"); BootSplash splash; splash.showScreen("init"); qDebug() << "Initializing Session"; @@ -114,7 +116,6 @@ void LSession::setupSession(){ sessionsettings->value("InitLocale/LC_COLLATE","").toString(), \ sessionsettings->value("InitLocale/LC_CTYPE","").toString() ); } - currTranslator = LUtils::LoadTranslation(this, "lumina-desktop"); //use the system settings //Setup the user's lumina settings directory as necessary splash.showScreen("user"); @@ -191,7 +192,10 @@ void LSession::CleanupSession(){ int vol = LOS::audioVolume(); if(vol>=0){ sessionsettings->setValue("last_session_state/audio_volume", vol); } bool playaudio = sessionsettings->value("PlayLogoutAudio",true).toBool(); - if( playaudio ){ playAudioFile(LOS::LuminaShare()+"Logout.ogg"); } + if( playaudio ){ + QString sfile = sessionsettings->value("audiofiles/logout", LOS::LuminaShare()+"Logout.ogg").toString(); + playAudioFile(sfile); + } //Stop the background system tray (detaching/closing apps as necessary) stopSystemTray(!cleansession); //Now perform any other cleanup @@ -296,7 +300,8 @@ void LSession::launchStartupApps(){ //Now play the login music since we are finished if(sessionsettings->value("PlayStartupAudio",true).toBool()){ - LSession::playAudioFile(LOS::LuminaShare()+"Login.ogg"); + QString sfile = sessionsettings->value("audiofiles/login", LOS::LuminaShare()+"Login.ogg").toString(); + playAudioFile(sfile); } qDebug() << "[DESKTOP INIT FINISHED]"; } @@ -360,12 +365,14 @@ void LSession::screensChanged(){ qDebug() << "Screen Number Changed"; if(screenTimer->isActive()){ screenTimer->stop(); } screenTimer->start(); + xchange = true; } void LSession::screenResized(int scrn){ qDebug() << "Screen Resized:" << scrn; if(screenTimer->isActive()){ screenTimer->stop(); } screenTimer->start(); + xchange = true; } void LSession::checkWindowGeoms(){ @@ -463,9 +470,10 @@ void LSession::updateDesktops(){ } dset.setValue("last_used_screens", allNames); //Make sure fluxbox also gets prompted to re-load screen config if the number of screens changes in the middle of a session - if(numchange && !firstrun) { + if(!firstrun && xchange){ qDebug() << "Update WM"; - refreshWindowManager(); + //QProcess::startDetached("killall fluxbox"); + xchange = false; } //Make sure all the background windows are registered on the system as virtual roots @@ -656,6 +664,7 @@ void LSession::playAudioFile(QString filepath){ void LSession::RootSizeChange(){ qDebug() << "Got Root Size Change"; if(DESKTOPS.isEmpty()){ return; } //Initial setup not run yet + xchange = true; screenTimer->start(); } diff --git a/src-qt5/core/lumina-desktop/LSession.h b/src-qt5/core/lumina-desktop/LSession.h index 4c8da41c..0d69df84 100644 --- a/src-qt5/core/lumina-desktop/LSession.h +++ b/src-qt5/core/lumina-desktop/LSession.h @@ -109,6 +109,7 @@ private: QList<LDesktop*> DESKTOPS; QFileSystemWatcher *watcher; QTimer *screenTimer; + bool xchange; //flag for when the x11 session was adjusted //Internal variable for global usage AppMenu *appmenu; diff --git a/src-qt5/core/lumina-desktop/SystemWindow.cpp b/src-qt5/core/lumina-desktop/SystemWindow.cpp index 1c0b59a5..cd09c9bd 100644 --- a/src-qt5/core/lumina-desktop/SystemWindow.cpp +++ b/src-qt5/core/lumina-desktop/SystemWindow.cpp @@ -55,6 +55,9 @@ bool SystemWindow::promptAboutUpdates(bool &skip){ if(pending.isEmpty()){ skip = false; } //continue without skip else{ QMessageBox dlg(QMessageBox::Question, tr("Apply Updates?"), tr("You have system updates waiting to be applied! Do you wish to install them now?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, this); + dlg.setButtonText(QMessageBox::Yes, tr("Yes")); + dlg.setButtonText(QMessageBox::No, tr("No")); + dlg.setButtonText(QMessageBox::Cancel, tr("Cancel")); dlg.setDetailedText(pending); dlg.setDefaultButton(QMessageBox::Yes); dlg.show(); diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp index 55f05fe9..0258d561 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp @@ -151,6 +151,7 @@ void AppLauncherPlugin::loadButton(){ tmp = this->contextMenu()->addAction( tr("Delete"), this, SLOT(fileDelete()) ); ICONS->loadIcon(tmp, "document-close"); } + iconLoaded(iconID); //make sure the emblem is layered on top //If the file is a symlink, put the overlay on the icon /*if(info.isSymLink()){ QImage img = button->icon().pixmap(QSize(icosize,icosize)).toImage(); @@ -171,7 +172,7 @@ void AppLauncherPlugin::loadButton(){ if(txt.contains("\n")){ //need to check each line QStringList txtL = txt.split("\n"); - for(int i=0; i<txtL.length(); i++){ + for(int i=0; i<txtL.length(); i++){ if(( i+1<txtL.length()) && (button->fontMetrics().width(txtL[i]) < button->width()/2) ){ txtL[i] = txtL[i]+" "+txtL[i+1]; txtL.removeAt(i+1); @@ -179,11 +180,11 @@ void AppLauncherPlugin::loadButton(){ } txt = txtL.join("\n").section("\n",0,2); } - + if(txt.contains("\n")){ //need to check each line QStringList txtL = txt.split("\n"); - for(int i=0; i<txtL.length(); i++){ + for(int i=0; i<txtL.length(); i++){ if(i>1){ txtL.removeAt(i); i--; } //Only take the first two lines else{ txtL[i] = button->fontMetrics().elidedText(txtL[i], Qt::ElideRight, (button->width()-OUTMARGIN) ); } } @@ -200,7 +201,7 @@ void AppLauncherPlugin::loadButton(){ QTimer::singleShot(100, this, SLOT(update()) ); //Make sure to re-draw the image in a moment } - + void AppLauncherPlugin::buttonClicked(bool openwith){ QString path = button->whatsThis(); if(path.isEmpty() || !QFile::exists(path) ){ @@ -218,7 +219,7 @@ void AppLauncherPlugin::buttonClicked(bool openwith){ }else{ LSession::LaunchApplication("lumina-open \""+path+"\""); } - + } void AppLauncherPlugin::iconLoaded(QString ico){ diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts index 2496641f..c603fd8c 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Изтриване</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Избор на програма</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Име:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (зарежда се)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 оставащи)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Часова зона (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Използване на системното време</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Работен плот</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Назад</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Отказ</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (външно захранване)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (приблизително %2)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>остават %1%</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Работен плот %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Отказ</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts index 20bf3c1b..4cd0c63e 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts @@ -83,17 +83,17 @@ <translation>Suprimeix</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Seleccioneu l'aplicació</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nom:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>Nom de fitxer nou</translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Carregant)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (resten %2)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Zona horària (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Usa l'hora del sistema</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Escriptori</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Enrere</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Aplico les actualitzacions?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Teniu actualitzacions de sistema per aplicar! Voleu instal·lar-les ara?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Cancel·la</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (connectat)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 estimat)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>Resta %1%</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Espai de treball %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Teniu actualitzacions de sistema per aplicar! Voleu instal·lar-les ara?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts index b22b1309..adc843ed 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts @@ -83,17 +83,17 @@ <translation>Vymazat</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Vybrat aplikaci</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Název:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>Nový název souboru</translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Nabíjení)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Zbývá)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Časové pásmo (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Použít systémový čas</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Plocha</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Zpět</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Nainstalovat aktualizace?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Aktualizace systému čekají na instalaci! Chcete je nainstalovat nyní?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Storno</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (zapojeno)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (odhadováno %2)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% zbývá</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Pracovní plocha %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Storno</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Aktualizace systému čekají na instalaci! Chcete je nainstalovat nyní?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts index a9522431..f791a3d9 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -83,17 +83,17 @@ <translation>Slet</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Vælg program</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Navn:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>Nyt filnavn</translation> </message> @@ -196,7 +196,7 @@ <message> <location filename="../BootSplash.ui" line="94"/> <source>Starting the Lumina Desktop...</source> - <translation>Starter Lumina-skrivebordet ...</translation> + <translation>Starter Lumina-skrivebordet...</translation> </message> <message> <location filename="../BootSplash.cpp" line="17"/> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (lader)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 tilbage)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Tidszone (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Brug systemtid</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Skrivebord</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Tilbage</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Opdater?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Du har systemopdateringer der venter! Ønsker du at installere dem nu?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Annuller</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (tilsluttet)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 estimeret)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% tilbage</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Arbejdsområde %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Annuller</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Du har systemopdateringer der venter! Ønsker du at installere dem nu?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts index 644524e1..80b8eb9d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts @@ -83,17 +83,17 @@ <translation>Löschen</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Anwendung auswählen</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>Neuer Dateiname</translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Aufladen)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 verbleibend)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Zeitzone (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Systemzeit verwenden</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Arbeitsfläche</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Zurück</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Aktualisierungen anwenden?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Sie haben Systemaktualisierungen, die darauf warten, angewendet zu werden! Möchten Sie sie jetzt installieren?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Abbrechen</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Eingesteckt)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Geschätzt)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% verbleibend</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Arbeitsbereich %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Sie haben Systemaktualisierungen, die darauf warten, angewendet zu werden! Möchten Sie sie jetzt installieren?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts index 257c2f1d..118b48b1 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Επιλογή εφαρμογής</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Όνομα:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts index 2b611add..3cf7e09c 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Delete</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Select Application</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Charging)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Remaining)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Time Zone (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Use System Time</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Desktop</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Back</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Apply Updates?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>You have system updates waiting to be applied! Do you wish to install them now?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Cancel</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Plugged In)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Estimated)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Remaining</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Workspace %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>You have system updates waiting to be applied! Do you wish to install them now?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts index b89fb14b..db35d013 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Delete</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Select Application</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Charging)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Remaining)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Time Zone (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Use System Time</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Desktop</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Back</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Apply Updates?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>You have system updates waiting to be applied! Do you wish to install them now?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Cancel</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Plugged In)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Estimated)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Remaining</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Workspace %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>You have system updates waiting to be applied! Do you wish to install them now?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts index d1289b1b..319f90ab 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts @@ -83,17 +83,17 @@ <translation>Borrar</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Seleccionar Aplicación</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nombre:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Cargando)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Restante)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Zona Horaria (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Usar Hora del Sistema</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Escritorio</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Atrás</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>¿Aplicar Actualizaciones?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>¡Tienes actualizaciones del sistema esperando ser aplicadas! ¿Desearías instalarlas ahora?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Conectado)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Estimado)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Restante</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Área de Trabajo %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>!Tienes actualizaciones del sistema esperando ser aplicadas! ¿Quisieras instalarlas ahora?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts index 5bf00b5f..4fbe1d5b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Kustuta</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Vali rakendus</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nimi:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1% (laeb)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1% (%2 jäänud)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished">Töölaud</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Tagasi</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Loobu</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished">Tööruum %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Loobu</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts index 800eb234..248cc262 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Ezabatu</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Aplikazioa hautatu</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Izena:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Kargatzen)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Faltan)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Utzi</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished">Laneko area %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Utzi</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts index d6469c56..e45c6072 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished">کاربست برگزین</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts index 62634130..ff8e867c 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Poista</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Valitse sovellus</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nimi:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (lataa)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 jäljellä)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Aikavyöhyke (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Käytä järjestelmän aikaa</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Työpöytä</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Takaisin</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Toteutetaanko päivitykset?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Jotkin järjestelmäpäivitykset odottavat toteuttamista! Haluatko asentaa ne nyt?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Peru</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1 % (verkkovirta)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1 % (arviolta %2)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1 % jäljellä</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Työtila %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Peru</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Joitakin järjestelmäpäivityksiä odottavat toteuttamista! Haluatko asentaa ne nyt?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts index 53f00a69..f85a0380 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Sélectionner un Programme</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nom :</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Chargement)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Restant)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Fuseau Horaire (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Utiliser l'Heure du Système</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Bureau</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Retour</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Appliquer les Mises à Jour ?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Des mises à jour du système sont en attente, voulez-vous les installer maintenant ?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Annuler</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Branchée)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Estimé)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% restant(s)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Espace de Travail %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Des mises à jour du système sont en attente, voulez-vous les installer maintenant ?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts index 9ff16d1d..fabf3f31 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished">שולחן עבודה</translation> </message> @@ -1449,34 +1449,49 @@ <translation>אחורה</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">ביטול</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>ביטול</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts index f1ed8825..f1cb1d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts @@ -83,17 +83,17 @@ <translation type="unfinished">नष्ट करें</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>एप्लीकेशन चुनें</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>नाम</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 %(चार्ज हो रहा है)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 %(%2 बचा है)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>समय क्षेत्र(%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>उपकरण समय का उपयोग करें</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished">डेस्कटॉप</translation> </message> @@ -1449,34 +1449,49 @@ <translation>वापस</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">रद्द</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1%(प्लग इन)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 लगभग)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% शेष</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>कार्यस्थल %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>रद्द</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts index abdfc7b4..30cc030d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Törlés</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Alkalmazás kiválasztása</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Név:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Töltés)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 hátralévő)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Időzóna (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Rendszeridő használata</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Asztal</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Vissza</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Mégsem</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>%1/%2 munkaterület</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Mégsem</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts index 13bba7d0..38cdee0f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Hapus</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Pilih Aplikasi</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nama:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (pengisian baterai)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 sisa)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Zona waktu (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Gunakan Tema Waktu (%1)</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished">Layar Kerja Utama</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Mundur</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Batalkan</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished">%1% (Terpasang Dalam)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Perkiraan)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Sisa</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished">Ruang kerja %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Batalkan</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts index ed420545..32aae413 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Cancella</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Seleziona Applicazione</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nome:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (In Carica)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Rimanente)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Fuso Orario (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Usa Orario Sistema</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Desktop</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Indietro</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Cancella</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Plugged In)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Stimato)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Rimanente</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Spazio Lavoro %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Cancella</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts index 55ab6645..0179804f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts @@ -86,17 +86,17 @@ <translation type="unfinished">削除</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>アプリケーションを選択してください</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>名前:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -668,12 +668,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (充電中)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (残り %2 %)</translation> </message> @@ -681,12 +681,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>タイムゾーン (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>システムの時刻を使用する</translation> </message> @@ -856,7 +856,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translatorcomment>これ、ファイルパスなので、「デスクトップ」と訳したらまずい</translatorcomment> <translation>Desktop</translation> @@ -1466,34 +1466,49 @@ <translation>戻る</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>更新を行いますか?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>適用されていないシステムアップデートがあります。インストールしますか?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">キャンセル</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (電源接続中)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (推定残り時間: %2)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>残り %1%</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>ワークスペース %1/%2</translation> </message> @@ -1522,6 +1537,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>キャンセル</translation> </message> @@ -1545,6 +1561,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>システムが適用されるのを待っている更新があります！ 今それらをインストールしますか？</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts index c47d7279..b7a23143 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts @@ -83,17 +83,17 @@ <translation type="unfinished">삭제</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>프로그램 선택</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>이름:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (충전중)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 남음)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>시간대 (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>시스템 시간 사용</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished">바탕 화면</translation> </message> @@ -1449,34 +1449,49 @@ <translation>뒤로</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">취소</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (연결됨)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 예상)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% 남음</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>작업 공간 %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>취소</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts index 34b0a5e6..55cc8ec1 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts @@ -83,17 +83,17 @@ <translation>Ištrinti</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Pasirinkti programą</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Pavadinimas:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>Naujas failo pavadinimas</translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Kraunama)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (Liko %2)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Laiko juosta (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Naudoti sistemos laiką</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Darbalaukis</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Atgal</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Taikyti atnaujinimus?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Jūsų sistemoje yra laukiančių atnaujinimų! Ar norite įdiegti juos dabar?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Atsisakyti</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Įdėta)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (Apytikriai %2)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>Liko %1%</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Darbo sritis %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Atsisakyti</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Jūsų sistemoje yra laukiančių atnaujinimų! Ar norite įdiegti juos dabar?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts index 7cf1b6f3..5d7d9e0f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Dzēst</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Izvēlieties lietotni</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nosaukums:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (uzlādējas)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 atlicis)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Laika zona (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Izmantot sistēmas laiku</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Darbvirsma</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Atpakaļ</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Atcelt</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (pievienots)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 paredzamais)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% atlicis</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Darbvieta %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Atcelt</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts index 9702b408..3e0fc664 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Verwijderen</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Applicatie selecteren</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Naam:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Bezig met opladen)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 resterend)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Tijdzone (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Systeemtijd gebruiken</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Bureaublad</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Terug</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Wilt u de updates toepassen?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Er zijn systeemupdates beschikbaar. Wilt u deze nu installeren?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Annuleren</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Oplaadkabel is verbonden)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 geschat)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% resterend</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Werkruimte %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Er zijn systeemupdates beschikbaar! Wilt u deze nu installeren?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts index f9c747e9..e3ebe0a6 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Usuń</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Wybierz aplikację</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nazwa:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Ładowanie)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 pozostało)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Strefa czasowa (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Czas systemowy</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Pulpit</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Wstecz</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Zastosować aktualizacje?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Masz oczekujące aktualizacje systemowe gotowe do zastosowania! Czy chcesz zainstalować je teraz?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Zaniechaj</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Podłączony)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Szacowane)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Pozostało</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Przestrzeń robocza %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Zaniechaj</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Masz oczekujące aktualizacje systemu gotowe do zastosowania! Czy chcesz je teraz zainstalować?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts index dfe5c837..0321a6b1 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Excluir</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Selecionar Aplicativo </translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nome:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Carregando)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Restantes)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished">Área de Trabalho</translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished">Espaço de trabalho %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts index 08732029..0fd7d193 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Excluir</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Selecionar aplicativo</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Nome:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (carregando)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 restantes)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Fuso horário (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Usar hora do sistema</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Área de trabalho</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Voltar</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Aplicar atualizações?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Você tem atualização de sistema pendentes! Gostaria de instalá-las agora?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Plugado)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Estimado)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Restantes</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Espaço de trabalho %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>Você tem atualização de sistema pendentes! Gostaria de instalá-las agora?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts index a7a78a16..2f4b4072 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts @@ -83,17 +83,17 @@ <translation>Удалить</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Выбрать Приложение</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Название:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>Новое имя файла</translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Заряжается)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (Осталось %2 )</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Часовой пояс (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Использовать системное время</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Рабочий стол</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Назад</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>Применить обновления?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>У вас есть системные обновления! Вы хотите установить их сейчас?</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Отмена</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (подключенный)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 расчетно)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% осталось</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Рабочая Область %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>У вас есть системные обновления! Вы хотите установить их сейчас?</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts index c9bfecb1..907717e2 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Vymazať</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Výber aplikácie</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Meno:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Nabíjania)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 zostáva)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Časová zóna (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Použiť systémový čas </translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished">Pracovná plocha</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Späť</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Zrušiť</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Nabitia)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 odhadovaný)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>Zostáva %1%</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Pracovná plocha %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts index 5a4ab343..637f7436 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Izbriši</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Izberi program</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Ime:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts index 9a5870cd..ecf6aa32 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Ta bort</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Välj program</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Namn:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>Nytt filnamn</translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Laddar)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 % (%2 Återstår)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Tidszon (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Använd systemtid</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Skrivbord</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Bakåt</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Avbryt</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Inkopplad)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 Beräknad)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% återstår</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Arbetsyta %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts index 02e7e914..f3e6147d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Sil</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Uygulama Seç</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Ad:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>% %1 (Doluyor)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>% %1 (Kalan %2)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Saat Dilimi (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Sistem Saatini Kullan</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Masaüstü</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Geri</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">İptal</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Prize Takılı)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (Tahmini %2)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Kaldı</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Çalışma alanı %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>İptal</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts index eef5d753..e73fe905 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts @@ -83,17 +83,17 @@ <translation type="unfinished">Видалити</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>Оберіть додаток</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>Ім'я:</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 % (Заряд)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 (залишилося %2)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>Часовий пояс (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>Використовувати системний час</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>Робочий стіл</translation> </message> @@ -1449,34 +1449,49 @@ <translation>Назад</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">Скасувати</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (Підключено)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (%2 розрахунково)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>%1% Залишилось</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>Робочий простір %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>Скасувати</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts index 17149435..cf6f658b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts @@ -83,17 +83,17 @@ <translation>删除</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation>选择程序</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation>名称：</translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation>新文件名</translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation>%1 %(充电)</translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation>%1 (%2 剩余)</translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation>时区 (%1)</translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation>使用系统时间</translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation>桌面</translation> </message> @@ -1449,34 +1449,49 @@ <translation>返回</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation>应用更新？</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>您有系统更新可用！请问您是否想现在安装？</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished">取消</translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation>%1% (已插电)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation>%1% (估计 %2)</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation>剩余 %1%</translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation>工作区 %1/%2</translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation>您有系统更新可用！请问您是否想现在安装？</translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts index caeb719a..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts @@ -83,17 +83,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Select Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="212"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="213"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="298"/> + <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="299"/> <source>New Filename</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ <context> <name>LBattery</name> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="92"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="94"/> <source>%1 % (Charging)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/battery/LBattery.cpp" line="93"/> + <location filename="../panel-plugins/battery/LBattery.cpp" line="95"/> <source>%1 % (%2 Remaining)</source> <translation type="unfinished"></translation> </message> @@ -677,12 +677,12 @@ <context> <name>LClock</name> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="137"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="139"/> <source>Time Zone (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/clock/LClock.cpp" line="159"/> + <location filename="../panel-plugins/clock/LClock.cpp" line="161"/> <source>Use System Time</source> <translation type="unfinished"></translation> </message> @@ -851,7 +851,7 @@ <name>LSession</name> <message> <location filename="../LSession.cpp" line="163"/> - <location filename="../LSession.cpp" line="342"/> + <location filename="../LSession.cpp" line="346"/> <source>Desktop</source> <translation type="unfinished"></translation> </message> @@ -1449,34 +1449,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>Apply Updates?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="290"/> <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="500"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="291"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="292"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="293"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="501"/> <source>%1% (Plugged In)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="504"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> <source>%1% (%2 Estimated)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="505"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="506"/> <source>%1% Remaining</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="521"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="680"/> - <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="691"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="522"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="681"/> + <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="692"/> <source>Workspace %1/%2</source> <translation type="unfinished"></translation> </message> @@ -1505,6 +1520,7 @@ </message> <message> <location filename="../SystemWindow.ui" line="127"/> + <location filename="../SystemWindow.cpp" line="60"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1528,6 +1544,16 @@ <source>You have system updates waiting to be applied! Do you wish to install them now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../SystemWindow.cpp" line="58"/> + <source>Yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SystemWindow.cpp" line="59"/> + <source>No</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserItemWidget</name> diff --git a/src-qt5/core/lumina-desktop/main.cpp b/src-qt5/core/lumina-desktop/main.cpp index 1b0e5e4d..6017cad7 100644 --- a/src-qt5/core/lumina-desktop/main.cpp +++ b/src-qt5/core/lumina-desktop/main.cpp @@ -72,8 +72,8 @@ int main(int argc, char ** argv) LXDG::setEnvironmentVars(); setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); - unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... - //setenv("QT_QPA_PLATFORMTHEME", "lthemeengine"); + //unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... + setenv("QT_QPA_PLATFORMTHEME", "lthemeengine", 1); unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //causes pixel-specific scaling issues with the desktop - turn this on after-the-fact for other apps //Startup the session LSession a(argc, argv); diff --git a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp index 5e9d7a7f..be5b8488 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp @@ -78,8 +78,10 @@ void LBattery::updateBattery(bool force){ } if(icon<iconOld && icon==0){ //Play some audio warning chime when - LSession::handle()->playAudioFile(LOS::LuminaShare()+"low-battery.ogg"); - } + QString sfile = LSession::handle()->sessionSettings()->value("audiofiles/batterylow", LOS::LuminaShare()+"low-battery.ogg").toString(); + LSession::handle()->playAudioFile(sfile); + } + if(icon==0){ label->setStyleSheet("QLabel{ background: red;}"); } else if(icon==14 && charge>98){ label->setStyleSheet("QLabel{ background: green;}"); } else{ label->setStyleSheet("QLabel{ background: transparent;}"); } diff --git a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp index bdf9b27e..2972ea86 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp @@ -25,14 +25,14 @@ LClock::LClock(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, calAct->setDefaultWidget(calendar); TZMenu = new QMenu(this); connect(TZMenu, SIGNAL(triggered(QAction*)), this, SLOT(ChangeTZ(QAction*)) ); - + //Now assemble the menu button->menu()->addAction(calAct); button->menu()->addMenu(TZMenu); - + this->layout()->setContentsMargins(0,0,0,0); //reserve some space on left/right this->layout()->addWidget(button); - + //Setup the timer timer = new QTimer(); //Load all the initial settings @@ -71,10 +71,11 @@ void LClock::updateTime(bool adjustformat){ }else if(datetimeorder == "datetime"){ label = datelabel + "\n" + timelabel; button->setToolTip(""); - }else{ + }else{ label = timelabel; button->setToolTip(datelabel); } + QStringList lines = label.split("\n"); if( this->layout()->direction() == QBoxLayout::TopToBottom ){ //different routine for vertical text (need newlines instead of spaces) for(int i=0; i<label.count("\n")+1; i++){ @@ -84,7 +85,7 @@ void LClock::updateTime(bool adjustformat){ } } //label.replace(" ","\n"); - }else if( this->size().height() < 2*this->fontMetrics().height() ){ + }else if( this->size().height() < lines.length()*this->fontMetrics().height() ){ label.replace("\n",", "); } if(adjustformat){ @@ -92,17 +93,18 @@ void LClock::updateTime(bool adjustformat){ font.setBold(true); button->setFont(font); //Check the font/spacing for the display and adjust as necessary - QStringList lines = label.split("/n"); + QStringList lines = label.split("\n"); QFontMetrics metrics(font); if(this->layout()->direction()==QBoxLayout::LeftToRight){ //horizontal layout int wid = 0; - int lwid; + int lwid = 0; for(int i=0; i<lines.length(); i++){ lwid = metrics.width(lines[i]); if(lwid>wid){ wid = lwid; } } - this->setMinimumWidth( wid - (4*metrics.width("O")) ); + qDebug() << "Verify Clock width:" << lines.length() << wid << lines; + this->setMinimumWidth(wid); this->setMaximumWidth(wid + (4*metrics.width("O"))); }else{ //vertical layout diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp index 6557dbee..1992db0f 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp @@ -1,8 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2015, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details +// Copyright (c) 2015, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== #include "StartMenu.h" #include "ui_StartMenu.h" @@ -290,6 +288,9 @@ bool StartMenu::promptAboutUpdates(bool &skip){ if(pending.isEmpty()){ skip = false; } //continue without skip else{ QMessageBox dlg(QMessageBox::Question, tr("Apply Updates?"), tr("You have system updates waiting to be applied! Do you wish to install them now?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, this); + dlg.setButtonText(QMessageBox::Yes, tr("Yes")); + dlg.setButtonText(QMessageBox::No, tr("No")); + dlg.setButtonText(QMessageBox::Cancel, tr("Cancel")); dlg.setDetailedText(pending); dlg.setDefaultButton(QMessageBox::Yes); dlg.show(); diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index 3696ed20..71244a8b 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -21,6 +21,11 @@ #include <unistd.h> #define DEBUG 0 +int findAvailableSession(){ + int num = 0; + while(QFile::exists("/tmp/.X11-unix/X"+QString::number(num))){ num++; } + return num; +} int main(int argc, char ** argv) { @@ -45,7 +50,7 @@ int main(int argc, char ** argv) QString prog = QString(argv[0]).section("/",-1); LUtils::isValidBinary(prog); //will adjust the path to be absolute if(unified){ prog = prog+" --unified"; } - QStringList args; args << prog; + QStringList args; args << prog << "--" << ":"+QString::number(findAvailableSession()); //if(LUtils::isValidBinary("x11vnc")){ args << "--" << "-listen" << "tcp"; } //need to be able to VNC into this session return QProcess::execute("xinit", args); } diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 48a25a8f..3fdf9e66 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -39,6 +39,7 @@ void LSession::procFinished(){ if(!stopping){ //See if this process is the main desktop binary if(PROCS[i]->objectName()=="runtime"){ stopall(); } + else if(PROCS[i]->objectName()=="wm" && wmfails<2){ wmfails++; PROCS[i]->start(QIODevice::ReadOnly); wmTimer->start(); } //restart the WM //if(PROCS[i]->program().section("/",-1) == "lumina-desktop"){ stopall(); } //start closing down everything //else{ PROCS[i]->start(QIODevice::ReadOnly); } //restart the process //break; @@ -85,11 +86,17 @@ void LSession::start(bool unified){ if(!LUtils::isValidBinary("lumina-desktop") ){ exit(1); } + setenv("DESKTOP_SESSION","Lumina",1); + setenv("XDG_CURRENT_DESKTOP","Lumina",1); + setenv("QT_QPA_PLATFORMTHEME","lthemeengine", true); + setenv("QT_NO_GLIB", "1", 1); //Disable the glib event loop within Qt at runtime (performance hit + bugs) + unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //need exact-pixel measurements (no fake scaling) + if(!unified){ QSettings sessionsettings("lumina-desktop","sessionsettings"); QString WM = sessionsettings.value("WindowManager", "fluxbox").toString(); //Window Manager First - if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.isEmpty() ){ + if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.simplified().isEmpty() ){ // FLUXBOX BUG BYPASS: if the ~/.fluxbox dir does not exist, it will ignore the given config file if( !LUtils::isValidBinary("fluxbox") ){ qDebug() << "[INCOMPLETE LUMINA INSTALLATION] fluxbox binary is missing - cannot continue"; diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h index caa61ad6..5cf1ccfa 100644 --- a/src-qt5/core/lumina-session/session.h +++ b/src-qt5/core/lumina-session/session.h @@ -8,6 +8,7 @@ #include <QProcess> #include <QDebug> #include <QFileSystemWatcher> +#include <QTimer> #include <sys/types.h> #include <signal.h> @@ -59,6 +60,8 @@ class LSession : public QObject{ private: QList<QProcess*> PROCS; bool stopping; + int wmfails; + QTimer *wmTimer; private slots: void stopall(); @@ -67,9 +70,14 @@ private slots: void startProcess(QString ID, QString command, QStringList watchfiles = QStringList()); + void resetWMCounter(){ wmfails = 0; } public: LSession(){ - stopping = false; + stopping = false; wmfails = 0; + wmTimer = new QTimer(this); + wmTimer->setSingleShot(true); + wmTimer->setInterval(2000); //2 second timeout + connect(wmTimer, SIGNAL(timeout()), this, SLOT(resetWMCounter()) ); } ~LSession(){ } diff --git a/src-qt5/core/lumina-theme-engine/colors/airy.conf b/src-qt5/core/lumina-theme-engine/colors/airy.conf new file mode 100644 index 00000000..94008b7a --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/airy.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #dcdcdc, #dcdcdc, #5e5c5b, #646464, #e1e1e1, #000000, #0a0a0a, #0a0a0a, #c8c8c8, #ffffff, #e7e4e0, #0986d3, #0a0a0a, #0986d3, #a70b06, #5c5b5a, #ffffff, #646464, #050505 +disabled_colors=#ffffff, #424245, #dcdcdc, #5e5c5b, #646464, #e1e1e1, #808080, #ffffff, #808080, #969696, #c8c8c8, #e7e4e0, #0986d3, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #646464, #ffffff +inactive_colors=#323232, #b4b4b4, #dcdcdc, #5e5c5b, #646464, #e1e1e1, #323232, #323232, #323232, #969696, #c8c8c8, #e7e4e0, #0986d3, #323232, #0986d3, #a70b06, #5c5b5a, #ffffff, #646464, #323232 diff --git a/src-qt5/core/lumina-theme-engine/colors/darker.conf b/src-qt5/core/lumina-theme-engine/colors/darker.conf new file mode 100644 index 00000000..9c822b60 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/darker.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff +disabled_colors=#808080, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #808080, #ffffff, #808080, #3d3d3d, #222020, #e7e4e0, #12608a, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff +inactive_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff diff --git a/src-qt5/core/lumina-theme-engine/colors/dusk.conf b/src-qt5/core/lumina-theme-engine/colors/dusk.conf new file mode 100644 index 00000000..5186ecef --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/dusk.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 +disabled_colors=#bebebe, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #bebebe, #ffffff, #bebebe, #7f7f7f, #7f7f7f, #b1aeab, #7f7f7f, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 +inactive_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 diff --git a/src-qt5/core/lumina-theme-engine/colors/sand.conf b/src-qt5/core/lumina-theme-engine/colors/sand.conf new file mode 100644 index 00000000..92349195 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/sand.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #ffffdc, #979797, #5e5c5b, #302f2e, #4a4947, #000000, #000000, #000000, #ffffdc, #ffffdc, #e7e4e0, #5f5b5d, #f9f9f9, #0986d3, #a70b06, #ffffdc, #000000, #3f3f36, #000000 +disabled_colors=#4a4947, #ffffdc, #979797, #5e5c5b, #302f2e, #4a4947, #4a4947, #4a4947, #4a4947, #ffffdc, #ffffdc, #e7e4e0, #5f5b5d, #f9f9f9, #0986d3, #a70b06, #ffffdc, #000000, #3f3f36, #000000 +inactive_colors=#000000, #ffffdc, #979797, #5e5c5b, #302f2e, #4a4947, #000000, #000000, #000000, #ffffdc, #ffffdc, #e7e4e0, #5f5b5d, #f9f9f9, #0986d3, #a70b06, #ffffdc, #000000, #3f3f36, #000000 diff --git a/src-qt5/core/lumina-theme-engine/colors/simple.conf b/src-qt5/core/lumina-theme-engine/colors/simple.conf new file mode 100644 index 00000000..8db9d75b --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/simple.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #efebe7, #ffffff, #cbc7c4, #9f9d9a, #b8b5b2, #000000, #ffffff, #000000, #ffffff, #efebe7, #b1aeab, #308cc6, #ffffff, #0000ff, #ff0000, #f7f5f3, #000000, #ffffdc, #000000 +disabled_colors=#bebebe, #efebe7, #ffffff, #cbc7c4, #9f9d9a, #b8b5b2, #bebebe, #ffffff, #bebebe, #efebe7, #efebe7, #b1aeab, #9f9d9a, #ffffff, #0000ff, #ff0000, #f7f5f3, #000000, #ffffdc, #000000 +inactive_colors=#000000, #efebe7, #ffffff, #cbc7c4, #9f9d9a, #b8b5b2, #000000, #ffffff, #000000, #ffffff, #efebe7, #b1aeab, #308cc6, #ffffff, #0000ff, #ff0000, #f7f5f3, #000000, #ffffdc, #000000 diff --git a/src-qt5/core/lumina-theme-engine/colors/waves.conf b/src-qt5/core/lumina-theme-engine/colors/waves.conf new file mode 100644 index 00000000..7c7b4530 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/waves.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#b0b0b0, #010b2c, #979797, #5e5c5b, #302f2e, #4a4947, #b0b0b0, #b0b0b0, #b0b0b0, #010b2c, #010b2c, #b0b0b0, #302f2e, #b0b0b0, #0986d3, #a70b06, #5c5b5a, #ffffff, #0a0a0a, #ffffff +disabled_colors=#808080, #010b2c, #979797, #5e5c5b, #302f2e, #4a4947, #808080, #808080, #808080, #00071d, #00071d, #b0b0b0, #00071d, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #0a0a0a, #ffffff +inactive_colors=#b0b0b0, #010b2c, #979797, #5e5c5b, #302f2e, #4a4947, #b0b0b0, #b0b0b0, #b0b0b0, #010b2c, #010b2c, #b0b0b0, #302f2e, #b0b0b0, #0986d3, #a70b06, #5c5b5a, #ffffff, #0a0a0a, #ffffff diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pri b/src-qt5/core/lumina-theme-engine/lthemeengine.pri index aa8a58bb..40202045 100644 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pri +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pri @@ -1,24 +1,11 @@ -#Some conf to redirect intermediate stuff in separate dirs -UI_DIR=./.build/ui/ -MOC_DIR=./.build/moc/ -OBJECTS_DIR=./.build/obj -RCC_DIR=./.build/rcc - -QMAKE_DISTCLEAN += -r .build +QT *= core gui widgets x11extras network +!isEqual (QT_MAJOR_VERSION, 5) { + error("Use Qt 5.4.0 or higher.") +} +include(../../OS-detect.pri) -CONFIG += c++11 +CONFIG *= c++11 #Install paths -unix { - isEmpty(PREFIX) { - PREFIX = /usr/local/ - } - isEmpty(PLUGINDIR) { - PLUGINDIR = $$[QT_INSTALL_PLUGINS] - } - - BINDIR = $$PREFIX/bin - DATADIR = $$PREFIX/share - - DEFINES += LTHEMEENGINE_DATADIR=\\\"$$DATADIR\\\" -} + PLUGINDIR = $${DISTDIR}$$[QT_INSTALL_PLUGINS] + DEFINES += LTHEMEENGINE_DATADIR=\\\"$$L_SHAREDIR\\\" diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro deleted file mode 100644 index e3cb47b1..00000000 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro +++ /dev/null @@ -1,59 +0,0 @@ -QT += core gui widgets x11extras network -!isEqual (QT_MAJOR_VERSION, 5) { - error("Use Qt 5.4.0 or higher.") -} - -QMAKE_DISTCLEAN += -r .build - -CONFIG += c++11 - -desktop.files=src/lthemeengine/ltheme.desktop -desktop.path=$${L_SHAREDIR}/applications/ - -#Install paths -unix { - isEmpty(PREFIX) { - PREFIX = /usr/local - } - isEmpty(PLUGINDIR) { - PLUGINDIR = $$[QT_INSTALL_PLUGINS] - } - - BINDIR = $$PREFIX/bin - DATADIR = $$PREFIX/share - - DEFINES += LTHEMEENGINE_DATADIR=\\\"$$DATADIR\\\" -} - -TEMPLATE = subdirs - -SUBDIRS += src/lthemeengine-qtplugin src/lthemeengine-style src/lthemeengine - -unix:exists($$[QT_INSTALL_BINS]/lrelease){ -LRELEASE_EXECUTABLE = $$[QT_INSTALL_BINS]/lrelease -} - -unix:exists($$[QT_INSTALL_BINS]/lrelease-qt5){ -LRELEASE_EXECUTABLE = $$[QT_INSTALL_BINS]/lrelease-qt5 -} - - -isEmpty(LRELEASE_EXECUTABLE){ -error(Could not find lrelease executable) -} -else { -message(Found lrelease executable: $$LRELEASE_EXECUTABLE) -} - -message (PREFIX=$$PREFIX) -message (BINDIR=$$BINDIR) -message (DATADIR=$$DATADIR) -message (PLUGINDIR=$$PLUGINDIR) -equals (DISABLE_WIDGETS,1):message ("QtWidgets are disabled!") - -#Some conf to redirect intermediate stuff in separate dirs -UI_DIR=./.build/ui/ -MOC_DIR=./.build/moc/ -OBJECTS_DIR=./.build/obj -RCC_DIR=./.build/rcc - diff --git a/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro b/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro new file mode 100644 index 00000000..d91091d3 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro @@ -0,0 +1,11 @@ +include(../../OS-detect.pri) + +TEMPLATE = subdirs +SUBDIRS += src/lthemeengine-qtplugin \ + src/lthemeengine-style \ + src/lthemeengine + +colors.files = colors/*.conf +colors.path = $${L_SHAREDIR}/lthemeengine/colors + +INSTALLS += colors diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro index a186cd49..3dca4fd1 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro @@ -2,7 +2,7 @@ include(../../lthemeengine.pri) TEMPLATE = lib TARGET = lthemeengine -CONFIG += plugin +CONFIG *= plugin greaterThan(QT_MINOR_VERSION, 7) { QT += gui-private theme_support-private diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp index 9d6c9bea..453bde1d 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp @@ -70,7 +70,7 @@ QPlatformSystemTrayIcon *lthemeenginePlatformTheme::createPlatformSystemTrayIcon QDBusMenuConnection conn; m_dbusTrayAvailable = conn.isStatusNotifierHostRegistered(); m_checkDBusTray = false; - qCDebug(llthemeengine) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); + //qCDebug(llthemeengine) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); } return (m_dbusTrayAvailable ? new QDBusTrayIcon() : nullptr); } @@ -177,10 +177,10 @@ void lthemeenginePlatformTheme::readSettings(){ settings.beginGroup("Appearance"); m_style = settings.value("style", "Fusion").toString(); if(settings.value("custom_palette", false).toBool()){ - QString schemePath = settings.value("color_scheme_path").toString(); + QString schemePath = settings.value("color_scheme_path","airy").toString(); m_customPalette = new QPalette(loadColorScheme(schemePath)); } - m_iconTheme = settings.value("icon_theme").toString(); + m_iconTheme = settings.value("icon_theme", "material-design-light").toString(); settings.endGroup(); settings.beginGroup("Fonts"); m_generalFont = settings.value("general", QPlatformTheme::font(QPlatformTheme::SystemFont)).value<QFont>(); @@ -237,7 +237,20 @@ QString lthemeenginePlatformTheme::loadStyleSheets(const QStringList &paths){ return content; } -QPalette lthemeenginePlatformTheme::loadColorScheme(const QString &filePath){ +QPalette lthemeenginePlatformTheme::loadColorScheme(QString filePath){ + if(!filePath.contains("/") && !filePath.endsWith(".conf") && !filePath.isEmpty()){ + //relative theme name, auto-complete it + QStringList dirs; + dirs << getenv("XDG_CONFIG_HOME"); + dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":"); + dirs << QString(getenv("XDG_DATA_DIRS")).split(":"); + QString relpath = "/lthemeengine/colors/%1.conf"; + relpath = relpath.arg(filePath); + for(int i=0; i<dirs.length(); i++){ + if(QFile::exists(dirs[i]+relpath)){ filePath = dirs[i]+relpath; break; } + } + } + QPalette customPalette; QSettings settings(filePath, QSettings::IniFormat); settings.beginGroup("ColorScheme"); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h index 5313b73e..17323328 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h @@ -65,7 +65,7 @@ private: bool hasWidgets(); #endif QString loadStyleSheets(const QStringList &paths); - QPalette loadColorScheme(const QString &filePath); + QPalette loadColorScheme(QString filePath); QString m_style, m_iconTheme, m_userStyleSheet, m_prevStyleSheet; QPalette *m_customPalette = nullptr; QFont m_generalFont, m_fixedFont; diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro index 0b40de64..0f68e7e4 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro @@ -2,11 +2,11 @@ include(../../lthemeengine.pri) TEMPLATE = lib TARGET = lthemeengine-style -QT += widgets +QT *= widgets # Input -CONFIG += plugin +CONFIG *= plugin target.path = $$PLUGINDIR/styles INSTALLS += target diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp index 4d585409..04ca6a0b 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp @@ -190,8 +190,7 @@ void AppearancePage::readSettings(){ m_ui->customPaletteButton->setChecked(settings.value("custom_palette", false).toBool()); QString colorSchemePath = settings.value("color_scheme_path").toString(); QDir("/").mkpath(lthemeengine::userColorSchemePath()); - findColorSchemes(lthemeengine::userColorSchemePath()); - findColorSchemes(lthemeengine::sharedColorSchemePath().join(", ")); + findColorSchemes( QStringList() << lthemeengine::userColorSchemePath() << lthemeengine::sharedColorSchemePath()); if(m_ui->colorSchemeComboBox->count() == 0){ m_customPalette = palette(); //load fallback palette } @@ -223,12 +222,16 @@ void AppearancePage::setPalette(QWidget *w, QPalette p){ w->setPalette(p); } -void AppearancePage::findColorSchemes(const QString &path){ - QDir dir(path); - dir.setFilter(QDir::Files); - dir.setNameFilters(QStringList() << "*.conf"); - foreach (QFileInfo info, dir.entryInfoList()){ - m_ui->colorSchemeComboBox->addItem(info.baseName(), info.filePath()); +void AppearancePage::findColorSchemes(QStringList paths){ + paths.removeDuplicates(); + for(int i=0; i<paths.length(); i++){ + if( !QFile::exists(paths[i])){ continue; } + QDir dir(paths[i]); + dir.setFilter(QDir::Files); + dir.setNameFilters(QStringList() << "*.conf"); + foreach (QFileInfo info, dir.entryInfoList()){ + m_ui->colorSchemeComboBox->addItem(info.baseName(), info.filePath()); + } } } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h index 23bab52f..3f0fa427 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h @@ -35,7 +35,7 @@ private: void readSettings(); void setStyle(QWidget *w, QStyle *s); void setPalette(QWidget *w, QPalette p); - void findColorSchemes(const QString &path); + void findColorSchemes(QStringList paths); QPalette loadColorScheme(const QString &filePath); void createColorScheme(const QString &name, const QPalette &palette); Ui::AppearancePage *m_ui; diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp index 36b0c2fa..fdeb8966 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp @@ -6,6 +6,7 @@ #define LTHEMEENGINE_DATADIR "/usr/local/share" #endif +#include <QDebug> QString lthemeengine::configPath(){ return QDir::homePath() + "/.config/lthemeengine/"; @@ -46,7 +47,8 @@ QStringList lthemeengine::sharedStyleSheetPath(){ QStringList dirs; dirs << QString(getenv("XDG_CONFIG_HOME")); dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":"); - for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/colors/"); } + dirs << QString(getenv("XDG_DATA_DIRS")).split(":"); + for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/qss/"); } if(dirs.isEmpty()){ dirs << LTHEMEENGINE_DATADIR"/lthemeengine/qss/"; } //no XDG settings - use the hardcoded path return dirs; } @@ -59,8 +61,10 @@ QStringList lthemeengine::sharedColorSchemePath(){ QStringList dirs; dirs << QString(getenv("XDG_CONFIG_HOME")); dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":"); + dirs << QString(getenv("XDG_DATA_DIRS")).split(":"); for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/colors/"); } if(dirs.isEmpty()){ dirs << LTHEMEENGINE_DATADIR"/lthemeengine/colors/"; } //no XDG settings - use the hardcoded path + qDebug() << "Got Color Dirs:" << dirs; return dirs; } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h index 93a1d433..8a466ed9 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h @@ -8,7 +8,7 @@ #define LTHEMEENGINE_STRINGIFY(s) LTHEMEENGINE_TOSTRING(s) #define LTHEMEENGINE_VERSION_INT (LTHEMEENGINE_VERSION_MAJOR<<8 | LTHEMEENGINE_VERSION_MINOR) -#define LTHEMEENGINE_VERSION_STR LTHEMEENGINE_STRINGIFY(LTHEMEENGINE_VERSION_MAJOR.QT5CT_VERSION_MINOR) +#define LTHEMEENGINE_VERSION_STR LTHEMEENGINE_STRINGIFY(LTHEMEENGINE_VERSION_MAJOR.LTHEMEENGINE_VERSION_MINOR) #include <QString> #include <QStringList> diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro index cc36ee5b..721b8888 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro @@ -2,7 +2,7 @@ include(../../lthemeengine.pri) TEMPLATE = app -QT += widgets +QT *= widgets SOURCES += \ main.cpp \ @@ -43,13 +43,12 @@ HEADERS += \ qsspage.h \ qsseditordialog.h -!equals (DISABLE_WIDGETS,1) { DEFINES += USE_WIDGETS -} -target.path = $$BINDIR +TARGET = lthemeengine +target.path = $${L_BINDIR} desktop.files = lthemeengine.desktop -desktop.path = $$DATADIR/applications +desktop.path = $${L_SHAREDIR}/applications INSTALLS += target desktop diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp index 4c1b89fa..b0d5fe08 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp @@ -23,7 +23,7 @@ int main(int argc, char **argv){ QStringList errorMessages; QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); if(env.contains("QT_STYLE_OVERRIDE")){ errorMessages << app.translate("main", "Please remove the <b>QT_STYLE_OVERRIDE</b> environment variable"); } - if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine"){ errorMessages << app.translate("main", "The <b>QT_QPA_PLATFORMTHEME</b> environment variable is not set correctly"); } + //if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine"){ errorMessages << app.translate("main", "The <b>QT_QPA_PLATFORMTHEME</b> environment variable is not set correctly"); } if(!QStyleFactory::keys().contains("lthemeengine-style")){ errorMessages << app.translate("main", "Unable to find <b>liblthemeengine-style.so</b>"); } if(!errorMessages.isEmpty()){ QMessageBox::critical(0, app.translate("main", "Error"), errorMessages.join("<br><br>")); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp index 97d4ea1a..ac891a80 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp @@ -13,6 +13,30 @@ QSSEditorDialog::QSSEditorDialog(const QString &filePath, QWidget *parent) : QDi setWindowTitle(tr("%1 - Style Sheet Editor").arg(file.fileName())); QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); restoreGeometry(settings.value("QSSEditor/geometry").toByteArray()); + //Generate the list of standard colors for the user to pick + QStringList colors; + colors << tr("base (alternate)")+"::::alternate-base" + << tr("base")+"::::base" + << tr("text (bright)")+"::::bright-text" + << tr("button")+"::::button" + << tr("text (button)")+"::::button-text" + << tr("dark")+"::::dark" + << tr("highlight")+"::::highlight" + << tr("text (highlight)")+"::::highlighted-text" + << tr("light")+"::::light" + << tr("link")+"::::link" + << tr("link (visited)")+"::::link-visited" + << tr("mid")+"::::mid" + << tr("midlight")+"::::midlight" + << tr("shadow")+"::::shadow" + << tr("text")+"::::text" + << tr("window")+"::::window" + << tr("text (window)")+"::::window-text"; + colors.sort(); //sort by translated display name + colorMenu = new QMenu(m_ui->tool_color); + for(int i=0; i<colors.length(); i++){ colorMenu->addAction( colors[i].section("::::",0,0) )->setWhatsThis(colors[i].section("::::",1,1) ); } + m_ui->tool_color->setMenu(colorMenu); + connect(colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorPicked(QAction*)) ); } QSSEditorDialog::~QSSEditorDialog(){ @@ -39,3 +63,9 @@ void QSSEditorDialog::on_buttonBox_clicked(QAbstractButton *button){ else if(id == QDialogButtonBox::Save){ save(); } else{ reject(); } } + +void QSSEditorDialog::colorPicked(QAction* act){ + QString id = act->whatsThis(); + if(id.isEmpty()){ return; } + m_ui->textEdit->insertPlainText( QString("palette(%1)").arg(id) ); +} diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h index ea615e81..114611fe 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h @@ -3,6 +3,8 @@ #include <QDialog> #include <QString> +#include <QMenu> +#include <QAction> namespace Ui { class QSSEditorDialog; @@ -20,12 +22,15 @@ public: private slots: void on_buttonBox_clicked(QAbstractButton *button); + void colorPicked(QAction*); private: void save(); void hideEvent(QHideEvent *); Ui::QSSEditorDialog *m_ui; QString m_filePath; + QMenu *colorMenu; + }; #endif // QSSEDITORDIALOG_H diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui index 7627b4d4..f75a21c6 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui @@ -31,14 +31,38 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Save</set> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QToolButton" name="tool_color"> + <property name="text"> + <string>Palette</string> + </property> + <property name="icon"> + <iconset theme="preferences-desktop-color"> + <normaloff>.</normaloff>.</iconset> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Save</set> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp index d690ef5d..2cf0f221 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp @@ -95,8 +95,7 @@ void QSSPage::on_removeButton_clicked(){ void QSSPage::readSettings(){ //load stylesheets m_ui->qssListWidget->clear(); - findStyleSheets(lthemeengine::userStyleSheetPath()); - findStyleSheets(lthemeengine::sharedStyleSheetPath().join(", ")); + findStyleSheets(QStringList() << lthemeengine::userStyleSheetPath() << lthemeengine::sharedStyleSheetPath()); QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QStringList styleSheets = settings.value("Interface/stylesheets").toStringList(); for(int i = 0; i < m_ui->qssListWidget->count(); ++i){ @@ -106,16 +105,20 @@ void QSSPage::readSettings(){ } } -void QSSPage::findStyleSheets(const QString &path){ - QDir dir(path); - dir.setFilter(QDir::Files); - dir.setNameFilters(QStringList() << "*.qss"); - foreach (QFileInfo info, dir.entryInfoList()){ - QListWidgetItem *item = new QListWidgetItem(info.fileName(), m_ui->qssListWidget); - item->setToolTip(info.filePath()); - item->setData(QSS_FULL_PATH_ROLE, info.filePath()); - item->setData(QSS_WRITABLE_ROLE, info.isWritable()); +void QSSPage::findStyleSheets(QStringList paths){ + paths.removeDuplicates(); + for(int i=0; i<paths.length(); i++){ + if(!QFile::exists(paths[i])){ continue; } + QDir dir(paths[i]); + dir.setFilter(QDir::Files); + dir.setNameFilters(QStringList() << "*.qss"); + foreach (QFileInfo info, dir.entryInfoList()){ + QListWidgetItem *item = new QListWidgetItem(info.fileName(), m_ui->qssListWidget); + item->setToolTip(info.filePath()); + item->setData(QSS_FULL_PATH_ROLE, info.filePath()); + item->setData(QSS_WRITABLE_ROLE, info.isWritable()); } + } } void QSSPage::on_renameButton_clicked(){ diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h index 1fe0ed73..5e924ad9 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h @@ -30,7 +30,7 @@ private slots: private: void readSettings(); - void findStyleSheets(const QString &path); + void findStyleSheets(QStringList paths); Ui::QSSPage *m_ui; QMenu *m_menu; }; |