diff options
81 files changed, 1340 insertions, 898 deletions
diff --git a/admin b/admin -Subproject 60f84493601273e216a013532248513e733f72c +Subproject 95578bc83bad7ea609c9c3fbfbfba54864c7abe diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 874df3b67..919b15608 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -93,7 +93,7 @@ static ModifierKey modifierKeys[] = { KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) : TDEUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false), - overlay(0), wm(0, KWinModule::INFO_DESKTOP) + overlay(0), wm(0, TWinModule::INFO_DESKTOP) { _activeWindow = wm.activeWindow(); connect(&wm, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(activeWindowChanged(WId))); diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index 0bb22f8e7..fc4c015ca 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -73,7 +73,7 @@ private: TQTimer *artsBellTimer; - KWinModule wm; + TWinModule wm; WId _activeWindow; diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 79686182e..c3531c07f 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -72,8 +72,8 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_multidesktop = _multidesktop; m_previewUpdates = true; - KWinModule *m_twin; - m_twin = new KWinModule(this); + TWinModule *m_twin; + m_twin = new TWinModule(this); m_curDesk = m_twin->currentDesktop(); TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; diff --git a/kcontrol/hwmanager/hwdevicetray_configdialog.cpp b/kcontrol/hwmanager/hwdevicetray_configdialog.cpp index c98944461..d6ac94b29 100644 --- a/kcontrol/hwmanager/hwdevicetray_configdialog.cpp +++ b/kcontrol/hwmanager/hwdevicetray_configdialog.cpp @@ -54,7 +54,7 @@ ConfigDialog::~ConfigDialog() { // prevent huge size due to long regexps in the action-widget void ConfigDialog::show() { if (!isVisible()) { - KWinModule module(0, KWinModule::INFO_DESKTOP); + TWinModule module(0, TWinModule::INFO_DESKTOP); TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 88ec261f2..315c03b8c 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -58,7 +58,7 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::show() { if ( !isVisible() ) { - KWinModule module(0, KWinModule::INFO_DESKTOP); + TWinModule module(0, TWinModule::INFO_DESKTOP); TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp index 49cff2c16..8446a5729 100644 --- a/kdesktop/bgmanager.cpp +++ b/kdesktop/bgmanager.cpp @@ -65,7 +65,7 @@ extern KDesktopApp *myApp; /**** KBackgroundManager ****/ -KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule) +KBackgroundManager::KBackgroundManager(TQWidget *desktop, TWinModule* twinModule) : KBackgroundIface() { if( !properties_inited ) @@ -86,7 +86,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule m_Serial = 0; m_Hash = 0; m_pConfig = TDEGlobal::config(); m_bExport = m_bCommon = m_bInit = false; - m_pKwinmodule = twinModule; + m_pTWinModule = twinModule; m_pPixmapServer = new KPixmapServer(); m_xrootpmap = None; @@ -121,11 +121,11 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule /*Ends here*/ - connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopChanged(int)), + connect(m_pTWinModule, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(slotChangeDesktop(int))); - connect(m_pKwinmodule, TQ_SIGNAL(numberOfDesktopsChanged(int)), + connect(m_pTWinModule, TQ_SIGNAL(numberOfDesktopsChanged(int)), TQ_SLOT(slotChangeNumberOfDesktops(int))); - connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)), + connect(m_pTWinModule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotChangeViewport(int, const TQPoint&))); @@ -133,12 +133,12 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support #endif - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; } - for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) { + for (signed j=0;j<(m_pTWinModule->numberOfDesktops() * m_numberOfViewports);j++) { renderBackground(j); } } @@ -258,12 +258,12 @@ void KBackgroundManager::configure() slotChangeDesktop(0); // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; } - for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) { + for (signed j=0;j<(m_pTWinModule->numberOfDesktops() * m_numberOfViewports);j++) { renderBackground(j); } } @@ -271,7 +271,7 @@ void KBackgroundManager::configure() int KBackgroundManager::realDesktop() { - int desk = m_pKwinmodule->currentDesktop(); + int desk = m_pTWinModule->currentDesktop(); if (desk) desk--; return desk; } @@ -279,7 +279,7 @@ int KBackgroundManager::realDesktop() int KBackgroundManager::effectiveDesktop() { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports > 1) { @@ -287,7 +287,7 @@ int KBackgroundManager::effectiveDesktop() return 0; } else { - TQPoint vx(m_pKwinmodule->currentViewport(m_pKwinmodule->currentDesktop())); + TQPoint vx(m_pTWinModule->currentViewport(m_pTWinModule->currentDesktop())); return (realDesktop() * m_numberOfViewports) + ((vx.x() * vx.y()) - 1); } } @@ -302,7 +302,7 @@ int KBackgroundManager::effectiveDesktop() */ void KBackgroundManager::slotChangeNumberOfDesktops(int num) { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -352,7 +352,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num) void KBackgroundManager::slotChangeDesktop(int desk) { resizingDesktop = true; - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -364,8 +364,8 @@ void KBackgroundManager::slotChangeDesktop(int desk) desk--; // Lazy initialisation of # of desktops - if ((unsigned)(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) - slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() * m_numberOfViewports); + if ((unsigned)(m_pTWinModule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) + slotChangeNumberOfDesktops( m_pTWinModule->numberOfDesktops() * m_numberOfViewports); int edesk = effectiveDesktop(); m_Serial++; @@ -413,7 +413,7 @@ void KBackgroundManager::slotChangeDesktop(int desk) */ void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport) { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -425,8 +425,8 @@ void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport) desk--; // Lazy initialisation of # of desktops - if ((unsigned)(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) - slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() * m_numberOfViewports ); + if ((unsigned)(m_pTWinModule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size()) + slotChangeNumberOfDesktops( m_pTWinModule->numberOfDesktops() * m_numberOfViewports ); int edesk = effectiveDesktop(); m_Serial++; @@ -625,7 +625,7 @@ void KBackgroundManager::slotCrossFadeTimeout() */ void KBackgroundManager::slotImageDone(int desk) { - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; @@ -863,7 +863,7 @@ void KBackgroundManager::slotTimeout() int KBackgroundManager::validateDesk(int desk) { if (desk > (int)m_Renderer.size()) - slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() ); + slotChangeNumberOfDesktops( m_pTWinModule->numberOfDesktops() ); if ( (desk <= 0) || (desk > (int)m_Renderer.size()) ) return realDesktop(); @@ -1042,12 +1042,12 @@ void KBackgroundManager::desktopResized() repaintBackground(); // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly - TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); + TQSize s(m_pTWinModule->numberOfViewports(m_pTWinModule->currentDesktop())); m_numberOfViewports = s.width() * s.height(); if (m_numberOfViewports < 1) { m_numberOfViewports = 1; } - for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) { + for (signed j=0;j<(m_pTWinModule->numberOfDesktops() * m_numberOfViewports);j++) { renderBackground(j); } } diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index d78ebebc3..0c7722311 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -24,7 +24,7 @@ class TDEConfig; class TQTimer; class TQPixmap; class TDEPopupMenu; -class KWinModule; +class TWinModule; class KPixmap; class KVirtualBGRenderer; class KPixmapServer; @@ -58,7 +58,7 @@ class KBackgroundManager public: - KBackgroundManager(TQWidget *desktop, KWinModule* twinModule); + KBackgroundManager(TQWidget *desktop, TWinModule* twinModule); ~KBackgroundManager(); void configure(); @@ -129,7 +129,7 @@ private: TQPtrVector<KVirtualBGRenderer> m_Renderer; TQPtrVector<KBackgroundCacheEntry> m_Cache; - KWinModule *m_pKwinmodule; + TWinModule *m_pTWinModule; KPixmapServer *m_pPixmapServer; unsigned long m_xrootpmap; diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp index 3ef0e33e7..5303e8cf6 100644 --- a/kdesktop/desktop.cpp +++ b/kdesktop/desktop.cpp @@ -155,7 +155,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) : setCaption( "KDE Desktop"); setAcceptDrops(true); // WStyle_Customize seems to disable that - m_pKwinmodule = new KWinModule( this ); + m_pTWinModule = new TWinModule( this ); tdeApp->dcopClient()->setNotifications(true); tdeApp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)", @@ -245,7 +245,7 @@ KDesktop::initRoot() // Geert Jansen: backgroundmanager belongs here // TODO tell KBackgroundManager if we change widget() - bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule ); + bgMgr = new KBackgroundManager( m_pIconView, m_pTWinModule ); bgMgr->setExport(1); connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone())); if (!m_bInit) @@ -286,7 +286,7 @@ KDesktop::initRoot() // Geert Jansen: backgroundmanager belongs here // TODO tell KBackgroundManager if we change widget() - bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule ); + bgMgr = new KBackgroundManager( m_pIconView, m_pTWinModule ); bgMgr->setExport(1); connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone())); @@ -347,7 +347,7 @@ void KDesktop::slotNoKicker() { kdDebug(1204) << "KDesktop::slotNoKicker ... kicker did not respond" << endl; // up till now, we got no desktopIconsArea from kicker - probably - // it's not running, so use the area from KWinModule + // it's not running, so use the area from TWinModule TQRect area = twinModule()->workArea(twinModule()->currentDesktop()); m_pIconView->updateWorkArea(area); } diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index ca1eefc61..c295a6a8e 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -33,7 +33,7 @@ class TQCloseEvent; class TQDropEvent; class TQPopupMenu; class TDEGlobalAccel; -class KWinModule; +class TWinModule; class KBackgroundManager; class TQTimer; class StartupId; @@ -97,7 +97,7 @@ public: void logout( TDEApplication::ShutdownConfirm confirm, TDEApplication::ShutdownType sdtype ); - KWinModule* twinModule() const { return m_pKwinmodule; } + TWinModule* twinModule() const { return m_pTWinModule; } // The action collection of the active widget TDEActionCollection *actionCollection(); @@ -194,7 +194,7 @@ private: TDEGlobalAccel *keys; - KWinModule* m_pKwinmodule; + TWinModule* m_pTWinModule; KBackgroundManager* bgMgr; diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h index efdd64c3e..1216eef39 100644 --- a/kdesktop/krootwm.h +++ b/kdesktop/krootwm.h @@ -37,7 +37,7 @@ class SaverEngine; class TQPopupMenu; class KCMultiDialog; class KNewMenu; -class KWinModule; +class TWinModule; class KBookmarkMenu; class KHelpMenu; class TDEActionCollection; diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index 2ad89f5ab..e0eeed05d 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -204,7 +204,7 @@ LockProcess::LockProcess() resizeTimer(NULL), hackResumeTimer(NULL), mVkbdProcess(NULL), - mKWinModule(NULL), + mTWinModule(NULL), mPipeOpen(false), mPipeOpen_out(false), mInfoMessageDisplayed(false), @@ -2467,8 +2467,8 @@ void LockProcess::showVkbd() if( run_vkbd ) { mVkbdWindows.clear(); mVkbdLastEventWindow = None; - mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS ); - connect( mKWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); + mTWinModule = new TWinModule( NULL, TWinModule::INFO_WINDOWS ); + connect( mTWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); mVkbdProcess = new TDEProcess; *mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm"; mVkbdProcess->start(); @@ -2481,8 +2481,8 @@ void LockProcess::hideVkbd() mVkbdProcess->kill(); delete mVkbdProcess; mVkbdProcess = NULL; - delete mKWinModule; - mKWinModule = NULL; + delete mTWinModule; + mTWinModule = NULL; mVkbdWindows.clear(); } } diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index 1afc9bb46..b0e33aad2 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -26,7 +26,7 @@ #include <X11/Xlib.h> class KLibrary; -class KWinModule; +class TWinModule; class KSMModalDialog; class LockProcess; #ifdef WITH_TDEHWLIB @@ -214,7 +214,7 @@ class LockProcess : public TQWidget TQTimer *hackResumeTimer; TDEProcess* mVkbdProcess; - KWinModule* mKWinModule; + TWinModule* mTWinModule; struct VkbdWindow { WId id; TQRect rect; diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index d2658e8e1..fdd037565 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -237,7 +237,6 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem { kdDebug(1400) << "Requested IOSlave documents for ID " << name << endl; -#if KDE_IS_VERSION( 3, 1, 90 ) TQStringList list = KProtocolInfo::protocols(); list.sort(); @@ -257,9 +256,6 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem item->setAutoDeleteDocEntry( true ); } } -#else - Q_UNUSED( topItem ); -#endif } void Navigator::insertAppletDocs( NavigatorItem *topItem ) diff --git a/khelpcenter/pics/CMakeLists.txt b/khelpcenter/pics/CMakeLists.txt index 31014722a..e0d4cedaf 100644 --- a/khelpcenter/pics/CMakeLists.txt +++ b/khelpcenter/pics/CMakeLists.txt @@ -10,4 +10,3 @@ ################################################# tde_install_icons( khelpcenter ) -tde_install_icons( helpdoc helpbook helpbook_open DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/icons ) diff --git a/khelpcenter/pics/Makefile.am b/khelpcenter/pics/Makefile.am index dcfadd16a..788184ccd 100644 --- a/khelpcenter/pics/Makefile.am +++ b/khelpcenter/pics/Makefile.am @@ -1,6 +1,2 @@ KDE_ICON = khelpcenter - -khelpcenter_ICON = helpdoc helpbook helpbook_open -khelpcenterdir = $(kde_datadir)/khelpcenter/icons - diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index e91e41df3..42dc3f6b1 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -39,7 +39,7 @@ namespace KHotKeys Windows::Windows( bool enable_signal_P, TQObject* parent_P ) : TQObject( parent_P ), signals_enabled( enable_signal_P ), - twin_module( new KWinModule( this )), _action_window( 0 ) + twin_module( new TWinModule( this )), _action_window( 0 ) { assert( windows_handler == NULL ); windows_handler = this; diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index 05890c435..c40c31b1f 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -22,7 +22,7 @@ #include "khotkeysglobal.h" class TDEConfig; -class KWinModule; +class TWinModule; namespace KHotKeys { @@ -63,7 +63,7 @@ class TDE_EXPORT Windows void window_changed_slot( WId window_P, unsigned int flags_P ); private: bool signals_enabled; - KWinModule* twin_module; + TWinModule* twin_module; WId _action_window; }; diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index d1aae0268..2f1a8616b 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -299,7 +299,7 @@ void Applet::claimSelection() delete selection_watcher; selection_watcher = NULL; connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); - module = new KWinModule; + module = new TWinModule; connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId ))); connect( module, TQ_SIGNAL( activeWindowChanged( WId )), this, TQ_SLOT( activeWindowChanged( WId ))); diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 159c7a37d..9512b1c1f 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <karrowbutton.h> -class KWinModule; +class TWinModule; namespace KickerMenuApplet { @@ -145,7 +145,7 @@ private: */ static Atom makeSelectionAtom(); void updateTopEdgeOffset(); - KWinModule* module; + TWinModule* module; /** * List of all known menus. diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 0af954fcb..7c6f1e8eb 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( TDEGlobalSettings::taskbarFont() ); - m_twin = new KWinModule(this); + m_twin = new TWinModule(this); m_activeWindow = m_twin->activeWindow(); m_curDesk = m_twin->currentDesktop(); diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 6433a6790..4390b4b6b 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -38,7 +38,7 @@ class TQGridLayout; class TQTimer; class TDEProcess; -class KWinModule; +class TWinModule; class KTextShadowEngine; class TDESelectionOwner; @@ -58,7 +58,7 @@ public: int heightForWidth(int width) const; KWin::WindowInfo* info( WId win ); - KWinModule* twin() { return m_twin; } + TWinModule* twin() { return m_twin; } KTextShadowEngine* shadowEngine(); void setActive( WId active ) { m_activeWindow = active; } @@ -131,7 +131,7 @@ private: int desktopLayoutY; TDESelectionOwner* m_desktopLayoutOwner; - KWinModule *m_twin; + TWinModule *m_twin; KTextShadowEngine* m_shadowEngine; TQPopupMenu *m_contextMenu; diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 3274f406b..06ad608af 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -436,7 +436,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // window preview... if (m_pager->desktopPreview()) { - KWinModule* twin = m_pager->twin(); + TWinModule* twin = m_pager->twin(); KWin::WindowInfo *info = 0; int dw = TQApplication::desktop()->width(); int dh = TQApplication::desktop()->height(); diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h index 4d889c39e..f2bb0d4ff 100644 --- a/kicker/applets/minipager/pagerbutton.h +++ b/kicker/applets/minipager/pagerbutton.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kickertip.h" class KPixmap; -class KWinModule; +class TWinModule; class KMiniPager; class TDESharedPixmap; class TQLineEdit; diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index a9eea202e..ad28dfc5f 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -48,7 +48,7 @@ template class TQPtrList<SwallowCommand>; // init static variables SwallowAppList * SwallowApplet::appList = 0L; SwallowAppList * SwallowApplet::embeddedList = 0L; -KWinModule * SwallowApplet::wModule = 0L; +TWinModule * SwallowApplet::wModule = 0L; SwallowApplet * SwallowApplet::self = 0L; extern "C" @@ -68,7 +68,7 @@ SwallowApplet::SwallowApplet( const TQString& configFile, self = this; m_swcList = new SwallowCommandList; m_swcList->setAutoDelete( true ); - wModule = new KWinModule(this); + wModule = new TWinModule(this); embeddedList = new SwallowAppList; embeddedList->setAutoDelete( false ); appList = new SwallowAppList; diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index 8bacc79f3..1aa3d34e8 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -29,7 +29,7 @@ class TQBoxLayout; class TDEConfig; class TDEProcess; -class KWinModule; +class TWinModule; class SwallowApp; @@ -53,7 +53,7 @@ public: // returns 0L if we don't have a SwallowApplet object yet, // but who cares - static KWinModule * winModule() { return wModule; } + static TWinModule * winModule() { return wModule; } static void removeApplet( SwallowApp * ); public: // for KPanelApplet @@ -78,7 +78,7 @@ private: static SwallowApplet *self; static SwallowAppList *appList; static SwallowAppList *embeddedList; - static KWinModule *wModule; + static TWinModule *wModule; SwallowCommandList * m_swcList; TQBoxLayout *m_layout; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 0175bd689..ed138212f 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -110,7 +110,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac setBackgroundOrigin(AncestorOrigin); - twin_module = new KWinModule(this); + twin_module = new TWinModule(this); // tdeApp notifies us of settings changes. added to support // disabling of frame effect on mouse hover @@ -156,7 +156,7 @@ void SystemTrayApplet::initialize() layoutTray(); } - // the KWinModule notifies us when tray windows are added or removed + // the TWinModule notifies us when tray windows are added or removed connect( twin_module, TQ_SIGNAL( systemTrayWindowAdded(WId) ), this, TQ_SLOT( systemTrayWindowAdded(WId) ) ); connect( twin_module, TQ_SIGNAL( systemTrayWindowRemoved(WId) ), diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 26a02de1c..8785bca11 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -41,7 +41,7 @@ class TQGridLayout; class TQSpinBox; class TQCheckBox; class TQTimer; -class KWinModule; +class TWinModule; class TrayEmbed; class KDialogBase; class TDEActionSelector; @@ -104,7 +104,7 @@ private: TrayEmbedList m_hiddenWins; TQStringList m_hiddenIconList; TQStringList m_sortOrderIconList; - KWinModule *twin_module; + TWinModule *twin_module; Atom net_system_tray_selection; Atom net_system_tray_opcode; bool m_showFrame; diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index ac35bfdbc..17182fee7 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -57,7 +57,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - twin_module = new KWinModule(this); + twin_module = new TWinModule(this); connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 1431f29ee..1bf8a6266 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpanelextension.h> #include "dockcontainer.h" -class KWinModule; +class TWinModule; class DockBarExtension : public KPanelExtension { @@ -61,7 +61,7 @@ protected: void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); private: - KWinModule* twin_module; + TWinModule* twin_module; DockContainer::Vector containers; // handle the dragging of applets diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index b1db1efeb..cf6148671 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -44,7 +44,7 @@ class TQVBox; class QXEmbed; class HideButton; class TDEConfig; -class KWinModule; +class TWinModule; class PopupWidgetFilter; class PanelExtensionOpMenu; class TQColor; diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 21ff97684..2e9f8f01f 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -427,11 +427,11 @@ void Kicker::clearQuickStartMenu() MenuManager::the()->kmenu()->clearRecentMenuItems(); } -KWinModule* Kicker::twinModule() +TWinModule* Kicker::twinModule() { if (!m_twinModule) { - m_twinModule = new KWinModule(); + m_twinModule = new TWinModule(); } return m_twinModule; diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 5a76570a5..744190678 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KCMultiDialog; class KDirWatch; class TDEGlobalAccel; -class KWinModule; +class TWinModule; class PanelKMenu; class PanelPopupButton; @@ -72,7 +72,7 @@ k_dcop_signals: public: static Kicker* the(); KDirWatch* fileWatcher(); - KWinModule* twinModule(); + TWinModule* twinModule(); bool isImmutable() const; bool isKioskImmutable() const; @@ -125,7 +125,7 @@ private: static void crashHandler(int signal); TDEGlobalAccel* keys; - KWinModule* m_twinModule; + TWinModule* m_twinModule; KCMultiDialog* m_configDialog; bool m_canAddContainers; TQPoint m_insertionPoint; diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index ec7119438..2b9ef0706 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __showdesktop_h__ #define __showdesktop_h__ -class KWinModule; +class TWinModule; #include <tqvaluevector.h> diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 3e941315f..014cf5f1c 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -59,7 +59,7 @@ TaskManager::TaskManager() : TQObject(), _active(0), _startup_info(0), - m_winModule(new KWinModule()), + m_winModule(new TWinModule()), m_trackGeometry(false) { TDEGlobal::locale()->insertCatalogue("libtaskmanager"); diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 3f8e2f5e2..2b517c5de 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #endif -class KWinModule; +class TWinModule; class TaskManager; typedef TQValueList<WId> WindowList; @@ -66,7 +66,7 @@ typedef TQValueList<WId> WindowList; * A dynamic interface to a task (main window). * * @see TaskManager - * @see KWinModule + * @see TWinModule */ class TDE_EXPORT Task: public TQObject, public TDEShared { @@ -569,7 +569,7 @@ private: * * @see Task * @see Startup - * @see KWinModule + * @see TWinModule */ class TDE_EXPORT TaskManager : public TQObject { @@ -634,7 +634,7 @@ public: */ static bool isOnScreen( int screen, const WId wid ); - KWinModule* winModule() const { return m_winModule; } + TWinModule* winModule() const { return m_winModule; } void setXCompositeEnabled(bool state); static bool xCompositeEnabled() { return m_xCompositeEnabled != 0; } @@ -707,7 +707,7 @@ private: WindowList _skiptaskbar_windows; Startup::List _startups; TDEStartupInfo* _startup_info; - KWinModule* m_winModule; + TWinModule* m_winModule; bool m_trackGeometry; static TaskManager* m_self; diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 0dfc7ede1..f407aeab9 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -64,7 +64,7 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::show() { if ( !isVisible() ) { - KWinModule module(0, KWinModule::INFO_DESKTOP); + TWinModule module(0, TWinModule::INFO_DESKTOP); TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index a1da0ad7d..9a919e363 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -5857,14 +5857,6 @@ void KonqMainWindow::resetWindow() XChangeProperty( tqt_xdisplay(), winId(), atom, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &x_time, 1); set_tqt_x_user_time(CurrentTime); // won't have _NET_WM_USER_TIME set -#if !KDE_IS_VERSION( 3, 2, 90 ) // _KDE_NET_USER_TIME is obsolete - static Atom atom2 = XInternAtom( tqt_xdisplay(), "_KDE_NET_USER_TIME", False ); - timeval tv; - gettimeofday( &tv, NULL ); - unsigned long now = tv.tv_sec * 10 + tv.tv_usec / 100000; - XChangeProperty(tqt_xdisplay(), winId(), atom2, XA_CARDINAL, - 32, PropModeReplace, (unsigned char *)&now, 1); -#endif static Atom atom3 = XInternAtom( tqt_xdisplay(), "_NET_WM_USER_TIME", False ); XDeleteProperty( tqt_xdisplay(), winId(), atom3 ); // Qt remembers the iconic state if the window was withdrawn while on another virtual desktop diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 1c435165c..e5159b15e 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -201,7 +201,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,se_previous(0) ,m_initialSession(0) ,colors(0) -,kWinModule(0) +,tWinModule(0) ,menubar(0) ,statusbar(0) ,m_session_string(i18n("&Session")) @@ -389,8 +389,8 @@ Konsole::~Konsole() delete colors; colors=0; - delete kWinModule; - kWinModule = 0; + delete tWinModule; + tWinModule = 0; } void Konsole::setAutoClose(bool on) diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index 7af520661..71e80b4ba 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -312,7 +312,7 @@ private: TQString s_encodingName; TQPtrDict<KRootPixmap> rootxpms; - KWinModule* kWinModule; + TWinModule* tWinModule; KMenuBar* menubar; KStatusBar* statusbar; diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 95f4ec61c..a3b665d7d 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -187,7 +187,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) m_windows.setAutoDelete(true); // delete windows info after removal setBackgroundColor( black ); - m_winmodule=new KWinModule(this); + m_winmodule=new TWinModule(this); m_currentDesktop=m_winmodule->currentDesktop(); m_grabWinTimer=new TQTimer(this,"grabWinTimer"); diff --git a/kpager/kpager.h b/kpager/kpager.h index 7fdd7d573..96af163fe 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -67,7 +67,7 @@ public: KPager(KPagerMainWindow *parent=0, const char *name=0); ~KPager(); - class KWinModule *twin() const { return m_winmodule; }; + class TWinModule *twin() const { return m_winmodule; }; void updateLayout(); void redrawDesktops(); @@ -110,7 +110,7 @@ protected: }; protected: - KWinModule *m_winmodule; + TWinModule *m_winmodule; TQValueList<class Desktop *> m_desktops; TQIntDict<KWin::WindowInfo> m_windows; diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index bab627df1..8e3480600 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -46,7 +46,7 @@ class KRootBackingData public: TQWidget *toplevel; #ifdef TQ_WS_X11 - KWinModule *twin; + TWinModule *twin; #endif }; @@ -73,7 +73,7 @@ void KRootBacking::init() #ifdef TQ_WS_X11 connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); - d->twin = new KWinModule( this ); + d->twin = new TWinModule( this ); #endif m_bInit = true; diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index bc2c17670..b0ea31fa8 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -87,7 +87,7 @@ void KSMServer::performLegacySessionSave() XErrorHandler oldHandler = XSetErrorHandler(winsErrorHandler); // Compute set of leader windows that need legacy session management // and determine which style (WM_COMMAND or WM_SAVE_YOURSELF) - KWinModule module; + TWinModule module; if( wm_save_yourself == (Atom)None ) { Atom atoms[ 3 ]; const char* const names[] diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 50efa566c..69ec79158 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -43,7 +43,7 @@ static bool fullscreen = false; static unsigned long state = 0; static unsigned long mask = 0; static NET::WindowType windowtype = NET::Unknown; -static KWinModule* twinmodule; +static TWinModule* twinmodule; KStart::KStart() :TQObject() @@ -312,7 +312,7 @@ int main( int argc, char *argv[] ) for(int i=0; i < args->count(); i++) proc << args->arg(i); - twinmodule = new KWinModule; + twinmodule = new TWinModule; desktop = args->getOption( "desktop" ).toInt(); if ( args->isSet ( "alldesktops") ) diff --git a/kstart/kstart.h b/kstart/kstart.h index adfaf53c6..bee4dc876 100644 --- a/kstart/kstart.h +++ b/kstart/kstart.h @@ -13,7 +13,7 @@ #include <tqobject.h> -class KWinModule; +class TWinModule; class KStart: public TQObject { TQ_OBJECT diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index bb0c06c5c..3446601f4 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -26,7 +26,7 @@ KSysTrayCmd::KSysTrayCmd() win(0), client(0), twinmodule(0), top(0), left(0) { setAlignment( AlignCenter ); - twinmodule = new KWinModule( this ); + twinmodule = new TWinModule( this ); refresh(); } diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h index 20ebd0b25..5c477cc84 100644 --- a/ksystraycmd/ksystraycmd.h +++ b/ksystraycmd/ksystraycmd.h @@ -5,7 +5,7 @@ #include <twin.h> class KShellProcess; -class KWinModule; +class TWinModule; /** * Provides a system tray icon for a normal window. @@ -75,7 +75,7 @@ private: WId win; KShellProcess *client; - KWinModule *twinmodule; + TWinModule *twinmodule; TQString errStr; /** Memorized 'top' position of the window*/ diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 6aa5b8ee2..a223a6f9b 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -69,7 +69,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID), m_rules(nullptr), m_tray(nullptr), - kWinModule(nullptr) + tWinModule(nullptr) { X11Helper::initializeTranslations(); XKBExtension *xkb = XKBExtension::the(); @@ -98,7 +98,7 @@ KXKBApp::~KXKBApp() delete m_tray; delete m_rules; delete m_layoutOwnerMap; - delete kWinModule; + delete tWinModule; delete keys; } @@ -130,8 +130,8 @@ void KXKBApp::readSettings() if (kxkbConfig.m_switchingPolicy == SWITCH_POLICY_GLOBAL) { - delete kWinModule; - kWinModule = nullptr; + delete tWinModule; + tWinModule = nullptr; } else @@ -143,13 +143,13 @@ void KXKBApp::readSettings() //TODO: find out how to handle that } - if (!kWinModule) + if (!tWinModule) { - kWinModule = new KWinModule(nullptr, KWinModule::INFO_DESKTOP); - connect(kWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId))); + tWinModule = new TWinModule(nullptr, TWinModule::INFO_DESKTOP); + connect(tWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId))); } - m_prevWinId = kWinModule->activeWindow(); + m_prevWinId = tWinModule->activeWindow(); kdDebug() << "Active window " << m_prevWinId << endl; } diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h index 803057f61..2977101f7 100644 --- a/kxkb/kxkb.h +++ b/kxkb/kxkb.h @@ -45,7 +45,7 @@ DESCRIPTION class XKBExtension; class XkbRules; class TDEGlobalAccel; -class KWinModule; +class TWinModule; class LayoutMap; /* This is the main Kxkb class responsible for reading options @@ -107,7 +107,7 @@ private: XkbRules *m_rules; KxkbSystemTray *m_tray; TDEGlobalAccel *keys; - KWinModule* kWinModule; + TWinModule* tWinModule; bool m_forceSetXKBMap; }; diff --git a/tdm/kfrontend/gentdmconf.c b/tdm/kfrontend/gentdmconf.c index 0576eef56..e34f69b1a 100644 --- a/tdm/kfrontend/gentdmconf.c +++ b/tdm/kfrontend/gentdmconf.c @@ -632,8 +632,6 @@ static const char def_session1[] = "#! /bin/sh\n" "# Xsession - run as user\n" "\n" -"session=$1\n" -"\n" "# Note that the respective logout scripts are not sourced.\n" "case $SHELL in\n" " */bash)\n" @@ -675,8 +673,56 @@ static const char def_session2[] = " [ -f $HOME/.profile ] && . $HOME/.profile\n" " ;;\n" "esac\n" -"# invoke global X session script\n" -". /etc/X11/Xsession\n"; +"\n" +"# source system & user xprofiles\n" +"[ -f /etc/xprofile ] && . /etc/xprofile\n" +"[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" +"\n" +"# run system xinitrc shell scripts\n" +"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" +" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" +" [ -x \"$i\" ] && . \"$i\"\n" +" done\n" +"fi\n" +"\n" +"# if the system Xsession startup script is present use it\n" +"if [ -x /etc/X11/Xsession ]; then\n" +" exec /etc/X11/Xsession \"$@\"\n" +"else # otherwice fallback to running the session manually\n" +" # apply Xresources configs\n" +" if type xrdb >/dev/null 2>&1; then\n" +" if [ -d /etc/X11/Xresources ]; then\n" +" for i in /etc/X11/Xresources/*; do\n" +" [ -f \"$i\" ] && xrdb -merge \"$i\"\n" +" done\n" +" elif [ -f /etc/X11/Xresources ]; then\n" +" xrdb -merge /etc/X11/Xresources\n" +" fi\n" +" [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources\n" +" fi\n" +" \n" +" session=$1\n" +"\n" +" case \"$session\" in\n" +" \"\")\n" +" exec xmessage -center -buttons OK:0 -default OK \"Sorry, \\\"$DESKTOP_SESSION\\\" is not a valid session.\"\n" +" ;;\n" +" failsafe)\n" +" exec xterm -geometry 80x24-0-0\n" +" ;;\n" +" custom)\n" +" exec ${SHELL:-/bin/sh} $HOME/.xsession\n" +" ;;\n" +" default)\n" +" exec " TDE_BINDIR "/starttde\n" +" ;;\n" +" *)\n" +" eval exec \"$session\"\n" +" ;;\n" +" esac\n" +"fi\n" +"\n" +"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n"; static const char def_background[] = "[Desktop0]\n" diff --git a/translations/desktop_files/drkonqi-presets/ru.po b/translations/desktop_files/drkonqi-presets/ru.po index e4c87d38d..b2badd378 100644 --- a/translations/desktop_files/drkonqi-presets/ru.po +++ b/translations/desktop_files/drkonqi-presets/ru.po @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Alexander Golubev <fatzer2@gmail.com>, 2024. +# Alexander Golubev <fatzer2@gmail.com>, 2024, 2026. # Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 03:59+0200\n" -"PO-Revision-Date: 2024-04-06 08:44+0000\n" -"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"PO-Revision-Date: 2026-02-24 02:52+0000\n" +"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/drkonqi-presets/ru/>\n" "Language: ru\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: developerrc:2 @@ -36,7 +36,7 @@ msgid "" "The application %progname (%appname), pid %pid, crashed and caused the " "signal %signum (%signame)." msgstr "" -"Ð’ приложении %progname (%appname) Ñ Ð˜Ð” процеÑÑа %pid произошёл фатальный " +"Ð’ приложении %progname (%appname) Ñ id процеÑÑа %pid произошёл фатальный " "Ñбой, вызвавший Ñигнал %signum (%signame)." #. Name diff --git a/translations/desktop_files/kappfinder-data/ru.po b/translations/desktop_files/kappfinder-data/ru.po index 973f6b4e8..e01f4d215 100644 --- a/translations/desktop_files/kappfinder-data/ru.po +++ b/translations/desktop_files/kappfinder-data/ru.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:16+0000\n" -"PO-Revision-Date: 2026-01-29 12:04+0000\n" +"PO-Revision-Date: 2026-03-14 16:55+0000\n" "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/kappfinder-data/ru/>\n" @@ -381,7 +381,7 @@ msgstr "ChessMail" #. GenericName #: Games/Emulators/cmail.desktop:3 msgid "Email for Chess" -msgstr "Сообщение email Ð´Ð»Ñ ÑˆÐ°Ñ…Ð¼Ð°Ñ‚" +msgstr "Ðл. почта Ð´Ð»Ñ ÑˆÐ°Ñ…Ð¼Ð°Ñ‚" #. Name #: Games/Emulators/qmamecat.desktop:2 diff --git a/translations/desktop_files/kappfinder.desktop/ia.po b/translations/desktop_files/kappfinder.desktop/ia.po new file mode 100644 index 000000000..79dfaa8ec --- /dev/null +++ b/translations/desktop_files/kappfinder.desktop/ia.po @@ -0,0 +1,28 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# giovanni <assecoibalcu@yahoo.it>, 2026. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-06-17 21:48+0200\n" +"PO-Revision-Date: 2026-03-05 03:27+0000\n" +"Last-Translator: giovanni <assecoibalcu@yahoo.it>\n" +"Language-Team: Interlingua <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/kappfinder-kappfinderdesktop/ia/>\n" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" + +#. Name +#: kappfinder.desktop:2 +msgid "KAppfinder" +msgstr "KAppfinder" + +#. GenericName +#: kappfinder.desktop:3 +msgid "Menu Updating Tool" +msgstr "Instrumento per actualisar menu" diff --git a/translations/desktop_files/kcontrol-desktops/ia.po b/translations/desktop_files/kcontrol-desktops/ia.po index 24be1f540..b88f0c8f6 100644 --- a/translations/desktop_files/kcontrol-desktops/ia.po +++ b/translations/desktop_files/kcontrol-desktops/ia.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# giovanni <assecoibalcu@yahoo.it>, 2025. +# giovanni <assecoibalcu@yahoo.it>, 2025, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-08 18:11+0000\n" -"PO-Revision-Date: 2025-10-14 16:16+0000\n" +"PO-Revision-Date: 2026-02-18 17:51+0000\n" "Last-Translator: giovanni <assecoibalcu@yahoo.it>\n" "Language-Team: Interlingua <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/kcontrol-desktop-files/ia/>\n" @@ -20,7 +20,7 @@ msgstr "" #. Name #: access/kaccess.desktop:3 msgid "Accessibility Tool" -msgstr "Instrumento de Accessibilitate" +msgstr "Instrumento de accessibilitate" #. Name #: access/kcmaccess.desktop:12 @@ -30,7 +30,7 @@ msgstr "Accessibilitate" #. Comment #: access/kcmaccess.desktop:14 msgid "Improve accessibility for disabled persons" -msgstr "" +msgstr "Meliora accessibilitate per personas con incapacitate" #. Keywords #: access/kcmaccess.desktop:16 @@ -38,16 +38,19 @@ msgid "" "access;accessibility;deaf;impaired;bell;audible bell;visible bell;Keyboard;" "keys;sticky keys;bounce keys;slow keys;mouse navigation;num pad;" msgstr "" +"accesso;accessibilitate;surde;debilitate;campana;campana audibile;campana " +"visibile;Claviero;claves;claves collose;claves de saltar;claves lente;" +"navegation del mus;claviero numeric;" #. Name #: arts/arts.desktop:12 msgid "Sound System" -msgstr "" +msgstr "Systema de sono" #. Comment #: arts/arts.desktop:14 msgid "Sound System Configuration" -msgstr "" +msgstr "Configuration del Systema de Sono" #. Keywords #: arts/arts.desktop:16 @@ -56,6 +59,9 @@ msgid "" "transparency;priority;duplex;full duplex;response time;Mixer;Volume;KMix;Mix;" "login;MIDI;synthesizer;music;" msgstr "" +"aRts;Servitor de Sono;artsd;Audio;Sono;poner in marcha;transparentia de " +"rete;transparentia;prioritate;duplex;full duplex;tempore de " +"responsa;Miscitor;Volumine;KMix;Mix;accesso;MIDI;synthetisator;musica;" #. Name #: background/background.desktop:12 @@ -65,7 +71,7 @@ msgstr "Fundo" #. Comment #: background/background.desktop:14 msgid "Change the background settings" -msgstr "" +msgstr "Cambia preferentias de fundo" #. Keywords #: background/background.desktop:16 @@ -73,6 +79,8 @@ msgid "" "background;desktops;colors;colours;images;wallpapers;blending;balance;cache;" "multiple wallpapers;pixmap;" msgstr "" +"fundo;scriptorios;colores;images;imagines;tapetes;mixtura;balancia;cache;" +"tapetes multiple;pixmap;" #. Name #: bell/bell.desktop:13 @@ -82,17 +90,17 @@ msgstr "Campana de systema" #. Comment #: bell/bell.desktop:15 msgid "System Bell Configuration" -msgstr "" +msgstr "Configuration del Campana de Systema" #. Keywords #: bell/bell.desktop:17 msgid "Bell;Audio;Sound;Volume;Pitch;Duration;" -msgstr "" +msgstr "Campana;Audio;Sono;Volumine;Tono;Duration;" #. Name #: clock/clock.desktop:13 msgid "Date & Time" -msgstr "Date & Tempore" +msgstr "Data & Tempore" #. Comment #: clock/clock.desktop:15 @@ -102,7 +110,7 @@ msgstr "Preferentias de Data e Tempore" #. Keywords #: clock/clock.desktop:17 msgid "clock;date;time;time zone;" -msgstr "" +msgstr "horologio;data;tempore;fuso horari;" #. Name #: colors/colors.desktop:12 @@ -117,17 +125,18 @@ msgstr "Preferentias de color" #. Keywords #: colors/colors.desktop:16 msgid "colors;colours;scheme;contrast;Widget colors;Color Scheme;" -msgstr "" +msgstr "colores;schemas;contrasto;colores de Widget;Schema de Color;" #. Name #: componentchooser/EXAMPLE.desktop:1 msgid "A nice name you have chosen for your interface" -msgstr "" +msgstr "Un nomine agradabile que tu ha seligite per tu interfacie" #. Comment #: componentchooser/EXAMPLE.desktop:2 msgid "A helpful description of the interface for the top right info box" msgstr "" +"Un description utile del interfacie per le cassa de info dextere del culmine" #. Name #: componentchooser/componentchooser.desktop:10 @@ -161,6 +170,9 @@ msgid "" "Here you can configure your default web browser. All TDE applications in " "which you can select hyperlinks should honor this setting." msgstr "" +"Hic tu pote configurar tu navigator web predefinite. Omne applicationes de " +"TDE in le qual tu pote selectionar hyperligamines deberea recognocer iste " +"option." #. Name #: componentchooser/componentservices/kcm_filemanager.desktop:1 @@ -175,6 +187,9 @@ msgid "" "applications which invoke a file manager application should honor this " "setting." msgstr "" +"Iste servicio te permitte configurar tu gerente de file predefinite. Omne " +"applicationes de TDE que invoca un application de gerente de file deberea " +"recognocer iste option." #. Name #: componentchooser/componentservices/kcm_kemail.desktop:1 @@ -188,6 +203,9 @@ msgid "" "applications which need access to an email client application should honor " "this setting." msgstr "" +"Iste servicio te permitte configurar tu cliente de e-posta. Omne " +"applicationes de TDE que necessita accesso a un application cliente de e-" +"posta deberea recognocer iste preferentia." #. Name #: componentchooser/componentservices/kcm_terminal.desktop:1 @@ -201,6 +219,9 @@ msgid "" "applications which invoke a terminal emulator application should honor this " "setting." msgstr "" +"Iste servicio te permitte configurar tu emulator de terminal. Omne " +"applicationes de TDE que invoca un application de emulator de terminal " +"deberea recognocer iste preferentia." #. Name #: crypto/crypto.desktop:10 @@ -211,6 +232,7 @@ msgstr "Crypto" #: crypto/crypto.desktop:12 msgid "Configure SSL, manage certificates, and other cryptography settings" msgstr "" +"Congigura SSL, gere certificatos, e alter epreferentias de cryptographia" #. Keywords #: crypto/crypto.desktop:14 @@ -218,6 +240,8 @@ msgid "" "Crypto;Krypto;Cryptography;encryption;SSL;https;certificates;ciphers;TLS;" "secure;security;" msgstr "" +"Crypto;Krypto;Cryptographia;encryption;SSL;https;certificatos;cifras;TLS;secu" +"re;securitate;" #. Name #: css/kcmcss.desktop:12 @@ -247,7 +271,7 @@ msgstr "Preferentias de monstrator" #. Name #: displayconfig/displayconfig.desktop:12 msgid "Monitor & Display" -msgstr "" +msgstr "Monitor & Monstrator" #. Comment #: displayconfig/displayconfig.desktop:14 @@ -257,17 +281,17 @@ msgstr "Configura Monstrator" #. Keywords #: displayconfig/displayconfig.desktop:16 msgid "monitor;resolution;display;" -msgstr "" +msgstr "monitor;resolution;monstrator;" #. Name #: dnssd/kcm_tdednssd.desktop:18 msgid "Zeroconf Service Discovery" -msgstr "" +msgstr "Discoperta de Servicio de Zeroconf" #. Comment #: dnssd/kcm_tdednssd.desktop:20 msgid "Configure service discovery" -msgstr "" +msgstr "Configura discoperta de servicio" #. Name #: ebrowsing/ebrowsing.desktop:12 @@ -277,7 +301,7 @@ msgstr "Vias Breve de web" #. Comment #: ebrowsing/ebrowsing.desktop:14 msgid "Configure enhanced browsing" -msgstr "" +msgstr "Configura navigation avantiate" #. Keywords #: ebrowsing/ebrowsing.desktop:16 @@ -285,16 +309,18 @@ msgid "" "Enhanced Browsing;Browsing;WWW;Internet;Internet Keywords;Internet Filters;" "Network;Search Engines;Shortcuts;" msgstr "" +"Navigation avantiate;Navigation;WWW;Internet;Parolas clave de Internet;" +"Filtros de Internet;Rete;Motores de cerca;Vias breve;" #. Name #: ebrowsing/plugins/ikws/kuriikwsfilter.desktop:3 msgid "InternetKeywordsFilter" -msgstr "" +msgstr "Filtro de Parolas clave de Internet" #. Name #: ebrowsing/plugins/ikws/kurisearchfilter.desktop:3 msgid "SearchKeywordsFilter" -msgstr "" +msgstr "Filtro de parolas clave de cerca" #. Comment #: ebrowsing/plugins/ikws/searchprovider.desktop:4 @@ -309,58 +335,59 @@ msgstr "Base de Datos Acronym" #. Query #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6 msgid "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}" -msgstr "" +msgstr "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3 msgid "Alexa" -msgstr "" +msgstr "Alexa" #. Query #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6 msgid "http://info.alexa.com/search?q=\\{@}" -msgstr "" +msgstr "http://info.alexa.com/search?q=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:3 msgid "Alexa URL" -msgstr "" +msgstr "URL de Alexa" #. Query #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:6 msgid "http://info.alexa.com/data/details?url=\\{@}" -msgstr "" +msgstr "http://info.alexa.com/data/details?url=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:3 msgid "AllTheWeb fast" -msgstr "" +msgstr "AllTheWeb de Fast" #. Query #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:6 msgid "" "http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web" msgstr "" +"http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web" #. Name #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:3 msgid "AltaVista" -msgstr "" +msgstr "AltaVista" #. Query #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:6 msgid "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}" -msgstr "" +msgstr "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:4 msgid "All Music Guide" -msgstr "All Music Guide" +msgstr "All Music Guide (Guida de Tote Musica)" #. Query #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:5 msgid "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}" -msgstr "" +msgstr "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:3 @@ -370,17 +397,17 @@ msgstr "Cerca de KDE App" #. Query #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:6 msgid "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}" -msgstr "" +msgstr "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:3 msgid "AustroNaut" -msgstr "" +msgstr "AustroNaut" #. Query #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:6 msgid "http://austronaut.at/page.php?begriff=\\{@}&wo=at" -msgstr "" +msgstr "http://austronaut.at/page.php?begriff=\\{@}&wo=at" #. Name #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3 @@ -390,12 +417,12 @@ msgstr "Cerca de Debian Backports" #. Query #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4 msgid "http://www.backports.org/package.php?search=\\{@}" -msgstr "" +msgstr "http://www.backports.org/package.php?search=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:3 msgid "KDE Bug Database Fulltext Search" -msgstr "" +msgstr "Cerca de texto plen in le base de datos de faltas de KDE" #. Query #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:4 @@ -403,16 +430,18 @@ msgid "" "http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+" "\\{5}+\\{6}+\\{7}+\\{8}+\\{9}" msgstr "" +"http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+" +"\\{5}+\\{6}+\\{7}+\\{8}+\\{9}" #. Name #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:3 msgid "TDE Bug Database Bug Number Search" -msgstr "" +msgstr "Cerca de numero de falta (bug) in le base de datos de faltas de TDE" #. Query #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:4 msgid "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}" -msgstr "" +msgstr "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/call.desktop:5 @@ -422,12 +451,12 @@ msgstr "QRZ.com base de datos Callsign" #. Query #: ebrowsing/plugins/ikws/searchproviders/call.desktop:6 msgid "http://www.qrz.com/database?callsign=\\{@}" -msgstr "" +msgstr "http://www.qrz.com/database?callsign=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/cia.desktop:4 msgid "CIA World Factbook" -msgstr "" +msgstr "CIA World Factbook (libro de stato del mundo de CIA)" #. Query #: ebrowsing/plugins/ikws/searchproviders/cia.desktop:5 @@ -436,6 +465,8 @@ msgid "" "http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww." "cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky" msgstr "" +"http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww." +"cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky" #. Name #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:5 @@ -445,7 +476,7 @@ msgstr "CiteSeer: Libreria Digital de litteratura Scientific" #. Query #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:6 msgid "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1" -msgstr "" +msgstr "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1" #. Name #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:3 @@ -459,6 +490,7 @@ msgstr "" msgid "" "http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}" msgstr "" +"http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}" #. Name #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:3 @@ -473,6 +505,8 @@ msgid "" "http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=" "\\{ at }" msgstr "" +"http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=\\{ " +"at }" #. Name #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3 @@ -484,6 +518,7 @@ msgstr "Catalogo CTAN" msgid "" "http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}" msgstr "" +"http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:3 @@ -493,7 +528,7 @@ msgstr "Cerca de Bug Debian BTS" #. Query #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:4 msgid "http://bugs.debian.org/\\{@}" -msgstr "" +msgstr "http://bugs.debian.org/\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5 @@ -504,7 +539,7 @@ msgstr "dict.cc Traduction: Germano a Anglese" #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:6 msgid "http://www.dict.cc/?s=\\{@}" -msgstr "" +msgstr "http://www.dict.cc/?s=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3 @@ -515,7 +550,7 @@ msgstr "LEO - Traducer inter Germano e Francese" #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:6 #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:6 msgid "http://dict.leo.org/?lp=frde&search=\\{@}" -msgstr "" +msgstr "http://dict.leo.org/?lp=frde&search=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:3 @@ -525,7 +560,7 @@ msgstr "Cerca de Pacchetto Debian" #. Query #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:4 msgid "http://packages.debian.org/\\{@}" -msgstr "" +msgstr "http://packages.debian.org/\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:3 @@ -535,7 +570,7 @@ msgstr "Aperi directorio" #. Query #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6 msgid "http://search.dmoz.org/cgi-bin/search?search=\\{@}" -msgstr "" +msgstr "http://search.dmoz.org/cgi-bin/search?search=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5 @@ -545,7 +580,7 @@ msgstr "DocBook - Le Guida Definitive" #. Query #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:6 msgid "http://www.docbook.org/tdg/en/html/\\{1}.html" -msgstr "" +msgstr "http://www.docbook.org/tdg/en/html/\\{1}.html" #. Name #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:5 @@ -555,7 +590,7 @@ msgstr "Identificator de Objecto Digital" #. Query #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:6 msgid "http://dx.doi.org/\\{@}" -msgstr "" +msgstr "http://dx.doi.org/\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5 @@ -570,7 +605,7 @@ msgstr "WordReference.com Traduction: Anglese a Espaniol" #. Query #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:6 msgid "http://www.wordreference.com/es/translation.asp?tranword=\\{@}" -msgstr "" +msgstr "http://www.wordreference.com/es/translation.asp?tranword=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:5 @@ -580,7 +615,7 @@ msgstr "WordReference.com Traduction: Anglese a Francese" #. Query #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:6 msgid "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}" -msgstr "" +msgstr "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:5 @@ -590,7 +625,7 @@ msgstr "WordReference.com Traduction: Anglese a Italiano" #. Query #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:6 msgid "http://www.wordreference.com/it/translation.asp?enit=\\{@}" -msgstr "" +msgstr "http://www.wordreference.com/it/translation.asp?enit=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:5 @@ -600,17 +635,17 @@ msgstr "WordReference.com Traduction: Espaniol a Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:6 msgid "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}" -msgstr "" +msgstr "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:3 msgid "Excite" -msgstr "" +msgstr "Excite" #. Query #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:6 msgid "http://search.excite.com/search.gw?search=\\{@}" -msgstr "" +msgstr "http://search.excite.com/search.gw?search=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:3 @@ -620,7 +655,7 @@ msgstr "Feedster" #. Query #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:6 msgid "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8" -msgstr "" +msgstr "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8" #. Name #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:3 @@ -632,7 +667,7 @@ msgstr "" #. Query #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:6 msgid "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}" -msgstr "" +msgstr "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:3 @@ -647,7 +682,7 @@ msgstr "WordReference.com Traduction: Francese a Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:6 msgid "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}" -msgstr "" +msgstr "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:3 @@ -662,22 +697,22 @@ msgstr "http://www.freedb.org/freedb_search.php?words=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:3 msgid "Freshmeat" -msgstr "" +msgstr "Freshmeat" #. Query #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:6 msgid "http://freshmeat.net/search/?q=\\{@}" -msgstr "" +msgstr "http://freshmeat.net/search/?q=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:3 msgid "Froogle" -msgstr "" +msgstr "Froogle" #. Query #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:6 msgid "http://froogle.google.com/froogle?q=\\{@}" -msgstr "" +msgstr "http://froogle.google.com/froogle?q=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:3 @@ -687,7 +722,7 @@ msgstr "FSF/UNESCO Free Software Directory (Directorio de software libere)" #. Query #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:6 msgid "http://directory.fsf.org/search/?query=\\{@}" -msgstr "" +msgstr "http://directory.fsf.org/search/?query=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/google.desktop:3 @@ -697,7 +732,7 @@ msgstr "Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google.desktop:6 msgid "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8" -msgstr "" +msgstr "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:3 @@ -713,26 +748,31 @@ msgid "" "\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\"}" "&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8" msgstr "" +"http://www.google.com/search?as_q=\\{all,@}&num=\\{num,\"10\"" +"}&btnG=Google+Search&as_epq=\\{exact,\"\"}&as_oq=\\{any,\"\"}&as_eq=\\" +"{without,\"\"}&lr=\\{lang,\"\"}&as_ft=\\{ft,\"i\"}&as_filetype=\\{filetype,\"" +"\"}&as_qdr=\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\"" +"}&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3 msgid "Google Groups" -msgstr "Google Groups : Gruppos de Google" +msgstr "Google Groups (Gruppos de Google)" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:6 msgid "http://groups.google.com/groups?oi=djq&as_q=\\{@}" -msgstr "" +msgstr "http://groups.google.com/groups?oi=djq&as_q=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:3 msgid "Google Image Search" -msgstr "Google Image Search : cerca de Imagine de Google" +msgstr "Cerca de Imagine de Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:6 msgid "http://images.google.com/images?q=\\{@}" -msgstr "" +msgstr "http://images.google.com/images?q=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:3 @@ -746,16 +786,18 @@ msgid "" "http://www.google.com/search?q=\\{@}&btnI=I%27m+Feeling" "+Lucky&ie=UTF-8&oe=UTF-8" msgstr "" +"http://www.google.com/search?q=\\" +"{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:3 msgid "Google Movies" -msgstr "Google Movies" +msgstr "Google Movies (Filmes de Google)" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:6 msgid "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8" -msgstr "" +msgstr "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:3 @@ -765,37 +807,37 @@ msgstr "Google News - Novas de Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:6 msgid "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8" -msgstr "" +msgstr "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8" #. Name #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:3 msgid "Gracenote" -msgstr "" +msgstr "Gracenote - Nota de Gratia" #. Query #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:6 msgid "http://www.gracenote.com/music/search-adv.html?q=\\{@}" -msgstr "" +msgstr "http://www.gracenote.com/music/search-adv.html?q=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5 msgid "Great Dictionary of the Catalan Language (GRan Enciclopèdia Catalana)" -msgstr "Grande Dictionario del Linguage Catalan (GRan Enciclopèdia Catalana)" +msgstr "Grande Dictionario del Linguage Catalan (GRan Enciclopèdia Catalana)" #. Query #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:6 msgid "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}" -msgstr "" +msgstr "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:3 msgid "Hotbot" -msgstr "" +msgstr "Hotbot" #. Query #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:6 msgid "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2" -msgstr "" +msgstr "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2" #. Name #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:3 @@ -825,7 +867,7 @@ msgstr "Base de datos de internet de films" #. Query #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:6 msgid "http://imdb.com/Find?\\{@}" -msgstr "" +msgstr "http://imdb.com/Find?\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:5 @@ -835,7 +877,7 @@ msgstr "WordReference.com Traduction: Italiano a Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:6 msgid "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}" -msgstr "" +msgstr "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:3 @@ -848,16 +890,18 @@ msgid "" "http://www.ask.com/main/askJeeves.asp?" "origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}" msgstr "" +"http://www.ask.com/main/askJeeves." +"asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:3 msgid "KataTudo" -msgstr "" +msgstr "KataTudo" #. Query #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:6 msgid "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar" -msgstr "" +msgstr "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar" #. Name #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:5 @@ -867,17 +911,17 @@ msgstr "Documentation de KDE API" #. Query #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:6 msgid "http://api.kde.org/classmapper.php?class=\\{@}" -msgstr "" +msgstr "http://api.kde.org/classmapper.php?class=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:3 msgid "KDE WebSVN" -msgstr "" +msgstr "WebSVN de KDE" #. Query #: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:6 msgid "http://websvn.kde.org/\\{@}" -msgstr "" +msgstr "http://websvn.kde.org/\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:3 @@ -887,27 +931,27 @@ msgstr "LEO-Traduce" #. Query #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:6 msgid "http://dict.leo.org/?search=\\{@}" -msgstr "" +msgstr "http://dict.leo.org/?search=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:3 msgid "Lycos" -msgstr "" +msgstr "Lycos" #. Query #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:6 msgid "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}" -msgstr "" +msgstr "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:3 msgid "Mamma - Mother of all Search Engines" -msgstr "" +msgstr "Mamma - Le Matre de omne motores de cerca" #. Query #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:6 msgid "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}" -msgstr "" +msgstr "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:3 @@ -921,6 +965,9 @@ msgid "" "&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10®ion=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-" "search&refer=mc-search" msgstr "" +"http://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=m" +"etaworld&redirect=web&rpp=20&hpe=10®ion=0&timeout=0&sort=0&format=beta99&t" +"heme=classic&refer=mc-search&refer=mc-search" #. Name #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3 @@ -934,6 +981,9 @@ msgid "" "handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault." "asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO" msgstr "" +"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff." +"asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault." +"asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO" #. Name #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:3 @@ -943,7 +993,7 @@ msgstr "Netcraft" #. Query #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:6 msgid "http://uptime.netcraft.com/up/graph?site=\\{@}" -msgstr "" +msgstr "http://uptime.netcraft.com/up/graph?site=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:2 @@ -959,6 +1009,10 @@ msgid "" "&citycode=&zipcode4=&street=&area=conditional&areacode=®ion=&subscription=&country=&catcode=&dcity=" "\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid=" msgstr "" +"http://www.detelefoongids.nl/tginl.dll?action=white&type=search&resultsperpag" +"e=25&pagestart=1&source=searchcategory&name2=\\{1}&name=&initials=&city=\\{2}" +"&citycode=&zipcode4=&street=&area=conditional&areacode=®ion=&subscription=" +"&country=&catcode=&dcity=\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid=" #. Name #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:2 @@ -968,7 +1022,7 @@ msgstr "Fornitor de cerca Teletekst" #. Query #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:6 msgid "http://teletekst.nos.nl/gif/\\{@}-01.html" -msgstr "" +msgstr "http://teletekst.nos.nl/gif/\\{@}-01.html" #. Name #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:3 @@ -978,7 +1032,7 @@ msgstr "Cerca de clave OpenPGP" #. Query #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:4 msgid "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex" -msgstr "" +msgstr "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex" #. Name #: ebrowsing/plugins/ikws/searchproviders/php.desktop:3 @@ -988,7 +1042,7 @@ msgstr "Cerca PHP" #. Query #: ebrowsing/plugins/ikws/searchproviders/php.desktop:4 msgid "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}" -msgstr "" +msgstr "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/python.desktop:5 @@ -1002,16 +1056,18 @@ msgid "" "http://www.google.com/search?sourceid=python-search&q=\\{@}" "&submit=Search&q=site%3Apython.org" msgstr "" +"http://www.google.com/search?sourceid=python-search&q=\\" +"{@}&submit=Search&q=site%3Apython.org" #. Name #: ebrowsing/plugins/ikws/searchproviders/qt.desktop:5 msgid "Latest Qt Online Documentation" -msgstr "" +msgstr "Ultime documentation de Qt in linea" #. Query #: ebrowsing/plugins/ikws/searchproviders/qt.desktop:6 msgid "http://doc.trolltech.com/latest/\\{@}.html" -msgstr "" +msgstr "http://doc.trolltech.com/latest/\\{@}.html" #. Name #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:5 @@ -1021,7 +1077,7 @@ msgstr "Documentation in linea de Qt3" #. Query #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:6 msgid "http://doc.trolltech.com/3.3/\\{@}.html" -msgstr "" +msgstr "http://doc.trolltech.com/3.3/\\{@}.html" #. Name #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:5 @@ -1034,6 +1090,8 @@ msgid "" "http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}" "&FORMATO=ampliado" msgstr "" +"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\" +"{@}&FORMATO=ampliado" #. Name #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3 @@ -1043,7 +1101,7 @@ msgstr "IETF Requestas pro Commentos" #. Query #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:4 msgid "http://www.ietf.org/rfc/rfc\\{@}.txt" -msgstr "" +msgstr "http://www.ietf.org/rfc/rfc\\{@}.txt" #. Name #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:3 @@ -1053,7 +1111,7 @@ msgstr "RPM-Find" #. Query #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:6 msgid "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}" -msgstr "" +msgstr "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:3 @@ -1063,12 +1121,12 @@ msgstr "Archivo de application de Ruby" #. Query #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:6 msgid "http://raa.ruby-lang.org/search.rhtml?search=\\{@}" -msgstr "" +msgstr "http://raa.ruby-lang.org/search.rhtml?search=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:3 msgid "GO.com" -msgstr "" +msgstr "GO.com" #. Query #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:6 @@ -1076,6 +1134,8 @@ msgid "" "http://www.go.com/Titles?col=WW&qt=\\{@}" "&svx=home_searchbox&sv=IS&lk=noframeso" msgstr "" +"http://www.go.com/Titles?col=WW&qt=\\" +"{@}&svx=home_searchbox&sv=IS&lk=noframeso" #. Name #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3 @@ -1088,6 +1148,8 @@ msgid "" "http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact=" "\\{exact,\"0\"}&words=\\{@}" msgstr "" +"http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact=\\" +"{exact,\"0\"}&words=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3 @@ -1097,7 +1159,7 @@ msgstr "Technorati" #. Query #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6 msgid "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}" -msgstr "" +msgstr "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:3 @@ -1107,7 +1169,7 @@ msgstr "Technorati Etiquettas" #. Query #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:6 msgid "http://technorati.com/tag/\\{@}?sourceid=kde-search" -msgstr "" +msgstr "http://technorati.com/tag/\\{@}?sourceid=kde-search" #. Name #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:3 @@ -1117,7 +1179,7 @@ msgstr "Merriam-Webster Thesauro" #. Query #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:6 msgid "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}" -msgstr "" +msgstr "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:4 @@ -1127,7 +1189,7 @@ msgstr "TV Tome" #. Query #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:6 msgid "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0" -msgstr "" +msgstr "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0" #. Name #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:5 @@ -1146,7 +1208,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3 msgid "Vivisimo" -msgstr "" +msgstr "Vivisimo" #. Query #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:6 @@ -1155,6 +1217,8 @@ msgid "" "http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD" "%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16" msgstr "" +"http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD" +"%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16" #. Name #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:3 @@ -1167,6 +1231,8 @@ msgid "" "http://search.ke.voila.fr/S/voila?" "lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}" msgstr "" +"http://search.ke.voila.fr/S/" +"voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:3 @@ -1176,18 +1242,19 @@ msgstr "Merriam-Webster Dictionario" #. Query #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:6 msgid "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}" -msgstr "" +msgstr "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:3 msgid "Whatis Query" -msgstr "" +msgstr "Demanda Que es (What is)" #. Query #: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:6 msgid "" "http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}" msgstr "" +"http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:3 @@ -1197,7 +1264,7 @@ msgstr "Wikipedia - Le Encyclopedia Libere e Gratuite" #. Query #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:6 msgid "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go" -msgstr "" +msgstr "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go" #. Name #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3 @@ -1207,7 +1274,7 @@ msgstr "Wiktionary - Le Dictionario Libere e Gratuite" #. Query #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6 msgid "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go" -msgstr "" +msgstr "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go" #. Name #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:5 @@ -1217,32 +1284,34 @@ msgstr "WordReference.com Dictionario Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:6 msgid "http://www.wordreference.com/english/definition.asp?en=\\{@}" -msgstr "" +msgstr "http://www.wordreference.com/english/definition.asp?en=\\{@}" #. Name #: ebrowsing/plugins/localdomain/localdomainurifilter.desktop:3 msgid "LocalDomainFilter" -msgstr "" +msgstr "FiltrodeDominioLocal" #. Name #: ebrowsing/plugins/shorturi/tdeshorturifilter.desktop:3 msgid "ShortURIFilter" -msgstr "" +msgstr "Filtro de URIs curte" #. Name #: energy/energy.desktop:11 msgid "Power Control" -msgstr "" +msgstr "Controlo de Energia" #. Comment #: energy/energy.desktop:13 msgid "Settings for display power management" -msgstr "" +msgstr "Preferentias per monstrar gestion de energia" #. Keywords #: energy/energy.desktop:15 msgid "energy;saver;apm;acpi;dpms;timeout;blanking;stand by;suspend;power;" msgstr "" +"energia;sparnio;apm;acpi;dpms;tempore de expiration;blanking;modo de " +"pausa;suspender;potentia;" #. Name #: filetypes/filetypes.desktop:12 @@ -1278,48 +1347,51 @@ msgid "" "fonts;font size;styles;charsets;character sets;panel;kicker;control panel;" "desktops;FileManager;Toolbars;Menu;Window Title;Title;" msgstr "" +"fonts;grandor de font;stilos;charsets;insimul de characteres;pannello;kicker;" +"pannello de controlo;scriptorioss;Gerente de File;Barras de instrumento;Menu;" +"Titulo de Fenestra;Titulo;" #. Name #: hwmanager/hwdevicetray-autostart.desktop:2 msgid "tdehwdevicetray" -msgstr "" +msgstr "tdehwdevicetray" #. GenericName #. Name #: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2 #: hwmanager/hwdevicetray.desktop:4 msgid "Device Monitor" -msgstr "" +msgstr "Monitor de dispositivo" #. Comment #: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6 msgid "Monitor hardware devices from the system tray" -msgstr "" +msgstr "Observa dispositivos hardware ab le area de tabuliero de sistema" #. Name #: hwmanager/hwmanager.desktop:11 msgid "Device Manager" -msgstr "" +msgstr "Gerente de Dispositivo" #. Comment #: hwmanager/hwmanager.desktop:13 msgid "Configure hardware devices" -msgstr "" +msgstr "Configurar dispositivos hardware" #. Keywords #: hwmanager/hwmanager.desktop:15 msgid "hardware;devices;manager;" -msgstr "" +msgstr "hardware;dispositivos;gerente;" #. Comment #: iccconfig/iccconfig.desktop:14 msgid "Configure display ICC color profile" -msgstr "" +msgstr "Configurar profilo de color ICC de monstrator" #. Keywords #: iccconfig/iccconfig.desktop:16 msgid "ICC;display;color;profile;" -msgstr "" +msgstr "ICC;monstrator;color;profilo;" #. Name #: iccconfig/iccconfig.desktop:18 @@ -1334,27 +1406,27 @@ msgstr "Icones" #. Comment #: icons/icons.desktop:14 msgid "Customize TDE Icons" -msgstr "" +msgstr "Personalisar Icones deTDE" #. Keywords #: icons/icons.desktop:16 msgid "icons;effects;size;hicolor;locolor;" -msgstr "" +msgstr "icones;effectos;grandor;hicolor;locolor;" #. Name #: info/cdinfo.desktop:12 msgid "CD-ROM Information" -msgstr "" +msgstr "Information de CD-ROM" #. Comment #: info/cdinfo.desktop:14 msgid "CD/DVD Drive Capabilites" -msgstr "" +msgstr "Capacitates de Drive CD/DVD" #. Keywords #: info/cdinfo.desktop:16 msgid "CD-ROM Information;CD-ROM;CD;CD Drive;Writer Capabilities;" -msgstr "" +msgstr "Information CD-ROM;CD-ROM;CD;Dispositivo CD;Capacitates de scriptura;" #. Name #: info/devices.desktop:13 @@ -1364,27 +1436,27 @@ msgstr "Dispositivos" #. Comment #: info/devices.desktop:15 msgid "Attached devices information" -msgstr "" +msgstr "Information de dispositivos attachate" #. Keywords #: info/devices.desktop:17 msgid "dev;Devices;System Information;Information;" -msgstr "" +msgstr "dev;Dispositivos;Information de Systema;Information;" #. Name #: info/dma.desktop:13 msgid "DMA-Channels" -msgstr "" +msgstr "Canales DMA" #. Comment #: info/dma.desktop:15 msgid "DMA information" -msgstr "" +msgstr "Information de DMA" #. Keywords #: info/dma.desktop:17 msgid "dma;DMA-Channels;System Information;" -msgstr "" +msgstr "DMA;Canales DMA;Information del systema;" #. Name #: info/interrupts.desktop:13 @@ -1404,17 +1476,19 @@ msgstr "Interruptiones;IRQ;Information de systema;" #. Name #: info/ioports.desktop:13 msgid "IO-Ports" -msgstr "" +msgstr "Portos de IO" #. Comment #: info/ioports.desktop:15 msgid "IO-port information" -msgstr "" +msgstr "Information de portos de I/E (I/O)" #. Keywords #: info/ioports.desktop:17 msgid "IO;I/O;IO-Ports;I/O-Ports;Ports;IO-Range;I/O-Range;System Information;" msgstr "" +"IE;I/E;Portos de IE;Portos de I/E;Portos;Intervallo de IE;Intervallo de I/E;" +"Information del systema;" #. Name #: info/memory.desktop:12 @@ -1432,6 +1506,8 @@ msgid "" "Memory;RAM;Virtual memory;Physical memory;Shared memory;Swap;System " "Information;" msgstr "" +"Memoria;RAM;Memoria virtual;Memoria fÃsica;Memoria " +"compartite;Swap;Intercambio;Information del systema;" #. Name #: info/opengl.desktop:13 @@ -1455,17 +1531,17 @@ msgstr "" #. Name #: info/partitions.desktop:13 msgid "Partitions" -msgstr "" +msgstr "Partitiones" #. Comment #: info/partitions.desktop:15 msgid "Partition information" -msgstr "" +msgstr "Information de Partition" #. Keywords #: info/partitions.desktop:17 msgid "Partitions;Harddrive;HD;System Information;" -msgstr "" +msgstr "Partitiones;Disco duro;Information del systema;" #. Name #: info/pci.desktop:12 @@ -1490,12 +1566,12 @@ msgstr "Processor" #. Comment #: info/processor.desktop:14 msgid "Processor information" -msgstr "" +msgstr "Information de processor" #. Keywords #: info/processor.desktop:16 msgid "Processor;CPU;FPU;MHz;System Information;" -msgstr "" +msgstr "Processor;CPU;FPU;MHz;Informationn del systema;" #. Name #: info/scsi.desktop:12 @@ -1505,12 +1581,12 @@ msgstr "SCSI" #. Comment #: info/scsi.desktop:14 msgid "SCSI information" -msgstr "" +msgstr "Information de SCSI" #. Keywords #: info/scsi.desktop:16 msgid "SCSI;SCSI-Bus;System Information;" -msgstr "" +msgstr "SCSI;Bus SCSI;Information del systema;" #. Name #: info/sound.desktop:12 @@ -1520,12 +1596,12 @@ msgstr "Sono" #. Comment #: info/sound.desktop:14 msgid "Sound information" -msgstr "" +msgstr "Information de Sono" #. Keywords #: info/sound.desktop:16 msgid "Sound;Audio;Soundcard;MIDI;OSS;System Information;" -msgstr "" +msgstr "Sono;Audio;Carta de sono;MIDI;OSS;Information del systema;" #. Name #: info/xserver.desktop:12 @@ -1551,7 +1627,7 @@ msgstr "Mus" #. Comment #: input/mouse.desktop:15 msgid "Mouse settings" -msgstr "" +msgstr "Preferentias de mus" #. Keywords #: input/mouse.desktop:17 @@ -1560,6 +1636,10 @@ msgid "" "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;" "DoubleClick;mapping;right handed;left handed;" msgstr "" +"Mus;Acceleration del mus;Limine del Mus;Buttones del mus;Selection;Forma del " +"cursor;Dispositivos de ingresso;Assignationes (Mappar) de " +"buttones;Pulsar;icones;commentario;Punctatores;Traher;Duple " +"pulsar;mappar;destromane;sinistromane;" #. Name #: input/touchpad.desktop:13 @@ -1577,42 +1657,44 @@ msgid "" "Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;" "Click;mapping;right handed;left handed;" msgstr "" +"Touchpad;Tocca per cliccar;Mus;Buttones de Mus;Dispositivo de Ingresso;" +"Mappar de Button;Toccar;Cliccar;mappar;destromane;sinistromane;" #. Name #: joystick/joystick.desktop:12 msgid "Joystick" -msgstr "" +msgstr "Joystick" #. Comment #: joystick/joystick.desktop:14 msgid "Joystick - a kcontrol module to test Joysticks" -msgstr "" +msgstr "Joystick - un módulo de kcontrol per provar Joystickes" #. Keywords #: joystick/joystick.desktop:16 msgid "joystick;gamepad;" -msgstr "" +msgstr "joystick;gamepad;" #. Name #: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8 #: kcontrol/tde-kcontrol.desktop:8 msgid "Trinity Control Center" -msgstr "" +msgstr "Centro de Controlo de Trinity" #. Name #: kded/kcmkded.desktop:11 msgid "Service Manager" -msgstr "" +msgstr "Gerente de Servicio" #. Comment #: kded/kcmkded.desktop:13 msgid "System Services Configuration" -msgstr "" +msgstr "Configuration del Servicios de Systema" #. Keywords #: kded/kcmkded.desktop:15 msgid "KDED;Daemon;Services;" -msgstr "" +msgstr "KDED;Demonio;servicios;" #. Name #: keys/keys.desktop:12 @@ -1622,7 +1704,7 @@ msgstr "Vias breve de claviero" #. Comment #: keys/keys.desktop:14 msgid "Configuration of keybindings" -msgstr "" +msgstr "Configuration de ligamines (associationes) de claves" #. Keywords #: keys/keys.desktop:16 @@ -1630,6 +1712,8 @@ msgid "" "Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application " "shortcuts;" msgstr "" +"Claves;Associationes de claves global;Squema de clavess;Associationes de " +"claves;accessos directe;accessos directe de applicationes;" #. Name #: kicker/kicker_config.desktop:11 @@ -1639,7 +1723,7 @@ msgstr "Disposition" #. Comment #: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13 msgid "Configure the arrangement of the panel" -msgstr "" +msgstr "Configura le adaptation del pannello" #. Keywords #: kicker/kicker_config.desktop:15 kicker/kicker_config_appearance.desktop:15 @@ -1652,6 +1736,12 @@ msgid "" "bookmarks;recent documents;quickbrowser;browser menu;menu;icons;tiles;" "applets;startup;highlight;handles;zooming icons;" msgstr "" +"kicker;pannello;kpanel;barra de cargas;barra de initio;barra de " +"lancear;location;grandor;auto celar;celar;buttones;animation;fundo;themas;" +"cache de menu;cache;celate;Menu de TDE;marcatores de libro;documentos " +"recente;navigator rapide;menu de " +"navigator;menu;icones;tegulas;applets;startar;evidentiar;identificatores;" +"icones ampliate;" #. Name #: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11 @@ -1661,7 +1751,7 @@ msgstr "Apparentia" #. Comment #: kicker/kicker_config_appearance.desktop:13 msgid "Configure the appearance of the panel" -msgstr "" +msgstr "Configuration del appariencia del pannello" #. Name #: kicker/kicker_config_arrangement.desktop:11 @@ -1671,12 +1761,12 @@ msgstr "Arrangiamento" #. Name #: kicker/kicker_config_hiding.desktop:11 msgid "Hiding" -msgstr "" +msgstr "Celar" #. Comment #: kicker/kicker_config_hiding.desktop:13 msgid "Configure the hiding of the panel" -msgstr "" +msgstr "Configurar le celar del pannello" #. Name #: kicker/kicker_config_menus.desktop:11 @@ -1686,7 +1776,7 @@ msgstr "Minus" #. Comment #: kicker/kicker_config_menus.desktop:13 msgid "Configure the menus of the panel" -msgstr "" +msgstr "Configurar le menus del pannello" #. Name #: kicker/panel.desktop:10 @@ -1696,7 +1786,7 @@ msgstr "Pannellos" #. Comment #: kicker/panel.desktop:12 msgid "Configure the arrangement of the panels" -msgstr "" +msgstr "Configurar le adaptation del pannello" #. Name #: knotify/kcmnotify.desktop:11 @@ -1706,27 +1796,27 @@ msgstr "Notificationes de Systema" #. Comment #: knotify/kcmnotify.desktop:13 msgid "System Notification Configuration" -msgstr "" +msgstr "Configuration de Notification de Systema" #. Keywords #: knotify/kcmnotify.desktop:15 msgid "System sounds;Audio;Sound;Notify;Alerts;Notification;" -msgstr "" +msgstr "Sonos del systema;Audio;Sono;Notificar;Alertas;Notification;" #. Name #: konq/desktop.desktop:11 msgid "Multiple Desktops" -msgstr "" +msgstr "Scriptorios Multiple" #. Comment #: konq/desktop.desktop:13 msgid "You can configure how many virtual desktops there are" -msgstr "" +msgstr "Tu pote configurar quante scriptorios virtual il ha ci" #. Keywords #: konq/desktop.desktop:15 msgid "desktop;desktops;number;virtual desktop;" -msgstr "" +msgstr "scriptorio;scriptorios;numero;scriptorio virtual;" #. Name #: konq/desktopbehavior.desktop:12 konq/filebehavior.desktop:11 @@ -1736,7 +1826,7 @@ msgstr "Comportamento" #. Comment #: konq/desktopbehavior.desktop:14 msgid "You can configure how the desktop behaves here" -msgstr "" +msgstr "Tu pote configurar como le scriptorio se comporta ci" #. Keywords #: konq/desktopbehavior.desktop:16 @@ -1744,6 +1834,9 @@ msgid "" "konqueror;filemanager;kfm;tips;file tips;separate window;spawn windows;" "behavior;behaviour;memory usage;Home URL;" msgstr "" +"konqueror;gerente de file;kfm;consilios;consilios de file;fenestra separate;" +"extender fenestras;comportamento;comportar;usage de memoria;uso de memoria;" +"URL initial;" #. Name #: konq/desktoppath.desktop:11 @@ -1753,17 +1846,19 @@ msgstr "Percursos" #. Comment #: konq/desktoppath.desktop:13 msgid "Change the location important files are stored" -msgstr "" +msgstr "Cambiar le location ubi files importante es immagazinate" #. Keywords #: konq/desktoppath.desktop:15 msgid "konqueror;filemanager;paths;desktop;directories;autostart;" msgstr "" +"konqueror;gerente de " +"file;percursos;scriptorios;directorios;autoinitio;autostartar;" #. Comment #: konq/fileappearance.desktop:13 msgid "Configure how Konqueror looks as a file manager" -msgstr "" +msgstr "Configurar como Konqueror appare como gerente de file" #. Keywords #: konq/fileappearance.desktop:15 konq/filebrowser.desktop:16 @@ -1771,11 +1866,13 @@ msgid "" "konqueror;filemanager;word wrap;wrap;underline;display;filesize;bytes;font;" "color;colour;" msgstr "" +"konqueror;gerente de file;tomo de parola;inveloppar;sublinear;monstrator;" +"grandor de file;bytes;font;color;" #. Comment #: konq/filebehavior.desktop:13 msgid "Configure how Konqueror behaves as a file manager" -msgstr "" +msgstr "Configurar como Konqueror se comporta como gerente de file" #. Keywords #: konq/filebehavior.desktop:15 @@ -1784,26 +1881,31 @@ msgid "" "behavior;behaviour;memory usage;Home URL;network operations;progress dialog;" "trash can;delete;confirmation;" msgstr "" +"konqueror;gerente de files;kfm;consilioss;fenestra separate; extender " +"fenestras;comportamento;uso de memoria; URL de initio;operationes de rete; " +"diálogo de progresso;corbe;deler;confirmation;" #. Comment #: konq/filebrowser.desktop:14 msgid "You can configure Konqueror's file manager mode here" -msgstr "" +msgstr "Tu pote configurar ci le modo de gerente de file de Konqueror" #. Name #: konq/filepreviews.desktop:11 msgid "Previews & Metadata" -msgstr "" +msgstr "Vistas preliminar & Meta-Datos" #. Comment #: konq/filepreviews.desktop:13 msgid "Configure how Konqueror Previews & Meta-data work" -msgstr "" +msgstr "Configura como functiona le Vista Preliminar & Meta-Datos de Konqueror" #. Keywords #: konq/filepreviews.desktop:15 msgid "konqueror;filemanager;previews;file previews;maximum size;" msgstr "" +"konqueror;gerente de files;vistas preliminar;vistas preliminar de file;" +"grandor maxime;" #. Name #: konqhtml/tdehtml_behavior.desktop:11 @@ -1821,6 +1923,8 @@ msgid "" "konqueror;kfm;browser;html;web;www;fonts;colours;colors;java;javascript;" "cursor;links;images;charsets;character sets;encoding;" msgstr "" +"konqueror;kfm;navigator;html;web;www;fonts;color;colores;java;javascript;curs" +"or;ligaminess;images;charsets;insimul de character;codification;" #. Name #: konqhtml/tdehtml_filter.desktop:10 @@ -1835,13 +1939,15 @@ msgstr "Configura le filtros AdBlock de Konqueror" #. Comment #: konqhtml/tdehtml_fonts.desktop:13 msgid "Configure the fonts used on web pages" -msgstr "" +msgstr "Configura le fonts usate su le paginas web" #. Keywords #: konqhtml/tdehtml_fonts.desktop:15 msgid "" "konqueror;kfm;browser;html;web;www;fonts;charsets;character sets;encoding;" msgstr "" +"konqueror;kfm;navigator;html;web;www;fonts;insimul de " +"character;charset;codification;" #. Name #: konqhtml/tdehtml_java_js.desktop:11 @@ -1856,7 +1962,7 @@ msgstr "Configura le comportamento de Java e JavaScript" #. Keywords #: konqhtml/tdehtml_java_js.desktop:15 msgid "konqueror;kfm;browser;html;web;www;java;javascript;" -msgstr "" +msgstr "konqueror;kfm;navigator;html;web;www;java;javascript;" #. Name #: konqhtml/tdehtml_userinterface.desktop:11 @@ -1866,12 +1972,12 @@ msgstr "Interfacie de usator" #. Comment #: konqhtml/tdehtml_userinterface.desktop:13 msgid "Configure user interface options" -msgstr "" +msgstr "Configura le optiones de interfacie de usator" #. Keywords #: konqhtml/tdehtml_userinterface.desktop:15 msgid "konqueror;kfm;user;interface;tabbed;browsing;" -msgstr "" +msgstr "konqueror;kfm;usator;interfacie;schedas;navigar;" #. Name #: konsole/kcmkonsole.desktop:10 @@ -1881,7 +1987,7 @@ msgstr "Konsole" #. Comment #: konsole/kcmkonsole.desktop:12 msgid "Konsole configuration module" -msgstr "" +msgstr "Modulo de configuration de Konsole" #. Keywords #: konsole/kcmkonsole.desktop:14 @@ -1889,31 +1995,32 @@ msgid "" "konsole;schema;konsole background;colors;background;terminal application;" "terminal;" msgstr "" +"konsole;schema;fundo de konsole;colores;fundo;terminal application;terminal;" #. Name #: kthememanager/installktheme.desktop:2 msgid "Install TDE Theme" -msgstr "" +msgstr "Installa Thema de TDE" #. Comment #: kthememanager/kthememanager.desktop:2 msgid "Manage global TDE visual themes" -msgstr "" +msgstr "Gere themas visual de TDE global" #. Keywords #: kthememanager/kthememanager.desktop:5 msgid "themes;look and feel;" -msgstr "" +msgstr "themas;apparentia;" #. Name #: kthememanager/kthememanager.desktop:6 msgid "Theme Manager" -msgstr "" +msgstr "Gerente de Thema" #. Comment #: kthememanager/x-ktheme.desktop:3 msgid "TDE Theme" -msgstr "" +msgstr "Thema de TDE" #. Name #: launch/kcmlaunch.desktop:12 @@ -1923,7 +2030,7 @@ msgstr "Retorno de lanceamento" #. Comment #: launch/kcmlaunch.desktop:14 msgid "Choose application-launch feedback style" -msgstr "" +msgstr "Selige stilo de commentario de lanceator de applicationes" #. Keywords #: launch/kcmlaunch.desktop:16 @@ -1931,21 +2038,24 @@ msgid "" "application;start;launch;busy;cursor;feedback;mouse;pointer;rotating;" "spinning;disk;startup;program;report;" msgstr "" +"application;startar;launcear;occupate;cursor;commentario;mus;punctator;rotar;" +"spinning;disco;initiar;programma;reportar;" #. Name #: locale/default/entry.desktop:2 msgid "English (American)" -msgstr "" +msgstr "Anglese (American)" #. Name #: locale/language.desktop:12 msgid "Country/Region & Language" -msgstr "" +msgstr "Pais/Region & Linguage" #. Comment #: locale/language.desktop:14 msgid "Language, numeric, and time settings for your particular region" msgstr "" +"Preferentias de Linguage, formato numeric e tempore per tu region particular" #. Keywords #: locale/language.desktop:16 @@ -1954,6 +2064,11 @@ msgid "" "charsets;character sets;Decimal symbol;Thousands separator;symbol;separator;" "sign;positive;negative;fractional digits;week;week start;" msgstr "" +"linguage;traduction;formato de " +"numero;numerario;tempore;data;formatos;locale;Pais;charsets;insimuled de " +"character;Symbolo Decimal;Separator de " +"milles;symbolo;separator;signar;positive;negative;digitos " +"fractional;septimana;initio de septimana;" #. Name #: nics/nic.desktop:12 @@ -1979,62 +2094,64 @@ msgstr "Configura preferentias que pote meliorar le prestation de Konqueror" #. Keywords #: performance/kcmkonqyperformance.desktop:15 msgid "konqueror;reuse;preloading;" -msgstr "" +msgstr "konqueror;reusar;precargar;" #. Comment #: performance/kcmperformance.desktop:13 msgid "Configure settings that can improve TDE performance" -msgstr "" +msgstr "Configurar preferentias que pote meliorar le prestatione de TDE" #. Keywords #: performance/kcmperformance.desktop:15 msgid "performance;speed;memory;improve;" -msgstr "" +msgstr "prestationes;velocitate;memoria;meliorar;" #. Name #: privacy/privacy.desktop:11 msgid "Privacy" -msgstr "" +msgstr "Confidentialitate" #. Comment #: privacy/privacy.desktop:13 msgid "Clean unwanted traces the user leaves on the system" -msgstr "" +msgstr "Netta tracias non volite que le usator lassa sur le systema" #. Keywords #: privacy/privacy.desktop:15 msgid "Privacy;privacy;" -msgstr "" +msgstr "Confidentialitate;Confidentialitate;intimitate;" #. Name #: randr/randr.desktop:9 msgid "Size & Orientation" -msgstr "" +msgstr "Grandor & Orientation" #. Comment #: randr/randr.desktop:11 msgid "Resize and Rotate your display" -msgstr "" +msgstr "Redimensiona e Rota tu monstrator" #. Keywords #: randr/randr.desktop:13 msgid "resize;rotate;display;color;depth;size;horizontal;vertical;" msgstr "" +"redimensionar;rotar;monstrator;color;profunditate;grandor;dimension;horizonta" +"l;vertical;" #. Name #: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2 msgid "TDERandRTray" -msgstr "" +msgstr "TDERandRTray" #. GenericName #: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4 msgid "Screen Resize & Rotate" -msgstr "" +msgstr "Redimensionar & Rotar Schermo" #. Comment #: randr/tderandrtray-autostart.desktop:6 randr/tderandrtray.desktop:6 msgid "Resize and rotate X screens." -msgstr "" +msgstr "Redimensionar e rotar schermos de X." #. Name #: samba/smbstatus.desktop:12 @@ -2049,7 +2166,7 @@ msgstr "Monitor de stato de Samba" #. Keywords #: samba/smbstatus.desktop:16 msgid "SMB;SAMBA;Windows network;LAN;System Information;" -msgstr "" +msgstr "SMB;SAMBA;Rete Windows;LAN;Information del systema;" #. Name #: screensaver/screensaver.desktop:12 @@ -2059,12 +2176,12 @@ msgstr "Salvator de schermo" #. Comment #: screensaver/screensaver.desktop:14 msgid "Screen Saver Settings" -msgstr "" +msgstr "Preferentias del salvaschermo" #. Keywords #: screensaver/screensaver.desktop:16 msgid "screensavers;Priority;" -msgstr "" +msgstr "salvaschermos;Prioritate;" #. Name #: smartcard/smartcard.desktop:11 @@ -2074,12 +2191,12 @@ msgstr "Smartcards" #. Comment #: smartcard/smartcard.desktop:13 msgid "Configure smartcard support" -msgstr "" +msgstr "Configura supporto de smartcard" #. Keywords #: smartcard/smartcard.desktop:15 msgid "Smartcard;PKCS;SSL;reader;smart;card;" -msgstr "" +msgstr "Smartcard;PKCS;SSL;lector;smart;carta;" #. Name #: smserver/kcmsmserver.desktop:12 @@ -2090,11 +2207,12 @@ msgstr "Gerente de session" #: smserver/kcmsmserver.desktop:14 msgid "Configure the session manager and logout settings" msgstr "" +"Configura le gerente de session e le preferentias de clauder session (logout)" #. Keywords #: smserver/kcmsmserver.desktop:16 msgid "ksmserver;session;logout;confirmation;save;restore;" -msgstr "" +msgstr "ksmserver;session;clauder session;confirmation;salveguardar;restabilir;" #. Name #: spellchecking/spellchecking.desktop:11 @@ -2104,12 +2222,12 @@ msgstr "Controlator Orthographic" #. Comment #: spellchecking/spellchecking.desktop:13 msgid "Configure the spell checker" -msgstr "" +msgstr "Configurar le corrector orthographic" #. Keywords #: spellchecking/spellchecking.desktop:15 msgid "Spell;" -msgstr "" +msgstr "Ortographia;" #. Name #: style/style.desktop:13 @@ -2121,12 +2239,16 @@ msgstr "Stilo" msgid "" "Allows the manipulation of widget behavior and changing the Style for TDE" msgstr "" +"Permitte le manipulation del comportamento de widget e cambia le stilo per " +"TDE" #. Keywords #: style/style.desktop:17 msgid "" "style;styles;look;widget;icons;toolbars;text;highlight;apps;TDE applications;" msgstr "" +"stilo;stilos;aspecto;widget;icones;barras de " +"instrumento;texto;evidentiate;apps;applicationes de TDE;" #. Name #: taskbar/kcmtaskbar.desktop:11 @@ -2136,12 +2258,14 @@ msgstr "Barra de Carga" #. Comment #: taskbar/kcmtaskbar.desktop:13 msgid "Configure the selected taskbar" -msgstr "" +msgstr "Configurar le barra de carga selectionate" #. Keywords #: taskbar/kcmtaskbar.desktop:15 msgid "kicker;panel;kpanel;taskbar;startbar;launchbar;windows;" msgstr "" +"kicker;pannello;kpanel;barra de cargas;barra de initiar;barra de " +"lancear;fenestrass;" #. Name #: tdefontinst/installfont.desktop:6 @@ -2156,32 +2280,32 @@ msgstr "Installator de Font" #. Comment #: tdefontinst/kcmfontinst/kcmfontinst.desktop:16 msgid "Install & preview fonts" -msgstr "" +msgstr "Installar & previsualisar fonts" #. Keywords #: tdefontinst/kcmfontinst/kcmfontinst.desktop:18 msgid "font;fonts;installer;truetype;type1;speedo;bitmap;" -msgstr "" +msgstr "font;fonts;installator;truetype;type1;speedo;bitmap;" #. Name #: tdefontinst/tdefile-plugin/tdefile_font.desktop:3 msgid "Font Information" -msgstr "" +msgstr "Information de font" #. Comment #: tdefontinst/tdeio/folder.desktop:2 msgid "Fonts Folder" -msgstr "" +msgstr "Dossier de Fonts" #. Comment #: tdefontinst/tdeio/package.desktop:6 msgid "Fonts Package" -msgstr "" +msgstr "Pacchetto de Fonts" #. Comment #: tdefontinst/tdeio/system-folder.desktop:2 msgid "System Fonts Folder" -msgstr "" +msgstr "Dossier de Font de Systema" #. Name #: tdefontinst/thumbnail/fontthumbnail.desktop:3 @@ -2191,14 +2315,14 @@ msgstr "Files de font" #. Name #: tdefontinst/viewpart/tdefontview.desktop:2 msgid "TDEFontView" -msgstr "" +msgstr "TDEFontView (Vista de Font de TDE)" #. GenericName #. Name #: tdefontinst/viewpart/tdefontview.desktop:8 #: tdefontinst/viewpart/tdefontviewpart.desktop:2 msgid "Font Viewer" -msgstr "" +msgstr "Visor de Font" #. Name #: tdeio/cache.desktop:12 @@ -2208,12 +2332,12 @@ msgstr "Cache" #. Comment #: tdeio/cache.desktop:14 msgid "Configure web cache settings" -msgstr "" +msgstr "Configurar preferentias de cache de web" #. Keywords #: tdeio/cache.desktop:16 msgid "Cache;History;Browsing History;Ports;Size;" -msgstr "" +msgstr "Cache;Chronologia;Navigar Chronologia;Portos;Grandor;" #. Name #: tdeio/cookies.desktop:12 @@ -2228,22 +2352,22 @@ msgstr "Configura le modo de functionar del cookies" #. Keywords #: tdeio/cookies.desktop:16 msgid "Cookies;Browsing;Internet;WWW;Network;Policy;Domains;" -msgstr "" +msgstr "Cookies;Navigar;Internet;WWW;Rete;Politica;Dominios;" #. Name #: tdeio/lanbrowser.desktop:11 msgid "Local Network Browsing" -msgstr "" +msgstr "Navigar de rete local" #. Comment #: tdeio/lanbrowser.desktop:13 msgid "Setup lisa, reslisa and the ioslaves" -msgstr "" +msgstr "Configuration de lisa, reslisa e le ioslaves" #. Keywords #: tdeio/lanbrowser.desktop:15 msgid "samba;smb;windows;network;" -msgstr "" +msgstr "samba;smb;fenestras;rete;" #. Comment #: tdeio/netpref.desktop:2 @@ -2255,7 +2379,7 @@ msgstr "" #. Keywords #: tdeio/netpref.desktop:5 msgid "timeout;iopref;netpref;network preferences;ftp;" -msgstr "" +msgstr "timeout;iopref;netpref;preferentias de rete;ftp;" #. Name #: tdeio/netpref.desktop:6 @@ -2275,17 +2399,18 @@ msgstr "Configura le servitores de proxy usate" #. Keywords #: tdeio/proxy.desktop:16 msgid "Proxy;Proxy server;Firewall;Squid;proxy;" -msgstr "" +msgstr "Proxy;Proxy server;Talia Foco;Squid;proxy;" #. Name #: tdeio/smb.desktop:12 msgid "Windows Shares" -msgstr "" +msgstr "Areas Compartite de Windows" #. Comment #: tdeio/smb.desktop:14 msgid "Use to configure which windows (SMB) filesystems you can browse" msgstr "" +"Usa per configurar qual systema de files (SMB) de windows tu pote navigar" #. Keywords #: tdeio/smb.desktop:16 @@ -2293,11 +2418,13 @@ msgid "" "SMB;SAMBA;SMB client;Windows network;LAN;Network;neighborhood;Server;" "Broadcast;WINS;Share;Login;Passwords;" msgstr "" +"SMB;SAMBA;Cliente de SMB;rete de Windows;LAN;rete;vicinitate;Servitor;Broadca" +"st;WINS;Share;Accesso;Contrasignos;" #. Comment #: tdeio/uasprovider.desktop:4 msgid "UserAgent Strings" -msgstr "" +msgstr "Catenas de Agente de Usator" #. Name #: tdeio/uasproviders/ie401onwinnt4.desktop:2 @@ -2377,22 +2504,24 @@ msgstr "Identification de Navigator" #. Comment #: tdeio/useragent.desktop:14 msgid "Configure the way Konqueror reports itself" -msgstr "" +msgstr "Configurar le modo que Konqueror reporta se mesme" #. Keywords #: tdeio/useragent.desktop:16 msgid "User Agent;Browser;Internet;WWW;Network;agent;bindings;server;login;" msgstr "" +"Agente de " +"Usator;Navigator;Internet;WWW;Rete;agente;ligamines;servitor;accesso;" #. Name #: tdm/tdm.desktop:14 msgid "Login Manager" -msgstr "" +msgstr "Gerente de accesso" #. Comment #: tdm/tdm.desktop:16 msgid "Configure the login manager (TDM)" -msgstr "" +msgstr "Configurar le gerente de accesso (TDM)" #. Keywords #: tdm/tdm.desktop:18 @@ -2400,6 +2529,8 @@ msgid "" "tdm;display manager;xdm;users;login;greeting;Logo;styles;language;country;" "fonts;background;wallpapers;sessions;shutdown;restart;" msgstr "" +"tdm;gerente de monstrator;xdm;usatores;accesso;salutationes;Logo;stilos;lingu" +"age;pais;fonts;fundo;tapetes de papiro;sessiones;shutdown;reinitiar;" #. Name #: usbview/kcmusb.desktop:10 @@ -2409,39 +2540,39 @@ msgstr "Dispositivos USB" #. Comment #: usbview/kcmusb.desktop:12 msgid "View the USB devices attached to this computer" -msgstr "" +msgstr "Vider le dispositivos USB attachate a iste computator" #. Keywords #: usbview/kcmusb.desktop:14 msgid "USB;devices;viewer;control;" -msgstr "" +msgstr "USB;dispositivos;visor;controlo;" #. Name #: view1394/kcmview1394.desktop:10 msgid "IEEE 1394 Devices" -msgstr "" +msgstr "Dispositivos IEEE 1394" #. Comment #: view1394/kcmview1394.desktop:12 msgid "View the IEEE 1394 devices attached to this computer" -msgstr "" +msgstr "Vider le dispositivos IEEE 1394 attachate a iste computator" #. Keywords #: view1394/kcmview1394.desktop:14 msgid "1394;Firewire;devices;viewer;control;" -msgstr "" +msgstr "1394;Firewire;dispositivos;visor;controlo;" #. Name #: xinerama/xinerama.desktop:10 msgid "Multiple Monitors" -msgstr "" +msgstr "Varie monitores" #. Comment #: xinerama/xinerama.desktop:12 msgid "Configure TDE for multiple monitors" -msgstr "" +msgstr "Configurar TDE per varie monitores" #. Keywords #: xinerama/xinerama.desktop:14 msgid "Xinerama;dual head;multihead;monitor;" -msgstr "" +msgstr "Xinerama;dualis capite;multicapite;monitor;" diff --git a/translations/desktop_files/kcontrol-desktops/ru.po b/translations/desktop_files/kcontrol-desktops/ru.po index 8755cdec1..3a887bd6c 100644 --- a/translations/desktop_files/kcontrol-desktops/ru.po +++ b/translations/desktop_files/kcontrol-desktops/ru.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-08 18:11+0000\n" -"PO-Revision-Date: 2026-02-09 00:55+0000\n" -"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"PO-Revision-Date: 2026-02-24 02:52+0000\n" +"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/kcontrol-desktop-files/ru/>\n" "Language: ru\n" @@ -1498,6 +1498,8 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ портах ввода/вывода" #: info/ioports.desktop:17 msgid "IO;I/O;IO-Ports;I/O-Ports;Ports;IO-Range;I/O-Range;System Information;" msgstr "" +"IO;I/O;IO-Ports;I/O-Ports;Ports;IO-Range;I/O-Range;System Information;порты " +"ввода/вывода;Ð’Ð’;в/в;порты;" #. Name #: info/memory.desktop:12 @@ -1515,6 +1517,9 @@ msgid "" "Memory;RAM;Virtual memory;Physical memory;Shared memory;Swap;System " "Information;" msgstr "" +"Memory;RAM;Virtual memory;Physical memory;Shared memory;Swap;System " +"Information;памÑÑ‚ÑŒ;Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ð¿Ð°Ð¼ÑÑ‚ÑŒ;физичеÑÐºÐ°Ñ Ð¿Ð°Ð¼ÑÑ‚ÑŒ;подкачка;ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ " +"информациÑ;" #. Name #: info/opengl.desktop:13 @@ -1532,6 +1537,9 @@ msgid "" "OpenGL;DRI;GLX;3D;VideoCard;Hardware Acceleration;Graphics;X;X11;Xserver;X-" "Server;XFree86;Display;" msgstr "" +"OpenGL;DRI;GLX;3D;VideoCard;Hardware " +"Acceleration;Graphics;X;X11;Xserver;X-Server;XFree86;Display;графичеÑÐºÐ°Ñ " +"карта;уÑкорение;графика;X-Ñервер;диÑплей;Ñкран;монитор;" #. Name #: info/partitions.desktop:13 @@ -1545,9 +1553,10 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ иÑпользовании разделов" #. Keywords #: info/partitions.desktop:17 -#, fuzzy msgid "Partitions;Harddrive;HD;System Information;" -msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ иÑпользовании разделов" +msgstr "" +"Partitions;Harddrive;HD;System Information;разделы;жёÑткий диÑк;ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ " +"информациÑ;" #. Name #: info/pci.desktop:12 @@ -1563,6 +1572,8 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ уÑтройÑтвах PCI" #: info/pci.desktop:16 msgid "PCI;PCI-Devices;PCI-Bus;System Information;" msgstr "" +"PCI;PCI-Devices;PCI-Bus;System Information;уÑтройÑтва PCI;ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ " +"информациÑ;" #. Name #: info/processor.desktop:12 @@ -1576,9 +1587,10 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ процеÑÑоре" #. Keywords #: info/processor.desktop:16 -#, fuzzy msgid "Processor;CPU;FPU;MHz;System Information;" -msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ процеÑÑоре" +msgstr "" +"Processor;CPU;FPU;MHz;System Information;процеÑÑор;ЦП;МГц;ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ " +"информациÑ;" #. Name #: info/scsi.desktop:12 @@ -1592,9 +1604,8 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ уÑтройÑтвах SCSI" #. Keywords #: info/scsi.desktop:16 -#, fuzzy msgid "SCSI;SCSI-Bus;System Information;" -msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ уÑтройÑтвах SCSI" +msgstr "SCSI;SCSI-Bus;System Information;шина SCSI;ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ;" #. Name #: info/sound.desktop:12 @@ -1610,6 +1621,8 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ звуке" #: info/sound.desktop:16 msgid "Sound;Audio;Soundcard;MIDI;OSS;System Information;" msgstr "" +"Sound;Audio;Soundcard;MIDI;OSS;System Information;звук;аудио;Ð·Ð²ÑƒÐºÐ¾Ð²Ð°Ñ Ð¿Ð»Ð°Ñ‚Ð°;" +"Ð·Ð²ÑƒÐºÐ¾Ð²Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°;ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ;" #. Name #: info/xserver.desktop:12 @@ -1625,6 +1638,8 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± X-Ñервере" #: info/xserver.desktop:16 msgid "X;X-Server;XServer;XFree86;Display;VideoCard;System Information;" msgstr "" +"X;X-Server;XServer;XFree86;Display;VideoCard;System Information;Ñервер " +"X;диÑплей;Ñкран;монитор;dидеокарта;cиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ;" #. Name #: input/mouse.desktop:13 @@ -1643,6 +1658,12 @@ msgid "" "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;" "DoubleClick;mapping;right handed;left handed;" msgstr "" +"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor " +"Shape;Input Devices;Button " +"Mapping;Click;icons;feedback;Pointers;Drag;DoubleClick;mapping;right handed;" +"left handed;мышь;уÑкорение мыши;порог мыши;кнопки мыши;выбор;форма курÑора;" +"входные уÑтройÑтва;ÑоответÑтвие клавиш;щелчок;пиктограммы;Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð°Ñ " +"ÑвÑзь;указатели;перетащить;двойной щелчок;отображение;левша;правша;" #. Name #: input/touchpad.desktop:13 @@ -1651,10 +1672,8 @@ msgstr "Touchpad" #. Comment #: input/touchpad.desktop:14 -#, fuzzy -#| msgid "Mouse settings" msgid "Touchpad settings" -msgstr "ÐаÑтройка мыши" +msgstr "ÐаÑтройки ÑенÑорной панели" #. Keywords #: input/touchpad.desktop:15 @@ -1662,6 +1681,10 @@ msgid "" "Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;" "Click;mapping;right handed;left handed;" msgstr "" +"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button " +"Mapping;Tap;Click;mapping;right handed;left handed;тачпад;ÑенÑÐ¾Ñ€Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ;" +"нажатие Ð´Ð»Ñ Ñ‰ÐµÐ»Ñ‡ÐºÐ°;мышь;кнопки мыши;уÑтройÑтва ввода;назначение " +"кнопок;нажать;щелчок;привÑзка;правша;левша;" #. Name #: joystick/joystick.desktop:12 @@ -1676,7 +1699,7 @@ msgstr "Joystick - модуль kcontrol Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ джойÑтиР#. Keywords #: joystick/joystick.desktop:16 msgid "joystick;gamepad;" -msgstr "" +msgstr "joystick;gamepad;джойÑтик;геймпад;контроллер;" #. Name #: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8 @@ -1739,6 +1762,15 @@ msgid "" "bookmarks;recent documents;quickbrowser;browser menu;menu;icons;tiles;" "applets;startup;highlight;handles;zooming icons;" msgstr "" +"kicker;panel;kpanel;taskbar;startbar;launchbar;location;size;auto " +"hide;hide;buttons;animation;background;themes;menu cache;cache;hidden;TDE " +"Menu;bookmarks;recent documents;quickbrowser;browser " +"menu;menu;icons;tiles;applets;startup;highlight;handles;zooming icons;панель;" +"панель задач;панель запуÑка;макет;положение;размер;автоматичеÑкое " +"Ñкрытие;Ñкрыть;кнопки;анимациÑ;фон;темы;кÑш меню;кÑш;Ñкрытое;Ñкрыть;меню " +"TDE;закладки;предыдущие;поÑледние;документы;быÑтрый проÑмотр;меню навигатора;" +"меню навигации;меню;значки;апплеты;запуÑк;выделение;обработка;обработчик;" +"маÑштабирование значков;" #. Name #: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11 @@ -1799,6 +1831,8 @@ msgstr "ÐаÑтройка ÑиÑтемных уведомлений" #: knotify/kcmnotify.desktop:15 msgid "System sounds;Audio;Sound;Notify;Alerts;Notification;" msgstr "" +"System sounds;Audio;Sound;Notify;Alerts;Notification;СиÑтемные " +"звуки;Ðудио;Звук;УведомлениÑ;ПредупреждениÑ;УведомлениÑ;" #. Name #: konq/desktop.desktop:11 @@ -1814,6 +1848,8 @@ msgstr "ÐаÑтройка количеÑтва виртуальных Ñ€Ð°Ð±Ð¾Ñ #: konq/desktop.desktop:15 msgid "desktop;desktops;number;virtual desktop;" msgstr "" +"desktop;desktops;number;virtual desktop;рабочий Ñтол;рабочие " +"Ñтолы;количеÑтво;виртуальный рабочий Ñтол;" #. Name #: konq/desktopbehavior.desktop:12 konq/filebehavior.desktop:11 @@ -1862,6 +1898,10 @@ msgid "" "konqueror;filemanager;word wrap;wrap;underline;display;filesize;bytes;font;" "color;colour;" msgstr "" +"konqueror;filemanager;word " +"wrap;wrap;underline;display;filesize;bytes;font;color;colour;файловый " +"менеджер;Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ Ñлов;переноÑ;подчёркивание;отображение;размер " +"файла;байты;шрифт;цвет;" #. Comment #: konq/filebehavior.desktop:13 @@ -1884,7 +1924,7 @@ msgstr "" #. Comment #: konq/filebrowser.desktop:14 msgid "You can configure Konqueror's file manager mode here" -msgstr "ÐаÑтройка режима менеджера файлов " +msgstr "ЗдеÑÑŒ можно наÑтроить режима файлового менеджера в Konqueror" #. Name #: konq/filepreviews.desktop:11 @@ -1898,9 +1938,10 @@ msgstr "ÐаÑтройка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð°Ñ‚ÑŽÑ€ и показа мР#. Keywords #: konq/filepreviews.desktop:15 -#, fuzzy msgid "konqueror;filemanager;previews;file previews;maximum size;" -msgstr "konqueror;filemanager;paths;desktop;trash;directories;autostart;" +msgstr "" +"konqueror;filemanager;previews;file previews;maximum size;файловый " +"менеджер;предпроÑмотр;предварительный проÑмотр файлов;макÑимальный размер;" #. Name #: konqhtml/tdehtml_behavior.desktop:11 @@ -1918,6 +1959,10 @@ msgid "" "konqueror;kfm;browser;html;web;www;fonts;colours;colors;java;javascript;" "cursor;links;images;charsets;character sets;encoding;" msgstr "" +"konqueror;kfm;browser;html;web;www;fonts;colours;colors;java;javascript;curso" +"r;links;images;charsets;character " +"sets;encoding;браузер;веб;шрифты;цвета;курÑор;ÑÑылки;изображениÑ;наборы " +"Ñимволов;кодировка;" #. Name #: konqhtml/tdehtml_filter.desktop:10 @@ -1939,6 +1984,8 @@ msgstr "ÐаÑтройка шрифтов веб-Ñтраниц" msgid "" "konqueror;kfm;browser;html;web;www;fonts;charsets;character sets;encoding;" msgstr "" +"konqueror;kfm;browser;html;web;www;fonts;charsets;character " +"sets;encoding;браузер;веб;шрифты;наборы Ñимволов;кодировка;" #. Name #: konqhtml/tdehtml_java_js.desktop:11 @@ -1953,7 +2000,7 @@ msgstr "ÐаÑтройка Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Java и JavaScript" #. Keywords #: konqhtml/tdehtml_java_js.desktop:15 msgid "konqueror;kfm;browser;html;web;www;java;javascript;" -msgstr "" +msgstr "konqueror;kfm;browser;html;web;www;java;javascript;браузер;веб;" #. Name #: konqhtml/tdehtml_userinterface.desktop:11 @@ -1975,7 +2022,7 @@ msgstr "" #. Name #: konsole/kcmkonsole.desktop:10 msgid "Konsole" -msgstr "Konsole" +msgstr "КонÑоль" #. Comment #: konsole/kcmkonsole.desktop:12 @@ -1988,6 +2035,9 @@ msgid "" "konsole;schema;konsole background;colors;background;terminal application;" "terminal;" msgstr "" +"konsole;schema;konsole background;colors;background;terminal " +"application;terminal;конÑоль;Ñхема;фон конÑоли;цвета;фон;терминальное " +"приложение;конÑольное приложение;терминал;" #. Name #: kthememanager/installktheme.desktop:2 @@ -2002,7 +2052,7 @@ msgstr "Менеджер глобальных визуальных тем TDE" #. Keywords #: kthememanager/kthememanager.desktop:5 msgid "themes;look and feel;" -msgstr "" +msgstr "themes;look and feel;темы; внешний вид;" #. Name #: kthememanager/kthememanager.desktop:6 @@ -2030,6 +2080,10 @@ msgid "" "application;start;launch;busy;cursor;feedback;mouse;pointer;rotating;" "spinning;disk;startup;program;report;" msgstr "" +"application;start;launch;busy;cursor;feedback;mouse;pointer;rotating;spinning" +";disk;startup;program;report;приложение;запуÑк;загрузка;занÑÑ‚;курÑор;" +"Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð°Ñ " +"ÑвÑзь;мышь;указатель;вращение;вращающийÑÑ;диÑк;запуÑк;программа;отчёт;" #. Name #: locale/default/entry.desktop:2 @@ -2053,6 +2107,13 @@ msgid "" "charsets;character sets;Decimal symbol;Thousands separator;symbol;separator;" "sign;positive;negative;fractional digits;week;week start;" msgstr "" +"language;translation;number " +"format;currency;time;date;formats;locale;Country;charsets;character sets;" +"Decimal symbol;Thousands separator;symbol;separator;sign;positive;negative;" +"fractional digits;week;week start;Ñзык;перевод;формат " +"чиÑел;валюта;времÑ;дата;форматы;локаль;Ñтрана;наборы Ñимволов;деÑÑтичный " +"Ñимвол;разделитель Ñ‚Ñ‹ÑÑч;Ñимвол;разделитель;знак;положительный;отрицательный;" +"дробные цифры;неделÑ;начало недели;" #. Name #: nics/nic.desktop:12 @@ -2091,6 +2152,7 @@ msgstr "ÐаÑтройка параметров, которые могут поР#: performance/kcmperformance.desktop:15 msgid "performance;speed;memory;improve;" msgstr "" +"performance;speed;memory;improve;производительноÑÑ‚ÑŒ;ÑкороÑÑ‚ÑŒ;памÑÑ‚ÑŒ;улучшить;" #. Name #: privacy/privacy.desktop:11 @@ -2106,9 +2168,8 @@ msgstr "" #. Keywords #: privacy/privacy.desktop:15 -#, fuzzy msgid "Privacy;privacy;" -msgstr "КонфиденциальноÑÑ‚ÑŒ" +msgstr "Privacy;privacy;КонфиденциальноÑÑ‚ÑŒ;приватноÑÑ‚ÑŒ;безопаÑноÑÑ‚ÑŒ;" #. Name #: randr/randr.desktop:9 @@ -2154,6 +2215,8 @@ msgstr "СоÑтоÑние Ñервера Samba" #: samba/smbstatus.desktop:16 msgid "SMB;SAMBA;Windows network;LAN;System Information;" msgstr "" +"SMB;SAMBA;Windows network;LAN;System Information;Ñеть Windows;ЛВС;Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ " +"Ñеть;ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ;" #. Name #: screensaver/screensaver.desktop:12 @@ -2183,7 +2246,7 @@ msgstr "ÐаÑтройка поддержки Ñмарткарт" #. Keywords #: smartcard/smartcard.desktop:15 msgid "Smartcard;PKCS;SSL;reader;smart;card;" -msgstr "" +msgstr "Smartcard;PKCS;SSL;reader;smart;card;cмарт-карта;Ñчитыватель;карта;" #. Name #: smserver/kcmsmserver.desktop:12 @@ -2199,6 +2262,8 @@ msgstr "ÐаÑтройка диÑпетчера ÑеанÑов" #: smserver/kcmsmserver.desktop:16 msgid "ksmserver;session;logout;confirmation;save;restore;" msgstr "" +"ksmserver;session;logout;confirmation;save;restore;ÑеанÑ;выход из " +"ÑиÑтемы;подтверждение;Ñохранение;воÑÑтановление;" #. Name #: spellchecking/spellchecking.desktop:11 @@ -2213,7 +2278,7 @@ msgstr "ÐаÑтройка проверки орфографии" #. Keywords #: spellchecking/spellchecking.desktop:15 msgid "Spell;" -msgstr "" +msgstr "Spell;правопиÑание;проверка;орфографиÑ;" #. Name #: style/style.desktop:13 @@ -2296,9 +2361,8 @@ msgstr "Файлы шрифтов" #. Name #: tdefontinst/viewpart/tdefontview.desktop:2 -#, fuzzy msgid "TDEFontView" -msgstr "Программа проÑмотра шрифтов" +msgstr "TDEFontView" #. GenericName #. Name @@ -2321,6 +2385,8 @@ msgstr "ÐаÑтройка кÑша" #: tdeio/cache.desktop:16 msgid "Cache;History;Browsing History;Ports;Size;" msgstr "" +"Cache;History;Browsing History;Ports;Size;КÑш;ИÑториÑ;ИÑÑ‚Ð¾Ñ€Ð¸Ñ " +"проÑмотров;Порты;Размер;" #. Name #: tdeio/cookies.desktop:12 @@ -2336,6 +2402,8 @@ msgstr "ÐаÑтройка cookies" #: tdeio/cookies.desktop:16 msgid "Cookies;Browsing;Internet;WWW;Network;Policy;Domains;" msgstr "" +"Cookies;Browsing;Internet;WWW;Network;Policy;Domains;куки;проÑмотр " +"веб-Ñтраниц;интернет;Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ñеть;паутина;Ñеть;политика;домены;" #. Name #: tdeio/lanbrowser.desktop:11 @@ -2350,7 +2418,7 @@ msgstr "ÐаÑтройка lisa, reslisa и ioslaves" #. Keywords #: tdeio/lanbrowser.desktop:15 msgid "samba;smb;windows;network;" -msgstr "" +msgstr "samba;smb;windows;network;Ñамба;Ñеть;" #. Comment #: tdeio/netpref.desktop:2 @@ -2360,7 +2428,7 @@ msgstr "Общие ÑвойÑтва Ñети, такие как Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ #. Keywords #: tdeio/netpref.desktop:5 msgid "timeout;iopref;netpref;network preferences;ftp;" -msgstr "" +msgstr "timeout;iopref;netpref;network preferences;ftp;тайм-аут;наÑтройки Ñети;" #. Name #: tdeio/netpref.desktop:6 @@ -2381,6 +2449,8 @@ msgstr "ÐаÑтройка Ñерверов прокÑи" #: tdeio/proxy.desktop:16 msgid "Proxy;Proxy server;Firewall;Squid;proxy;" msgstr "" +"Proxy;Proxy server;Firewall;Squid;proxy;прокÑи;прокÑи-Ñервер;брандмауÑÑ€;" +"межÑетевой Ñкран;файервол;" #. Name #: tdeio/smb.desktop:12 @@ -2398,6 +2468,10 @@ msgid "" "SMB;SAMBA;SMB client;Windows network;LAN;Network;neighborhood;Server;" "Broadcast;WINS;Share;Login;Passwords;" msgstr "" +"SMB;SAMBA;SMB client;Windows network;LAN;Network;neighborhood;Server;Broadcas" +"t;WINS;Share;Login;Passwords;СÐМБÐ;SMB-клиент;Ñеть Windows;ЛВС;Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ " +"Ñеть;cеть;Ñервер;ÑˆÐ¸Ñ€Ð¾ÐºÐ¾Ð²ÐµÑ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð°;общий доÑтуп;вход в " +"ÑиÑтему;пароли;" #. Comment #: tdeio/uasprovider.desktop:4 @@ -2488,6 +2562,9 @@ msgstr "ÐаÑтройка идентификации Konqueror" #: tdeio/useragent.desktop:16 msgid "User Agent;Browser;Internet;WWW;Network;agent;bindings;server;login;" msgstr "" +"User Agent;Browser;Internet;WWW;Network;agent;bindings;server;login;" +"пользовательÑкий агент;браузер;обозреватель;интернет;Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ " +"Ñеть;cеть;агент;привÑзки;Ñервер;вход в ÑиÑтему;" #. Name #: tdm/tdm.desktop:14 @@ -2536,9 +2613,10 @@ msgstr "ПроÑмотр уÑтройÑтв IEEE 1394, подключенных #. Keywords #: view1394/kcmview1394.desktop:14 -#, fuzzy msgid "1394;Firewire;devices;viewer;control;" -msgstr "USB;devices;viewer;control;утÑройÑтва;" +msgstr "" +"1394;Firewire;devices;viewer;control;уÑтройÑтва;проÑмотрщик;управление;файерв" +"ол;межÑетевой Ñкран;брандмауÑÑ€;" #. Name #: xinerama/xinerama.desktop:10 @@ -2554,3 +2632,5 @@ msgstr "ÐаÑтройка TDE Ð´Ð»Ñ Ð½ÐµÑкольких мониторов" #: xinerama/xinerama.desktop:14 msgid "Xinerama;dual head;multihead;monitor;" msgstr "" +"Xinerama;dual head;multihead;monitor;монитор;Ñкран;диÑплей;неÑколько " +"мониторов;" diff --git a/translations/desktop_files/knetattach.desktop/ia.po b/translations/desktop_files/knetattach.desktop/ia.po new file mode 100644 index 000000000..dfd0b2f36 --- /dev/null +++ b/translations/desktop_files/knetattach.desktop/ia.po @@ -0,0 +1,28 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# giovanni <assecoibalcu@yahoo.it>, 2026. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-06-21 14:58+0200\n" +"PO-Revision-Date: 2026-02-18 17:51+0000\n" +"Last-Translator: giovanni <assecoibalcu@yahoo.it>\n" +"Language-Team: Interlingua <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/knetattach-knetattachdesktop/ia/>\n" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" + +#. Name +#: knetattach.desktop:2 +msgid "KNetAttach" +msgstr "KNetAttach" + +#. GenericName +#: knetattach.desktop:4 +msgid "Network Folder Wizard" +msgstr "Assistente de dossier de rete" diff --git a/translations/desktop_files/konqueror-desktops/ru.po b/translations/desktop_files/konqueror-desktops/ru.po index 9eae7b0f9..c9458ed6a 100644 --- a/translations/desktop_files/konqueror-desktops/ru.po +++ b/translations/desktop_files/konqueror-desktops/ru.po @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2024. -# Andrei Stepanov <adem4ik@gmail.com>, 2024. +# Andrei Stepanov <adem4ik@gmail.com>, 2024, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:17+0000\n" -"PO-Revision-Date: 2024-05-11 01:02+0000\n" +"PO-Revision-Date: 2026-03-14 16:55+0000\n" "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/konqueror-desktop-files/ru/>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: Home.desktop:7 @@ -42,7 +42,7 @@ msgstr "Ð’ виде значков" #. Name #: iconview/konq_multicolumnview.desktop:3 msgid "MultiColumn View" -msgstr "Ð’ неÑколько колонок" +msgstr "Ð’ неÑколько Ñтолбцов" #. Name #: kfmclient.desktop:9 kfmclient_dir.desktop:9 kfmclient_html.desktop:9 diff --git a/translations/desktop_files/konsole-desktops/ia.po b/translations/desktop_files/konsole-desktops/ia.po new file mode 100644 index 000000000..96393f52e --- /dev/null +++ b/translations/desktop_files/konsole-desktops/ia.po @@ -0,0 +1,180 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# giovanni <assecoibalcu@yahoo.it>, 2026. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: 2026-02-12 16:51+0000\n" +"Last-Translator: giovanni <assecoibalcu@yahoo.it>\n" +"Language-Team: Interlingua <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/konsole-desktop-files/ia/>\n" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" + +#. Name +#: kcmkonsole.desktop:9 +msgid "Console" +msgstr "Console" + +#. GenericName +#: kcmkonsole.desktop:11 +msgid "All Konsole Settings" +msgstr "Omne preferentias de Konsole" + +#. Keywords +#: kcmkonsole.desktop:13 +msgid "konsole;console;terminal;" +msgstr "konsole;console;terminal;" + +#. Name +#: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10 +msgid "Konsole" +msgstr "Konsole" + +#. GenericName +#: konsole-script.desktop:11 konsole.desktop:11 +msgid "Terminal Program" +msgstr "Programma de terminal" + +#. Comment +#: konsole/x-konsole.desktop:7 +msgid "File to Open a Shell" +msgstr "File per aperir un shell" + +#. Name +#: konsolepart.desktop:14 terminalemulator.desktop:5 +msgid "Terminal Emulator" +msgstr "Emulator de Terminal" + +#. GenericName +#: konsolesu.desktop:12 +msgid "Terminal Program - Super User Mode" +msgstr "Programma de Terminal - Modo de super usator" + +#. Name +#: kwrited.desktop:2 +msgid "TDE Write Daemon" +msgstr "Demone de Scriptura de TDE" + +#. Comment +#: kwrited.desktop:4 +msgid "Watch for messages from local users sent with write(1) or wall(1)" +msgstr "Observar messages ex usatores local inviate con write(1) o wall(1)" + +#. Name +#: other/linux.desktop:3 +msgid "Linux Console" +msgstr "Console de Linux" + +#. Comment +#: other/linux.desktop:4 +msgid "New Linux Console" +msgstr "Nove Console de Linux" + +#. Name +#: other/mc.desktop:3 +msgid "Midnight Commander" +msgstr "Midnight Commander" + +#. Comment +#: other/mc.desktop:4 +msgid "New Midnight Commander" +msgstr "Nove Midnight Commander" + +#. Name +#: other/screen.desktop:3 +msgid "Screen Session" +msgstr "Session de Screen" + +#. Comment +#: other/screen.desktop:4 +msgid "New Screen Session" +msgstr "Nove Session de Screen" + +#. Name +#. Title0 +#: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6 +#: other/5shells:6 +msgid "Shell" +msgstr "Shell" + +#. Comment +#: other/shell.desktop:4 +msgid "New Shell" +msgstr "Nove Shell de Root" + +#. Name +#: other/su.desktop.cmake:3 +msgid "Root Shell" +msgstr "Shell de Root" + +#. Comment +#: other/su.desktop.cmake:4 +msgid "New Root Shell" +msgstr "Nove Shell de Root" + +#. Name +#: other/sumc.desktop.cmake:3 +msgid "Root Midnight Commander" +msgstr "Midnight Commander de Root" + +#. Comment +#: other/sumc.desktop.cmake:4 +msgid "New Root Midnight Commander" +msgstr "Nove Midnight Commander de Root" + +#. Name +#: terminalhere.desktop:6 +msgid "Terminal" +msgstr "Terminal" + +#. Name +#: terminalhere.desktop:11 +msgid "Open Terminal Here" +msgstr "Aperir terminal ci" + +#. Name +#: other/2shells:2 +msgid "Two consoles" +msgstr "Duo Consoles" + +#. Title1 +#: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7 +msgid "Shell No. 2" +msgstr "Shell No. 2" + +#. Name +#: other/3shells:2 +msgid "Three consoles" +msgstr "Tres Consoles" + +#. Title2 +#: other/3shells:8 other/4shells:8 other/5shells:8 +msgid "Shell No. 3" +msgstr "Shell No. 3" + +#. Name +#: other/4shells:2 +msgid "Four consoles" +msgstr "Quatro Consoles" + +#. Title3 +#: other/4shells:9 other/5shells:9 +msgid "Shell No. 4" +msgstr "Shell No. 4" + +#. Name +#: other/5shells:2 +msgid "Five consoles" +msgstr "Cinque Consoles" + +#. Title4 +#: other/5shells:10 +msgid "Shell No. 5" +msgstr "Shell No. 5" diff --git a/translations/desktop_files/kxkb-eventsrc/ru.po b/translations/desktop_files/kxkb-eventsrc/ru.po index 8de9c2690..c7be41932 100644 --- a/translations/desktop_files/kxkb-eventsrc/ru.po +++ b/translations/desktop_files/kxkb-eventsrc/ru.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2024. -# Andrei Stepanov <adem4ik@gmail.com>, 2024. +# Andrei Stepanov <adem4ik@gmail.com>, 2024, 2026. # "blu.256" <mavridisf@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-04-03 18:15+0000\n" -"PO-Revision-Date: 2025-04-24 12:44+0000\n" -"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n" +"PO-Revision-Date: 2026-03-14 16:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/kxkb-events/ru/>\n" "Language: ru\n" @@ -18,12 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 4.18.2\n" #. Comment #: eventsrc:3 msgid "TDE Keyboard Tool" -msgstr "СредÑтво Ð´Ð»Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹ TDE" +msgstr "СредÑтво клавиатуры TDE" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/libkonq-desktops/ru.po b/translations/desktop_files/libkonq-desktops/ru.po index a9469b816..696928882 100644 --- a/translations/desktop_files/libkonq-desktops/ru.po +++ b/translations/desktop_files/libkonq-desktops/ru.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Andrei Stepanov <adem4ik@gmail.com>, 2023. +# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-22 18:52+0200\n" -"PO-Revision-Date: 2023-12-09 05:14+0000\n" +"PO-Revision-Date: 2026-03-14 16:55+0000\n" "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/libkonq-desktop-files/ru/>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: directory_bookmarkbar.desktop:3 @@ -26,7 +26,7 @@ msgstr "Панель закладок" #. Name #: favicons/favicons.desktop:3 msgid "KDED Favicon Module" -msgstr "Служба значков" +msgstr "Служба значков KDED" #. Comment #: favicons/favicons.desktop:4 diff --git a/translations/desktop_files/tdeioslave-desktops/ia.po b/translations/desktop_files/tdeioslave-desktops/ia.po index 742dbf453..c56f6302a 100644 --- a/translations/desktop_files/tdeioslave-desktops/ia.po +++ b/translations/desktop_files/tdeioslave-desktops/ia.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# giovanni <assecoibalcu@yahoo.it>, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:17+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2026-02-20 02:51+0000\n" +"Last-Translator: giovanni <assecoibalcu@yahoo.it>\n" +"Language-Team: Interlingua <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/tdeioslave-desktop-files/ia/>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: cgi/kcmcgi/kcmcgi.desktop:9 msgid "CGI Scripts" -msgstr "" +msgstr "Scriptos CGI" #. Comment #: cgi/kcmcgi/kcmcgi.desktop:11 @@ -75,142 +76,142 @@ msgstr "" #. Comment #: media/mimetypes/audiocd.desktop:6 msgid "Audio CD" -msgstr "" +msgstr "CD Audio" #. Comment #: media/mimetypes/blankbluray.desktop:6 msgid "Blank BLURAY" -msgstr "" +msgstr "BLURAY vacue" #. Comment #: media/mimetypes/blankcd.desktop:6 msgid "Blank CD" -msgstr "" +msgstr "CD vacue" #. Comment #: media/mimetypes/blankdvd.desktop:6 msgid "Blank DVD" -msgstr "" +msgstr "DVD vacue" #. Comment #: media/mimetypes/bluray_encrypted_locked.desktop:7 msgid "Encrypted Locked BLURAY" -msgstr "" +msgstr "BLURAY cryptate blocate" #. Comment #: media/mimetypes/bluray_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked BLURAY" -msgstr "" +msgstr "BLURAY cryotate disblocate" #. Comment #: media/mimetypes/bluray_mounted.desktop:6 msgid "Mounted BLURAY" -msgstr "" +msgstr "BLURAY montate" #. Comment #: media/mimetypes/bluray_unmounted.desktop:6 msgid "Unmounted BLURAY" -msgstr "" +msgstr "BLURAY dismontate" #. Comment #: media/mimetypes/blurayvideo.desktop:6 msgid "BLURAY Video Disk" -msgstr "" +msgstr "Disco de video BLURAY" #. Comment #: media/mimetypes/camera_mounted.desktop:6 msgid "Mounted Camera" -msgstr "" +msgstr "Cmera montate" #. Comment #: media/mimetypes/camera_unmounted.desktop:6 msgid "Unmounted Camera" -msgstr "" +msgstr "Camera dismontate" #. Comment #: media/mimetypes/cd-r_encrypted_locked.desktop:7 msgid "Encrypted Locked CD-R" -msgstr "" +msgstr "CD-R cryptate blocate" #. Comment #: media/mimetypes/cd-r_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked CD-R" -msgstr "" +msgstr "CD-R cryptate disblocate" #. Comment #: media/mimetypes/cd-r_mounted.desktop:6 msgid "Mounted CD-R" -msgstr "" +msgstr "CD-R montate" #. Comment #: media/mimetypes/cd-r_unmounted.desktop:6 msgid "Unmounted CD-R" -msgstr "" +msgstr "CD-R dismontate" #. Comment #: media/mimetypes/cd-rw_encrypted_locked.desktop:7 msgid "Encrypted Locked CD-RW" -msgstr "" +msgstr "CD-RW cryptate blocate" #. Comment #: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked CD-RW" -msgstr "" +msgstr "CD-RW cryptate disblocate" #. Comment #: media/mimetypes/cd-rw_mounted.desktop:6 msgid "Mounted CD-RW" -msgstr "" +msgstr "CD-RW montate" #. Comment #: media/mimetypes/cd-rw_unmounted.desktop:6 msgid "Unmounted CD-RW" -msgstr "" +msgstr "CD-RW dismontate" #. Comment #: media/mimetypes/cdrom_encrypted_locked.desktop:7 msgid "Encrypted Locked CD-ROM" -msgstr "" +msgstr "CD-ROM criptate blocate" #. Comment #: media/mimetypes/cdrom_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked CD-ROM" -msgstr "" +msgstr "CD-ROM cryptate disblocate" #. Comment #: media/mimetypes/cdrom_mounted.desktop:6 msgid "Mounted CD-ROM" -msgstr "" +msgstr "CD-ROM montate" #. Comment #: media/mimetypes/cdrom_unmounted.desktop:6 msgid "Unmounted CD-ROM" -msgstr "" +msgstr "CD-ROM dismontate" #. Comment #: media/mimetypes/dvd_encrypted_locked.desktop:7 msgid "Encrypted Locked DVD" -msgstr "" +msgstr "DVD cryptate blocate" #. Comment #: media/mimetypes/dvd_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked DVD" -msgstr "" +msgstr "DVD cryptate disblocate" #. Comment #: media/mimetypes/dvd_mounted.desktop:6 msgid "Mounted DVD" -msgstr "" +msgstr "DVD montate" #. Comment #: media/mimetypes/dvd_unmounted.desktop:6 msgid "Unmounted DVD" -msgstr "" +msgstr "DVD dismontate" #. Comment #: media/mimetypes/dvdvideo.desktop:6 msgid "DVD Video Disk" -msgstr "" +msgstr "Disco de video DVD" #. Comment #: media/mimetypes/floppy5_mounted.desktop:6 @@ -235,7 +236,7 @@ msgstr "" #. Comment #: media/mimetypes/gphoto2camera.desktop:6 msgid "Camera" -msgstr "" +msgstr "Camera" #. Comment #: media/mimetypes/hdd_encrypted_locked.desktop:7 @@ -260,17 +261,17 @@ msgstr "" #. Comment #: media/mimetypes/mycomputer.desktop:6 msgid "My Computer" -msgstr "" +msgstr "Mi computator" #. Comment #: media/mimetypes/mydocuments.desktop:6 msgid "My Documents" -msgstr "" +msgstr "Mi Documentos" #. Comment #: media/mimetypes/mynetworkplaces.desktop:6 msgid "My Network Places" -msgstr "" +msgstr "Mi Locos de Rete" #. Comment #: media/mimetypes/nfs_mounted.desktop:6 @@ -285,12 +286,12 @@ msgstr "" #. Comment #: media/mimetypes/printers.desktop:6 msgid "Printers" -msgstr "" +msgstr "Imprimitores" #. Comment #: media/mimetypes/removable_encrypted_locked.desktop:7 msgid "Encrypted Locked Removable Medium" -msgstr "" +msgstr "Medio removibile cryptate blocate" #. Comment #: media/mimetypes/removable_encrypted_unlocked.desktop:7 @@ -327,32 +328,32 @@ msgstr "" #: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7 #: trash/kcmtrash.desktop:11 msgid "Trash" -msgstr "" +msgstr "Corbe" #. Comment #: media/mimetypes/vcd.desktop:6 msgid "Video CD" -msgstr "" +msgstr "Video CD" #. Comment #: media/mimetypes/webbrowser.desktop:6 msgid "Web Browser" -msgstr "" +msgstr "Navigator de Web" #. Comment #: media/mimetypes/zip_mounted.desktop:6 msgid "Mounted Zip Disk" -msgstr "" +msgstr "Disco Zip montate" #. Comment #: media/mimetypes/zip_unmounted.desktop:6 msgid "Unmounted Zip Disk" -msgstr "" +msgstr "Disco Zip dismontate" #. Name #: media/propsdlgplugin/media_propsdlgplugin.desktop:6 msgid "Media Properties Page" -msgstr "" +msgstr "Pagina de proprietates de medios" #. Comment #: media/propsdlgplugin/media_propsdlgplugin.desktop:8 @@ -362,47 +363,47 @@ msgstr "" #. Name #: media/services/media_eject.desktop:10 msgid "Eject" -msgstr "" +msgstr "Ejecular" #. Name #: media/services/media_lock.desktop:10 msgid "Lock" -msgstr "" +msgstr "Blocar" #. Name #: media/services/media_mount.desktop:10 msgid "Mount" -msgstr "" +msgstr "Montar" #. Name #: media/services/media_realfolder.desktop:10 msgid "Open Medium System Folder" -msgstr "" +msgstr "Aperir Dossier de Systema de Medio" #. Name #: media/services/media_safelyremove.desktop:10 msgid "Safely Remove" -msgstr "" +msgstr "Remover in securitate" #. Name #: media/services/media_unlock.desktop:10 msgid "Unlock" -msgstr "" +msgstr "Disblocar" #. Name #: media/services/media_unmount.desktop:10 msgid "Unmount" -msgstr "" +msgstr "Dismontar" #. Name #: media/tdecmodule/media.desktop:10 system/entries/media.desktop:6 msgid "Storage Media" -msgstr "" +msgstr "Medios de immagazinage" #. Comment #: media/tdecmodule/media.desktop:12 msgid "Configure Storage Media" -msgstr "" +msgstr "Configurar Medios de Immagazinage" #. Keywords #: media/tdecmodule/media.desktop:14 @@ -412,12 +413,12 @@ msgstr "" #. Name #: media/tdefile-plugin/tdefile_media.desktop:6 msgid "Medium Information" -msgstr "" +msgstr "Information de medio" #. Name #: remote/kdedmodule/remotedirnotify.desktop:4 msgid "KDED Remote Base URL Notifier" -msgstr "" +msgstr "Notification de URL de Base remote KDED" #. Comment #: remote/kdedmodule/remotedirnotify.desktop:6 @@ -432,91 +433,92 @@ msgstr "" #. Comment #: smb/x-smb-server.desktop:2 msgid "Windows Server" -msgstr "" +msgstr "Servitor Windows" #. Comment #: smb/x-smb-workgroup.desktop:2 msgid "Windows Workgroup" -msgstr "" +msgstr "Windows Workgroup(Gruppo de labor de Windows)" #. Name #: system/entries/documents.desktop:6 msgid "Documents Folder" -msgstr "" +msgstr "Dossier de documentos" #. Name #: system/entries/home.desktop:6 msgid "Home Folder" -msgstr "" +msgstr "Dossier Domo o de Initio" #. Name #: system/entries/remote.desktop:6 msgid "Remote Places" -msgstr "" +msgstr "Locos remote" #. Name #: system/entries/users.desktop:6 msgid "Users Folders" -msgstr "" +msgstr "Dossieres de usator" #. Name #: system/kdedmodule/systemdirnotify.desktop:4 msgid "KDED System Base URL Notifier" -msgstr "" +msgstr "Notificator de URL de Base de Systema KDED" #. Comment #: system/kdedmodule/systemdirnotify.desktop:6 -#, fuzzy msgid "" "Provides change notification for folders monitored by the system:/ tdeio " "plugin" -msgstr "Il forni notification de cambio pro dossieres de rete" +msgstr "" +"Il forni notification de cambio pro dossieres controlate per le systema:/" +"tdeio plugin" #. Comment #: system/mimetypes/system_directory.desktop:6 msgid "System Folder" -msgstr "" +msgstr "Dossier de systema" #. Name #: thumbnail/cursorthumbnail.desktop:4 msgid "Cursor Files" -msgstr "" +msgstr "Files de cursor" #. Name #: thumbnail/djvuthumbnail.desktop:4 msgid "DjVu Files" -msgstr "" +msgstr "Files DjVU" #. Name #: thumbnail/exrthumbnail.desktop:4 msgid "EXR Images" -msgstr "" +msgstr "Imagenes EXR" #. Name #: thumbnail/htmlthumbnail.desktop:4 msgid "HTML Files" -msgstr "" +msgstr "Files HTML" #. Name #: thumbnail/imagethumbnail.desktop:4 msgid "Images" -msgstr "" +msgstr "Imagines" #. Name #: thumbnail/textthumbnail.desktop:4 msgid "Text Files" -msgstr "" +msgstr "Files de Texto" #. Comment #: thumbnail/thumbcreator.desktop:5 msgid "Thumbnail Handler" -msgstr "" +msgstr "MAneator de miniatura" #. Comment #. Name #: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7 msgid "Trash Properties" -msgstr "" +msgstr "Proprietate del corbe" #. Keywords #: trash/kcmtrash.desktop:15 diff --git a/translations/desktop_files/tdeioslave-desktops/ru.po b/translations/desktop_files/tdeioslave-desktops/ru.po index 2701352ae..a27751ce4 100644 --- a/translations/desktop_files/tdeioslave-desktops/ru.po +++ b/translations/desktop_files/tdeioslave-desktops/ru.po @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Andrei Stepanov <adem4ik@gmail.com>, 2024, 2025. +# Andrei Stepanov <adem4ik@gmail.com>, 2024, 2025, 2026. # Alexander Golubev <fatzer2@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:17+0000\n" -"PO-Revision-Date: 2025-10-26 04:17+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"PO-Revision-Date: 2026-02-22 15:51+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/tdeioslave-desktop-files/ru/>\n" "Language: ru\n" @@ -27,7 +27,7 @@ msgstr "Сценарии CGI" #. Comment #: cgi/kcmcgi/kcmcgi.desktop:11 msgid "Configure the CGI TDEIO slave" -msgstr "ÐаÑтройка CGI TDEIO slave" +msgstr "ÐаÑтройка подчинённого CGI TDEIO" #. Keywords #: cgi/kcmcgi/kcmcgi.desktop:13 @@ -413,7 +413,8 @@ msgstr "ÐаÑтройка подключаемых уÑтройÑтв хранР#. Keywords #: media/tdecmodule/media.desktop:14 msgid "storage;media;usb;cdrom;device;" -msgstr "storage;media;usb;cdrom;device;уÑтройÑтво хранениÑ;" +msgstr "" +"storage;media;usb;cdrom;device;уÑтройÑтво хранениÑ;медиа;хранилище;ноÑитель;" #. Name #: media/tdefile-plugin/tdefile_media.desktop:6 diff --git a/translations/desktop_files/tdepasswd-desktops/ru.po b/translations/desktop_files/tdepasswd-desktops/ru.po index 6a987e271..b56e33d89 100644 --- a/translations/desktop_files/tdepasswd-desktops/ru.po +++ b/translations/desktop_files/tdepasswd-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-25 19:32+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2026-03-12 21:31+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/tdepasswd-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: kcm/kcm_useraccount.desktop:10 @@ -24,7 +26,7 @@ msgstr "Профиль пользователÑ" #. Comment #: kcm/kcm_useraccount.desktop:12 msgid "User information such as password, name and email" -msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ пользователе, такие как пароль, Ð¸Ð¼Ñ Ð¸ e-mail" +msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ пользователе, такие как пароль, Ð¸Ð¼Ñ Ð¸ Ñл. почта" #. Keywords #: kcm/kcm_useraccount.desktop:14 diff --git a/translations/desktop_files/tdeprint-desktops/ru.po b/translations/desktop_files/tdeprint-desktops/ru.po index 9817e3394..e845e3cac 100644 --- a/translations/desktop_files/tdeprint-desktops/ru.po +++ b/translations/desktop_files/tdeprint-desktops/ru.po @@ -1,13 +1,14 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2022, 2024. +# Andrei Stepanov <adem4ik@gmail.com>, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:17+0000\n" -"PO-Revision-Date: 2024-03-02 05:44+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"PO-Revision-Date: 2026-03-14 16:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/tdeprint-desktop-files/ru/>\n" "Language: ru\n" @@ -16,12 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8 msgid "KJobViewer" -msgstr "ПроÑмотрщик заданий печати TDE" +msgstr "ПроÑмотр заданий печати TDE" #. GenericName #. Comment diff --git a/translations/desktop_files/tdm-sessions/ia.po b/translations/desktop_files/tdm-sessions/ia.po index b792aba6a..caa67e315 100644 --- a/translations/desktop_files/tdm-sessions/ia.po +++ b/translations/desktop_files/tdm-sessions/ia.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# giovanni <assecoibalcu@yahoo.it>, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-25 20:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2026-03-06 13:51+0000\n" +"Last-Translator: giovanni <assecoibalcu@yahoo.it>\n" +"Language-Team: Interlingua <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/tdm-sessions/ia/>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: tde.desktop.cmake:7 msgid "TDE" -msgstr "" +msgstr "TDE" #. Comment #: tde.desktop.cmake:8 @@ -27,31 +28,33 @@ msgid "" "The Trinity Desktop Environment. A powerful Open Source graphical desktop " "environment" msgstr "" +"Le Ambiente de Scriptorio Trinity, un potente ambiente de scriptorio graphic " +"de Fonte Aperite" #. Name #: 9wm.desktop:6 msgid "9WM" -msgstr "" +msgstr "9WM" #. Comment #: 9wm.desktop:8 msgid "An emulation of the Plan 9 window manager 8-1/2" -msgstr "" +msgstr "Un emulation del gerente de fenestra Plan 9 8-1/2" #. Name #: admin.desktop:7 msgid "admin" -msgstr "" +msgstr "admin" #. Comment #: admin.desktop:9 msgid "Yast Admin Session" -msgstr "" +msgstr "Session de Admin de Yast" #. Name #: aewm++.desktop:6 msgid "AEWM++" -msgstr "" +msgstr "AEWM++" #. Comment #: aewm++.desktop:8 @@ -59,71 +62,75 @@ msgid "" "A minimal window manager based on AEWM, enhanced by virtual desktops and " "partial GNOME support" msgstr "" +"Un minime gerente de fenestra basate sur AEWM, meliorate per scriptorios " +"virtual e supporto partial de GNOME" #. Name #: aewm.desktop:6 msgid "AEWM" -msgstr "" +msgstr "AEWM" #. Comment #: aewm.desktop:8 msgid "A minimalist window manager" -msgstr "" +msgstr "Un gerente de fenestras minimaliste" #. Name #: afterstep.desktop:6 msgid "AfterStep" -msgstr "" +msgstr "AfterStep" #. Comment #: afterstep.desktop:8 msgid "A window manager with the NeXTStep look and feel, based on FVWM" -msgstr "" +msgstr "Un gerente de fenestra con le apparentia de NeXTStep, basate sur FVWM" #. Name #: amaterus.desktop:6 msgid "AMATERUS" -msgstr "" +msgstr "AMATERUS" #. Comment #: amaterus.desktop:8 msgid "A GTK+ based window manager with a window grouping feature" msgstr "" +"Un gerente de fenestras basate sur GTK+ con un characteristica de gruppar " +"fenestra" #. Name #: amiwm.desktop:6 msgid "AmiWM" -msgstr "" +msgstr "AmiWM" #. Comment #: amiwm.desktop:8 msgid "The Amiga look-alike window manager" -msgstr "" +msgstr "Un gerente de fenestra in stilo de Amiga" #. Name #: asclassic.desktop:6 msgid "ASClassic" -msgstr "" +msgstr "ASClassic" #. Comment #: asclassic.desktop:8 msgid "AfterStep Classic, a window manager based on AfterStep v1.1" -msgstr "" +msgstr "AfterStep Classic, un gerente de fenestra basate sur AfterStep v1.1" #. Name #: blackbox.desktop:6 msgid "Blackbox" -msgstr "" +msgstr "Blackbox" #. Comment #: blackbox.desktop:8 msgid "A fast & light window manager" -msgstr "" +msgstr "Un gerente de fenestras rapide e legier" #. Name #: cde.desktop:6 msgid "CDE" -msgstr "" +msgstr "CDE" #. Comment #: cde.desktop:8 @@ -131,96 +138,108 @@ msgid "" "The Common Desktop Environment, a proprietary industry standard desktop " "environment" msgstr "" +"Le Ambiente Commun de Scriptorio (Common Desktop Environment in anglese),un " +"ambiente de scriptorio standard industrial proprietari" #. Name #: ctwm.desktop:6 msgid "CTWM" -msgstr "" +msgstr "CTWM" #. Comment #: ctwm.desktop:8 msgid "Claude's Tab Window Manager, TWM enhanced by virtual screens, etc." -msgstr "" +msgstr "Claude's Tab Window Manager, TWM meliorate con schermos virtual, etc." #. Name #: cwwm.desktop:6 msgid "CWWM" -msgstr "" +msgstr "CWWM" #. Comment #: cwwm.desktop:8 msgid "The ChezWam Window Manager, a minimalist window manager based on EvilWM" msgstr "" +"Le gerente de fenestra ChezWam, un gerente de fenestra minimaliste basate " +"sur EvilWM" #. Name #: enlightenment.desktop:6 msgid "Enlightenment" -msgstr "" +msgstr "Enlightenment" #. Comment #: enlightenment.desktop:8 msgid "An extremely themable very feature-rich window manager" msgstr "" +"Un gerente de fenestras plen de characteristicas e extrememente " +"personalisabile" #. Name #: evilwm.desktop:6 msgid "EvilWM" -msgstr "" +msgstr "EvilWM" #. Comment #: evilwm.desktop:8 msgid "A minimalist window manager based on AEWM" -msgstr "" +msgstr "Un gerente de fenestras minimaliste basate sur AEWM" #. Name #: fluxbox.desktop:6 msgid "Fluxbox" -msgstr "" +msgstr "Fluxbox" #. Comment #: fluxbox.desktop:8 msgid "A highly configurable and low resource window manager based on Blackbox" msgstr "" +"Un gerente de fenestras basate sur Blackbox altemente configurabile e con " +"pauc ressources utilisate" #. Name #: flwm.desktop:6 msgid "FLWM" -msgstr "" +msgstr "FLWM" #. Comment #: flwm.desktop:8 msgid "The Fast Light Window Manager, based primarily on WM2" msgstr "" +"Le Fast Light Window Manager (Gerente de Fenestras Legier e Rapide), basate " +"principalmente sur WM2" #. Name #: fvwm.desktop:6 msgid "FVWM" -msgstr "" +msgstr "FVWM" #. Comment #: fvwm.desktop:8 fvwm2.desktop:8 msgid "A powerful ICCCM-compliant multiple virtual desktop window manager" msgstr "" +"Un potente gerente de fenestras de scriptorio virtual multiple compativile " +"con ICCCM" #. Name #: fvwm2.desktop:6 msgid "FVWM2" -msgstr "" +msgstr "FVWM2" #. Name #: fvwm95.desktop:6 msgid "FVWM95" -msgstr "" +msgstr "FVWM95" #. Comment #: fvwm95.desktop:8 msgid "A Windows 95 look-alike derivative of FVWM" -msgstr "" +msgstr "Un variante de FVWM de aspecto simile a Windows 95" #. Name #: gnome.desktop:6 msgid "GNOME" -msgstr "" +msgstr "GNOME" #. Comment #: gnome.desktop:8 @@ -228,36 +247,40 @@ msgid "" "The GNU Network Object Model Environment. A complete, free and easy-to-use " "desktop environment" msgstr "" +"Le GNU Network Object Model Environment. Un ambiente de scriptorio complete, " +"libere e facile a usar" #. Name #: golem.desktop:6 msgid "Golem" -msgstr "" +msgstr "Golem" #. Comment #: golem.desktop:8 msgid "A lightweight window manager" -msgstr "" +msgstr "Un gerente de ventanas legier" #. Name #: icewm.desktop:6 msgid "IceWM" -msgstr "" +msgstr "IceWM" #. Comment #: icewm.desktop:8 msgid "A Windows 95-OS/2-Motif-like window manager" -msgstr "" +msgstr "Un gerente de fenestra de stilo Windows 95-OS/2-Motif" #. Name #: ion.desktop:6 msgid "Ion" -msgstr "" +msgstr "Ion" #. Comment #: ion.desktop:8 msgid "A keyboard-friendly window manager with tiled windows, based on PWM" msgstr "" +"Un gerente de fenestras \"amico del claviero\" con fenestras tegulate (tiled " +"windows),basate sur PWM" #. Name #: kde-plasma-safe.desktop:7 @@ -282,57 +305,61 @@ msgstr "Le scriptorio facite per KDE" #. Name #: larswm.desktop:6 msgid "LarsWM" -msgstr "" +msgstr "LarsWM" #. Comment #: larswm.desktop:8 msgid "The Lars Window Manager, based on 9WM, supports tiled windows" msgstr "" +"Le Lars Window Manager, basate sur 9WM, supporta fenestras tegulate (tiled " +"windows)" #. Name #: lwm.desktop:6 msgid "LWM" -msgstr "" +msgstr "LWM" #. Comment #: lwm.desktop:8 msgid "The Lightweight Window Manager. A non-configurable, bare window manager" msgstr "" +"Le Lightweight Window Manager. Un gerente de fenestras simple non-" +"configurabile" #. Name #: matchbox.desktop:6 msgid "Matchbox" -msgstr "" +msgstr "Matchbox" #. Comment #: matchbox.desktop:8 msgid "A window manager for handheld devices" -msgstr "" +msgstr "Un gerente de fenestras per dispositivos de mano" #. Name #: metacity.desktop:6 msgid "Metacity" -msgstr "" +msgstr "Metacity" #. Comment #: metacity.desktop:8 msgid "A lightweight GTK2 based window manager" -msgstr "" +msgstr "Un gerente de fenestras legier basate sur GTK2" #. Name #: mwm.desktop:6 msgid "MWM" -msgstr "" +msgstr "MWM" #. Comment #: mwm.desktop:8 msgid "The Motif Window Manager" -msgstr "" +msgstr "Le gerente de fenestras de Motif" #. Name #: olvwm.desktop:6 msgid "OLVWM" -msgstr "" +msgstr "OLVWM" #. Comment #: olvwm.desktop:8 @@ -340,133 +367,140 @@ msgid "" "The OpenLook Virtual Window Manager. OLWM enhanced for handling of virtual " "desktops" msgstr "" +"Le OpenLook Virtual Window Manager. OLWM meliorate permanear scriptorios " +"virtual" #. Name #: olwm.desktop:6 msgid "OLWM" -msgstr "" +msgstr "OLWM" #. Comment #: olwm.desktop:8 msgid "The traditional Open Look Window Manager" -msgstr "" +msgstr "Le traditional Open Look Window Manager" #. Name #: openbox.desktop:6 msgid "Openbox" -msgstr "" +msgstr "Openbox" #. Comment #: openbox.desktop:8 msgid "A lightweight window manager based on Blackbox" -msgstr "" +msgstr "Un gerente de fenestras legier basate sur Blackbox" #. Name #: oroborus.desktop:6 msgid "Oroborus" -msgstr "" +msgstr "Oroborus" #. Comment #: oroborus.desktop:8 msgid "A lightweight themeable window manager" -msgstr "" +msgstr "Un gerente de fenestras legier con themas" #. Name #: phluid.desktop:6 msgid "Phluid" -msgstr "" +msgstr "Phluid" #. Comment #: phluid.desktop:8 msgid "An Imlib2 based window manager" -msgstr "" +msgstr "Un gerentede fenestras basate sur Imlib2" #. Name #: pwm.desktop:6 msgid "PWM" -msgstr "" +msgstr "PWM" #. Comment #: pwm.desktop:8 msgid "" "A lightweight window manager able to attach multiple windows to one frame" msgstr "" +"Un gerente de fenestras legier capace a attachar multiple fenestras a un " +"quadro" #. Name #: qvwm.desktop:6 msgid "QVWM" -msgstr "" +msgstr "QVWM" #. Comment #: qvwm.desktop:8 msgid "A Windows 95 like window manager" -msgstr "" +msgstr "Un gerente de fenestras similar a WIndows 95" #. Name #: ratpoison.desktop:6 msgid "Ratpoison" -msgstr "" +msgstr "Ratpoison" #. Comment #: ratpoison.desktop:8 msgid "A simple keyboard-only window manager modeled after Screen" msgstr "" +"Un simple gerente de fenestra de solmente claviero modellate secundo Screen" #. Name #: sapphire.desktop:6 msgid "Sapphire" -msgstr "" +msgstr "Sapphire" #. Comment #: sapphire.desktop:8 msgid "A minimal but configurable window manager" -msgstr "" +msgstr "Un gerente de fenestras minime ma configurabile" #. Name #: sawfish.desktop:6 msgid "Sawfish" -msgstr "" +msgstr "Sawfish" #. Comment #: sawfish.desktop:8 msgid "" "An extensible window manager scriptable with an Emacs Lisp-like language" msgstr "" +"Un gerente de fenestra extensibile per lequal es possibile facer scripts in " +"un linguage similar a Emacs Lisp" #. Name #: twm.desktop:6 msgid "TWM" -msgstr "" +msgstr "TWM" #. Comment #: twm.desktop:8 msgid "The Tab Window Manager" -msgstr "" +msgstr "Le Tab Window Manager" #. Name #: ude.desktop:6 msgid "UDE" -msgstr "" +msgstr "UDE" #. Comment #: ude.desktop:8 msgid "The UNIX Desktop Environment" -msgstr "" +msgstr "Le UNIX Desktop Environment (Ambiente de scriptorio de Unix)" #. Name #: vtwm.desktop:6 msgid "VTWM" -msgstr "" +msgstr "VTWM" #. Comment #: vtwm.desktop:8 msgid "The Virtual Tab Window Manager. TWM enhanced by virtual screens, etc." -msgstr "" +msgstr "Le Virtual Tab Window Manager. TWM meliorate con schermos virtual, etc." #. Name #: w9wm.desktop:6 msgid "W9WM" -msgstr "" +msgstr "W9WM" #. Comment #: w9wm.desktop:8 @@ -474,41 +508,43 @@ msgid "" "A window manager based on 9WM, enhanced by virtual screens and keyboard " "bindings" msgstr "" +"Un gerente de fenestra basate sur 9WM, meliorate con schermos virtual e vias " +"breve de claviero" #. Name #: waimea.desktop:6 msgid "Waimea" -msgstr "" +msgstr "Waimea" #. Comment #: waimea.desktop:8 msgid "A highly customizable window manager based on Blackbox" -msgstr "" +msgstr "Un gerente de fenestra altemente personalisabile basate su Blackbox" #. Name #: wm2.desktop:6 msgid "WM2" -msgstr "" +msgstr "WM2" #. Comment #: wm2.desktop:8 msgid "A small, non-configurable window manager" -msgstr "" +msgstr "Un gerente de fenestras parve e non configurabile" #. Name #: wmaker.desktop:6 msgid "WindowMaker" -msgstr "" +msgstr "WindowMaker" #. Comment #: wmaker.desktop:8 msgid "A simple window manager that resembles the NeXTStep look very closely" -msgstr "" +msgstr "Un gerente de fenestras simplice que es multo similar a NeXTStep" #. Name #: xfce.desktop:6 msgid "XFce" -msgstr "" +msgstr "XFce" #. Comment #: xfce.desktop:8 @@ -516,11 +552,13 @@ msgid "" "The Cholesterol Free Desktop Environment. A desktop environment reminiscent " "of CDE" msgstr "" +"Le Cholesterol Free Desktop Environment. Un ambiente de scriptorio " +"reminescente de CDE" #. Name #: xfce4.desktop:6 msgid "XFce 4" -msgstr "" +msgstr "XFce 4" #. Comment #: xfce4.desktop:8 @@ -528,3 +566,5 @@ msgid "" "The Cholesterol Free Desktop Environment, version 4. A desktop environment " "reminiscent of CDE" msgstr "" +"The Cholesterol Free Desktop Environment, version 4. Un ambiente de " +"scriptorio reminescente de CDE" diff --git a/translations/desktop_files/tdm-sessions/ru.po b/translations/desktop_files/tdm-sessions/ru.po index 410a2edca..58b42b662 100644 --- a/translations/desktop_files/tdm-sessions/ru.po +++ b/translations/desktop_files/tdm-sessions/ru.po @@ -1,13 +1,14 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2022, 2025. +# Andrei Stepanov <adem4ik@gmail.com>, 2026. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-25 20:47+0200\n" -"PO-Revision-Date: 2025-11-02 15:58+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"PO-Revision-Date: 2026-03-14 16:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/tdm-sessions/ru/>\n" "Language: ru\n" @@ -284,7 +285,7 @@ msgstr "Окружение рабочего Ñтола от команды KDE ( #. Name #: kde-plasma.desktop:7 msgid "KDE Plasma Workspace" -msgstr "Рабочий Ñтол Plasma" +msgstr "Рабочий Ñтол KDE Plasma" #. Comment #: kde-plasma.desktop:9 diff --git a/twin/activation.cpp b/twin/activation.cpp index 143756366..4d8193403 100644 --- a/twin/activation.cpp +++ b/twin/activation.cpp @@ -864,7 +864,7 @@ void Client::setActive( bool act, bool updateOpacity_) if (isModal() && transientFor()) { if (!act) transientFor()->updateOpacity(); - else if (!transientFor()->custom_opacity) transientFor()->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); + else if (!transientFor()->custom_opacity) transientFor()->setOpacity(options->translucentActiveWindows ? options->activeWindowOpacity : Opacity::Opaque); } updateShadowSize(); diff --git a/twin/client.cpp b/twin/client.cpp index 0f1e7d053..50248bc2c 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -120,7 +120,7 @@ Client::Client( Workspace *ws ) border_right( 0 ), border_top( 0 ), border_bottom( 0 ), - opacity_( 0 ), + opacity_( Opacity::Opaque ), demandAttentionKNotifyTimer( NULL ), activeMaximizing(false), activeTiled(false) @@ -224,7 +224,7 @@ void Client::releaseWindow( bool on_shutdown ) deleting = true; workspace()->discardUsedWindowRules( this, true ); // remove ForceTemporarily rules StackingUpdatesBlocker blocker( workspace()); - if (!custom_opacity) setOpacity(false); + if (!custom_opacity) setOpacity(Opacity::Opaque); if (moveResizeMode) leaveMoveResize(); removeShadow(); @@ -328,9 +328,6 @@ void Client::updateDecoration( bool check_workspace_pos, bool force ) XReparentWindow( tqt_xdisplay(), decoration->widget()->winId(), frameId(), 0, 0 ); decoration->widget()->lower(); decoration->borders( border_left, border_right, border_top, border_bottom ); - options->onlyDecoTranslucent ? - setDecoHashProperty(border_top, border_right, border_bottom, border_left): - unsetDecoHashProperty(); int save_workarea_diff_x = workarea_diff_x; int save_workarea_diff_y = workarea_diff_y; move( calculateGravitation( false )); @@ -387,9 +384,6 @@ void Client::checkBorderSizes() border_right != new_right || border_top != new_top || border_bottom != new_bottom) - options->onlyDecoTranslucent ? - setDecoHashProperty(new_top, new_right, new_bottom, new_left): - unsetDecoHashProperty(); move( calculateGravitation( false )); plainResize( sizeForClientSize( clientSize()), ForceGeometrySet ); checkWorkspacePosition(); @@ -2241,11 +2235,6 @@ void Client::takeFocus( allowed_t ) if ( rules()->checkAcceptFocus( input )) { XSetInputFocus( tqt_xdisplay(), window(), RevertToPointerRoot, get_tqt_x_time() ); - // Work around opacity bug - bool activePrev = active; - active = true; - updateOpacity(); - active = activePrev; } if ( Ptakefocus ) { @@ -2800,26 +2789,24 @@ void Client::cancelAutoRaise() autoRaiseTimer = 0; } -void Client::setOpacity(bool translucent, uint opacity) +void Client::setOpacity(uint opacity) { if (isDesktop()) return; // xcompmgr does not like non solid desktops and the user could set it accidently by mouse scrolling // tqWarning("setting opacity for %d",tqt_xdisplay()); - //rule out activated translulcency with 100% opacity - if (!translucent || opacity == 0xFFFFFFFF) - { - opacity_ = 0xFFFFFFFF; + if (opacity == Opacity::Opaque && !custom_opacity) + { // Note: if it is custom_opacity we want to keep the properties in case of WM restart XDeleteProperty (tqt_xdisplay(), frameId(), atoms->net_wm_window_opacity); XDeleteProperty (tqt_xdisplay(), window(), atoms->net_wm_window_opacity); // ??? frameId() is necessary for visible changes, window() is the winId() that would be set by apps - we set both to be sure the app knows what's currently displayd } else{ if(opacity == opacity_) return; - opacity_ = opacity; long data = opacity; // 32bit XChangeProperty needs long XChangeProperty(tqt_xdisplay(), frameId(), atoms->net_wm_window_opacity, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &data, 1L); XChangeProperty(tqt_xdisplay(), window(), atoms->net_wm_window_opacity, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &data, 1L); } + opacity_ = opacity; } void Client::setShadowSize(uint shadowSize) @@ -2830,162 +2817,94 @@ void Client::setShadowSize(uint shadowSize) XChangeProperty(tqt_xdisplay(), frameId(), atoms->net_wm_window_shadow, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &data, 1L); } -void Client::updateOpacity() -// extra syncscreen flag allows to avoid double syncs when active state changes (as it will usually change for two windows) +uint Client::defaultOpacity() { - if (!(isNormalWindow() || isDialog() || isUtility() )|| custom_opacity) - return; - if (isActive()) + return defaultOpacity(isActive() || (keepAbove() && options->keepAboveAsActive)); + } + +uint Client::defaultOpacity(bool active) + { + if (active) { if( ruleOpacityActive() ) - setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); + return rule_opacity_active; else - setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); - if (isBMP()) - // beep-media-player, only undecorated windows (gtk2 xmms, xmms doesn't work with compmgr at all - s.e.p. :P ) - { - ClientList tmpGroupMembers = group()->members(); - ClientList activeGroupMembers; - activeGroupMembers.append(this); - tmpGroupMembers.remove(this); - ClientList::Iterator it = tmpGroupMembers.begin(); - while (it != tmpGroupMembers.end()) - // search for next attached and not activated client and repeat if found - { - if ((*it) != this && (*it)->isBMP()) - // potential "to activate" client found - { -// tqWarning("client found"); - if ((*it)->touches(this)) // first test, if the new client touches the just activated one - { -// tqWarning("found client touches me"); - if( ruleOpacityActive() ) - (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); - else - (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); -// tqWarning("activated, search restarted (1)"); - (*it)->setShadowSize(options->activeWindowShadowSize); - activeGroupMembers.append(*it); - tmpGroupMembers.remove(it); - it = tmpGroupMembers.begin(); // restart, search next client - continue; - } - else - { // pot. client does not touch c, so we have to search if it touches some other activated client - bool found = false; - for( ClientList::ConstIterator it2 = activeGroupMembers.begin(); it2 != activeGroupMembers.end(); it2++ ) - { - if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) - { -// tqWarning("found client touches other active client"); - if( ruleOpacityActive() ) - (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); - else - (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); - (*it)->setShadowSize(options->activeWindowShadowSize); - activeGroupMembers.append(*it); - tmpGroupMembers.remove(it); - it = tmpGroupMembers.begin(); // reset potential client search - found = true; -// tqWarning("activated, search restarted (2)"); - break; // skip this loop - } - } - if (found) continue; - } - } - it++; - } - } - else if (isNormalWindow()) - // activate dependend minor windows as well - { - for( ClientList::ConstIterator it = group()->members().begin(); it != group()->members().end(); it++ ) - if ((*it)->isDialog() || (*it)->isUtility()) - { - if( (*it)->ruleOpacityActive() ) - (*it)->setOpacity((*it)->ruleOpacityActive() < 0xFFFFFFFF, (*it)->ruleOpacityActive()); - else - (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); - } - } + return options->translucentActiveWindows ? options->activeWindowOpacity : Opacity::Opaque; } else { if( ruleOpacityInactive() ) - setOpacity(rule_opacity_inactive < 0xFFFFFFFF, rule_opacity_inactive); + return rule_opacity_inactive; else - setOpacity(options->translucentInactiveWindows && !(keepAbove() && options->keepAboveAsActive), - options->inactiveWindowOpacity); - // deactivate dependend minor windows as well - if (isBMP()) - // beep-media-player, only undecorated windows (gtk2 xmms, xmms doesn't work with compmgr at all - s.e.p. :P ) + return options->translucentInactiveWindows ? options->inactiveWindowOpacity : Opacity::Opaque; + } + } + +void Client::updateOpacity() +// extra syncscreen flag allows to avoid double syncs when active state changes (as it will usually change for two windows) + { + if (!(isNormalWindow() || isDialog() || isUtility() )|| custom_opacity) + return; + uint opacity = defaultOpacity(); + setOpacity(opacity); + + if (isBMP()) + // beep-media-player, only undecorated windows (gtk2 xmms, xmms doesn't work with compmgr at all - s.e.p. :P ) + { + ClientList tmpGroupMembers = group()->members(); + ClientList groupMembers; + groupMembers.append(this); + tmpGroupMembers.remove(this); + ClientList::Iterator it = tmpGroupMembers.begin(); + while (it != tmpGroupMembers.end()) + // search for next attached and not activated client and repeat if found { - ClientList tmpGroupMembers = group()->members(); - ClientList inactiveGroupMembers; - inactiveGroupMembers.append(this); - tmpGroupMembers.remove(this); - ClientList::Iterator it = tmpGroupMembers.begin(); - while ( it != tmpGroupMembers.end() ) - // search for next attached and not activated client and repeat if found + if ((*it) != this && (*it)->isBMP()) + // potential "to activate" client found { - if ((*it) != this && (*it)->isBMP()) - // potential "to activate" client found - { // tqWarning("client found"); - if ((*it)->touches(this)) // first test, if the new client touches the just activated one - { + if ((*it)->touches(this)) // first test, if the new client touches the just activated one + { // tqWarning("found client touches me"); - if( (*it)->ruleOpacityInactive() ) - (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); - else - (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); - (*it)->setShadowSize(options->inactiveWindowShadowSize); -// tqWarning("deactivated, search restarted (1)"); - inactiveGroupMembers.append(*it); - tmpGroupMembers.remove(it); - it = tmpGroupMembers.begin(); // restart, search next client - continue; - } - else // pot. client does not touch c, so we have to search if it touches some other activated client + (*it)->setOpacity(opacity); +// tqWarning("(de)activated, search restarted (1)"); + (*it)->setShadowSize(options->activeWindowShadowSize); + groupMembers.append(*it); + tmpGroupMembers.remove(it); + it = tmpGroupMembers.begin(); // restart, search next client + continue; + } + else + { // pot. client does not touch c, so we have to search if it touches some other activated client + bool found = false; + for( ClientList::ConstIterator it2 = groupMembers.begin(); it2 != groupMembers.end(); it2++ ) { - bool found = false; - for( ClientList::ConstIterator it2 = inactiveGroupMembers.begin(); it2 != inactiveGroupMembers.end(); it2++ ) + if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) { - if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) - { -// tqWarning("found client touches other inactive client"); - if( (*it)->ruleOpacityInactive() ) - (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); - else - (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); - (*it)->setShadowSize(options->inactiveWindowShadowSize); -// tqWarning("deactivated, search restarted (2)"); - inactiveGroupMembers.append(*it); - tmpGroupMembers.remove(it); - it = tmpGroupMembers.begin(); // reset potential client search - found = true; - break; // skip this loop - } +// tqWarning("found client touches other active client"); + (*it)->setOpacity(opacity); + (*it)->setShadowSize(isActive() ? options->activeWindowShadowSize : options->inactiveWindowShadowSize); + groupMembers.append(*it); + tmpGroupMembers.remove(it); + it = tmpGroupMembers.begin(); // reset potential client search + found = true; +// tqWarning("(de)activated, search restarted (2)"); + break; // skip this loop } - if (found) continue; } + if (found) continue; } - it++; } - } - else if (isNormalWindow()) - { - for( ClientList::ConstIterator it = group()->members().begin(); it != group()->members().end(); it++ ) - if ((*it)->isUtility()) //don't deactivate dialogs... - { - if( (*it)->ruleOpacityInactive() ) - (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); - else - (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); - } + it++; } } + else if (isNormalWindow()) + // activate/deactivate dependend minor windows as well + { + for( ClientList::ConstIterator it = group()->members().begin(); it != group()->members().end(); it++ ) + if ((*it)->isUtility() || ((*it)->isDialog() && isActive() )) // note: don't deactivate dialogs... + (*it)->setOpacity(opacity); + } } void Client::updateShadowSize() @@ -3019,8 +2938,16 @@ bool Client::getWindowOpacity() //query translucency settings from X, returns tr if (result == Success && data && format == 32 ) { opacity_ = *reinterpret_cast< long* >( data ); - custom_opacity = true; -// setOpacity(opacity_ < 0xFFFFFFFF, opacity_); + // Don't set custom_opacity flag during initialization if the opacity looks like what it + // supposed to be for the given type of window. As in a such case it is likely set by us + // and the WM is just restarting + if ( !(Workspace::self()->initializing() + && ( opacity_ == defaultOpacity(/*active*/ false) + || opacity_ == defaultOpacity(/*active*/ true) ) ) ) + { + custom_opacity = true; + } +// setOpacity(opacity_); XFree ((char*)data); return true; } @@ -3039,7 +2966,7 @@ uint Client::opacity() int Client::opacityPercentage() { - return int(100*((double)opacity_/0xffffffff)); + return opacity_ / ( 0xffffffff / 100 ); } bool Client::touches(const Client* c) @@ -3056,20 +2983,6 @@ bool Client::touches(const Client* c) return false; } -void Client::setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth) -{ - long data = (topHeight < 255 ? topHeight : 255) << 24 | - (rightWidth < 255 ? rightWidth : 255) << 16 | - (bottomHeight < 255 ? bottomHeight : 255) << 8 | - (leftWidth < 255 ? leftWidth : 255); - XChangeProperty(tqt_xdisplay(), frameId(), atoms->net_wm_window_decohash, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &data, 1L); -} - -void Client::unsetDecoHashProperty() -{ - XDeleteProperty( tqt_xdisplay(), frameId(), atoms->net_wm_window_decohash); -} - #ifndef NDEBUG kdbgstream& operator<<( kdbgstream& stream, const Client* cl ) { diff --git a/twin/client.h b/twin/client.h index 178c718c4..fcca99650 100644 --- a/twin/client.h +++ b/twin/client.h @@ -321,8 +321,19 @@ class Client : public TQObject, public KDecorationDefines void cancelAutoRaise(); void destroyClient(); void checkActiveModal(); - void setOpacity(bool translucent, uint opacity = 0); + + // some helpful constants for setOpacity() and related functions + struct Opacity { enum : uint { + Transparent = 0, //< Completely transparent window + MouseStep = 0xCCCCCCC, //< A single step when changing opacity with mouse wheel + Opaque = 0xFFFFFFFF //< Fully opaque window + }; }; + + void setOpacity(uint opacity); void setShadowSize(uint shadowSize); + uint defaultOpacity(); + /// Returns default opacity for an active or inactive window depending on the argument + uint defaultOpacity(bool active); void updateOpacity(); void updateShadowSize(); bool hasCustomOpacity(){return custom_opacity;} @@ -451,8 +462,6 @@ class Client : public TQObject, public KDecorationDefines void ungrabButton( int mod ); void resetMaximize(); void resizeDecoration( const TQSize& s ); - void setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth); - void unsetDecoHashProperty(); void pingWindow(); void killProcess( bool ask, Time timestamp = CurrentTime ); diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 512f705a8..bf8dfeee3 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -2362,7 +2362,7 @@ bool Client::startMoveResize() if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque) { savedOpacity_ = opacity_; - setOpacity(options->translucentMovingWindows, options->movingWindowOpacity); + setOpacity(options->translucentMovingWindows ? options->movingWindowOpacity : Opacity::Opaque); } if ( ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque ) @@ -2429,7 +2429,7 @@ void Client::leaveMoveResize() { // rule out non opaque windows from useless translucency settings, maybe resizes? if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque) - setOpacity(true, savedOpacity_); + setOpacity(savedOpacity_); if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove)) updateShadowSize(); clearbound(); diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 53c55f90c..823067d34 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -1460,11 +1460,6 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, TQVBoxLayout *vLay = new TQVBoxLayout (tGroup,KDialog::marginHint(), KDialog::spacingHint()); vLay->addSpacing(11); // to get the proper gb top offset - onlyDecoTranslucent = new TQCheckBox(i18n("Apply translucency only to decoration"),tGroup); - vLay->addWidget(onlyDecoTranslucent); - - vLay->addSpacing(11); - TQGridLayout *gLay = new TQGridLayout(vLay,4,2,KDialog::spacingHint()); gLay->setColStretch(1,1); @@ -1648,7 +1643,6 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), dockWindowOpacity, TQ_SLOT(setEnabled(bool))); connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); - connect(onlyDecoTranslucent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); @@ -1757,7 +1751,6 @@ void KTranslucencyConfig::load( void ) removeShadowsOnResize->setChecked(config->readBoolEntry("RemoveShadowsOnResize",false)); dockWindowTransparency->setChecked(config->readBoolEntry("TranslucentDocks",false)); keepAboveAsActive->setChecked(config->readBoolEntry("TreatKeepAboveAsActive",true)); - onlyDecoTranslucent->setChecked(config->readBoolEntry("OnlyDecoTranslucent",false)); activeWindowOpacity->setValue(config->readNumEntry("ActiveWindowOpacity",100)); inactiveWindowOpacity->setValue(config->readNumEntry("InactiveWindowOpacity",75)); @@ -1849,7 +1842,6 @@ void KTranslucencyConfig::save( void ) config->writeEntry("RemoveShadowsOnMove",removeShadowsOnMove->isChecked()); config->writeEntry("RemoveShadowsOnResize",removeShadowsOnResize->isChecked()); - config->writeEntry("OnlyDecoTranslucent", onlyDecoTranslucent->isChecked()); config->writeEntry("ResetKompmgr",resetKompmgr_); TDEConfig *conf_ = new TDEConfig(TQDir::homeDirPath() + "/.xcompmgrrc"); @@ -1981,7 +1973,6 @@ void KTranslucencyConfig::defaults() if (!kompmgrAvailable_) return; useTranslucency->setChecked(false); - onlyDecoTranslucent->setChecked(false); activeWindowTransparency->setChecked(false); inactiveWindowTransparency->setChecked(false); movingWindowTransparency->setChecked(false); diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h index 80c9e76d7..06121f5ac 100644 --- a/twin/kcmtwin/twinoptions/windows.h +++ b/twin/kcmtwin/twinoptions/windows.h @@ -304,7 +304,6 @@ private: TQCheckBox *removeShadowsOnResize; TQCheckBox *removeShadowsOnMove; TQGroupBox *sGroup; - TQCheckBox *onlyDecoTranslucent; // TQPushButton *xcompmgrButton; KIntNumInput *activeWindowOpacity; KIntNumInput *inactiveWindowOpacity; diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index 116ac8b41..504321544 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -108,7 +108,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name ) SETUP( maxsize, force ); SETUP( strictgeometry, force ); SETUP( disableglobalshortcuts, force ); - KWinModule module; + TWinModule module; int i; for( i = 1; i <= module.numberOfDesktops(); diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index 03daebc28..62b42d5ef 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -626,9 +626,7 @@ class KWIN_EXPORT KDecoration * isShade() to get the current state. */ virtual void shadeChange() = 0; -#if KDE_IS_VERSION( 3, 90, 0 ) -#warning Redo all the XYZChange() virtuals as signals. -#endif + // TODO: redo all the XYZChange() virtuals as signals. signals: /** * This signal is emitted whenever the window's keep-above state changes. @@ -751,27 +749,10 @@ class KWIN_EXPORT KDecoration * Changes the maximize mode of the decorated window. This function should * be preferred to the other maximize() overload for reacting on clicks * on the maximize titlebar button. - * NOTE: This function is new in KDE3.3. In order to support also KDE3.2, - * it is recommended to use code like this: - * \code - * ButtonState button = ... ; - * #if KDE_IS_VERSION( 3, 3, 0 ) - * maximize( button ); - * #else - * if( button == MidButton ) - * maximize( maximizeMode() ^ MaximizeVertical ); - * else if( button == RightButton ) - * maximize( maximizeMode() ^ MaximizeHorizontal ); - * else - * maximize( maximizeMode() == MaximizeFull ? MaximizeRestore : MaximizeFull ); - * #endif * \endcode * @since 3.3 */ -#if KDE_IS_VERSION( 3, 90, 0 ) -#warning Update the docs. -#endif - void maximize( ButtonState button ); + void maximize( ButtonState button ); /** * Set the maximize mode of the decorated window. * @param mode The maximization mode to be set. diff --git a/twin/options.cpp b/twin/options.cpp index c9411f6de..c00d64477 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -202,7 +202,6 @@ unsigned long Options::updateSettings() menuShadowSize = config->readNumEntry("MenuShadowSize", 1*100); removeShadowsOnMove = config->readBoolEntry("RemoveShadowsOnMove", false); removeShadowsOnResize = config->readBoolEntry("RemoveShadowsOnResize", false); - onlyDecoTranslucent = config->readBoolEntry("OnlyDecoTranslucent",false); resetKompmgr = config->readBoolEntry("ResetKompmgr", false); if (resetKompmgr) config->writeEntry("ResetKompmgr",false); diff --git a/twin/options.h b/twin/options.h index 41d1340a7..e4150c419 100644 --- a/twin/options.h +++ b/twin/options.h @@ -361,7 +361,6 @@ class Options : public KDecorationOptions uint inactiveWindowShadowSize; uint dockShadowSize; uint menuShadowSize; - bool onlyDecoTranslucent; bool resetKompmgr; bool tabboxOutline; diff --git a/twin/rules.cpp b/twin/rules.cpp index aa4b7904a..a72c4d195 100644 --- a/twin/rules.cpp +++ b/twin/rules.cpp @@ -902,12 +902,16 @@ void Client::checkAndSetInitialRuledOpacity() rule_opacity_inactive = 0; return; - + if( isDock() ) //workaround for docks, as they don't have active/inactive settings and don't aut, therefore we take only the active one... { - uint tmp = rule_opacity_active ? rule_opacity_active : options->dockOpacity; - setOpacity(tmp < 0xFFFFFFFF && (rule_opacity_active || options->translucentDocks), tmp); + if (rule_opacity_active) + setOpacity(rule_opacity_active); + else if(options->translucentDocks) + setOpacity(options->dockOpacity); + else + setOpacity(Opacity::Opaque); } else updateOpacity(); diff --git a/twin/useractions.cpp b/twin/useractions.cpp index fe60c4d04..fddc4cb38 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -116,7 +116,7 @@ TQPopupMenu* Workspace::clientPopup() connect(transButton, TQ_SIGNAL(clicked()), TQ_SLOT(resetClientOpacity())); connect(transButton, TQ_SIGNAL(clicked()), trans_popup, TQ_SLOT(hide())); connect(transSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setTransButtonText(int))); - connect(transSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setPopupClientOpacity(int))); + connect(transSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setPopupClientTransparancy(int))); // connect(transSlider, TQ_SIGNAL(sliderReleased()), trans_popup, TQ_SLOT(hide())); trans_popup->insertItem(transBox); popup->insertItem(i18n("&Opacity"), trans_popup ); @@ -143,11 +143,11 @@ TQPopupMenu* Workspace::clientPopup() } //sets the transparency of the client to given value(given by slider) -void Workspace::setPopupClientOpacity(int value) +void Workspace::setPopupClientTransparancy(int value) { active_popup_client->setCustomOpacityFlag(true); - value = 100 - value; - value<100?active_popup_client->setOpacity(true, (uint)((value/100.0)*0xffffffff)):active_popup_client->setOpacity(false,0xffffffff); + int opacityPercent = 100 - value; + active_popup_client->setOpacity(percentToUint(opacityPercent)); } void Workspace::setTransButtonText(int value) @@ -648,25 +648,26 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP workspace()->windowToNextDesktop( this ); break; case Options::MouseOpacityMore: - if (opacity_ < 0xFFFFFFFF) + if (opacity_ < Opacity::Opaque) { - if (opacity_ < 0xF3333333) + if (opacity_ < Opacity::Opaque - Opacity::MouseStep) { - setOpacity(true, opacity_ + 0xCCCCCCC); custom_opacity = true; + setOpacity(opacity_ + Opacity::MouseStep); } else { - setOpacity(false, 0xFFFFFFFF); - custom_opacity = false; + if (defaultOpacity() == Opacity::Opaque) + custom_opacity = false; + setOpacity(Opacity::Opaque); } } break; case Options::MouseOpacityLess: - if (opacity_ > 0) + if (opacity_ > Opacity::Transparent) { - setOpacity(true, (opacity_ > 0xCCCCCCC) ? opacity_ - 0xCCCCCCC : 0); custom_opacity = true; + setOpacity((opacity_ > Opacity::MouseStep) ? opacity_ - Opacity::MouseStep : Opacity::Transparent); } break; case Options::MouseNothing: diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 89bd84993..af7b671d7 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -77,10 +77,10 @@ TQString compositorPIDFile () { return locateLocal("tmp", TQString("compton-tde.").append(getenv("DISPLAY")).append(".pid")); } -pid_t getCompositorPID() { +pid_t readCompositorPID(const TQString &pidfileFName) { // Attempt to load the compton-tde pid file pid_t rv = 0; - TQFile pidFile(compositorPIDFile()); + TQFile pidFile(pidfileFName); if (pidFile.open(IO_ReadOnly)) { bool ok; @@ -97,6 +97,17 @@ pid_t getCompositorPID() { return rv; } +pid_t getCompositorPID() { + pid_t rv = readCompositorPID(compositorPIDFile()); + + // check the process is still running + if (kill(rv, 0) != 0) { + return 0; + } + + return rv; +} + // Rikkus: This class is too complex. It needs splitting further. // It's a nightmare to understand, especially with so few comments :( @@ -161,6 +172,7 @@ Workspace::Workspace( bool restore ) forced_global_mouse_grab( false ), kompmgr( NULL ), kompmgr_selection( NULL ), + kompmgr_kill_timer( NULL ), allowKompmgrRestart( true ) { _self = this; @@ -204,7 +216,7 @@ Workspace::Workspace( bool restore ) tdeApp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later // call this before XSelectInput() on the root window startup = new TDEStartupInfo( - TDEStartupInfo::DisableKWinModule | TDEStartupInfo::AnnounceSilenceChanges, this ); + TDEStartupInfo::DisableTWinModule | TDEStartupInfo::AnnounceSilenceChanges, this ); // select windowmanager privileges XSelectInput(tqt_xdisplay(), root, @@ -249,38 +261,12 @@ Workspace::Workspace( bool restore ) // start kompmgr - i wanted to put this into main.cpp, but that would prevent dcop support, as long as Application was no dcop_object - // If compton-tde is already running, send it SIGTERM - pid_t kompmgrpid = getCompositorPID(); + // If compton-tde is already running it's a stale process, send it SIGTERM + if (pid_t kompmgrpid = getCompositorPID()) + kill(kompmgrpid, SIGTERM); if (options->useTranslucency) - { - createKompmgrProcess(); - - if (kompmgrpid) - { - if (kill(kompmgrpid, 0) < 0) - { - // Stale PID file detected; (re)start compositor! - startKompmgr(); - } - } - else - { - startKompmgr(); - } - } - else if (!disable_twin_composition_manager) - { - - if (kompmgrpid) - { - kill(kompmgrpid, SIGTERM); - } - else - { - stopKompmgr(); - } - } + startKompmgr(); } @@ -602,9 +588,13 @@ void Workspace::addClient( Client* c, allowed_t ) if (!c->hasCustomOpacity()) // this xould be done slightly more efficient, but we want to support the topDock in future { c->setShadowSize(options->dockShadowSize); - c->setOpacity(options->translucentDocks, options->dockOpacity); + c->setOpacity(options->translucentDocks ? options->dockOpacity : Client::Opacity::Opaque); } } + else + { + c->updateOpacity(); + } if (c->isMenu() || c->isTopMenu()) { @@ -1114,37 +1104,16 @@ void Workspace::slotReconfigure() if (options->resetKompmgr) // need restart { - bool tmp = options->useTranslucency; - - // If compton-tde is already running, sending SIGUSR1 will force a reload of its settings - pid_t kompmgrpid = getCompositorPID(); - - if (tmp) + if (options->useTranslucency) { - if (kompmgrpid) - { - kill(kompmgrpid, SIGUSR1); - } + if (kompmgrIsRunning()) + kompmgrReloadSettings(); else - { - stopKompmgr(); - if (!kompmgr) - { - createKompmgrProcess(); - } TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart - } } else { - if (kompmgrpid) - { - kill(kompmgrpid, SIGTERM); - } - else - { - stopKompmgr(); - } + stopKompmgr(); } } } @@ -2893,14 +2862,6 @@ void Workspace::helperDialog( const TQString& message, const Client* c ) // kompmgr stuff -void Workspace::createKompmgrProcess() -{ - kompmgr = new TDEProcess; - connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); - *kompmgr << TDE_COMPOSITOR_BINARY; - *kompmgr << "--write-pid-path" << compositorPIDFile(); -} - void Workspace::startKompmgr() { // See if the desktop is loaded yet @@ -2909,25 +2870,55 @@ void Workspace::startKompmgr() unsigned long length, after; unsigned char* data_root; Atom prop_root; + bool retry_later = false; + pid_t kompmgrpid; + + if (!kompmgr) + { + kompmgr = new TDEProcess; + connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); + *kompmgr << TDE_COMPOSITOR_BINARY; + *kompmgr << "--write-pid-path" << compositorPIDFile(); + } + if (!kompmgr_kill_timer) + { + kompmgr_kill_timer = new TQTimer(this); + connect(kompmgr_kill_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(killKompmgr())); + } + prop_root = XInternAtom(tqt_xdisplay(), "_XROOTPMAP_ID", False); - if( XGetWindowProperty( tqt_xdisplay(), tqt_xrootwin(), prop_root, 0L, 1L, False, AnyPropertyType, &type, &format, &length, &after, &data_root) == Success && data_root != NULL ) { - // Root pixmap is available; OK to load... - } - else { + if( XGetWindowProperty( tqt_xdisplay(), tqt_xrootwin(), prop_root, 0L, 1L, False, AnyPropertyType, &type, &format, &length, &after, &data_root) != Success || data_root == NULL ) { + // Root pixmap is not available; try to start compton-tde later + retry_later = true; + } + else if (kompmgrIsRunning()) + { + if (kompmgr_kill_timer->isActive()) + { + // The process is pending to stop but didn't yet; this shouldn't generally happend, + // but to be on the safe side kill it now and retry starting later + kompmgr_kill_timer->stop(); + killKompmgr(); + retry_later = true; + } + else + { + kompmgrReloadSettings(); + return; + } + } + else if ( (kompmgrpid = getCompositorPID()) ) + { + // stale compton-tde process detected; kill it and retry starting again later + kill(kompmgrpid, SIGKILL); + retry_later = true; + } + if (retry_later) + { // Try again a bit later! TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); return; - } - pid_t kompmgrpid = getCompositorPID(); - if (kompmgrpid && kill(kompmgrpid, 0) >= 0) - { - // Active PID file detected; do not attempt to restart - return; } - if (!kompmgr || kompmgr->isRunning()) { - kompmgrReloadSettings(); - return; - } if (!kompmgr->start(TDEProcess::OwnGroup, TDEProcess::Stderr)) { options->useTranslucency = false; @@ -2959,7 +2950,7 @@ void Workspace::startKompmgr() void Workspace::stopKompmgr() { - if (!kompmgr || !kompmgr->isRunning()) { + if (!kompmgrIsRunning()) { return; } delete kompmgr_selection; @@ -2967,16 +2958,34 @@ void Workspace::stopKompmgr() kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*))); options->useTranslucency = false; if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider - kompmgr->kill(SIGKILL); + connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess *)), kompmgr_kill_timer, TQ_SLOT()); + kompmgr->kill(SIGTERM); + kompmgr_kill_timer->start(5000, /* sshot */ true); TQByteArray ba; TQDataStream arg(ba, IO_WriteOnly); arg << ""; tdeApp->dcopClient()->emitDCOPSignal("default", "kompmgrStopped()", ba); } +void Workspace::killKompmgr() { + if (!kompmgrIsRunning()) { + return; + } + + // Since we had to forcefully kill the process it won't have a chance to clean-up after itself; + // so do it manually + TQString pidfileFName = compositorPIDFile(); + // To be on the safe side verify that the file belongs to the process we are killing + if (readCompositorPID(pidfileFName) == kompmgr->pid()) { + TQFile::remove(pidfileFName); + } + + kompmgr->kill(SIGKILL); +} + void Workspace::kompmgrReloadSettings() { - if (!kompmgr || !kompmgr->isRunning()) { + if (!kompmgrIsRunning()) { return; } kompmgr->kill(SIGUSR1); @@ -3080,13 +3089,24 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen) } } +uint Workspace::percentToUint(int percent) { + if(percent < 0) { + return 0; + } else if (percent<100) { + // the same as "percent / 100.0 * 0xffffffff" but avoids FP arithmetics and overflows + return (0xffffffff/100) * (uint) percent + (0xffffffff % 100) * percent / 100; + } else { + return 0xffffffff; + } +} + void Workspace::setOpacity(unsigned long winId, unsigned int opacityPercent) { if (opacityPercent > 100) opacityPercent = 100; for( ClientList::ConstIterator it = stackingOrder().begin(); it != stackingOrder().end(); it++ ) if (winId == (*it)->window()) { - (*it)->setOpacity(opacityPercent < 100, (unsigned int)((opacityPercent/100.0)*0xFFFFFFFF)); + (*it)->setOpacity(percentToUint(opacityPercent)); return; } } diff --git a/twin/workspace.h b/twin/workspace.h index 5f1d71025..164e2d799 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -417,13 +417,14 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin void updateActiveBorders(); void tileCurrentWindowToBorder(int position); // kompmgr - void setPopupClientOpacity(int v); + void setPopupClientTransparancy(int v); void resetClientOpacity(); void setTransButtonText(int value); void unblockKompmgrRestart(); void restartKompmgr( TDEProcess *proc ); void handleKompmgrOutput( TDEProcess *proc, char *buffer, int buflen); void stopKompmgr(); + void killKompmgr(); void kompmgrReloadSettings(); // end @@ -432,7 +433,6 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin private: void init(); - void createKompmgrProcess(); void initShortcuts(); void readShortcuts(); void initDesktopPopup(); @@ -538,6 +538,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin static const char* windowTypeToTxt( NET::WindowType type ); static NET::WindowType txtToWindowType( const char* txt ); static bool sessionInfoWindowTypeMatch( Client* c, SessionInfo* info ); + /// A small helper which proportionally converts value in range 0-100 into 0-0xffffffff + static uint percentToUint(int percent); Client* active_client; Client* last_active_client; @@ -667,6 +669,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin //kompmgr TDEProcess* kompmgr; TDESelectionOwner* kompmgr_selection; + TQTimer *kompmgr_kill_timer; bool allowKompmgrRestart; TQSlider *transSlider; |