diff options
101 files changed, 1334 insertions, 1263 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 640849814..2019a603f 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -13,7 +13,7 @@ ################################################# # required stuff -tde_setup_architecture_flags( ) +tde_setup_compiler_flags( ) include(TestBigEndian) test_big_endian(WORDS_BIGENDIAN) diff --git a/config.h.cmake b/config.h.cmake index 1f5aaac61..239757e4f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -182,7 +182,7 @@ unsigned long strlcpy(char*, const char*, unsigned long); // tdm #cmakedefine XBINDIR "@XBINDIR@" -#define KDE_BINDIR "@TDE_BIN_DIR@" +#define TDE_BINDIR "@TDE_BIN_DIR@" #define KDE_DATADIR "@TDE_DATA_DIR@" #define KDE_CONFDIR "@TDE_CONFIG_DIR@" diff --git a/configure.in.in b/configure.in.in index 305760d09..831a60cfb 100644 --- a/configure.in.in +++ b/configure.in.in @@ -229,9 +229,9 @@ KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir) AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory]) KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir) AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory]) -KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir) -AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory]) -AC_SUBST(KDE_BINDIR) +KDE_EXPAND_MAKEVAR(TDE_BINDIR, kde_bindir) +AC_DEFINE_UNQUOTED(TDE_BINDIR, "$TDE_BINDIR", [TDE's binaries directory]) +AC_SUBST(TDE_BINDIR) dnl libart is used by tdm, kcontrol and thumbnails code in tdeioslaves KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ diff --git a/doc/khelpcenter/releasenotes/r14.1.x/index.docbook b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook index cd315ed72..a7f8acd4a 100644 --- a/doc/khelpcenter/releasenotes/r14.1.x/index.docbook +++ b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook @@ -9,6 +9,7 @@ <!ENTITY r14.1.03 SYSTEM "r14.1.03.docbook"> <!ENTITY r14.1.04 SYSTEM "r14.1.04.docbook"> <!ENTITY r14.1.05 SYSTEM "r14.1.05.docbook"> + <!ENTITY r14.1.06 SYSTEM "r14.1.06.docbook"> ]> <article id="release-notes-14-1-x" lang="&language;"> @@ -45,6 +46,7 @@ <para></para> </sect1> +&r14.1.06; &r14.1.05; &r14.1.04; &r14.1.03; diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.05.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.05.docbook index 3a1fdc5a5..ac4ac68ab 100644 --- a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.05.docbook +++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.05.docbook @@ -1,6 +1,86 @@ <sect1 id="release-notes-r14.1.5"> -<title>R14.1.5 Release Notes (draft)</title> +<title>R14.1.5 Release Notes</title> -<para>The ongoing list of changes introduced by this release can be found <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/230">here</ulink>.</para> +<para>This document tracks some of the most important changes introduced in release R14.1.5, the fifth maintenance release of the R14.1.x series.</para> +<para>The <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.5">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para> + +<sect2 id="release-notes-r14.1.5-new-functionalities"> +<title>New functionalities and enhancements</title> + <itemizedlist> + <listitem><para>twin: add support for tiling when multiple monitors are in use. Tiling now works within each screen geometry (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/612">TDE/tdebase#612</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/624">TDE/tdebase#624</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/628">TDE/tdebase#628</ulink>)</para></listitem> + <listitem><para>twin: more user friendly tiling band settings (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/620">TDE/tdebase#620</ulink>)</para></listitem> + <listitem><para>kicker: various aesthetic improvements and new options (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/576">TDE/tdebase#576</ulink>)</para></listitem> + <listitem><para>kdrc: add <emphasis>paste</emphasis> command, allowing sending clipboard content as text (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/pulls/104">TDE/tdenetwork#104</ulink>)</para></listitem> + <listitem><para>add support for OpenLDAP 2.5 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libtdeldap/pulls/19">TDE/libtdeldap#19</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kcmldap/pulls/15">TDE/kcmldap#15</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kcmldapcontroller/pulls/18">TDE/kcmldapcontroller#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kcmldapmanager/pulls/13">TDE/kcmldapmanager#13</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kerberostray/pulls/14">TDE/kerberostray#14</ulink>)</para></listitem> + <listitem><para>codeine: add mute toggle button to volume slider (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/33">TDE/codeine#33</ulink>)</para></listitem> + <listitem><para>kolourpaint: use smooth resize as default selection at start (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/126">TDE/tdegraphics#126</ulink>)</para></listitem> + <listitem><para>ark: fix support for unzip v6 date format (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/pulls/104">TDE/tdeutils#104</ulink>)</para></listitem> + <listitem><para>improvements to various TDE-branded icons/pictures/artwork (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/238">TDE/tde#238</ulink>)</para></listitem> + <listitem><para>tdeartwork: new Flying Konqi wallpaper (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/52">TDE/tdeartwork#52</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/54">TDE/tdeartwork#54</ulink>)</para></listitem> + <listitem><para>tde-style-baghira: add option to center the popup menu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-baghira/pulls/28">TDE/tde-style-baghira#28</ulink>)</para></listitem> + <listitem><para>tdepim: add support for libgpgme 2.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/162">TDE/tdepim#162</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/165">TDE/tdepim#165</ulink>)</para></listitem> + <listitem><para>kalzium: replace use of legacy <emphasis>nums</emphasis> library with new <emphasis>zarith</emphasis> library (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu/issues/63">TDE/tdeedu#63</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu/pulls/64">TDE/tdeedu#64</ulink>)</para></listitem> + <listitem><para>k9copy: add support for ffmpeg 8.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/issues/37">TDE/k9copy#37</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/38">TDE/k9copy#38</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/39">TDE/k9copy#39</ulink>)</para></listitem> + </itemizedlist> +</sect2> + +<sect2 id="release-notes-r14.1.5-bug-fixes"> +<title>Bug fixes</title> + <itemizedlist> + <listitem><para>tqt: fix secondary event loop using 100% CPU in particular situations (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/635">TDE/tdebase#635</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt/pulls/229">TDE/tqt#229</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt/issues/231">TDE/tqt#231</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt/pulls/232">TDE/tqt#232</ulink>)</para></listitem> + <listitem><para>kdesktop: fixed deadlock situation and unresponsive lock (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/641">TDE/tdebase#641</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/646">TDE/tdebase#646</ulink>)</para></listitem> + <listitem><para>tdebase: fix crash in tderandrtray on display reconnect (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/660">TDE/tdebase#660</ulink>)</para></listitem> + <listitem><para>branding: make TDE xsession name compliant to XDG specification (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/637">TDE/tdebase#637</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/638">TDE/tdebase#638</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/xdg-desktop-portal-tde/pulls/14">TDE/xdg-desktop-portal-tde#14</ulink>)</para></listitem> + <listitem><para>Use normal mouse pointer instead of the dot-pointer when local mouse pointer is enabled in krdc (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/pulls/103">TDE/tdenetwork#103</ulink>)</para></listitem> + <listitem><para>showfoto: fix application usability (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/issues/50">TDE/digikam#50</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/51">TDE/digikam#51</ulink>)</para></listitem> + <listitem><para>bibletime: fix text rendering in display windows (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime/pulls/32">TDE/bibletime#32</ulink>)</para></listitem> + <listitem><para>k3b: fix detection of <emphasis>normalize</emphasis> and <emphasis>sox</emphasis> external programs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/issues/58">TDE/k3b#58</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/60">TDE/k3b#60</ulink>)</para></listitem> + <listitem><para>koffice: fix FTBFS of filters/xsltfilter against libxml 2.13+ (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/issues/96">TDE/koffice#96</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/pulls/97">TDE/koffice#97</ulink>)</para></listitem> + <listitem><para>kpdf: fix a few SEGV faults (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/127">TDE/tdegraphics#127</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/130">TDE/tdegraphics#130</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/132">TDE/tdegraphics#132</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/133">TDE/tdegraphics#133</ulink>)</para></listitem> + <listitem><para>kopete: fix some basic bugs with account creation and libgsm backend (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/pulls/110">TDE/tdenetwork#110</ulink>)</para></listitem> + <listitem><para>amarok: fix occasional SEGV on collection rescan (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/issues/87">TDE/amarok#87</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/88">TDE/amarok#88</ulink>)</para></listitem> + </itemizedlist> +</sect2> + +<sect2 id="release-notes-r14.1.5-distro-support"> +<title>Distro support</title> + <itemizedlist> + <listitem><para>Debian: add support for Trixie, drop support for Buster. Also add support for Forky for nightly builds (PSB/PTB) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/459">TDE/tde-packaging#459</ulink>)</para></listitem> + <listitem><para>Ubuntu: add support for Questing, drop support for Mantic (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/446">TDE/tde-packaging#446</ulink>)</para></listitem> + <listitem><para>OpenSUSE: add support for Leap 16 and drop support for Leap 15.5</para></listitem> + </itemizedlist> +</sect2> + +<sect2 id="release-notes-r14.1.5-dropped-code-applications"> +<title>Drop autotools support</title> + <itemizedlist> + <listitem><para>digikam (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/52">TDE/digikam#52</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/54">TDE/digikam#54</ulink>)</para></listitem> + <listitem><para>krecipes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/krecipes/pulls/27">TDE/krecipes#27</ulink>)</para></listitem> + <listitem><para>ksquirrel (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel/pulls/33">TDE/ksquirrel#33</ulink>)</para></listitem> + <listitem><para>ktorrent (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent/pulls/38">TDE/ktorrent#38</ulink>)</para></listitem> + </itemizedlist> +</sect2> + +<sect2 id="release-notes-r14.1.5-info-developers"> +<title>Info for developers/packagers</title> + <itemizedlist> + <listitem><para>General renames, code improvements, obsolete code removal (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/229">TDE/tde#229</ulink>)</para></listitem> + <listitem><para>DEB specific: moved tde cdbs files into metapackage tde-cdbs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/442">TDE/tde-packaging#442</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/443">TDE/tde-packaging#443</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/pulls/233">TDE/tde#233</ulink>)</para></listitem> + <listitem><para>sip4-tqt: add spec for linux-clang (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/issues/35">TDE/sip4-tqt#35</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/36">TDE/sip4-tqt#36</ulink>)</para></listitem> + <listitem><para>pytdeextensions: various improvements to build code (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytdeextensions/pulls/20">TDE/pytdeextensions#20</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytdeextensions/pulls/21">TDE/pytdeextensions#21</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytdeextensions/pulls/22">TDE/pytdeextensions#22</ulink>)</para></listitem> + <listitem><para>Gentoo: several updates to building scripts</para></listitem> + <listitem><para>kxsldbg has been carved out from tdewebdev and converted into a standalone application (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdewebdev/pulls/65">TDE/tdewebdev#65</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-i18n/pulls/67">TDE/tde-i18n#67</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/pulls/241">TDE/tde#241</ulink>). Since version 1.1.43, libxslt is built <emphasis>--without-debugger</emphasis> by default, so if you wish to package kxsldbg for recent distributions, you will also need to custom build libxslt. Also from version 2.14 of libxml2, some code has been removed and this will likely make kxsldbg unbuildable without further changes.</para></listitem> + </itemizedlist> +</sect2> + +<sect2 id="release-notes-r14.1.5-additional-info"> +<title>Additional info</title> + <itemizedlist> + <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.5">Full release notes (with screenshots)</ulink> on TDE wiki</para></listitem> + <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/230">This release notes</ulink> on TGW</para></listitem> + <listitem><para>TGW full <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/231">issue and PR list</ulink>, by module</para></listitem> + <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.5">change log</ulink></para></listitem> + </itemizedlist> +</sect2> </sect1> diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.06.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.06.docbook new file mode 100644 index 000000000..c86598e4f --- /dev/null +++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.06.docbook @@ -0,0 +1,6 @@ +<sect1 id="release-notes-r14.1.6"> +<title>R14.1.6 Release Notes (draft)</title> + +<para>The ongoing list of changes introduced by this release can be found <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/242">here</ulink>.</para> + +</sect1> diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index 5625ca84e..214e596fd 100644 --- a/kappfinder/main_install.cpp +++ b/kappfinder/main_install.cpp @@ -21,7 +21,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdestandarddirs.h> diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index aad992e3b..990c163f1 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -44,7 +44,7 @@ #include <tqwhatsthis.h> #include <tqcombobox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <kdialogbase.h> #include <tdeglobalaccel.h> diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 1f7853fd2..cfd158036 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestartupinfo.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 76f6d5d6a..bd44d3ffb 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -45,7 +45,7 @@ #include "../interfaces/toolviewmanager.h" #include <dcopclient.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <tdeaction.h> #include <tdecmdlineargs.h> diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index f6227b90f..f29678e15 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 78f84780c..fb816ef84 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 84f140a54..12c9a37b8 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -24,7 +24,7 @@ #include <kbugreport.h> #include <tdeaboutapplication.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <twin.h> #include <kiconloader.h> diff --git a/kcontrol/pics/cr16-app-kcmkicker.png b/kcontrol/pics/cr16-app-kcmkicker.png Binary files differindex 681263792..40ea57417 100644 --- a/kcontrol/pics/cr16-app-kcmkicker.png +++ b/kcontrol/pics/cr16-app-kcmkicker.png diff --git a/kcontrol/pics/cr16-app-panel_settings.png b/kcontrol/pics/cr16-app-panel_settings.png Binary files differindex 7df91bed1..2fe3f09b4 100644 --- a/kcontrol/pics/cr16-app-panel_settings.png +++ b/kcontrol/pics/cr16-app-panel_settings.png diff --git a/kcontrol/pics/cr22-app-kcmkicker.png b/kcontrol/pics/cr22-app-kcmkicker.png Binary files differindex 7a3b5c6a6..a9625465b 100644 --- a/kcontrol/pics/cr22-app-kcmkicker.png +++ b/kcontrol/pics/cr22-app-kcmkicker.png diff --git a/kcontrol/pics/cr32-app-kcmkicker.png b/kcontrol/pics/cr32-app-kcmkicker.png Binary files differindex 5a8c1d4f0..f9599d396 100644 --- a/kcontrol/pics/cr32-app-kcmkicker.png +++ b/kcontrol/pics/cr32-app-kcmkicker.png diff --git a/kcontrol/pics/cr48-app-kcmkicker.png b/kcontrol/pics/cr48-app-kcmkicker.png Binary files differindex 613dd6708..fcbb0b2ac 100644 --- a/kcontrol/pics/cr48-app-kcmkicker.png +++ b/kcontrol/pics/cr48-app-kcmkicker.png diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 1c95bd552..0506639e3 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -195,15 +195,15 @@ void KRandRSystemTray::reloadDisplayConfiguration() if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { continue; } - + // Activate this output randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[i]; randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); - + main_low_apply(randr_screen_info); + if (randr_screen_info->outputs[i]->cur_crtc) { // Output successfully activated! set_primary_output(randr_screen_info, randr_screen_info->cur_output->id); @@ -879,7 +879,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); if (!randr_screen_info->outputs[parameter]->cur_crtc) { output_name = randr_screen_info->outputs[parameter]->info->name; @@ -894,7 +894,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 0; randr_screen_info->cur_output->off_set = 1; output_off(randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); findPrimaryDisplay(); refresh(); diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index afed0d441..753e412cd 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -56,7 +56,7 @@ #include <tqdir.h> #include <tqdatastream.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klargefile.h> #include <tdetempfile.h> #include <tdesu/su.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index c2437ef1a..b3f3b1c94 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -45,7 +45,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tdeio/netaccess.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <knuminput.h> #include <kstdaction.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index 90b65eebf..a2ea58602 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp @@ -30,7 +30,7 @@ #include "FontViewPart.h" #include <kdebug.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> extern "C" diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index c057867d1..9ad28eacf 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -252,7 +252,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) hbox2->setColStretch(1, 1); hbox2->addWidget(sakbox, 1, 0); if (getuid() == 0 && config->checkConfigFilesWritable( true )) { - if (system(KDE_BINDIR "/tsak checkdeps") != 0) { + if (system(TDE_BINDIR "/tsak checkdeps") != 0) { sakbox->setEnabled(false); sakwarning = new TQLabel( i18n("Secure Attention Key support is not available on your system. Please check for the presence of evdev and uinput."), group ); hbox2->addWidget(sakwarning, 2, 0); @@ -494,7 +494,7 @@ void TDMAppearanceWidget::save() // Enable/disable tsak as needed if (sakbox->isChecked()) { - system(KDE_BINDIR "/tsak"); + system(TDE_BINDIR "/tsak"); } else { // Get PID diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index 789ceee0f..2ad89f5ab 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -151,14 +151,6 @@ Atom kde_wm_system_modal_notification = 0; Atom kde_wm_transparent_to_desktop = 0; Atom kde_wm_transparent_to_black = 0; -static void segv_handler(int) -{ - kdError(KDESKTOP_DEBUG_ID) << "A fatal exception was encountered." - << " Trapping and ignoring it so as not to compromise desktop security..." - << kdBacktrace() << endl; - sleep(1); -} - extern Atom tqt_wm_state; extern bool trinity_desktop_lock_use_system_modal_dialogs; extern bool trinity_desktop_lock_delay_screensaver_start; @@ -166,8 +158,7 @@ extern bool trinity_desktop_lock_use_sak; extern bool trinity_desktop_lock_hide_active_windows; extern bool trinity_desktop_lock_hide_cancel_button; extern bool trinity_desktop_lock_forced; - -extern LockProcess* trinity_desktop_lock_process; +extern bool trinity_desktop_lock_failed_grab; extern bool argb_visual; extern pid_t kdesktop_pid; @@ -176,6 +167,15 @@ extern TQXLibWindowList trinity_desktop_lock_hidden_window_list; bool trinity_desktop_lock_autohide_lockdlg = true; +static void segv_handler(int) +{ + kdError(KDESKTOP_DEBUG_ID) << "A fatal exception was encountered." + << " Trapping and ignoring it so as not to compromise desktop security..." + << kdBacktrace() << endl; + + sleep(1); +} + #define ENABLE_CONTINUOUS_LOCKDLG_DISPLAY \ if (!mForceContinualLockDisplayTimer->isActive()) mForceContinualLockDisplayTimer->start(100, false); \ trinity_desktop_lock_autohide_lockdlg = false; \ @@ -234,7 +234,9 @@ LockProcess::LockProcess() m_notifyReadyRequested(false), m_loginCardDevice(NULL), m_maskWidget(NULL), - m_saverRootWindow(0) + m_saverRootWindow(0), + mControlPipeHandler(nullptr), + mControlPipeHandlerThread(nullptr) { #ifdef KEEP_MOUSE_UNGRABBED setNFlags(WX11DisableMove|WX11DisableClose|WX11DisableShade|WX11DisableMinimize|WX11DisableMaximize); @@ -331,8 +333,6 @@ LockProcess::~LockProcess() mControlPipeHandler->terminateThread(); mControlPipeHandlerThread->wait(); delete mControlPipeHandler; -// delete mControlPipeHandlerThread; - if (resizeTimer != NULL) { resizeTimer->stop(); delete resizeTimer; @@ -412,9 +412,7 @@ void LockProcess::init(bool child, bool useBlankOnly) } #endif -#if (TQT_VERSION-0 >= 0x030200) // XRANDR support connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); -#endif if (!trinity_desktop_lock_use_system_modal_dialogs) { setWFlags((WFlags)WX11BypassWM); @@ -438,18 +436,22 @@ void LockProcess::init(bool child, bool useBlankOnly) TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); + // If the lock process terminates before 'mControlPipeHandler::run()' has been called, the + // 'mControlPipeHandlerThread' thread would not terminate and the lock process would have a + // dirty exit, potentially leaving 'kdesktop' in a dirty state that prevents the lock from + // working correctly till 'kdesktop' is killed and restarted. By forcing a call to 'processEvents()' + // we make sure to handle pending timer events and execute the required call + tdeApp->processEvents(); } static int signal_pipe[2]; static void sigterm_handler(int) { - if ((!trinity_desktop_lock_process) || (!trinity_desktop_lock_process->inSecureDialog())) { - // Exit uncleanly - char tmp = 'U'; - if (::write( signal_pipe[1], &tmp, 1) == -1) { - // Error handler to shut up gcc warnings - } + // Exit uncleanly + char tmp = 'U'; + if (::write( signal_pipe[1], &tmp, 1) == -1) { + // Error handler to shut up gcc warnings } } @@ -552,9 +554,11 @@ void LockProcess::signalPipeSignal() startLock(); } else if( tmp == 'U' ) { - // Exit uncleanly - quitSaver(); - exit(1); + if (!inSecureDialog()) { + // Exit uncleanly + quitSaver(); + exit(1); + } } } @@ -566,7 +570,7 @@ bool LockProcess::lock() m_startupStatusDialog->setStatusMessage(i18n("Securing desktop session").append("...")); m_startupStatusDialog->show(); m_startupStatusDialog->setActiveWindow(); - tqApp->processEvents(); + tdeApp->processEvents(); #endif if (startSaver(true)) { @@ -722,7 +726,7 @@ bool LockProcess::runSecureDialog() m_startupStatusDialog->setStatusMessage(i18n("Securing desktop session").append("...")); m_startupStatusDialog->show(); m_startupStatusDialog->setActiveWindow(); - tqApp->processEvents(); + tdeApp->processEvents(); #endif mInSecureDialog = true; @@ -1343,6 +1347,7 @@ bool LockProcess::startSaver(bool notify_ready) if (!child_saver && !grabInput()) { kdWarning(KDESKTOP_DEBUG_ID) << "LockProcess::startSaver() grabInput() failed!!!!" << endl; + trinity_desktop_lock_failed_grab = true; return false; } mBusy = false; @@ -1370,7 +1375,8 @@ bool LockProcess::startSaver(bool notify_ready) slotPaintBackground(rootWinSnapShot); } - if (((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!mInSecureDialog)) && (mHackStartupEnabled || mOverrideHackStartupEnabled)) { + if (!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) && !mInSecureDialog && + (mHackStartupEnabled || mOverrideHackStartupEnabled)) { if (argb_visual) { setTransparentBackgroundARGB(); } @@ -1397,7 +1403,7 @@ bool LockProcess::startSaver(bool notify_ready) } } - if (mInSecureDialog == false) { + if (!mInSecureDialog) { if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); @@ -1791,19 +1797,17 @@ void LockProcess::displayLockDialogIfNeeded() m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog = NULL; } - if (!mInSecureDialog) { - if (trinity_desktop_lock_use_system_modal_dialogs) { - if (!mBusy) { - mBusy = true; - if (mLocked) { - if (checkPass()) { - mClosingWindows = true; - stopSaver(); - tdeApp->quit(); - } + if (!mInSecureDialog && trinity_desktop_lock_use_system_modal_dialogs) { + if (!mBusy) { + mBusy = true; + if (mLocked) { + if (checkPass()) { + mClosingWindows = true; + stopSaver(); + tdeApp->quit(); } - mBusy = false; } + mBusy = false; } } } @@ -2205,7 +2209,7 @@ bool LockProcess::x11Event(XEvent *event) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true); } } - if ((!mLocked) && (!mInSecureDialog)) { + if (!mLocked && !mInSecureDialog) { stopSaver(); tdeApp->quit(); } @@ -2308,7 +2312,7 @@ bool LockProcess::x11Event(XEvent *event) && event->xkey.window != mDialogs.first()->winId()) { XEvent ev2 = *event; ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId(); - tqApp->x11ProcessEvent( &ev2 ); + tdeApp->x11ProcessEvent( &ev2 ); return true; } @@ -2963,7 +2967,7 @@ void LockProcess::saverReady() { // Control pipe handler // ControlPipeHandlerObject::ControlPipeHandlerObject() : TQObject() { - mParent = NULL; + mParent = nullptr; mRunning = false; mTerminate = false; mThreadID = 0L; @@ -2987,7 +2991,7 @@ void ControlPipeHandlerObject::run(void) { int display_number = atoi(TQString(XDisplayString(tqt_xdisplay())).replace(":","").ascii()); if (display_number < 0) { - printf("[kdesktop_lock] Warning: unable to create control socket. Interactive logon modules may not function properly.\n"); + printf("[kdesktop_lock] Warning: unable to create control socket. Interactive logon modules may not function properly.\n"); mRunning = false; TQApplication::eventLoop()->exit(-1); return; @@ -3018,7 +3022,7 @@ void ControlPipeHandlerObject::run(void) { } if (!mParent->mPipeOpen) { - printf("[kdesktop_lock] Warning: unable to create control socket '%s'. Interactive logon modules may not function properly.\n", fifo_file); + printf("[kdesktop_lock] Warning: unable to create control socket '%s'. Interactive logon modules may not function properly.\n", fifo_file); mRunning = false; TQApplication::eventLoop()->exit(-1); return; diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp index 41b918664..9f707c35d 100644 --- a/kdesktop/lock/main.cpp +++ b/kdesktop/lock/main.cpp @@ -64,8 +64,8 @@ bool trinity_desktop_lock_use_sak = false; bool trinity_desktop_lock_hide_active_windows = false; bool trinity_desktop_lock_hide_cancel_button = false; bool trinity_desktop_lock_forced = false; - -LockProcess* trinity_desktop_lock_process = NULL; +// This is a temporary variable used till a fix for the grab issue is prepared +bool trinity_desktop_lock_failed_grab = false; bool signalled_forcelock; bool signalled_dontlock; @@ -88,17 +88,17 @@ static void sigusr2_handler(int) signalled_dontlock = true; } -static void sigusr3_handler(int) +static void sigwinch_handler(int) { signalled_securedialog = true; } -static void sigusr4_handler(int) +static void sigttin_handler(int) { signalled_blank = true; } -static void sigusr5_handler(int) +static void sigttou_handler(int) { signalled_run = true; } @@ -236,9 +236,9 @@ int main( int argc, char **argv ) XSetErrorHandler(trapXErrors); - MyApp* app = NULL; + MyApp *app = nullptr; - while (1 == 1) { + while (true) { sigset_t new_mask; sigset_t orig_mask; @@ -261,7 +261,7 @@ int main( int argc, char **argv ) if (TDEGlobalSettings::isMultiHead()) { Display *dpy = XOpenDisplay(NULL); - if (! dpy) { + if (!dpy) { fprintf(stderr, "%s: FATAL ERROR: couldn't open display '%s'\n", argv[0], XDisplayName(NULL)); @@ -303,14 +303,11 @@ int main( int argc, char **argv ) } } - env.sprintf("DISPLAY=%s.%d", display_name.data(), - kdesktop_screen_number); + env.sprintf("DISPLAY=%s.%d", display_name.data(), kdesktop_screen_number); kdDebug() << "env " << env << endl; if (putenv(strdup(env.data()))) { - fprintf(stderr, - "%s: WARNING: unable to set DISPLAY environment variable\n", - argv[0]); + fprintf(stderr, "%s: WARNING: unable to set DISPLAY environment variable\n", argv[0]); perror("putenv()"); } } @@ -384,7 +381,7 @@ int main( int argc, char **argv ) tdmconfig->setGroup("X-:*-Greeter"); // Create new LockProcess, which also spawns threads inheriting the blocked signal mask - trinity_desktop_lock_process = new LockProcess; + LockProcess lock_process; // Unblock reception of all signals in this thread sigprocmask(SIG_UNBLOCK, &new_mask, NULL); @@ -410,20 +407,20 @@ int main( int argc, char **argv ) sigaddset(&(act.sa_mask), SIGUSR2); act.sa_flags = 0; sigaction(SIGUSR2, &act, 0L); - // handle SIGWINCH (an ersatz SIGUSR3) - act.sa_handler= sigusr3_handler; + // handle SIGWINCH (as custom user signal rather than its inherent meaning) + act.sa_handler= sigwinch_handler; sigemptyset(&(act.sa_mask)); sigaddset(&(act.sa_mask), SIGWINCH); act.sa_flags = 0; sigaction(SIGWINCH, &act, 0L); - // handle SIGTTIN (an ersatz SIGUSR4) - act.sa_handler= sigusr4_handler; + // handle SIGTTIN (as custom user signal rather than its inherent meaning) + act.sa_handler= sigttin_handler; sigemptyset(&(act.sa_mask)); sigaddset(&(act.sa_mask), SIGTTIN); act.sa_flags = 0; sigaction(SIGTTIN, &act, 0L); - // handle SIGTTOU (an ersatz SIGUSR5) - act.sa_handler= sigusr5_handler; + // handle SIGTTOU (as custom user signal rather than its inherent meaning) + act.sa_handler= sigttou_handler; sigemptyset(&(act.sa_mask)); sigaddset(&(act.sa_mask), SIGTTOU); act.sa_flags = 0; @@ -498,35 +495,47 @@ int main( int argc, char **argv ) trinity_desktop_lock_forced = true; } - trinity_desktop_lock_process->init(child, (args->isSet( "blank" ) || signalled_blank)); + lock_process.init(child, (args->isSet( "blank" ) || signalled_blank)); if (!child) { - trinity_desktop_lock_process->setChildren(child_sockets); + lock_process.setChildren(child_sockets); } else { - trinity_desktop_lock_process->setParent(parent_connection); + lock_process.setParent(parent_connection); } + trinity_desktop_lock_failed_grab = false; bool rt; - if( (((!child) && (args->isSet( "forcelock" ))) || signalled_forcelock)) { - rt = trinity_desktop_lock_process->lock(); + if( (!child && args->isSet( "forcelock" )) || signalled_forcelock) { + rt = lock_process.lock(); } else if( child || (args->isSet( "dontlock" ) || signalled_dontlock)) { - rt = trinity_desktop_lock_process->dontLock(); + rt = lock_process.dontLock(); } else if( child || (args->isSet( "securedialog" ) || signalled_securedialog)) { int retcode = tde_sak_verify_calling_process(); if (retcode == 0) { - rt = trinity_desktop_lock_process->runSecureDialog(); + rt = lock_process.runSecureDialog(); } else { return 1; } } else { - rt = trinity_desktop_lock_process->defaultSave(); + rt = lock_process.defaultSave(); } + + // Make sure to handle all pending responses from the X server. + // If we don't do this, in case of failed activation of the saver/lock screen, + // we will end up in a dirty state and the screen lock will no longer hide the windows + // on the screen due to 'm_rootPixmap' failing to load the background image. + // This is caused by a 'XConvertSelection' request in 'TDESharedPixmap::loadFromShared' + // not being handled and causing the corresponding property to become unusuable in X for + // subsequent lock requests. + XSync(tqt_xdisplay(), False); + app->processEvents(); + if (!rt) { - return 0; + return (trinity_desktop_lock_failed_grab ? 0 : 12); } if (!in_internal_mode) { @@ -548,9 +557,6 @@ int main( int argc, char **argv ) return 12; } - delete trinity_desktop_lock_process; - trinity_desktop_lock_process = NULL; - // FIXME // We should not have to return (restart) at all, // but it seems that some X11 connections are left active, diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp index 3de190484..fc3c9db6e 100644 --- a/kdesktop/lockeng.cpp +++ b/kdesktop/lockeng.cpp @@ -63,7 +63,7 @@ static void sigusr1_handler(int) { if (gbl_saverEngineEventHandler) { - gbl_saverEngineEventHandler->lockProcessExited(); + gbl_saverEngineEventHandler->lockCompleted(); } } @@ -71,7 +71,7 @@ static void sigusr2_handler(int) { if (gbl_saverEngineEventHandler) { - gbl_saverEngineEventHandler->lockProcessFullyActivated(); + gbl_saverEngineEventHandler->lockFullyActivated(); } } @@ -79,7 +79,7 @@ static void sigttin_handler(int) { if (gbl_saverEngineEventHandler) { - gbl_saverEngineEventHandler->lockProcessReady(); + gbl_saverEngineEventHandler->lockReady(); } } @@ -108,7 +108,7 @@ SaverEngine::SaverEngine() mSignalAction.sa_flags = 0; sigaction(SIGUSR2, &mSignalAction, 0L); - // handle SIGTTIN + // handle SIGTTIN (as custom user signal rather than its inherent meaning) mSignalAction.sa_handler= sigttin_handler; sigemptyset(&(mSignalAction.sa_mask)); sigaddset(&(mSignalAction.sa_mask), SIGTTIN); @@ -502,28 +502,6 @@ void SaverEngine::lockProcessFullyActivatedGUI() } } -void SaverEngine::lockProcessWaitingGUI() -{ - emitDCOPSignal("KDE_stop_screensaver()", TQByteArray()); - if (mEnabled) - { - if (mXAutoLock) - { - mXAutoLock->start(); - } - XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset); - XSetScreenSaver(tqt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures); - } - processLockTransactions(); - - if (systemdSession && systemdSession->canSend()) - { - TQValueList<TQT_DBusData> params; - params << TQT_DBusData::fromBool(false); - TQT_DBusMessage reply = systemdSession->sendWithReply("SetIdleHint", params); - } -} - // XAutoLock has detected the required idle time. void SaverEngine::idleTimeout() { @@ -750,30 +728,30 @@ void SaverEngineEventHandler::terminateLockProcess() m_lockProcess.detach(); // don't kill it if we crash } -void SaverEngineEventHandler::lockProcessExited() +void SaverEngineEventHandler::lockCompleted() { - kdDebug(1204) << "SaverEngineEventHandler: lock exited" << endl; + kdDebug(1204) << "SaverEngineEventHandler: lock completed" << endl; - if (trinity_lockeng_sak_available) - { - startSAKProcess(); - } if (m_state == Waiting) { return; } m_state = Waiting; - TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(lockProcessWaitingGUI())); + if (trinity_lockeng_sak_available) + { + startSAKProcess(); + } + TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(stopLockProcessGUI())); } -void SaverEngineEventHandler::lockProcessFullyActivated() +void SaverEngineEventHandler::lockFullyActivated() { m_state = Saving; TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(lockProcessFullyActivatedGUI())); } -void SaverEngineEventHandler::lockProcessReady() +void SaverEngineEventHandler::lockReady() { m_saverProcessReady = true; } @@ -819,6 +797,9 @@ void SaverEngineEventHandler::saveScreen() void SaverEngineEventHandler::slotLockProcessExited() { + // Clean up status after the lock process has exited + lockCompleted(); + m_lockProcessRestarting = true; bool abnormalExit = false; diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index 94d8f9e44..11806e73c 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -144,7 +144,6 @@ private slots: // in 'SaverEngineEventHandler' to complete the remaining X11 part of the actions void activateSaverOrLockGUI(); void lockProcessFullyActivatedGUI(); - void lockProcessWaitingGUI(); void lockScreenGUI(); void stopLockProcessGUI(); @@ -197,9 +196,9 @@ public: SaverState getState() const { return m_state; } - void lockProcessExited(); - void lockProcessFullyActivated(); - void lockProcessReady(); + void lockCompleted(); + void lockFullyActivated(); + void lockReady(); void terminateLockProcess(); public slots: diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 8fb99fdac..760c6a42f 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <tqdir.h> -#include <kinstance.h> +#include <tdeinstance.h> class KonqDirPart; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 175e037e5..0175bd689 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -38,6 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqimage.h> #include <tqlayout.h> +#include <tqwhatsthis.h> #include <dcopclient.h> #include <tdeapplication.h> @@ -91,7 +92,8 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac m_showClockSettingCB(nullptr), m_iconMargin(1), m_iconMarginSB(nullptr), - m_layout(nullptr) + m_iconSpacing(1), + m_iconSpacingSB(nullptr) { DCOPObject::setObjId("SystemTrayApplet"); loadSettings(); @@ -257,16 +259,18 @@ void SystemTrayApplet::preferences() connect(m_settingsDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(applySettings())); connect(m_settingsDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(settingsDialogFinished())); - TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 3, TQt::Vertical); + TQWidget *settingsWidget = m_settingsDialog->makeMainWidget(); + TQVBoxLayout *settingsLayout = new TQVBoxLayout(settingsWidget); - m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid); + m_showClockSettingCB = new TQCheckBox(i18n("Show clock in tray"), settingsWidget); m_showClockSettingCB->setChecked(m_showClockInTray); + settingsLayout->addWidget(m_showClockSettingCB); + settingsLayout->setSpacing(m_settingsDialog->spacingHint()); - //m_iconSelector = new TDEActionSelector(m_settingsDialog); - m_iconSelector = new TDEActionSelector(settingsGrid); + m_iconSelector = new TDEActionSelector(settingsWidget); m_iconSelector->setAvailableLabel(i18n("Hidden icons:")); m_iconSelector->setSelectedLabel(i18n("Visible icons:")); - //m_settingsDialog->setMainWidget(m_iconSelector); + settingsLayout->addWidget(m_iconSelector); TQListBox *hiddenListBox = m_iconSelector->availableListBox(); TQListBox *shownListBox = m_iconSelector->selectedListBox(); @@ -293,12 +297,37 @@ void SystemTrayApplet::preferences() } } - TQHBox *hbox = new TQHBox(settingsGrid); - hbox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); - TQLabel *iconMarginL = new TQLabel(i18n("Icon margin: "), hbox); - m_iconMarginSB = new TQSpinBox(0, 20, 1, hbox); + TQGridLayout *marginGrid = new TQGridLayout(2, 3); + marginGrid->setSpacing(m_settingsDialog->spacingHint()); + marginGrid->setColStretch(2,1); // last empty column operates as a spacer + + TQLabel *iconMarginL = new TQLabel(i18n("Icon &margin:"), settingsWidget); + m_iconMarginSB = new TQSpinBox(0, 20, 1, settingsWidget); m_iconMarginSB->setSuffix(i18n(" px")); m_iconMarginSB->setValue(m_iconMargin); + iconMarginL->setBuddy(m_iconMarginSB); + TQWhatsThis::add(iconMarginL, i18n( "Preferred margin between icons in the system tray and outer border.<br>" + "Note that the actual margins can be either larger (in case there is " + "extra free space on the panel) or smaller (in case the panel is " + "not able to fit a single row).") ); + + marginGrid->addWidget(iconMarginL, 0, 0); + marginGrid->addWidget(m_iconMarginSB, 0, 1); + + TQLabel *iconSpacingL = new TQLabel(i18n("Icon &spacing:"), settingsWidget); + m_iconSpacingSB = new TQSpinBox(0, 20, 1, settingsWidget); + m_iconSpacingSB->setSuffix(i18n(" px")); + m_iconSpacingSB->setValue(m_iconSpacing); + iconSpacingL->setBuddy(m_iconSpacingSB); + TQWhatsThis::add(iconSpacingL, i18n( "Minimal spacing between adjacent icons in the system tray.<br>" + "Note that the actual spacing can be larger (in case there is " + "extra free space on the panel).") ); + + + marginGrid->addWidget(iconSpacingL, 1, 0); + marginGrid->addWidget(m_iconSpacingSB, 1, 1); + + settingsLayout->addLayout(marginGrid); m_settingsDialog->show(); } @@ -319,6 +348,7 @@ void SystemTrayApplet::applySettings() m_showClockInTray = m_showClockSettingCB->isChecked(); m_iconMargin = m_iconMarginSB->value(); + m_iconSpacing = m_iconSpacingSB->value(); TDEConfig *conf = config(); @@ -369,6 +399,7 @@ void SystemTrayApplet::applySettings() conf->setGroup("System Tray"); conf->writeEntry("ShowClockInTray", m_showClockInTray); conf->writeEntry("IconMargin", m_iconMargin); + conf->writeEntry("IconSpacing", m_iconSpacing); conf->sync(); @@ -487,21 +518,21 @@ void SystemTrayApplet::orientationChange( Orientation /*orientation*/ ) } void SystemTrayApplet::iconSizeChanged() { - loadSettings(); - updateVisibleWins(); - layoutTray(); - - TrayEmbedList::iterator emb = m_shownWins.begin(); - while (emb != m_shownWins.end()) { - (*emb)->setFixedSize(m_iconSize, m_iconSize); - ++emb; - } - - emb = m_hiddenWins.begin(); - while (emb != m_hiddenWins.end()) { - (*emb)->setFixedSize(m_iconSize, m_iconSize); - ++emb; - } + loadSettings(); + updateVisibleWins(); + layoutTray(); + + TrayEmbedList::iterator emb = m_shownWins.begin(); + while (emb != m_shownWins.end()) { + (*emb)->setFixedSize(m_iconSize, m_iconSize); + ++emb; + } + + emb = m_hiddenWins.begin(); + while (emb != m_hiddenWins.end()) { + (*emb)->setFixedSize(m_iconSize, m_iconSize); + ++emb; + } } void SystemTrayApplet::loadSettings() @@ -514,7 +545,7 @@ void SystemTrayApplet::loadSettings() conf->reparseConfiguration(); conf->setGroup("General"); - if (conf->readBoolEntry("ShowPanelFrame", false) || m_showFrame) // Does ShowPanelFrame even exist? + if (conf->readBoolEntry("ShowPanelFrame", false) || m_showFrame) // Does ShowPanelFrame even exist? { setFrameStyle(Panel | Sunken); } @@ -530,6 +561,7 @@ void SystemTrayApplet::loadSettings() m_iconSize = conf->readNumEntry("systrayIconWidth", 22); m_showClockInTray = conf->readNumEntry("ShowClockInTray", false); m_iconMargin = conf->readNumEntry("IconMargin", 1); + m_iconSpacing = conf->readNumEntry("IconSpacing", 1); } void SystemTrayApplet::systemTrayWindowAdded( WId w ) @@ -810,7 +842,7 @@ int SystemTrayApplet::maxIconHeight() const int largest = m_iconSize; TrayEmbedList::const_iterator lastEmb = m_shownWins.end(); - for (TrayEmbedList::const_iterator emb = m_shownWins.begin(); emb != m_shownWins.end(); ++emb) + for (TrayEmbedList::const_iterator emb = m_shownWins.begin(); emb != lastEmb; ++emb) { if (*emb == 0) { @@ -934,20 +966,8 @@ void SystemTrayApplet::layoutTray() { setUpdatesEnabled(false); - int iconCount = m_shownWins.count(); - - if (m_showHidden) - { - iconCount += m_hiddenWins.count(); - } - - /* heightWidth = height or width in pixels (depends on orientation()) - * nbrOfLines = number of rows or cols (depends on orientation()) - * line = what line to draw an icon in */ - int i = 0, line, nbrOfLines, heightWidth; + int i = 0; bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this); - delete m_layout; - m_layout = new TQGridLayout(this, 1, 1, 0, m_iconMargin); if (m_expandButton) { @@ -961,41 +981,58 @@ void SystemTrayApplet::layoutTray() } } + // delete and recreate the tray layout from scratch + delete layout(); + + TQBoxLayout *mainLayout; + + if (orientation() == TQt::Vertical) { + mainLayout = new TQVBoxLayout(this); + } else { + mainLayout = new TQHBoxLayout(this); + } + + mainLayout->addWidget(m_leftSpacer); + + if (showExpandButton) { + mainLayout->addWidget(m_expandButton, TQt::AlignHCenter | TQt::AlignVCenter); + } + + TQGridLayout *iconLayout = new TQGridLayout(mainLayout, 1, 1, m_iconSpacing); + iconLayout->setMargin(m_iconMargin); + + mainLayout->addWidget(m_rightSpacer); + + if (m_clockApplet) { + mainLayout->addWidget(m_clockApplet); + } + // col = column or row, depends on orientation(), // the opposite direction of line int col = 0; // - // The margin and spacing specified in the layout implies that: - // [-- m_iconMargin pixels --] [-- first icon --] [-- m_iconMargin pixels --] ... [-- m_iconMargin pixels --] [-- last icon --] [-- m_iconMargin pixels --] + // The margin and spacing specified in the layout implies that it looks like: // - // So, if we say that iconWidth is the icon width plus the m_iconMargin pixels spacing, then the available width for the icons - // is the widget width minus m_iconMargin pixels margin. Forgetting these m_iconMargin pixels broke the layout algorithm in KDE <= 3.5.9. + // [-- m_iconMargin px --] [-- first icon --] [-- m_iconSpacing px --] ... [-- m_iconSpacing px --] [-- last icon --] [-- m_iconMargin px --] // - // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded. + // So, the panel size with this layout should conform to the relation: // + // panelSize == iconSize*nbrOfLines + 2*m_iconMargin + (nbrOfLines-1)*m_iconSpacing. + // + // Solving it for number of lines we get: + // + // panelSize - 2*m_iconMargin + m_iconSpacing + // nbrOfLines = -------------------------------------------- + // iconSize + m_iconSpacing if (orientation() == TQt::Vertical) { - int iconWidth = maxIconWidth() + m_iconMargin * 2; // +2 for the margins that implied by the layout - heightWidth = width() - m_iconMargin * 2; - // to avoid nbrOfLines=0 we ensure heightWidth >= iconWidth! - heightWidth = heightWidth < iconWidth ? iconWidth : heightWidth; - nbrOfLines = heightWidth / iconWidth; - - m_layout->addMultiCellWidget(m_leftSpacer, - 0, 0, - 0, nbrOfLines - 1, - TQt::AlignHCenter | TQt::AlignVCenter); - col = 1; - - if (showExpandButton) - { - m_layout->addMultiCellWidget(m_expandButton, - 1, 1, - 0, nbrOfLines - 1, - TQt::AlignHCenter | TQt::AlignVCenter); - col = 2; + int nbrOfLines = (width() - 2*m_iconMargin + m_iconSpacing) / + (maxIconWidth() + m_iconSpacing); + if (nbrOfLines < 1) { + nbrOfLines = 1; // avoid nbrOfLines==0 or negative (in case m_iconMargin is unreasonably large) + iconLayout->setMargin( (width() - maxIconWidth()) / 2); // also adjust the margins, so the icons won't get shifted beyond visibility } if (m_showHidden) @@ -1004,9 +1041,9 @@ void SystemTrayApplet::layoutTray() for (TrayEmbedList::const_iterator emb = m_hiddenWins.begin(); emb != lastEmb; ++emb) { - line = i % nbrOfLines; + int line = i % nbrOfLines; (*emb)->show(); - m_layout->addWidget((*emb), col, line, + iconLayout->addWidget((*emb), col, line, TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -1022,9 +1059,9 @@ void SystemTrayApplet::layoutTray() for (TrayEmbedList::const_iterator emb = m_shownWins.begin(); emb != lastEmb; ++emb) { - line = i % nbrOfLines; + int line = i % nbrOfLines; (*emb)->show(); - m_layout->addWidget((*emb), col, line, + iconLayout->addWidget((*emb), col, line, TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -1035,43 +1072,14 @@ void SystemTrayApplet::layoutTray() ++i; } - m_layout->addMultiCellWidget(m_rightSpacer, - col, col, - 0, nbrOfLines - 1, - TQt::AlignHCenter | TQt::AlignVCenter); - - if (m_clockApplet) { - if (m_showClockInTray) - m_clockApplet->show(); - else - m_clockApplet->hide(); - - m_layout->addMultiCellWidget(m_clockApplet, - col+1, col+1, - 0, nbrOfLines - 1, - TQt::AlignHCenter | TQt::AlignVCenter); - } } else // horizontal { - int iconHeight = maxIconHeight() + m_iconMargin * 2; // +2 for the margins that implied by the layout - heightWidth = height() - m_iconMargin * 2; - heightWidth = heightWidth < iconHeight ? iconHeight : heightWidth; // to avoid nbrOfLines=0 - nbrOfLines = heightWidth / iconHeight; - - m_layout->addMultiCellWidget(m_leftSpacer, - 0, nbrOfLines - 1, - 0, 0, - TQt::AlignHCenter | TQt::AlignVCenter); - col = 1; - - if (showExpandButton) - { - m_layout->addMultiCellWidget(m_expandButton, - 0, nbrOfLines - 1, - 1, 1, - TQt::AlignHCenter | TQt::AlignVCenter); - col = 2; + int nbrOfLines = (height() - 2*m_iconMargin + m_iconSpacing) / + (maxIconHeight() + m_iconSpacing); + if (nbrOfLines < 1) { + nbrOfLines = 1; // avoid nbrOfLines==0 or negative (in case m_iconMargin is unreasonably large) + iconLayout->setMargin( (height() - maxIconHeight()) / 2); // also adjust the margins, so the icons won't shift beyond viability } if (m_showHidden) @@ -1079,9 +1087,9 @@ void SystemTrayApplet::layoutTray() TrayEmbedList::const_iterator lastEmb = m_hiddenWins.end(); for (TrayEmbedList::const_iterator emb = m_hiddenWins.begin(); emb != lastEmb; ++emb) { - line = i % nbrOfLines; + int line = i % nbrOfLines; (*emb)->show(); - m_layout->addWidget((*emb), line, col, + iconLayout->addWidget((*emb), line, col, TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -1097,9 +1105,9 @@ void SystemTrayApplet::layoutTray() for (TrayEmbedList::const_iterator emb = m_shownWins.begin(); emb != lastEmb; ++emb) { - line = i % nbrOfLines; + int line = i % nbrOfLines; (*emb)->show(); - m_layout->addWidget((*emb), line, col, + iconLayout->addWidget((*emb), line, col, TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -1109,23 +1117,13 @@ void SystemTrayApplet::layoutTray() ++i; } + } - m_layout->addMultiCellWidget(m_rightSpacer, - 0, nbrOfLines - 1, - col, col, - TQt::AlignHCenter | TQt::AlignVCenter); - - if (m_clockApplet) { - if (m_showClockInTray) - m_clockApplet->show(); - else - m_clockApplet->hide(); - - m_layout->addMultiCellWidget(m_clockApplet, - 0, nbrOfLines - 1, - col+1, col+1, - TQt::AlignHCenter | TQt::AlignVCenter); - } + if (m_clockApplet) { + if (m_showClockInTray) + m_clockApplet->show(); + else + m_clockApplet->hide(); } setUpdatesEnabled(true); @@ -1133,6 +1131,8 @@ void SystemTrayApplet::layoutTray() setBackground(); updateClockGeometry(); + + update(); } void SystemTrayApplet::paletteChange(const TQPalette & /* oldPalette */) @@ -1190,43 +1190,43 @@ void TrayEmbed::setBackground() void TrayEmbed::ensureBackgroundSet() { - XWindowAttributes winprops; - XGetWindowAttributes(x11Display(), embeddedWinId(), &winprops); - if (winprops.depth == 32) { - // This is a nasty little hack to make sure that tray icons / applications which do not match our QXEmbed native depth are still displayed properly, - // i.e without irritating white/grey borders where the tray icon's transparency is supposed to be... - // Essentially it converts a 24 bit Xlib Pixmap to a 32 bit Xlib Pixmap - - TQPixmap bg(width(), height()); - - // Get the RGB background image - bg.fill(parentWidget(), pos()); - TQImage bgImage = bg.convertToImage(); - - // Create the ARGB pixmap - Pixmap argbpixmap = XCreatePixmap(x11Display(), embeddedWinId(), width(), height(), 32); - GC gc; - gc = XCreateGC(x11Display(), embeddedWinId(), 0, 0); - int w = bgImage.width(); - int h = bgImage.height(); - for (int y = 0; y < h; ++y) { - TQRgb *ls = (TQRgb *)bgImage.scanLine( y ); - for (int x = 0; x < w; ++x) { - TQRgb l = ls[x]; - int r = int( tqRed( l ) ); - int g = int( tqGreen( l ) ); - int b = int( tqBlue( l ) ); - int a = int( tqAlpha( l ) ); - XSetForeground(x11Display(), gc, (a << 24) | (r << 16) | (g << 8) | b ); - XDrawPoint(x11Display(), argbpixmap, gc, x, y); - } - } - XFlush(x11Display()); - XSetWindowBackgroundPixmap(x11Display(), embeddedWinId(), argbpixmap); - XFreePixmap(x11Display(), argbpixmap); - XFreeGC(x11Display(), gc); - - // Repaint - XClearArea(x11Display(), embeddedWinId(), 0, 0, 0, 0, True); - } + XWindowAttributes winprops; + XGetWindowAttributes(x11Display(), embeddedWinId(), &winprops); + if (winprops.depth == 32) { + // This is a nasty little hack to make sure that tray icons / applications which do not match our QXEmbed native depth are still displayed properly, + // i.e without irritating white/grey borders where the tray icon's transparency is supposed to be... + // Essentially it converts a 24 bit Xlib Pixmap to a 32 bit Xlib Pixmap + + TQPixmap bg(width(), height()); + + // Get the RGB background image + bg.fill(parentWidget(), pos()); + TQImage bgImage = bg.convertToImage(); + + // Create the ARGB pixmap + Pixmap argbpixmap = XCreatePixmap(x11Display(), embeddedWinId(), width(), height(), 32); + GC gc; + gc = XCreateGC(x11Display(), embeddedWinId(), 0, 0); + int w = bgImage.width(); + int h = bgImage.height(); + for (int y = 0; y < h; ++y) { + TQRgb *ls = (TQRgb *)bgImage.scanLine( y ); + for (int x = 0; x < w; ++x) { + TQRgb l = ls[x]; + int r = int( tqRed( l ) ); + int g = int( tqGreen( l ) ); + int b = int( tqBlue( l ) ); + int a = int( tqAlpha( l ) ); + XSetForeground(x11Display(), gc, (a << 24) | (r << 16) | (g << 8) | b ); + XDrawPoint(x11Display(), argbpixmap, gc, x, y); + } + } + XFlush(x11Display()); + XSetWindowBackgroundPixmap(x11Display(), embeddedWinId(), argbpixmap); + XFreePixmap(x11Display(), argbpixmap); + XFreeGC(x11Display(), gc); + + // Repaint + XClearArea(x11Display(), embeddedWinId(), 0, 0, 0, 0, True); + } } diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index d06d42b72..26a02de1c 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -120,9 +120,11 @@ private: int m_iconSize; bool m_showClockInTray; TQCheckBox *m_showClockSettingCB; - uint m_iconMargin; + int m_iconMargin; TQSpinBox *m_iconMarginSB; - TQGridLayout* m_layout; + int m_iconSpacing; + TQSpinBox *m_iconSpacingSB; + TQLayout* m_layout; }; class TrayEmbed : public QXEmbed diff --git a/kicker/data/kmenu_side/kside.png b/kicker/data/kmenu_side/kside.png Binary files differindex 8ec2661c7..af0f0c32f 100755 --- a/kicker/data/kmenu_side/kside.png +++ b/kicker/data/kmenu_side/kside.png diff --git a/kicker/data/kmenu_side/kside_tile.png b/kicker/data/kmenu_side/kside_tile.png Binary files differindex 71ed66308..7129b8b7b 100755 --- a/kicker/data/kmenu_side/kside_tile.png +++ b/kicker/data/kmenu_side/kside_tile.png diff --git a/konqueror/about/top-right-konqueror.png b/konqueror/about/top-right-konqueror.png Binary files differindex 1013b61c6..f685d4a3c 100644 --- a/konqueror/about/top-right-konqueror.png +++ b/konqueror/about/top-right-konqueror.png diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp index 5cd554d55..33424ca52 100644 --- a/konqueror/listview/konq_listview.cpp +++ b/konqueror/listview/konq_listview.cpp @@ -46,7 +46,7 @@ #include <sys/stat.h> #include <time.h> #include <unistd.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <konq_sort_constants.h> diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 437c7bda9..7be580b8b 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -79,7 +79,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // notable exception of the TDEAboutData data #include <tdeaboutdata.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> TDEInstance* KonqSidebarFactory::s_instance = 0L; TDEAboutData* KonqSidebarFactory::s_about = 0L; diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index 3c979d5fc..7e1145854 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ #include "konqsidebartest.moc" -#include <kinstance.h> +#include <tdeinstance.h> extern "C" { diff --git a/kpersonalizer/pics/step3.png b/kpersonalizer/pics/step3.png Binary files differindex 21608b604..47f690668 100755 --- a/kpersonalizer/pics/step3.png +++ b/kpersonalizer/pics/step3.png diff --git a/kpersonalizer/pics/step5.png b/kpersonalizer/pics/step5.png Binary files differindex a61676198..4ea33023f 100755 --- a/kpersonalizer/pics/step5.png +++ b/kpersonalizer/pics/step5.png diff --git a/ksplashml/pics/splash.png b/ksplashml/pics/splash.png Binary files differindex fbdfbe299..295e18bed 100755 --- a/ksplashml/pics/splash.png +++ b/ksplashml/pics/splash.png diff --git a/ksplashml/themeengine/standard/Preview.png b/ksplashml/themeengine/standard/Preview.png Binary files differindex f432c7611..9545b9eac 100644..100755 --- a/ksplashml/themeengine/standard/Preview.png +++ b/ksplashml/themeengine/standard/Preview.png diff --git a/ksplashml/themeengine/standard/pics/Preview.png b/ksplashml/themeengine/standard/pics/Preview.png Binary files differindex b8268e018..ec936a18c 100644..100755 --- a/ksplashml/themeengine/standard/pics/Preview.png +++ b/ksplashml/themeengine/standard/pics/Preview.png diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp index 146090edf..1051ba7eb 100644 --- a/libkonq/knewmenu.cpp +++ b/libkonq/knewmenu.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tdedesktopfile.h> #include <kdirwatch.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kinputdialog.h> #include <tdelocale.h> #include <tdemessagebox.h> diff --git a/libkonq/konq_propsview.cpp b/libkonq/konq_propsview.cpp index 2d525c23c..a5acfa1bf 100644 --- a/libkonq/konq_propsview.cpp +++ b/libkonq/konq_propsview.cpp @@ -29,7 +29,7 @@ #include <tqfile.h> #include <iostream> #include <ktrader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> #include <tdesimpleconfig.h> diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index 3f4c1fc41..fff534978 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -36,7 +36,7 @@ class TDEConfig; * The class KonqPropsView holds the properties for a Konqueror View * * Separating them from the view class allows to store the default - * values (the one read from \<kinstance\>rc) in one instance of this class + * values (the one read from \<tdeinstance\>rc) in one instance of this class * and to have another instance of this class in each view, storing the * current values of the view. * diff --git a/pics/wallpapers/Trinity-lineart.svg b/pics/wallpapers/Trinity-lineart.svg index f83523690..f167d072d 100755 --- a/pics/wallpapers/Trinity-lineart.svg +++ b/pics/wallpapers/Trinity-lineart.svg @@ -6,7 +6,7 @@ height="800" id="svg1" sodipodi:version="0.32" - inkscape:version="1.4.1 (unknown)" + inkscape:version="1.4.2 (unknown)" sodipodi:docname="Trinity-lineart.svg" inkscape:export-filename="Trinity-lineart.png" inkscape:export-xdpi="225" @@ -21,7 +21,8 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"><defs + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"><defs id="defs3"><linearGradient id="linearGradient1823"><stop style="stop-color:#ffffff;stop-opacity:0.0000000;" @@ -506,34 +507,7 @@ - </linearGradient><linearGradient - id="linearGradient10" - inkscape:collect="always"><stop - style="stop-color:#a4cdec;stop-opacity:1;" - offset="0" - id="stop10" /><stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0.61437917" - id="stop3" /><stop - style="stop-color:#a4cdec;stop-opacity:1;" - offset="1" - id="stop11" /></linearGradient><linearGradient - id="linearGradient8" - inkscape:collect="always"><stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0.44533902" - id="stop8" /><stop - style="stop-color:#a4cdec;stop-opacity:1;" - offset="1" - id="stop9" /></linearGradient><linearGradient - id="linearGradient1" - inkscape:collect="always"><stop - style="stop-color:#63b5e8;stop-opacity:1;" - offset="0" - id="stop1" /><stop - style="stop-color:#001b7b;stop-opacity:1;" - offset="1" - id="stop2" /></linearGradient><inkscape:perspective + </linearGradient><inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 111.91846 : 1" inkscape:vp_y="0 : 1000 : 0" @@ -1241,74 +1215,7 @@ - </radialGradient><linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1" - id="linearGradient2-3" - x1="159.31137" - y1="62.696201" - x2="55.129848" - y2="170.78062" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0786978,0,0,1.0786978,-8.4733578,-7.5425968)" /><linearGradient - inkscape:collect="always" - xlink:href="#linearGradient10" - id="linearGradient13-4" - gradientUnits="userSpaceOnUse" - x1="-61.653011" - y1="-56.658314" - x2="215.04774" - y2="232.46077" - gradientTransform="matrix(-1,0,0,1,217.26984,0.07197834)" /><linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32" - id="linearGradient29-7" - gradientUnits="userSpaceOnUse" - x1="127.49177" - y1="98.280273" - x2="51.48325" - y2="177.46597" - gradientTransform="translate(-0.14395669,0.07197834)" /><linearGradient - inkscape:collect="always" - xlink:href="#path1065_2_" - id="linearGradient3" - gradientUnits="userSpaceOnUse" - x1="217.86621" - y1="217.28516" - x2="7.1352701" - y2="6.5542202" /><linearGradient - inkscape:collect="always" - xlink:href="#XMLID_1_" - id="linearGradient4" - gradientUnits="userSpaceOnUse" - x1="214.27441" - y1="213.71484" - x2="10.727790" - y2="10.168220" /><linearGradient - inkscape:collect="always" - xlink:href="#path1067_2_" - id="linearGradient5" - gradientUnits="userSpaceOnUse" - x1="112.50049" - y1="211.02246" - x2="112.50048" - y2="12.813960" /><linearGradient - inkscape:collect="always" - xlink:href="#path1082_2_" - id="linearGradient6" - gradientUnits="userSpaceOnUse" - x1="112.49854" - y1="6.1372099" - x2="112.49853" - y2="129.34680" /><linearGradient - inkscape:collect="always" - xlink:href="#linearGradient8" - id="linearGradient7" - gradientUnits="userSpaceOnUse" - x1="77.470703" - y1="151.55273" - x2="186.59547" - y2="18.10693" /><filter + </radialGradient><filter style="color-interpolation-filters:sRGB;" inkscape:label="Blur" id="filter7" @@ -1318,22 +1225,88 @@ height="1.0734538"><feGaussianBlur stdDeviation="0.94 0.94" result="blur" - id="feGaussianBlur7" /></filter></defs><sodipodi:namedview + id="feGaussianBlur7" /></filter><linearGradient + id="XMLID_1_-3" + gradientUnits="userSpaceOnUse" + x1="90.397" + y1="123.7812" + x2="90.397" + y2="21.4445"> + <stop + offset="0.0000000" + style="stop-color:#ffffff;stop-opacity:1.0000000;" + id="stop1071" /> + + + + + + + <stop + offset="1.0000000" + style="stop-color:#ffffff;stop-opacity:0.0000000;" + id="stop1073" /> + + + + + + + <a:midPointStop + offset="0" + style="stop-color:#FFFFFF" + id="midPointStop1075" /> + + + + + + + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" + id="midPointStop1077" /> + + + + + + + <a:midPointStop + offset="1" + style="stop-color:#000000" + id="midPointStop1079" /> + + + + + + + </linearGradient><linearGradient + y2="943.17517" + x2="110.43429" + y1="782.28998" + x1="150.38568" + gradientTransform="matrix(-0.57006231,0,0,0.28057746,1293.7681,-203.70123)" + gradientUnits="userSpaceOnUse" + id="linearGradient10239-3" + xlink:href="#linearGradient1818" + inkscape:collect="always" /></defs><sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="3.1785021" - inkscape:cx="1095.7992" - inkscape:cy="81.484923" - inkscape:current-layer="svg1" + inkscape:zoom="4.4950808" + inkscape:cx="1172.3927" + inkscape:cy="100.44313" + inkscape:current-layer="g2" gridtolerance="2.0000000px" showgrid="false" guidetolerance="2.0000000px" - inkscape:window-width="1914" - inkscape:window-height="1123" + inkscape:window-width="1908" + inkscape:window-height="1124" inkscape:window-x="1920" inkscape:window-y="0" inkscape:grid-bbox="false" @@ -1369,95 +1342,103 @@ rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><rect - style="opacity:1;fill:#01306f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26412666;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.53846154" + style="opacity:1;fill:#01306f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26413;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.538462" id="rect1107" width="1280.1382" height="800.22717" x="-0.073321879" - y="-0.051684864" /><path + y="-0.051684864" + sodipodi:insensitive="true" /><path style="opacity:1;fill:url(#linearGradient11144);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 1164.7328,-0.69951341 C 1264.2196,258.61376 928.11914,531.4294 910.39831,800.29111 L 1174.2649,800.29111 C 1061.8695,614.77634 1049.9813,404.74614 1280.0864,164.46313 L 1280.0864,-0.69951341 L 1164.7328,-0.69951341 z " - id="path4304" /><path + d="M 1164.7328,-0.69951341 C 1264.2196,258.61376 928.11914,531.4294 910.39831,800.29111 H 1174.2649 C 1061.8695,614.77634 1049.9813,404.74614 1280.0864,164.46313 V -0.69951341 Z" + id="path4304" + sodipodi:insensitive="true" /><path style="opacity:1;fill:url(#linearGradient11147);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 829.67261,-0.49113936 C 1031.4355,464.22183 845.40864,673.83345 580.61988,800.49948 L 825.76602,800.49948 C 904.35813,516.06374 1060.7127,269.57227 1073.3186,-0.49113936 L 829.67261,-0.49113936 z " - id="path4930" /><rect - style="fill:url(#linearGradient1158);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26412666;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.53846154" + d="M 829.67261,-0.49113936 C 1031.4355,464.22183 845.40864,673.83345 580.61988,800.49948 H 825.76602 C 904.35813,516.06374 1060.7127,269.57227 1073.3186,-0.49113936 Z" + id="path4930" + sodipodi:insensitive="true" /><rect + style="fill:url(#linearGradient1158);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26413;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.538462" id="rect1157" width="1280.1105" height="800.1571" x="-0.055212095" - y="-0.07439056" /><path + y="-0.07439056" + sodipodi:insensitive="true" /><path style="opacity:1;fill:url(#linearGradient1811);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 998.67409,0.026826928 C 1178.6349,288.72368 979.67532,511.56754 763.7601,800.25926 L 227.09108,800.07824 C 651.81895,466.19802 1097.6907,427.22589 1135.4818,-0.19987259 L 998.67409,0.026826928 z " + d="M 998.67409,0.02682693 C 1178.6349,288.72368 979.67532,511.56754 763.7601,800.25926 L 227.09108,800.07824 C 651.81895,466.19802 1097.6907,427.22589 1135.4818,-0.19987259 Z" id="path1186" - sodipodi:nodetypes="ccccc" /><path + sodipodi:nodetypes="ccccc" + sodipodi:insensitive="true" /><path style="display:inline;opacity:1;fill:url(#linearGradient3061);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1191.6798,-0.11972768 87.8811,0.06769579 C 1202.4208,283.55831 1121.0568,502.76116 1279.7309,799.79924 l -217.4612,0.35119 C 884.55474,602.8032 1118.9338,215.53806 1191.6798,-0.11972768 Z" id="path2436" - sodipodi:nodetypes="ccccc" /><g + sodipodi:nodetypes="ccccc" + sodipodi:insensitive="true" /><g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - style="display:inline" /><rect + style="display:inline" + sodipodi:insensitive="true" /><rect style="display:inline;opacity:1;fill:none;fill-opacity:0.351598;fill-rule:nonzero;stroke:none;stroke-linejoin:round;stroke-opacity:1" width="176.63861" height="147.9144" x="876.961" y="511.80521" - id="rect1983" /><path - d="m 978.95037,58.564064 h -2.67903 v 8.147766 l -2.76041,0.240885 v -8.388651 h -2.89388 l 0.7194,-2.584629 h 7.61392 z m 4.21223,4.7884 v 3.385408 l -2.65299,0.253905 V 58.81797 l 2.48046,-0.305989 v 1.347653 q 0.30599,-0.602212 0.92122,-0.947263 0.59896,-0.348307 1.29232,-0.348307 0.21158,0 0.38736,0.01302 0.17253,0.0293 0.23763,0.04232 l -0.81054,2.545566 q -0.0293,-0.01302 -0.13346,-0.03906 -0.10743,-0.01302 -0.27995,-0.01302 -0.24089,0 -0.54687,0.07813 -0.54688,0.159505 -0.72266,0.585936 -0.17252,0.442707 -0.19857,1.162106 0.026,0.133463 0.026,0.413411 z m 5.89516,-5.133451 -1.74804,-1.347653 1.5332,-1.585282 1.85546,1.318356 z m -1.33463,0.572915 2.51952,-0.305989 v 8.173808 l -2.51952,0.185546 z m 8.98761,8.134745 v -4.749337 q 0,-1.503902 -0.96029,-1.503902 -0.94726,0 -0.94726,1.503902 v 4.560536 l -2.51952,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.22786,-0.263672 0.21159,-0.227864 0.63802,-0.439452 0.42643,-0.214843 1.10677,-0.253905 0.0684,0 0.13346,0 1.01237,0 1.722,0.719399 0.74544,0.771483 0.74544,1.904292 v 5.628241 z m 6.11976,-8.70766 -1.748,-1.347653 1.5332,-1.585282 1.8554,1.318356 z m -1.3346,0.572915 2.5195,-0.305989 v 8.173808 l -2.5195,0.185546 z m 8.5872,2.291661 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1075,0.214844 0.4265,0.374348 0.1855,0.07813 0.6803,0.133464 0.2279,-0.01302 0.5469,-0.06836 0.306,-0.03906 0.4264,-0.0651 l -0.7324,2.506505 q -0.055,0 -0.2018,0 -0.1465,0.01302 -0.3451,0.01302 -1.2532,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4674,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.2396,1.933589 1.9889,-4.746082 2.4935,0.602212 -4.9219,10.624973 -2.679,-0.361327 1.7741,-3.385408 -3.1999,-6.878238 2.5456,-0.546873 z m 12.4804,-4.63866 v 5.826808 q 1.9075,0 2.7213,-0.8138 0.8138,-0.8138 0.8138,-2.119135 v -0.08138 q -0.042,-1.598303 -0.9472,-2.200516 -0.9212,-0.585936 -2.5879,-0.611977 z m 0.2279,8.333312 h -3.0925 V 55.979435 h 3.252 q 1.7741,0 3.1185,0.598957 1.3476,0.598957 2.08,1.787105 0.7227,1.201169 0.7357,2.932935 0,1.227211 -0.4818,2.252599 -0.4785,1.028643 -1.3053,1.722001 -0.8268,0.693357 -1.9596,1.067705 -1.1328,0.371093 -2.347,0.371093 z m 15.677,-5.706366 -5.1334,3.225904 q 0.1074,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1725,0 0.4264,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3092,-0.211588 0.3092,-0.240885 l 1.2793,1.95963 q -0.1757,0.133464 -0.6152,0.40039 -0.4394,0.266926 -1.1719,0.546874 -0.7487,0.279947 -1.5722,0.292968 -0.029,0 -0.055,0 -1.1979,0 -2.2005,-0.546874 -1.0384,-0.543618 -1.6406,-1.516923 -0.599,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038409 0.4818,-1.972652 0.4915,-0.947263 1.3704,-1.559241 0.8822,-0.611977 1.9759,-0.73242 0.28,-0.02604 0.5469,-0.02604 0.7324,0 1.3867,0.237629 0.8659,0.348307 1.3867,0.839842 0.5176,0.507811 0.7585,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8659,1.692704 2.92,-1.826167 q -0.094,-0.06836 -0.3321,-0.159505 -0.2539,-0.0944 -0.6282,-0.0944 -0.8268,0 -1.3867,0.628253 -0.573,0.638019 -0.573,1.451819 z m 13.5742,-2.958976 -1.5592,1.399736 q 0,-0.02604 -0.094,-0.133464 -0.1074,-0.0944 -0.2279,-0.185546 -0.1204,-0.0944 -0.345,-0.188802 -0.2409,-0.09114 -0.5339,-0.09114 -0.3743,0 -0.6543,0.146484 -0.293,0.159505 -0.306,0.452473 0,0 0,0.02604 0,0.172526 0.267,0.305989 0.2669,0.133463 0.6933,0.214843 0.4264,0.07813 0.8789,0.159505 0.7617,0.146484 1.4421,0.719399 0.651,0.572915 0.651,1.826167 0,0.02604 0,0.05534 -0.013,0.758461 -0.4915,1.386715 -0.4948,0.624999 -1.2793,0.973305 -0.7487,0.31901 -1.6146,0.31901 -0.068,0 -0.1335,0 -1.1198,-0.03906 -2.054,-0.520832 -0.9342,-0.465494 -1.1458,-0.680337 l 1.2923,-1.692704 q 0.2148,0.227864 0.7194,0.546873 0.4948,0.31901 1.1361,0.31901 0,0 0.052,0 0.4525,0 0.7878,-0.185547 0.2799,-0.159504 0.2799,-0.426431 0,-0.02604 0,-0.06836 -0.042,-0.292968 -0.2669,-0.384114 -0.2278,-0.08138 -0.9342,-0.227864 -0.7194,-0.133463 -1.2272,-0.345051 -1.5072,-0.667316 -1.5072,-2.268874 0,-0.758462 0.4264,-1.373695 0.4134,-0.611977 1.1068,-0.960284 0.6803,-0.345051 1.4681,-0.371093 0.1074,0 0.2116,0 1.0417,0 1.9075,0.478515 0.9473,0.546874 1.0547,0.774738 z m 7.1322,7.304669 -2.8809,-3.971345 v 3.613273 l -2.5325,0.240884 V 55.979435 l 2.5325,-0.305988 v 6.425765 l 2.7344,-3.694653 2.4935,0.787759 -2.6791,3.346346 3.0241,3.841136 z m 7.6269,-5.960272 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1075,0.214844 0.4265,0.374348 0.1855,0.07813 0.6803,0.133464 0.2279,-0.01302 0.5469,-0.06836 0.306,-0.03906 0.4264,-0.0651 l -0.7324,2.506505 q -0.055,0 -0.2018,0 -0.1465,0.01302 -0.3451,0.01302 -1.2532,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4674,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.5358,-2.731113 q 0,0 0.1042,0 1.2532,0 2.2395,0.533853 1.0287,0.559895 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5468,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1464,0.01302 -0.2929,0.01302 -1.0287,0 -1.9759,-0.468749 -1.1068,-0.530598 -1.7578,-1.490882 -0.6674,-0.960284 -0.7064,-2.174473 0,-0.08138 0,-0.159505 0,-1.067706 0.5338,-2.02799 0.573,-1.012367 1.5853,-1.637366 0.9994,-0.615232 2.1745,-0.654295 z m 0.1042,2.347 q -0.5306,0.02604 -0.9603,0.279947 -0.4265,0.266926 -0.6641,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5469,-0.546873 0.5469,-1.344397 0,-0.826821 -0.5762,-1.386716 -0.5729,-0.533852 -1.3704,-0.533852 -0.016,0 -0.029,0 z m 12.1874,2.213536 q 0,0 0,-0.16276 0,-0.452473 -0.1758,-0.865884 -0.2246,-0.478514 -0.638,-0.784503 -0.4264,-0.296223 -0.9603,-0.348306 -0.1334,-0.01302 -0.2539,-0.01302 -0.4134,0 -0.8007,0.172526 -0.4916,0.227864 -0.7976,0.641274 -0.3222,0.426431 -0.3873,0.973305 -0.013,0.107421 -0.013,0.198567 0,0.735675 0.5339,1.334632 0.5859,0.693358 1.4388,0.706378 0.8138,0 1.4127,-0.546873 0.599,-0.546874 0.6413,-1.305335 z m -1.722,-4.453114 q 0.029,0 0.055,0 1.0644,0 2.0117,0.546873 0.9733,0.559895 1.5755,1.516924 0.5989,0.973305 0.612,2.148432 0,1.132809 -0.5729,2.148432 -0.573,1.012367 -1.5723,1.611324 -1.0026,0.611978 -2.1615,0.611978 h -0.026 q -0.6803,-0.01302 -1.2272,-0.305989 -0.5599,-0.279947 -0.7748,-0.465494 v 3.066399 l -2.5716,0.240884 V 58.710548 l 2.3861,-0.224609 v 0.960285 q 0.9603,-0.960285 2.2656,-0.986326 z m 9.5085,8.251932 V 55.979435 h 6.3997 l 0.5469,2.373041 h -4.1862 v 1.692704 h 3.011 v 2.373041 h -3.0371 v 1.920568 h 4.5052 l -0.7063,2.373041 z m 13.0012,0.214843 v -4.749337 q 0,-1.503902 -0.9602,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4265,-0.214843 1.1068,-0.253905 0.068,0 0.1335,0 1.0123,0 1.722,0.719399 0.7454,0.771483 0.7454,1.904292 v 5.628241 z m 7.3861,0.598957 -4.1081,-8.548155 2.5195,-0.465494 1.6146,3.746735 1.5886,-3.746735 2.4511,0.465494 z m 7.4284,-9.306617 -1.7481,-1.347653 1.5332,-1.585282 1.8555,1.318356 z m -1.3347,0.572915 2.5195,-0.305989 v 8.173808 l -2.5195,0.185546 z m 7.4935,4.560536 v 3.385408 l -2.653,0.253905 V 58.81797 l 2.4805,-0.305989 v 1.347653 q 0.306,-0.602212 0.9212,-0.947263 0.5989,-0.348307 1.2923,-0.348307 0.2116,0 0.3874,0.01302 0.1725,0.0293 0.2376,0.04232 l -0.8105,2.545566 q -0.029,-0.01302 -0.1335,-0.03906 -0.1074,-0.01302 -0.28,-0.01302 -0.2408,0 -0.5468,0.07813 -0.5469,0.159505 -0.7227,0.585936 -0.1725,0.442707 -0.1986,1.162106 0.026,0.133463 0.026,0.413411 z m 7.9492,-4.999988 q 0,0 0.1042,0 1.2532,0 2.2395,0.533853 1.0287,0.559895 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5468,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1464,0.01302 -0.2929,0.01302 -1.0287,0 -1.9759,-0.468749 -1.1068,-0.530598 -1.7578,-1.490882 -0.6674,-0.960284 -0.7064,-2.174473 0,-0.08138 0,-0.159505 0,-1.067706 0.5338,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9994,-0.615232 2.1745,-0.654295 z m 0.1042,2.347 q -0.5306,0.02604 -0.9603,0.279947 -0.4265,0.266926 -0.6641,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5469,-0.546873 0.5469,-1.344397 0,-0.826821 -0.5762,-1.386716 -0.5729,-0.533852 -1.3705,-0.533852 -0.016,0 -0.029,0 z m 10.1334,6.227197 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2279,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4264,-0.214843 1.1068,-0.253905 0.068,0 0.1334,0 1.0124,0 1.722,0.719399 0.7455,0.771483 0.7455,1.904292 v 5.628241 z m 14.6777,-0.214843 -2.4382,0.159505 v -4.892566 q 0,-0.585936 -0.1595,-0.973305 -0.1334,-0.319009 -0.5599,-0.319009 -0.081,0 -0.1757,0.01302 -0.5176,0.05208 -0.6771,0.41341 -0.1758,0.358072 -0.2018,0.960284 0.026,0.159505 0.026,0.397134 v 4.241526 l -2.4805,0.185547 v -4.853504 q 0,-1.370439 -0.7063,-1.370439 -0.078,0 -0.1726,0.02604 -0.5338,0.09115 -0.6673,0.439452 -0.1465,0.345051 -0.1465,1.201168 v 4.371734 l -2.5455,0.185547 v -8.13149 l 2.373,-0.279948 v 0.80078 q 0,-0.04232 0.1855,-0.240885 0.1758,-0.201823 0.5339,-0.387369 0.3613,-0.185546 0.9603,-0.227864 0.1074,-0.01302 0.2148,-0.01302 0.3451,0 0.638,0.107422 0.3744,0.133463 0.586,0.305989 0.2018,0.188801 0.3483,0.374348 0.1465,0.198567 0.1465,0.240885 0.4524,-0.533853 0.9472,-0.774738 0.4916,-0.227864 1.2142,-0.240885 0,0 0.052,0 0.7324,0 1.3477,0.309244 0.638,0.31901 0.9993,0.917967 0.3581,0.615232 0.3581,1.373694 z m 9.5345,-5.706366 -5.1335,3.225904 q 0.1074,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1726,0 0.4264,-0.04232 0.8658,-0.227864 0.4265,-0.185546 0.7325,-0.400389 0.3092,-0.211588 0.3092,-0.240885 l 1.2793,1.95963 q -0.1758,0.133464 -0.6152,0.40039 -0.4395,0.266926 -1.1719,0.546874 -0.7487,0.279947 -1.5723,0.292968 -0.029,0 -0.055,0 -1.1979,0 -2.2005,-0.546874 -1.0384,-0.543618 -1.6406,-1.516923 -0.599,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038409 0.4817,-1.972652 0.4916,-0.947263 1.3705,-1.559241 0.8821,-0.611977 1.9759,-0.73242 0.2799,-0.02604 0.5469,-0.02604 0.7324,0 1.3867,0.237629 0.8659,0.348307 1.3867,0.839842 0.5176,0.507811 0.7585,0.89518 0.2408,0.387369 0.319,0.572915 z m -5.8659,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.332,-0.159505 -0.2539,-0.0944 -0.6283,-0.0944 -0.8268,0 -1.3867,0.628253 -0.5729,0.638019 -0.5729,1.451819 z m 11.5202,4.228505 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.6381,-0.439452 0.4264,-0.214843 1.1067,-0.253905 0.068,0 0.1335,0 1.0124,0 1.722,0.719399 0.7454,0.771483 0.7454,1.904292 v 5.628241 z m 7.8255,-5.843084 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5468,-0.06836 0.306,-0.03906 0.4265,-0.0651 l -0.7324,2.506505 q -0.055,0 -0.2019,0 -0.1465,0.01302 -0.345,0.01302 -1.2533,0 -2.0541,-0.49479 -1.4127,-0.810545 -1.4127,-2.545567 v -2.867831 h -1.3477 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z" - id="text2" - style="font-size:13.3333px;font-family:Kabel;-inkscape-font-specification:Kabel;text-align:center;text-anchor:middle;opacity:0.323;fill-rule:evenodd;stroke-width:0;filter:url(#filter1)" + id="rect1983" + sodipodi:insensitive="true" /><path + d="m 978.77787,58.382694 h -2.67903 v 8.147766 l -2.76041,0.240885 v -8.388651 h -2.89388 l 0.7194,-2.584629 h 7.61392 z m 4.21223,4.7884 v 3.385408 l -2.65299,0.253905 V 58.6366 l 2.48046,-0.305989 v 1.347653 q 0.30599,-0.602212 0.92122,-0.947263 0.59896,-0.348307 1.29232,-0.348307 0.21158,0 0.38736,0.01302 0.17253,0.0293 0.23763,0.04232 l -0.81054,2.545566 q -0.0293,-0.01302 -0.13346,-0.03906 -0.10743,-0.01302 -0.27995,-0.01302 -0.24089,0 -0.54687,0.07813 -0.54688,0.159504 -0.72266,0.585936 -0.17252,0.442707 -0.19857,1.162106 0.0261,0.133463 0.0261,0.413411 z m 5.89516,-5.133451 -1.74804,-1.347653 1.5332,-1.585282 1.85546,1.318356 z m -1.33463,0.572915 2.51952,-0.305989 v 8.173808 l -2.51952,0.185546 z m 8.98761,8.134745 v -4.749337 q 0,-1.503902 -0.96029,-1.503902 -0.94726,0 -0.94726,1.503902 v 4.560536 l -2.51952,0.214843 v -8.160787 l 2.34699,-0.279947 v 0.904946 q 0,-0.02604 0.22787,-0.263672 0.21159,-0.227864 0.63802,-0.439452 0.42643,-0.214843 1.10677,-0.253905 0.0684,0 0.13346,0 1.01237,0 1.722,0.719399 0.74544,0.771482 0.74544,1.904292 v 5.628241 z m 6.11986,-8.70766 -1.7481,-1.347653 1.5332,-1.585282 1.8555,1.318356 z m -1.3347,0.572915 2.5196,-0.305989 v 8.173808 l -2.5196,0.185546 z m 8.5873,2.291661 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.2395,1.933589 1.989,-4.746082 2.4934,0.602212 -4.9218,10.624973 -2.679,-0.361327 1.774,-3.385408 -3.1998,-6.878238 2.5455,-0.546873 z m 12.4805,-4.63866 v 5.826808 q 1.9075,0 2.7213,-0.8138 0.8138,-0.8138 0.8138,-2.119135 v -0.08138 q -0.042,-1.598304 -0.9472,-2.200516 -0.9213,-0.585936 -2.5879,-0.611977 z m 0.2278,8.333312 h -3.0924 V 55.798065 h 3.2519 q 1.7741,0 3.1185,0.598957 1.3477,0.598957 2.0801,1.787105 0.7226,1.201169 0.7357,2.932935 0,1.227211 -0.4818,2.252599 -0.4785,1.028643 -1.3053,1.722001 -0.8269,0.693357 -1.9597,1.067705 -1.1328,0.371093 -2.347,0.371093 z m 15.6771,-5.706366 -5.1335,3.225904 q 0.1075,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1726,0 0.4264,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3092,-0.211588 0.3092,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6152,0.40039 -0.4395,0.266926 -1.1719,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.1979,0 -2.2005,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.599,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3704,-1.559241 0.8822,-0.611977 1.9759,-0.73242 0.28,-0.02604 0.5469,-0.02604 0.7324,0 1.3867,0.237629 0.8659,0.348307 1.3867,0.839842 0.5176,0.507811 0.7585,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8659,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.332,-0.159505 -0.2539,-0.0944 -0.6283,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 13.5742,-2.958977 -1.5592,1.399736 q 0,-0.02604 -0.094,-0.133463 -0.1074,-0.0944 -0.2278,-0.185546 -0.1205,-0.0944 -0.3451,-0.188802 -0.2409,-0.09114 -0.5338,-0.09114 -0.3744,0 -0.6543,0.146484 -0.293,0.159504 -0.306,0.452472 0,0 0,0.02604 0,0.172526 0.2669,0.305989 0.267,0.133463 0.6934,0.214843 0.4264,0.07813 0.8789,0.159505 0.7617,0.146484 1.442,0.719399 0.6511,0.572915 0.6511,1.826167 0,0.02604 0,0.05534 -0.013,0.758461 -0.4916,1.386715 -0.4947,0.624998 -1.2792,0.973305 -0.7487,0.319009 -1.6146,0.319009 -0.068,0 -0.1335,0 -1.1198,-0.03906 -2.054,-0.520832 -0.9343,-0.465493 -1.1459,-0.680336 l 1.2924,-1.692704 q 0.2148,0.227864 0.7194,0.546873 0.4948,0.31901 1.136,0.31901 0,0 0.052,0 0.4525,0 0.7878,-0.185547 0.2799,-0.159504 0.2799,-0.426431 0,-0.02604 0,-0.06836 -0.042,-0.292968 -0.2669,-0.384114 -0.2279,-0.08138 -0.9343,-0.227864 -0.7194,-0.133463 -1.2272,-0.345051 -1.5071,-0.667316 -1.5071,-2.268874 0,-0.758462 0.4264,-1.373695 0.4134,-0.611977 1.1068,-0.960284 0.6803,-0.345051 1.4681,-0.371093 0.1074,0 0.2116,0 1.0416,0 1.9075,0.478515 0.9473,0.546873 1.0547,0.774737 z m 7.1321,7.304669 -2.8808,-3.971344 v 3.613272 l -2.5326,0.240885 V 55.798065 l 2.5326,-0.305989 v 6.425765 l 2.7344,-3.694652 2.4934,0.787759 -2.679,3.346345 3.0241,3.841137 z m 7.627,-5.960271 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.5358,-2.731113 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7063,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5338,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 12.1875,2.213536 q 0,0 0,-0.16276 0,-0.452472 -0.1758,-0.865883 -0.2246,-0.478514 -0.638,-0.784503 -0.4264,-0.296223 -0.9603,-0.348306 -0.1335,-0.01302 -0.2539,-0.01302 -0.4134,0 -0.8008,0.172525 -0.4915,0.227864 -0.7975,0.641275 -0.3223,0.426431 -0.3874,0.973305 -0.013,0.107421 -0.013,0.198567 0,0.735675 0.5339,1.334632 0.5859,0.693358 1.4388,0.706378 0.8138,0 1.4127,-0.546873 0.599,-0.546874 0.6413,-1.305336 z m -1.722,-4.453113 q 0.029,0 0.055,0 1.0645,0 2.0117,0.546873 0.9733,0.559895 1.5756,1.516924 0.5989,0.973304 0.6119,2.148432 0,1.132809 -0.5729,2.148432 -0.5729,1.012367 -1.5722,1.611324 -1.0026,0.611977 -2.1615,0.611977 h -0.026 q -0.6804,-0.01302 -1.2272,-0.305988 -0.5599,-0.279948 -0.7748,-0.465494 v 3.066399 l -2.5716,0.240884 V 58.529178 l 2.3861,-0.224609 v 0.960284 q 0.9603,-0.960284 2.2656,-0.986325 z m 9.5084,8.251932 V 55.798065 h 6.3998 l 0.5468,2.373041 h -4.1862 v 1.692704 h 3.0111 v 2.373041 h -3.0371 v 1.920568 h 4.5052 l -0.7064,2.373041 z m 13.0013,0.214843 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5196,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2279,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4264,-0.214843 1.1068,-0.253905 0.068,0 0.1334,0 1.0124,0 1.722,0.719399 0.7455,0.771482 0.7455,1.904292 v 5.628241 z m 7.3861,0.598957 -4.1081,-8.548155 2.5195,-0.465494 1.6146,3.746735 1.5885,-3.746735 2.4512,0.465494 z m 7.4283,-9.306617 -1.748,-1.347653 1.5332,-1.585282 1.8554,1.318356 z m -1.3346,0.572915 2.5195,-0.305989 v 8.173808 l -2.5195,0.185546 z m 7.4935,4.560536 v 3.385408 l -2.653,0.253905 V 58.6366 l 2.4804,-0.305989 v 1.347653 q 0.306,-0.602212 0.9213,-0.947263 0.5989,-0.348307 1.2923,-0.348307 0.2116,0 0.3873,0.01302 0.1726,0.0293 0.2377,0.04232 l -0.8106,2.545566 q -0.029,-0.01302 -0.1334,-0.03906 -0.1075,-0.01302 -0.28,-0.01302 -0.2409,0 -0.5469,0.07813 -0.5468,0.159504 -0.7226,0.585936 -0.1725,0.442707 -0.1986,1.162106 0.026,0.133463 0.026,0.413411 z m 7.9492,-4.999988 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7064,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5339,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 10.1335,6.227198 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.6381,-0.439452 0.4264,-0.214843 1.1067,-0.253905 0.068,0 0.1335,0 1.0124,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 v 5.628241 z m 14.6777,-0.214843 -2.4382,0.159505 v -4.892566 q 0,-0.585936 -0.1595,-0.973305 -0.1335,-0.319009 -0.5599,-0.319009 -0.081,0 -0.1758,0.01302 -0.5175,0.05208 -0.6771,0.413411 -0.1757,0.358072 -0.2018,0.960284 0.026,0.159505 0.026,0.397134 v 4.241526 l -2.4805,0.185546 v -4.853503 q 0,-1.370439 -0.7064,-1.370439 -0.078,0 -0.1725,0.02604 -0.5339,0.09115 -0.6673,0.439452 -0.1465,0.345052 -0.1465,1.201169 v 4.371735 l -2.5456,0.185546 v -8.131489 l 2.3731,-0.279948 v 0.80078 q 0,-0.04232 0.1855,-0.240885 0.1758,-0.201823 0.5339,-0.387369 0.3613,-0.185546 0.9603,-0.227864 0.1074,-0.01302 0.2148,-0.01302 0.3451,0 0.638,0.107422 0.3744,0.133463 0.586,0.305989 0.2018,0.188801 0.3483,0.374348 0.1464,0.198567 0.1464,0.240884 0.4525,-0.533852 0.9473,-0.774737 0.4915,-0.227864 1.2142,-0.240885 0,0 0.052,0 0.7324,0 1.3476,0.309244 0.6381,0.31901 0.9994,0.917966 0.3581,0.615233 0.3581,1.373695 z m 9.5344,-5.706366 -5.1334,3.225904 q 0.1074,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1725,0 0.4265,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3093,-0.211588 0.3093,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6153,0.40039 -0.4394,0.266926 -1.1718,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.198,0 -2.2006,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.5989,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3705,-1.559241 0.8821,-0.611977 1.9759,-0.73242 0.2799,-0.02604 0.5468,-0.02604 0.7325,0 1.3867,0.237629 0.8659,0.348307 1.3868,0.839842 0.5175,0.507811 0.7584,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8658,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.3321,-0.159505 -0.2539,-0.0944 -0.6282,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 11.5201,4.228505 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4265,-0.214843 1.1068,-0.253905 0.068,0 0.1335,0 1.0123,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 v 5.628241 z m 7.8255,-5.843084 v 2.268875 q 0,0.546873 0.1205,0.74544 0.1074,0.214844 0.4264,0.374348 0.1855,0.07813 0.6803,0.133464 0.2279,-0.01302 0.5469,-0.06836 0.306,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2018,0 -0.1465,0.01302 -0.3451,0.01302 -1.2532,0 -2.054,-0.49479 -1.4127,-0.810545 -1.4127,-2.545567 v -2.867831 h -1.3477 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4674,-1.012368 v 2.571608 h 1.6276 v 2.239578 z" + id="path1" + style="font-size:13.3333px;font-family:Kabel;-inkscape-font-specification:Kabel;text-align:center;text-anchor:middle;opacity:0.321;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0" aria-label="Trinity Desktop Environment" /><path - d="m 977.33184,57.159134 h -2.67903 V 65.3069 l -2.76041,0.240885 v -8.388651 h -2.89388 l 0.7194,-2.584629 h 7.61392 z m 4.21223,4.7884 v 3.385408 l -2.65299,0.253905 V 57.41304 l 2.48046,-0.305989 v 1.347653 q 0.30599,-0.602212 0.92122,-0.947263 0.59896,-0.348307 1.29232,-0.348307 0.21158,0 0.38736,0.01302 0.17253,0.0293 0.23763,0.04232 l -0.81054,2.545566 q -0.0293,-0.01302 -0.13346,-0.03906 -0.10743,-0.01302 -0.27995,-0.01302 -0.24089,0 -0.54687,0.07813 -0.54688,0.159504 -0.72266,0.585936 -0.17252,0.442707 -0.19857,1.162106 0.0261,0.133463 0.0261,0.413411 z m 5.89516,-5.133451 -1.74804,-1.347653 1.5332,-1.585282 1.85546,1.318356 z m -1.33463,0.572915 2.51952,-0.305989 v 8.173808 l -2.51952,0.185546 z m 8.98761,8.134745 v -4.749337 q 0,-1.503902 -0.96029,-1.503902 -0.94726,0 -0.94726,1.503902 v 4.560536 l -2.51952,0.214843 v -8.160787 l 2.34699,-0.279947 v 0.904946 q 0,-0.02604 0.22787,-0.263672 0.21159,-0.227864 0.63802,-0.439452 0.42643,-0.214843 1.10677,-0.253905 0.0684,0 0.13346,0 1.01237,0 1.722,0.719399 0.74544,0.771482 0.74544,1.904292 V 65.3069 Z m 6.11979,-8.70766 -1.74806,-1.347653 1.53316,-1.585282 1.8555,1.318356 z m -1.33465,0.572915 2.51955,-0.305989 v 8.173808 l -2.51955,0.185546 z m 8.58725,2.291661 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.2395,1.933589 1.989,-4.746082 2.4934,0.602212 -4.9218,10.624973 -2.679,-0.361327 1.774,-3.385408 -3.1998,-6.878238 2.5455,-0.546873 z m 12.4805,-4.63866 v 5.826808 q 1.9075,0 2.7213,-0.8138 0.8138,-0.8138 0.8138,-2.119135 v -0.08138 q -0.042,-1.598304 -0.9472,-2.200516 -0.9213,-0.585936 -2.5879,-0.611977 z m 0.2278,8.333312 H 1025.32 V 54.574505 h 3.2519 q 1.7741,0 3.1185,0.598957 1.3477,0.598957 2.0801,1.787105 0.7226,1.201169 0.7357,2.932935 0,1.227211 -0.4818,2.252599 -0.4785,1.028643 -1.3053,1.722001 -0.8269,0.693357 -1.9597,1.067705 -1.1328,0.371093 -2.347,0.371093 z m 15.6771,-5.706366 -5.1335,3.225904 q 0.1075,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1726,0 0.4264,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3092,-0.211588 0.3092,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6152,0.40039 -0.4395,0.266926 -1.1719,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.1979,0 -2.2005,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.599,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3704,-1.559241 0.8822,-0.611977 1.9759,-0.73242 0.28,-0.02604 0.5469,-0.02604 0.7324,0 1.3867,0.237629 0.8659,0.348307 1.3867,0.839842 0.5176,0.507811 0.7585,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8659,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.332,-0.159505 -0.2539,-0.0944 -0.6283,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451819 z m 13.5742,-2.958977 -1.5592,1.399736 q 0,-0.02604 -0.094,-0.133463 -0.1074,-0.0944 -0.2278,-0.185546 -0.1205,-0.0944 -0.3451,-0.188802 -0.2409,-0.09114 -0.5338,-0.09114 -0.3744,0 -0.6543,0.146484 -0.293,0.159504 -0.306,0.452472 0,0 0,0.02604 0,0.172526 0.2669,0.305989 0.267,0.133463 0.6934,0.214843 0.4264,0.07813 0.8789,0.159505 0.7617,0.146484 1.442,0.719399 0.6511,0.572915 0.6511,1.826167 0,0.02604 0,0.05534 -0.013,0.758461 -0.4916,1.386715 -0.4947,0.624998 -1.2792,0.973305 -0.7487,0.319009 -1.6146,0.319009 -0.068,0 -0.1335,0 -1.1198,-0.03906 -2.054,-0.520832 -0.9343,-0.465493 -1.1459,-0.680336 l 1.2924,-1.692704 q 0.2148,0.227864 0.7194,0.546873 0.4948,0.31901 1.136,0.31901 0,0 0.052,0 0.4525,0 0.7878,-0.185547 0.2799,-0.159504 0.2799,-0.426431 0,-0.02604 0,-0.06836 -0.042,-0.292968 -0.2669,-0.384114 -0.2279,-0.08138 -0.9343,-0.227864 -0.7194,-0.133463 -1.2272,-0.345051 -1.5071,-0.667316 -1.5071,-2.268874 0,-0.758462 0.4264,-1.373695 0.4134,-0.611977 1.1068,-0.960284 0.6803,-0.345051 1.4681,-0.371093 0.1074,0 0.2116,0 1.0416,0 1.9075,0.478515 0.9473,0.546873 1.0547,0.774737 z m 7.1321,7.304669 -2.8808,-3.971344 v 3.613272 l -2.5326,0.240885 V 54.574505 l 2.5326,-0.305989 v 6.425765 l 2.7344,-3.694652 2.4934,0.787759 -2.679,3.346345 3.0241,3.841137 z m 7.627,-5.960271 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.5358,-2.731113 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7063,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5338,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 12.1875,2.213536 q 0,0 0,-0.16276 0,-0.452472 -0.1758,-0.865883 -0.2246,-0.478514 -0.638,-0.784503 -0.4264,-0.296223 -0.9603,-0.348306 -0.1335,-0.01302 -0.2539,-0.01302 -0.4134,0 -0.8008,0.172525 -0.4915,0.227864 -0.7975,0.641275 -0.3223,0.426431 -0.3874,0.973305 -0.013,0.107421 -0.013,0.198567 0,0.735675 0.5339,1.334632 0.5859,0.693358 1.4388,0.706378 0.8138,0 1.4127,-0.546873 0.599,-0.546874 0.6413,-1.305336 z m -1.722,-4.453113 q 0.029,0 0.055,0 1.0645,0 2.0117,0.546873 0.9733,0.559895 1.5756,1.516924 0.5989,0.973304 0.6119,2.148432 0,1.132809 -0.5729,2.148432 -0.5729,1.012367 -1.5722,1.611324 -1.0026,0.611977 -2.1615,0.611977 h -0.026 q -0.6804,-0.01302 -1.2272,-0.305988 -0.5599,-0.279948 -0.7748,-0.465494 v 3.066399 l -2.5716,0.240884 V 57.305618 l 2.3861,-0.224609 v 0.960284 q 0.9603,-0.960284 2.2656,-0.986325 z m 9.5084,8.251932 V 54.574505 h 6.3998 l 0.5468,2.373041 h -4.1862 v 1.692704 h 3.0111 v 2.373041 h -3.0371 v 1.920568 h 4.5052 l -0.7064,2.373041 z m 13.0013,0.214843 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5196,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2279,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4264,-0.214843 1.1068,-0.253905 0.068,0 0.1334,0 1.0124,0 1.722,0.719399 0.7455,0.771482 0.7455,1.904292 V 65.3069 Z m 7.3861,0.598957 -4.1081,-8.548155 2.5195,-0.465494 1.6146,3.746735 1.5885,-3.746735 2.4512,0.465494 z m 7.4283,-9.306617 -1.748,-1.347653 1.5332,-1.585282 1.8554,1.318356 z m -1.3346,0.572915 2.5195,-0.305989 v 8.173808 l -2.5195,0.185546 z m 7.4935,4.560536 v 3.385408 l -2.653,0.253905 V 57.41304 l 2.4804,-0.305989 v 1.347653 q 0.306,-0.602212 0.9213,-0.947263 0.5989,-0.348307 1.2923,-0.348307 0.2116,0 0.3873,0.01302 0.1726,0.0293 0.2377,0.04232 l -0.8106,2.545566 q -0.029,-0.01302 -0.1334,-0.03906 -0.1075,-0.01302 -0.28,-0.01302 -0.2409,0 -0.5469,0.07813 -0.5468,0.159504 -0.7226,0.585936 -0.1725,0.442707 -0.1986,1.162106 0.026,0.133463 0.026,0.413411 z m 7.9492,-4.999988 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7064,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5339,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 10.1335,6.227198 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.6381,-0.439452 0.4264,-0.214843 1.1067,-0.253905 0.068,0 0.1335,0 1.0124,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 V 65.3069 Z m 14.6777,-0.214843 -2.4382,0.159505 v -4.892566 q 0,-0.585936 -0.1595,-0.973305 -0.1335,-0.319009 -0.5599,-0.319009 -0.081,0 -0.1758,0.01302 -0.5175,0.05208 -0.6771,0.413411 -0.1757,0.358072 -0.2018,0.960284 0.026,0.159505 0.026,0.397134 V 65.3069 l -2.4805,0.185546 v -4.853503 q 0,-1.370439 -0.7064,-1.370439 -0.078,0 -0.1725,0.02604 -0.5339,0.09115 -0.6673,0.439452 -0.1465,0.345052 -0.1465,1.201169 V 65.3069 l -2.5456,0.185546 v -8.131489 l 2.3731,-0.279948 v 0.80078 q 0,-0.04232 0.1855,-0.240885 0.1758,-0.201823 0.5339,-0.387369 0.3613,-0.185546 0.9603,-0.227864 0.1074,-0.01302 0.2148,-0.01302 0.3451,0 0.638,0.107422 0.3744,0.133463 0.586,0.305989 0.2018,0.188801 0.3483,0.374348 0.1464,0.198567 0.1464,0.240884 0.4525,-0.533852 0.9473,-0.774737 0.4915,-0.227864 1.2142,-0.240885 0,0 0.052,0 0.7324,0 1.3476,0.309244 0.6381,0.31901 0.9994,0.917966 0.3581,0.615233 0.3581,1.373695 z m 9.5344,-5.706366 -5.1334,3.225904 q 0.1074,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1725,0 0.4265,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3093,-0.211588 0.3093,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6153,0.40039 -0.4394,0.266926 -1.1718,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.198,0 -2.2006,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.5989,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3705,-1.559241 0.8821,-0.611977 1.9759,-0.73242 0.2799,-0.02604 0.5468,-0.02604 0.7325,0 1.3867,0.237629 0.8659,0.348307 1.3868,0.839842 0.5175,0.507811 0.7584,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8658,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.3321,-0.159505 -0.2539,-0.0944 -0.6282,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451819 z m 11.5201,4.228505 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4265,-0.214843 1.1068,-0.253905 0.068,0 0.1335,0 1.0123,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 V 65.3069 Z m 7.8255,-5.843084 v 2.268875 q 0,0.546873 0.1205,0.74544 0.1074,0.214844 0.4264,0.374348 0.1855,0.07813 0.6803,0.133464 0.2279,-0.01302 0.5469,-0.06836 0.306,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2018,0 -0.1465,0.01302 -0.3451,0.01302 -1.2532,0 -2.054,-0.49479 -1.4127,-0.810545 -1.4127,-2.545567 v -2.867831 h -1.3477 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4674,-1.012368 v 2.571608 h 1.6276 v 2.239578 z" + d="m 977.33184,57.159134 h -2.67903 V 65.3069 l -2.76041,0.240885 v -8.388651 h -2.89388 l 0.7194,-2.584629 h 7.61392 z m 4.21223,4.7884 v 3.385408 l -2.65299,0.253905 V 57.41304 l 2.48046,-0.305989 v 1.347653 q 0.30599,-0.602212 0.92122,-0.947263 0.59896,-0.348307 1.29232,-0.348307 0.21158,0 0.38736,0.01302 0.17253,0.0293 0.23763,0.04232 l -0.81054,2.545566 q -0.0293,-0.01302 -0.13346,-0.03906 -0.10743,-0.01302 -0.27995,-0.01302 -0.24089,0 -0.54687,0.07813 -0.54688,0.159504 -0.72266,0.585936 -0.17252,0.442707 -0.19857,1.162106 0.0261,0.133463 0.0261,0.413411 z m 5.89516,-5.133451 -1.74804,-1.347653 1.5332,-1.585282 1.85546,1.318356 z m -1.33463,0.572915 2.51952,-0.305989 v 8.173808 l -2.51952,0.185546 z m 8.98761,8.134745 v -4.749337 q 0,-1.503902 -0.96029,-1.503902 -0.94726,0 -0.94726,1.503902 v 4.560536 l -2.51952,0.214843 v -8.160787 l 2.34699,-0.279947 v 0.904946 q 0,-0.02604 0.22787,-0.263672 0.21159,-0.227864 0.63802,-0.439452 0.42643,-0.214843 1.10677,-0.253905 0.0684,0 0.13346,0 1.01237,0 1.722,0.719399 0.74544,0.771482 0.74544,1.904292 V 65.3069 Z m 6.11979,-8.70766 -1.74806,-1.347653 1.53316,-1.585282 1.8555,1.318356 z m -1.33465,0.572915 2.51955,-0.305989 v 8.173808 l -2.51955,0.185546 z m 8.58725,2.291661 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.2395,1.933589 1.989,-4.746082 2.4934,0.602212 -4.9218,10.624973 -2.679,-0.361327 1.774,-3.385408 -3.1998,-6.878238 2.5455,-0.546873 z m 12.4805,-4.63866 v 5.826808 q 1.9075,0 2.7213,-0.8138 0.8138,-0.8138 0.8138,-2.119135 v -0.08138 q -0.042,-1.598304 -0.9472,-2.200516 -0.9213,-0.585936 -2.5879,-0.611977 z m 0.2278,8.333312 H 1025.32 V 54.574505 h 3.2519 q 1.7741,0 3.1185,0.598957 1.3477,0.598957 2.0801,1.787105 0.7226,1.201169 0.7357,2.932935 0,1.227211 -0.4818,2.252599 -0.4785,1.028643 -1.3053,1.722001 -0.8269,0.693357 -1.9597,1.067705 -1.1328,0.371093 -2.347,0.371093 z m 15.6771,-5.706366 -5.1335,3.225904 q 0.1075,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1726,0 0.4264,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3092,-0.211588 0.3092,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6152,0.40039 -0.4395,0.266926 -1.1719,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.1979,0 -2.2005,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.599,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3704,-1.559241 0.8822,-0.611977 1.9759,-0.73242 0.28,-0.02604 0.5469,-0.02604 0.7324,0 1.3867,0.237629 0.8659,0.348307 1.3867,0.839842 0.5176,0.507811 0.7585,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8659,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.332,-0.159505 -0.2539,-0.0944 -0.6283,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 13.5742,-2.958977 -1.5592,1.399736 q 0,-0.02604 -0.094,-0.133463 -0.1074,-0.0944 -0.2278,-0.185546 -0.1205,-0.0944 -0.3451,-0.188802 -0.2409,-0.09114 -0.5338,-0.09114 -0.3744,0 -0.6543,0.146484 -0.293,0.159504 -0.306,0.452472 0,0 0,0.02604 0,0.172526 0.2669,0.305989 0.267,0.133463 0.6934,0.214843 0.4264,0.07813 0.8789,0.159505 0.7617,0.146484 1.442,0.719399 0.6511,0.572915 0.6511,1.826167 0,0.02604 0,0.05534 -0.013,0.758461 -0.4916,1.386715 -0.4947,0.624998 -1.2792,0.973305 -0.7487,0.319009 -1.6146,0.319009 -0.068,0 -0.1335,0 -1.1198,-0.03906 -2.054,-0.520832 -0.9343,-0.465493 -1.1459,-0.680336 l 1.2924,-1.692704 q 0.2148,0.227864 0.7194,0.546873 0.4948,0.31901 1.136,0.31901 0,0 0.052,0 0.4525,0 0.7878,-0.185547 0.2799,-0.159504 0.2799,-0.426431 0,-0.02604 0,-0.06836 -0.042,-0.292968 -0.2669,-0.384114 -0.2279,-0.08138 -0.9343,-0.227864 -0.7194,-0.133463 -1.2272,-0.345051 -1.5071,-0.667316 -1.5071,-2.268874 0,-0.758462 0.4264,-1.373695 0.4134,-0.611977 1.1068,-0.960284 0.6803,-0.345051 1.4681,-0.371093 0.1074,0 0.2116,0 1.0416,0 1.9075,0.478515 0.9473,0.546873 1.0547,0.774737 z m 7.1321,7.304669 -2.8808,-3.971344 v 3.613272 l -2.5326,0.240885 V 54.574505 l 2.5326,-0.305989 v 6.425765 l 2.7344,-3.694652 2.4934,0.787759 -2.679,3.346345 3.0241,3.841137 z m 7.627,-5.960271 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.5358,-2.731113 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7063,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5338,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 12.1875,2.213536 q 0,0 0,-0.16276 0,-0.452472 -0.1758,-0.865883 -0.2246,-0.478514 -0.638,-0.784503 -0.4264,-0.296223 -0.9603,-0.348306 -0.1335,-0.01302 -0.2539,-0.01302 -0.4134,0 -0.8008,0.172525 -0.4915,0.227864 -0.7975,0.641275 -0.3223,0.426431 -0.3874,0.973305 -0.013,0.107421 -0.013,0.198567 0,0.735675 0.5339,1.334632 0.5859,0.693358 1.4388,0.706378 0.8138,0 1.4127,-0.546873 0.599,-0.546874 0.6413,-1.305336 z m -1.722,-4.453113 q 0.029,0 0.055,0 1.0645,0 2.0117,0.546873 0.9733,0.559895 1.5756,1.516924 0.5989,0.973304 0.6119,2.148432 0,1.132809 -0.5729,2.148432 -0.5729,1.012367 -1.5722,1.611324 -1.0026,0.611977 -2.1615,0.611977 h -0.026 q -0.6804,-0.01302 -1.2272,-0.305988 -0.5599,-0.279948 -0.7748,-0.465494 v 3.066399 l -2.5716,0.240884 V 57.305618 l 2.3861,-0.224609 v 0.960284 q 0.9603,-0.960284 2.2656,-0.986325 z m 9.5084,8.251932 V 54.574505 h 6.3998 l 0.5468,2.373041 h -4.1862 v 1.692704 h 3.0111 v 2.373041 h -3.0371 v 1.920568 h 4.5052 l -0.7064,2.373041 z m 13.0013,0.214843 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5196,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2279,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4264,-0.214843 1.1068,-0.253905 0.068,0 0.1334,0 1.0124,0 1.722,0.719399 0.7455,0.771482 0.7455,1.904292 V 65.3069 Z m 7.3861,0.598957 -4.1081,-8.548155 2.5195,-0.465494 1.6146,3.746735 1.5885,-3.746735 2.4512,0.465494 z m 7.4283,-9.306617 -1.748,-1.347653 1.5332,-1.585282 1.8554,1.318356 z m -1.3346,0.572915 2.5195,-0.305989 v 8.173808 l -2.5195,0.185546 z m 7.4935,4.560536 v 3.385408 l -2.653,0.253905 V 57.41304 l 2.4804,-0.305989 v 1.347653 q 0.306,-0.602212 0.9213,-0.947263 0.5989,-0.348307 1.2923,-0.348307 0.2116,0 0.3873,0.01302 0.1726,0.0293 0.2377,0.04232 l -0.8106,2.545566 q -0.029,-0.01302 -0.1334,-0.03906 -0.1075,-0.01302 -0.28,-0.01302 -0.2409,0 -0.5469,0.07813 -0.5468,0.159504 -0.7226,0.585936 -0.1725,0.442707 -0.1986,1.162106 0.026,0.133463 0.026,0.413411 z m 7.9492,-4.999988 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7064,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5339,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 10.1335,6.227198 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.6381,-0.439452 0.4264,-0.214843 1.1067,-0.253905 0.068,0 0.1335,0 1.0124,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 V 65.3069 Z m 14.6777,-0.214843 -2.4382,0.159505 v -4.892566 q 0,-0.585936 -0.1595,-0.973305 -0.1335,-0.319009 -0.5599,-0.319009 -0.081,0 -0.1758,0.01302 -0.5175,0.05208 -0.6771,0.413411 -0.1757,0.358072 -0.2018,0.960284 0.026,0.159505 0.026,0.397134 V 65.3069 l -2.4805,0.185546 v -4.853503 q 0,-1.370439 -0.7064,-1.370439 -0.078,0 -0.1725,0.02604 -0.5339,0.09115 -0.6673,0.439452 -0.1465,0.345052 -0.1465,1.201169 V 65.3069 l -2.5456,0.185546 v -8.131489 l 2.3731,-0.279948 v 0.80078 q 0,-0.04232 0.1855,-0.240885 0.1758,-0.201823 0.5339,-0.387369 0.3613,-0.185546 0.9603,-0.227864 0.1074,-0.01302 0.2148,-0.01302 0.3451,0 0.638,0.107422 0.3744,0.133463 0.586,0.305989 0.2018,0.188801 0.3483,0.374348 0.1464,0.198567 0.1464,0.240884 0.4525,-0.533852 0.9473,-0.774737 0.4915,-0.227864 1.2142,-0.240885 0,0 0.052,0 0.7324,0 1.3476,0.309244 0.6381,0.31901 0.9994,0.917966 0.3581,0.615233 0.3581,1.373695 z m 9.5344,-5.706366 -5.1334,3.225904 q 0.1074,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1725,0 0.4265,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3093,-0.211588 0.3093,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6153,0.40039 -0.4394,0.266926 -1.1718,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.198,0 -2.2006,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.5989,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3705,-1.559241 0.8821,-0.611977 1.9759,-0.73242 0.2799,-0.02604 0.5468,-0.02604 0.7325,0 1.3867,0.237629 0.8659,0.348307 1.3868,0.839842 0.5175,0.507811 0.7584,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8658,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.3321,-0.159505 -0.2539,-0.0944 -0.6282,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 11.5201,4.228505 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4265,-0.214843 1.1068,-0.253905 0.068,0 0.1335,0 1.0123,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 V 65.3069 Z m 7.8255,-5.843084 v 2.268875 q 0,0.546873 0.1205,0.74544 0.1074,0.214844 0.4264,0.374348 0.1855,0.07813 0.6803,0.133464 0.2279,-0.01302 0.5469,-0.06836 0.306,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2018,0 -0.1465,0.01302 -0.3451,0.01302 -1.2532,0 -2.054,-0.49479 -1.4127,-0.810545 -1.4127,-2.545567 v -2.867831 h -1.3477 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4674,-1.012368 v 2.571608 h 1.6276 v 2.239578 z" id="text1" style="font-size:13.3333px;font-family:Kabel;-inkscape-font-specification:Kabel;text-align:center;text-anchor:middle;fill:#ffffff;fill-rule:evenodd;stroke-width:0" - aria-label="Trinity Desktop Environment" /><path - d="m 1200.183,32.471617 h 48.9583 c 3.5166,0 6.3935,2.877037 6.3935,6.393369 v 48.639489 c 0,3.5166 -2.8769,6.393504 -6.3935,6.393504 h -48.9583 c -3.5167,0 -6.3937,-2.876901 -6.3937,-6.393504 V 38.864986 c 0,-3.516332 2.877,-6.393369 6.3937,-6.393369 z" - style="display:inline;fill:#000000;fill-opacity:1;stroke-width:0.274425;opacity:0.322;filter:url(#filter7)" - id="path1065_1_-6" - sodipodi:nodetypes="sssssssss" /><g - id="g1" - transform="matrix(0.27442463,0,0,0.27442463,1190.7053,29.409466)" - style="display:inline"><path - d="M 23.29883,0 H 201.70215 C 214.5166,0 225,10.48389 225,23.29736 v 177.2417 c 0,12.81445 -10.4834,23.29785 -23.29785,23.29785 H 23.29883 C 10.48389,223.83691 0,213.35352 0,200.53906 V 23.29736 C 0,10.48389 10.48389,0 23.29883,0 Z" - style="fill:url(#linearGradient3)" - id="path1065_1_" /><path - d="m 22.11377,5.60547 h 180.77295 c 9.10156,0 16.52734,7.42822 16.52734,16.52783 v 179.56787 c 0,9.10059 -7.42578,16.62012 -16.52734,16.62012 H 22.11377 c -9.09912,0 -16.52783,-7.51953 -16.52783,-16.62012 V 22.1333 C 5.58496,13.03369 13.01465,5.60547 22.11377,5.60547 Z" - style="fill:url(#linearGradient4)" - id="path111-8" /><path - d="m 25.26953,9.31934 h 174.46094 c 8.78223,0 15.95117,7.16846 15.95117,15.95068 v 173.29736 c 0,8.78223 -7.16895,16.04102 -15.95117,16.04102 H 25.26953 c -8.78174,0 -15.94971,-7.25879 -15.94971,-16.04102 V 25.27002 C 9.31836,16.48779 16.48779,9.31934 25.26953,9.31934 Z" - style="fill:#ffffff" - id="path113-4" /><path - d="m 25.62744,12.81348 h 173.74561 c 6.9873,0 12.72266,5.73535 12.72266,12.81396 V 198.2998 c 0,6.98828 -5.73438,12.72266 -12.72266,12.72266 H 25.62744 c -6.98877,0 -12.72217,-5.73438 -12.72217,-12.72266 V 25.62744 c 0,-7.07861 5.7334,-12.81396 12.72217,-12.81396 z" - style="fill:url(#linearGradient5)" - id="path1067_1_" /><path - d="m 25.62744,15.30322 c -5.64307,0 -10.2334,4.63135 -10.2334,10.32422 V 198.2998 c 0,5.6416 4.59033,10.23438 10.2334,10.23438 h 173.74561 c 5.64258,0 10.23438,-4.59277 10.23438,-10.23438 V 25.62744 c 0,-5.69287 -4.5918,-10.32422 -10.23438,-10.32422 z" - style="fill:url(#XMLID_2_-7)" - id="path189" /><path - d="m 25.62744,18.10547 c -4.09717,0 -7.43066,3.37354 -7.43066,7.52197 0,0 0,104.56689 0,112.51807 9.1123,-8.53418 38.96387,-31.54053 96.21631,-31.54053 62.64844,0 89.05566,-27.78271 92.3877,-31.60889 0,-1.25586 0,-49.36768 0,-49.36768 0,-4.14795 -3.33203,-7.52148 -7.42969,-7.52148 H 25.62744 Z" - style="display:inline;fill:url(#linearGradient6)" - id="path1082_1_-5" /><g - id="layer1-0" - inkscape:label="Layer 1" + aria-label="Trinity Desktop Environment" + sodipodi:insensitive="true" /><g + style="display:inline;overflow:visible" + id="g2" + transform="matrix(0.34306949,0,0,0.34306949,1190.3687,29.408192)"><path + fill-rule="evenodd" + clip-rule="evenodd" + fill="#0068C6" + d="M 24.621676,13.180258 H 164.80568 c 7.057,0 12.816,5.76 12.816,12.816 V 165.24427 c 0,7.057 -5.76,12.889 -12.816,12.889 H 24.621676 c -7.057,0 -12.816,-5.832 -12.816,-12.889 V 25.996258 c -10e-4,-7.056 5.759,-12.816 12.816,-12.816 z m -1.584,-7.4879995 H 166.38968 c 10.297,0 18.721,8.4239995 18.721,18.7199995 V 166.82827 c 0,10.297 -8.424,18.721 -18.721,18.721 H 23.037676 c -10.297,-0.001 -18.721,-8.424 -18.721,-18.721 V 24.412258 c 0,-10.296 8.424,-18.7199995 18.721,-18.7199995 z" + id="path2" + style="display:inline;overflow:visible;opacity:0.321;fill:#000000;fill-opacity:1;fill-rule:evenodd" + sodipodi:insensitive="true" /><path + style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd" + d="m 20.305,7.488 h 140.184 c 7.057,0 12.816,5.76 12.816,12.816 v 139.248 c 0,7.057 -5.76,12.889 -12.816,12.889 H 20.305 c -7.057,0 -12.816,-5.832 -12.816,-12.889 V 20.304 C 7.488,13.248 13.248,7.488 20.305,7.488 Z" + id="path1575" + sodipodi:insensitive="true" /><path + fill-rule="evenodd" + clip-rule="evenodd" + fill="#0068C6" + d="m 20.305,7.488 h 140.184 c 7.057,0 12.816,5.76 12.816,12.816 v 139.248 c 0,7.057 -5.76,12.889 -12.816,12.889 H 20.305 c -7.057,0 -12.816,-5.832 -12.816,-12.889 V 20.304 C 7.488,13.248 13.248,7.488 20.305,7.488 Z M 18.721,0 h 143.352 c 10.297,0 18.721,8.424 18.721,18.72 v 142.416 c 0,10.297 -8.424,18.721 -18.721,18.721 H 18.721 C 8.424,179.856 0,171.433 0,161.136 V 18.72 C 0,8.424 8.424,0 18.721,0 Z" + id="path1065" + style="display:inline;fill:#0068c6;fill-opacity:1;fill-rule:evenodd" /><path + fill-rule="evenodd" + clip-rule="evenodd" + fill="#0068C6" + d="m 20.592,10.296 h 139.609 c 5.615,0 10.223,4.608 10.223,10.296 v 138.745 c 0,5.615 -4.607,10.223 -10.223,10.223 H 20.592 c -5.615,0 -10.223,-4.607 -10.223,-10.223 V 20.592 c 0,-5.688 4.608,-10.296 10.223,-10.296 z" + id="path1067" + style="display:inline;fill:#0068c6;fill-opacity:1;fill-rule:evenodd" /><g + id="g1-7" + transform="matrix(0.96738749,0,0,0.96738749,3.8200679,2.9272463)" style="display:inline" - transform="translate(3.5901949,0.29068988)"><path - id="path271-3" - style="display:inline;fill:url(#linearGradient29-7)" - d="m 56.427507,56.751779 c -0.601317,0.06232 1.553047,-1.113886 1.104317,-0.664176 L 46.315027,67.302447 c -0.520999,0.521479 -0.789062,1.211914 -0.789062,1.908203 0,0.479979 0.126955,0.963378 0.390625,1.398437 0,0 12.095221,19.916024 12.775391,21.039063 -2.090328,3.624506 -3.778322,7.469244 -5.03125,11.46289 -1.272459,0.26367 -23.439454,4.875 -23.439454,4.875 -1.244628,0.25732 -2.146484,1.36768 -2.146484,2.63867 v 15.86524 c 0,1.24609 0.844729,2.32422 2.054688,2.61719 0,0 21.44873,5.24413 22.724609,5.55468 1.210939,4.72363 2.986822,9.21876 5.287109,13.40235 -0.723139,1.10254 -13.164062,20.07617 -13.164062,20.07617 -0.29395,0.44922 -0.4375,0.96094 -0.4375,1.47266 0,0.69921 0.270996,1.3955 0.791015,1.91406 l 11.212891,11.2168 c 0.883789,0.88183 2.245608,1.04394 3.310547,0.39648 0,0 19.546868,-11.86719 20.648437,-12.53516 3.895996,2.18066 8.016602,3.89454 12.279297,5.11133 0.27051,1.30371 4.808594,23.12109 4.808594,23.12109 0.25635,1.24316 1.364743,2.14844 2.638672,2.14844 h 16.30698 c 1.24512,0 2.71161,-0.73437 3.0075,-1.94531 0,0 -7e-4,0.003 0,0 0.29767,0.11169 -0.30651,-0.11468 0,0 0,0 4.53808,-21.81739 4.80859,-23.12109 4.2627,-1.21679 8.3833,-2.93067 12.2793,-5.11133 0.76137,0.46168 8.43111,5.11814 14.27149,8.66406 2.69164,1.76505 6.4746,4.24609 6.4746,4.24609 1.06152,0.69531 2.48439,0.54786 3.38282,-0.3457 l 11.2207,-11.2207 c 0.80237,-0.80148 0.97504,-1.99063 0.51758,-3.00196 -0.0714,-0.28069 0.16512,0.25234 0,0 0,0 -1.31431,-2.28841 -1.48633,-2.55078 l -7.15039,-10.90625 c -0.19641,-0.32286 0.35417,0.0545 0,0 -2.25104,-3.43326 -4.60167,-7.01797 -4.86914,-7.42578 2.30029,-4.18358 4.07617,-8.67872 5.28711,-13.40234 1.27588,-0.31055 22.72461,-5.55469 22.72461,-5.55469 1.20996,-0.29297 2.05468,-1.3711 2.05468,-2.61719 v -15.86523 c 0,-1.271 -0.90185,-2.38135 -2.14648,-2.63867 0,0 -22.16699,-4.61133 -23.43945,-4.875 -1.25293,-3.993655 -2.94092,-7.838389 -5.03125,-11.462895 0.68017,-1.123039 12.77539,-21.039063 12.77539,-21.039063 0.26367,-0.435059 0.39062,-0.918458 0.39062,-1.398437 0,-0.696289 -0.26806,-1.386724 -0.78906,-1.908203 L 159.60213,56.290728 c -0.89746,-0.899419 -2.32228,-1.049302 -3.38671,-0.351562 -1e-5,-10e-7 -19.73878,12.946773 -20.83399,13.664062 -2.44287,-1.284669 -2.45615,-1.289264 -5.20761,-2.252643 -0.38037,-0.1333 -0.80225,-0.07324 -1.13086,0.160156 -0.3291,0.23291 -0.52343,0.611816 -0.52343,1.015625 v 11.72461 c 0,0.490229 0.28515,0.935549 0.73242,1.136718 15.24079,7.999021 23.1991,21.963456 23.50448,39.176476 0.12338,6.9542 -1.60712,13.66137 -4.625,19.70898 -0.0501,0.0633 -0.1226,0.10445 -0.16016,0.17774 -7.60448,14.87986 -22.69337,24.12304 -39.38085,24.12304 -11.80956,0 -22.913092,-4.59765 -31.263674,-12.94922 -8.350582,-8.35058 -12.949219,-19.45508 -12.949219,-31.26367 0,-17.3657 8.660626,-30.567132 23.360527,-38.888557 0.447269,-0.20117 0.732421,-0.64649 0.732421,-1.136719 V 68.609201 c 0,-0.403809 -0.194337,-0.780762 -0.523437,-1.013672 -0.32861,-0.233399 -0.75049,-0.293456 -1.13086,-0.160156 -2.751457,0.963379 -5.35596,2.119628 -7.798828,3.404297 C 77.922141,70.122381 58.183366,57.175607 58.183366,57.175607 57.651147,56.826738 57.028824,56.689462 56.427507,56.751779 Z" - sodipodi:nodetypes="sccsccccssccccsccccccsscccccccccccccccccssccccsccscccsscsccscscssccccs" /><path - id="Gear_foreground-6" - style="display:inline;fill:#ffffff" - d="m 59.29159,56.546587 c -0.322997,0.03332 -0.635742,0.176267 -0.878906,0.419922 L 47.195887,68.183306 c -0.47168,0.47314 -0.561034,1.206548 -0.214844,1.779297 l 13.134766,21.630859 c -2.330078,3.916986 -4.195315,8.141118 -5.527344,12.595708 l -24.115234,5.01562 c -0.6709,0.13867 -1.154297,0.73243 -1.154297,1.41992 v 15.86524 c 0,0.6709 0.456049,1.25195 1.105468,1.41015 l 23.402344,5.71876 c 1.249999,5.15722 3.182134,10.0498 5.738281,14.54492 l -5.796875,8.83984 v 0 l -4.992187,7.61324 -2.75586,4.20508 c -0.141534,0.21578 0.01573,-0.24344 0,0 -0.328199,0.5671 -0.01777,1.65205 0.449157,2.11801 L 57.248621,182.047 c 0.48926,0.48633 1.160275,0.60494 1.737425,0.22896 l 10.760622,-6.59855 10.677734,-6.48242 c 4.154714,2.39706 8.635106,4.29282 13.373047,5.57031 l 0.376953,1.53906 4.634766,22.2793 c 0.13867,0.67285 0.732913,1.1582 1.419922,1.1582 h 0.80859 15.05664 0.8086 c 0.687,0 1.28125,-0.48535 1.41992,-1.1582 l 4.63476,-22.2793 0.37696,-1.53906 c 4.73794,-1.27749 9.21833,-3.17325 13.37304,-5.57031 l 10.67774,6.48242 10.67382,7 c 0.57715,0.37598 1.33496,0.29883 1.82422,-0.1875 l 11.21875,-11.2168 c 0.46693,-0.46596 0.55281,-1.1829 0.22461,-1.75 -0.0157,-0.24344 -0.0713,-0.48539 -0.21289,-0.70117 l -2.77343,-4.22852 -4.97461,-7.5898 v 0 l -5.79688,-8.83984 c 2.55615,-4.49512 4.48633,-9.3877 5.73633,-14.54492 l 23.40234,-5.71876 c 0.64942,-0.1582 1.10547,-0.73925 1.10547,-1.41015 v -15.86524 c 0,-0.68749 -0.4834,-1.28125 -1.1543,-1.41992 l -24.11523,-5.01562 c -1.33203,-4.45459 -3.19727,-8.678722 -5.52734,-12.595708 l 13.13476,-21.630859 c 0.34619,-0.572749 0.25684,-1.298344 -0.21484,-1.771484 l -11.2168,-11.216797 c -0.48633,-0.48731 -1.24805,-0.566402 -1.82422,-0.189453 l -21.41015,14.042968 c -0.005,0.0029 -0.009,0.0069 -0.0137,0.0098 -2.50278,-1.352558 -2.98999,-1.559296 -5.52961,-2.634464 l -2e-5,12.122443 c 14.69326,8.84668 23.548,21.823644 24.05696,40.035454 0.43667,15.62488 -7.89154,29.41711 -19.90625,37.59766 -0.0961,0.0654 -0.1924,0.13065 -0.28906,0.19531 -1.68183,1.12636 -3.44501,2.13946 -5.27539,3.03711 -0.14514,0.0711 -0.28956,0.14334 -0.43555,0.21289 -0.55304,0.26391 -1.11263,0.51783 -1.67774,0.75977 -0.24435,0.1044 -0.49174,0.20251 -0.73828,0.30273 -0.91889,0.37435 -1.85304,0.71645 -2.80078,1.03125 -0.32714,0.10837 -0.65203,0.22118 -0.98242,0.32227 -0.47162,0.14471 -0.94972,0.2766 -1.42773,0.40625 -0.44707,0.12083 -0.89719,0.23438 -1.34961,0.34179 -0.41685,0.0994 -0.8327,0.20127 -1.25391,0.28907 -0.81682,0.16944 -1.64038,0.32037 -2.47266,0.44531 -0.35761,0.054 -0.71978,0.0911 -1.08008,0.13672 -0.60669,0.0763 -1.21615,0.14516 -1.83007,0.19726 -0.35448,0.0304 -0.70965,0.0578 -1.06641,0.0801 -0.89458,0.0549 -1.79328,0.0933 -2.70117,0.0957 -0.0484,1.8e-4 -0.0961,0.004 -0.14453,0.004 -0.0491,-2e-5 -0.0974,-0.004 -0.14649,-0.004 -0.90789,-0.002 -1.80659,-0.0408 -2.70117,-0.0957 -0.35675,-0.0223 -0.71193,-0.0496 -1.0664,-0.0801 -0.61392,-0.0521 -1.22339,-0.12099 -1.83008,-0.19726 -0.3603,-0.0457 -0.72247,-0.0827 -1.08008,-0.13672 -0.83228,-0.12494 -1.65583,-0.27587 -2.472655,-0.44531 -0.421208,-0.0878 -0.837062,-0.1897 -1.253906,-0.28907 -0.452427,-0.10741 -0.902543,-0.22096 -1.349609,-0.34179 -0.47801,-0.12965 -0.956118,-0.26154 -1.427735,-0.40625 -0.330395,-0.10109 -0.655279,-0.2139 -0.982421,-0.32227 -0.947742,-0.3148 -1.881891,-0.6569 -2.800782,-1.03125 -0.246538,-0.10022 -0.493924,-0.19833 -0.738281,-0.30273 -0.565102,-0.24194 -1.124696,-0.49586 -1.677734,-0.75977 -0.145995,-0.0695 -0.290417,-0.14183 -0.435547,-0.21289 -1.830383,-0.89765 -3.593561,-1.91075 -5.275391,-3.03711 -0.09666,-0.0647 -0.192928,-0.12993 -0.289062,-0.19531 C 71.024882,149.77818 62.708672,135.98628 63.133347,120.36107 63.637195,101.8228 73.036601,88.548148 87.15627,80.302368 L 87.10974,68.222223 c -2.408556,1.046528 -3.092432,1.312066 -5.447096,2.607567 -0.0049,-0.0029 -0.0088,-0.0068 -0.01367,-0.0098 L 60.236902,56.777056 C 59.948818,56.588581 59.614587,56.513262 59.29159,56.546587 Z" - sodipodi:nodetypes="sccccccssccccccccccccccccsccsccccccccccccccccsscccccccccccsscccccccccccccccsccccccccccccccscscccccs" /><path - id="path13-1" - style="display:inline;fill:url(#linearGradient13-4);fill-opacity:1" - d="M 60.04159,63.437212 C 57.888762,65.58955 56.318436,67.161336 54.215418,69.263384 57.032795,73.90303 66.061124,88.772171 66.631434,89.71065 70.27694,84.609585 74.794033,80.131551 80.121668,76.607134 79.212489,76.010455 64.714435,66.502639 60.04159,63.437212 Z m 97.04101,0 c -4.67284,3.065427 -19.16894,12.573243 -20.07812,13.169922 5.32763,3.524417 9.84277,8.002451 13.48828,13.103516 0.57031,-0.938479 9.60059,-15.80762 12.41797,-20.447266 -2.10302,-2.102048 -3.6753,-3.673834 -5.82813,-5.826172 z M 58.109949,109.13448 c -1.065919,0.22119 -2.283203,0.47461 -2.283203,0.47461 0,0 -14.918465,3.10449 -20.3125,4.22461 v 8.23828 c 5.197265,1.26953 20.940924,5.11719 22.007813,5.37891 -0.38281,-2.55176 -0.638672,-5.13478 -0.638672,-7.76172 0,-3.60156 0.501953,-7.1123 1.226562,-10.55469 z m 100.906251,0 c 0.72461,3.44239 1.22656,6.95313 1.22656,10.55469 0,2.62694 -0.25586,5.20996 -0.63867,7.76172 1.06689,-0.26172 16.81054,-4.10938 22.00781,-5.37891 v -8.23828 c -5.39404,-1.12012 -20.31445,-4.22461 -20.31445,-4.22461 0,0 -1.21533,-0.25342 -2.28125,-0.47461 z m -93.011719,39.83984 c -0.60255,0.92091 -1.263672,1.92969 -1.263672,1.92969 0,0 -4.550858,6.94113 -8.080078,12.32422 -0.05365,0.003 -0.106335,0.0135 -0.160157,0.0156 -0.776091,1.2781 -1.293866,2.13288 -1.845703,3.04296 -0.47701,0.72764 -0.979293,1.49312 -1.332031,2.03125 0.02311,0.0231 0.03953,0.0395 0.0625,0.0625 -0.100277,0.16532 -0.177115,0.29067 -0.285156,0.46875 2.102538,2.10254 3.674811,3.67578 5.824218,5.82422 1.900678,-1.24602 4.561473,-2.98959 8.097657,-5.30859 5.256221,-3.19131 11.473111,-6.96706 12.015625,-7.29688 -0.142203,-0.0994 -0.280434,-0.20589 -0.421875,-0.30664 0.0023,-0.001 0.04276,-0.0279 0.04492,-0.0293 -4.004886,-2.85449 -7.597661,-6.2754 -10.679688,-10.22071 -0.02374,0.0348 -0.02314,0.0356 -0.04687,0.0703 -0.666864,-0.85445 -1.316608,-1.72031 -1.929687,-2.60743 z m 85.117179,0 c -0.61307,0.88712 -1.26282,1.75298 -1.92968,2.60743 -0.024,-0.0352 -0.0248,-0.0351 -0.0488,-0.0703 -3.08203,3.94531 -6.6748,7.36622 -10.67969,10.22071 0.002,0.001 0.0426,0.0278 0.0449,0.0293 -0.14101,0.10044 -0.27815,0.2075 -0.41992,0.30664 0.54133,0.3291 6.74468,4.09446 11.99024,7.2793 3.54705,2.32613 6.21467,4.07639 8.12109,5.32617 2.14941,-2.14844 3.72168,-3.72168 5.82422,-5.82422 -0.10804,-0.17808 -0.18488,-0.30343 -0.28516,-0.46875 0.023,-0.023 0.0394,-0.0394 0.0625,-0.0625 -0.35338,-0.53912 -0.85591,-1.30589 -1.33398,-2.03515 -0.55117,-0.90899 -1.06861,-1.76252 -1.84375,-3.03906 -0.0533,-0.002 -0.10508,-0.0123 -0.1582,-0.0156 -3.52934,-5.38327 -8.08008,-12.32422 -8.08008,-12.32422 0,0 -0.66113,-1.00878 -1.26368,-1.92969 z m -51.789055,21.47461 c 0.02865,0.11703 0.505004,2.07034 0.619138,2.53711 0.746107,3.58985 3.138527,15.08456 4.132817,19.86133 h 0.72265 7.51172 0.72266 c 0.99428,-4.77677 3.3867,-16.27148 4.13281,-19.86133 0.11414,-0.46677 0.59049,-2.42008 0.61914,-2.53711 -3.01954,0.54199 -6.08692,0.91992 -9.23047,0.91993 -3.14355,-1e-5 -6.21093,-0.37794 -9.230465,-0.91993 z" /><path - d="m 152.75239,53.316625 h -28.98684 v 88.158035 l -29.867364,2.60635 V 53.316625 H 62.586764 l 7.783829,-27.965432 h 82.381797 z" - id="T-0" - style="font-size:144.265px;font-family:Kabel;-inkscape-font-specification:Kabel;fill:#ffffff;stroke:url(#linearGradient2-3);stroke-width:1.284;stroke-linecap:round;stroke-linejoin:round" - inkscape:label="T" + sodipodi:insensitive="true"><path + id="path1088" + style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.992406" + d="m 71.292716,65.489408 c -9.948182,7.792163 -16.677482,17.154819 -16.677482,30.751146 0,23.369376 20.219055,35.177586 32.695313,35.320636 0.713897,0.008 1.420572,-0.007 2.123047,-0.0365 0.523668,0.0203 1.04823,0.0365 1.578125,0.0365 10.308751,0 32.695311,-10.6605 32.695311,-35.320636 0,-13.596327 -6.4888,-22.358388 -16.45028,-30.921551 v 4.461903 c 9.13883,7.485805 13.47675,14.366141 13.32528,26.834744 -0.0773,19.37996 -15.6746,33.13478 -32.453124,32.83538 C 77.025588,129.40002 57.828128,118.64394 57.740234,96.61565 57.588762,84.147047 64.230343,75.023399 71.292716,69.951311 Z" + sodipodi:nodetypes="csscssccccccc" /><path + d="m 125.80993,39.867975 h -23.94949 v 72.837845 l -24.676977,2.15342 V 39.867975 H 51.31337 l 6.431148,-23.105573 h 68.065412 z" + id="text1-7" + style="font-size:141.733px;font-family:Kabel;-inkscape-font-specification:Kabel;text-align:center;text-anchor:middle;display:inline;fill:#ffffff;stroke-width:0.735031" aria-label="T" /><path - id="T_foreground_Gradient-6" - style="display:inline;fill:url(#linearGradient7);stroke:none;stroke-width:1.02806;stroke-linecap:round;stroke-linejoin:round" - d="m 146.5332,30.736328 -71.025388,0.126953 -4.691406,17.490235 28.666016,-0.154297 v 88.212891 h 0.002 v 1.73437 L 117.9375,136.41211 V 48.097656 l 28.66602,-0.154297 z" /></g></g></svg> + id="Gear_foreground" + style="display:inline;opacity:1;fill:#ffffff;stroke-width:0.840979" + d="m 47.828985,42.330183 c -0.271635,0.02802 -0.534651,0.148237 -0.739144,0.353146 l -9.433093,9.433092 c -0.396673,0.397901 -0.471817,1.014682 -0.180679,1.496351 l 11.046069,18.191102 c -1.959549,3.294099 -3.528177,6.846513 -4.648386,10.592725 l -20.280407,4.218033 c -0.564214,0.116618 -0.97074,0.615958 -0.97074,1.194123 v 13.342335 c 0,0.56422 0.383528,1.05287 0.929676,1.18591 l 19.680881,4.80936 c 1.051223,4.33712 2.676112,8.45167 4.825772,12.23197 l -4.875048,7.43412 v 0 l -4.198325,6.40257 -2.317621,3.53639 c -0.119026,0.18147 0.01323,-0.20472 0,0 -0.276009,0.47693 -0.01494,1.38935 0.377732,1.78119 l 9.065218,9.34082 c 0.411458,0.40899 0.975764,0.50873 1.461134,0.19255 l 9.049456,-5.54925 8.979758,-5.45158 c 3.494024,2.01588 7.261939,3.61016 11.246455,4.68452 l 0.317008,1.29431 3.897742,18.73642 c 0.116619,0.56585 0.61637,0.97403 1.194131,0.97403 h 0.680007 12.662321 0.680014 c 0.577754,0 1.077505,-0.40818 1.194124,-0.97403 l 3.89774,-18.73642 0.31701,-1.29431 c 3.98451,-1.07436 7.75242,-2.66864 11.24645,-4.68452 l 8.97976,5.45158 8.97646,5.88686 c 0.48537,0.31618 1.12267,0.2513 1.53413,-0.15769 l 9.43472,-9.4331 c 0.39269,-0.39185 0.46491,-0.99479 0.1889,-1.4717 -0.0133,-0.20474 -0.0599,-0.40821 -0.17904,-0.58968 l -2.3324,-3.5561 -4.18353,-6.38286 v 0 l -4.87506,-7.43412 c 2.14967,-3.7803 3.77292,-7.89485 4.82413,-12.23197 L 154.9832,102.337 c 0.54615,-0.13304 0.92967,-0.62169 0.92967,-1.18591 V 87.808755 c 0,-0.578165 -0.40653,-1.077505 -0.97074,-1.194123 l -20.2804,-4.218033 c -1.12022,-3.746212 -2.68884,-7.298626 -4.64839,-10.592725 L 141.0594,53.612772 c 0.29115,-0.481669 0.216,-1.091879 -0.18066,-1.489781 l -9.4331,-9.433092 c -0.40899,-0.409817 -1.0496,-0.476332 -1.53414,-0.159326 l -18.00548,11.809843 c -0.004,0.0025 -0.008,0.0058 -0.0116,0.0082 -2.10478,-1.137474 -2.51451,-1.311336 -4.65028,-2.21553 l -2e-5,10.194722 c 12.35673,7.439871 19.80338,18.353227 20.23141,33.66898 0.36722,13.140182 -6.63663,24.739182 -16.74075,31.618842 -0.0807,0.055 -0.1618,0.10989 -0.24309,0.16425 -1.41439,0.94725 -2.89718,1.79924 -4.43649,2.55415 -0.12206,0.0597 -0.24352,0.12054 -0.36629,0.17903 -0.46509,0.22194 -0.9357,0.43549 -1.41094,0.63895 -0.2055,0.0878 -0.41355,0.17031 -0.62089,0.2546 -0.77276,0.31483 -1.55837,0.60251 -2.3554,0.86725 -0.27511,0.0912 -0.54834,0.18601 -0.8262,0.27103 -0.39661,0.12169 -0.798678,0.2326 -1.200682,0.34164 -0.375971,0.10163 -0.754516,0.19713 -1.134992,0.28745 -0.350555,0.0836 -0.70028,0.16926 -1.05451,0.24308 -0.686928,0.14251 -1.379526,0.26944 -2.079455,0.37451 -0.300742,0.0455 -0.60532,0.0767 -0.908324,0.11498 -0.510215,0.0642 -1.022758,0.12207 -1.539053,0.16589 -0.298109,0.0255 -0.596799,0.0487 -0.896827,0.0674 -0.752323,0.0462 -1.508111,0.0785 -2.271629,0.0805 -0.0407,1.5e-4 -0.08082,0.003 -0.121545,0.003 -0.04129,-1e-5 -0.08191,-0.003 -0.123196,-0.003 -0.763515,-0.002 -1.519304,-0.0343 -2.271627,-0.0805 -0.30002,-0.0187 -0.598719,-0.0417 -0.89682,-0.0674 -0.516295,-0.0438 -1.028845,-0.10175 -1.53906,-0.16589 -0.303004,-0.0384 -0.607582,-0.0695 -0.908323,-0.11498 -0.699932,-0.10507 -1.392519,-0.23201 -2.079457,-0.37451 -0.354228,-0.0739 -0.70395,-0.15951 -1.054511,-0.24308 -0.380476,-0.0903 -0.759018,-0.18582 -1.134987,-0.28745 -0.401995,-0.10903 -0.804078,-0.21995 -1.200703,-0.34164 -0.277853,-0.085 -0.551077,-0.17989 -0.826196,-0.27103 -0.797028,-0.26474 -1.58263,-0.55242 -2.355397,-0.86725 -0.207334,-0.0843 -0.415384,-0.16678 -0.620877,-0.2546 -0.475239,-0.20346 -0.945851,-0.41701 -1.410945,-0.63895 -0.122775,-0.0585 -0.244229,-0.11927 -0.366281,-0.17903 -1.53932,-0.75491 -3.022117,-1.6069 -4.4365,-2.55414 -0.08125,-0.0544 -0.162243,-0.10927 -0.243094,-0.16425 C 57.696437,120.73601 50.702679,109.13731 51.059817,95.99683 51.483544,80.406533 59.388252,69.242831 71.2626,62.3083 L 71.22349,52.14915 c -2.025548,0.880108 -2.600677,1.103419 -4.580896,2.192909 -0.0043,-0.0025 -0.0075,-0.0057 -0.01152,-0.0082 L 48.623972,42.524003 c -0.242279,-0.158505 -0.523358,-0.221846 -0.794987,-0.19382 z" + sodipodi:nodetypes="sccccccssccccccccccccccccsccsccccccccccccccccsscccccccccccsscccccccccccccccsccccccccccccccscscccccs" /></g></g><path + inkscape:connector-curvature="0" + d="m 1246.0222,29.455445 c 3.5415,0 6.4252,2.893739 6.4252,6.447707 l -0.074,7.020695 c -1.4071,0.414292 -10.1296,0.704463 -13.0796,1.197106 -3.4551,1.414602 -5.7873,2.732338 -7.8069,3.13768 -2.8836,0.578745 -6.2799,1.783527 -8.1468,3.656986 -2.6656,2.674876 -4.7881,2.511128 -7.2523,4.983988 -2.4433,2.451826 -5.475,3.153048 -9.4422,3.949295 -4.7573,0.954806 -10.997,1.753522 -15.4064,0.86854 -0.3198,-0.06418 -0.5361,-0.105653 -0.8359,-0.162754 V 35.903152 c 0,-3.553968 2.8992,-6.447699 6.4251,-6.447707 z" + style="display:inline;overflow:visible;fill:url(#linearGradient10239-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.402143" + id="path2042-9" + sodipodi:nodetypes="ccccccccccccc" /></svg> diff --git a/pics/wallpapers/andes-venezolanos.png b/pics/wallpapers/andes-venezolanos.png Binary files differindex 19a626502..a31bbee4a 100644 --- a/pics/wallpapers/andes-venezolanos.png +++ b/pics/wallpapers/andes-venezolanos.png diff --git a/pics/wallpapers/andes-venezolanos.svgz b/pics/wallpapers/andes-venezolanos.svgz Binary files differindex 606709785..6eb039010 100644 --- a/pics/wallpapers/andes-venezolanos.svgz +++ b/pics/wallpapers/andes-venezolanos.svgz diff --git a/pics/wallpapers/aurora.png b/pics/wallpapers/aurora.png Binary files differindex c245f41e9..a5eff6be6 100644 --- a/pics/wallpapers/aurora.png +++ b/pics/wallpapers/aurora.png diff --git a/pics/wallpapers/aurora.svgz b/pics/wallpapers/aurora.svgz Binary files differindex 63182be89..61fe467d5 100644 --- a/pics/wallpapers/aurora.svgz +++ b/pics/wallpapers/aurora.svgz diff --git a/pics/wallpapers/default_gears.jpg b/pics/wallpapers/default_gears.jpg Binary files differindex cb54eff5d..84fb716b5 100644 --- a/pics/wallpapers/default_gears.jpg +++ b/pics/wallpapers/default_gears.jpg diff --git a/pics/wallpapers/konqui.png b/pics/wallpapers/konqui.png Binary files differindex 075ece827..919f8a5c3 100644 --- a/pics/wallpapers/konqui.png +++ b/pics/wallpapers/konqui.png diff --git a/pics/wallpapers/konqui.svgz b/pics/wallpapers/konqui.svgz Binary files differindex 1c950bfa7..60e176b3e 100644..100755 --- a/pics/wallpapers/konqui.svgz +++ b/pics/wallpapers/konqui.svgz diff --git a/pics/wallpapers/lineart.png b/pics/wallpapers/lineart.png Binary files differnew file mode 100644 index 000000000..048c3c287 --- /dev/null +++ b/pics/wallpapers/lineart.png diff --git a/pics/wallpapers/lineart.svgz b/pics/wallpapers/lineart.svgz Binary files differindex f3fa630d2..405cfa621 100644 --- a/pics/wallpapers/lineart.svgz +++ b/pics/wallpapers/lineart.svgz diff --git a/pics/wallpapers/moon.svgz b/pics/wallpapers/moon.svgz Binary files differindex ab7759644..220379071 100644 --- a/pics/wallpapers/moon.svgz +++ b/pics/wallpapers/moon.svgz @@ -3,6 +3,15 @@ # DEFAULT TRINITY STARTUP SCRIPT # +# Paths and environment variables in this script must match the expected +# directory locations found in tdelibs/tdecore/tdestandarddirs.h and +# tdestandarddirs.cpp. + +# Until TDE supports being installed in /usr, part of this script is +# intended to avoid potential conflicts with KDE. + +# Within this script use full path names to all binaries, scripts, etc. + # This block might not be appropriate for all systems. # It should work for command line logins but graphical # login managers might already source these files. @@ -15,7 +24,7 @@ if [ -r $HOME/.xprofile ]; then . $HOME/.xprofile fi -# Some functions to parse and check path correctly ... +# Function to check PATH. # Usage: is_in_path PATH /usr/bin is_in_path() { var="$1"; search="$2"; @@ -27,6 +36,7 @@ is_in_path() { return 1 } +# Function to check TDE directory is in PATH in the correct order. # Usage: is_before_in_path ENV_VAR var before_var # Return 0 if 'var' is before 'before_var' in 'ENV_VAR', 1 otherwise is_before_in_path() { @@ -40,6 +50,7 @@ is_before_in_path() { return 1 } +# Function to place TDE directory in PATH in the correct order. # Usage: place_before_in_path PATH /opt/trinity/games /usr/games place_before_in_path() { var="$1"; insert="$2"; @@ -56,6 +67,7 @@ place_before_in_path() { fi } +# Function to remove TDE directory from PATH. # Usage: remove_from_path PATH /opt/trinity/games remove_from_path() { var="$1"; remove="$2"; @@ -77,22 +89,18 @@ is_newer() { return 1 } +# echo messages should appear in the user's .xsession-errors log. echo "[starttde] Starting starttde." 1>&2 echo "[starttde] This script is $0" 1>&2 -# Avoid any possible conflict with KDE4. Therefore within this script -# use full path names to all binaries used. - # The binaries for TDE are located in the same place as this script. -# To determine that location use the following method rather than presuming -# the existence of $TDEDIR. That environment variable might not be -# defined or defined to point to KDE4 binaries. +# To determine that location use the following method rather than +# presuming the existence of $TDEDIR. That environment variable might +# not be defined or defined to point to KDE binaries. BIN_DIR="" - -# Let's check if this script is called from the Debian alternatives +# Check if this script is called from the Debian alternatives. # See: https://wiki.debian.org/DebianAlternatives -if [ "$(readlink -- "$0")" = "/etc/alternatives/x-session-manager" ] -then +if [ "$(readlink -- "$0")" = "/etc/alternatives/x-session-manager" ]; then # Check if it is not a dangling symlink if [ -L "/etc/alternatives/x-session-manager" ] && \ [ -e "/etc/alternatives/x-session-manager" ] @@ -131,9 +139,9 @@ if kcheckrunning >/dev/null 2>&1; then fi # Set the background color. -# The standard X background is nasty, causing moire effects and exploding -# people's heads. We use colours from the standard TDE palette for those with -# palettised displays. +# The standard X background is nasty, causing moire effects and +# exploding people's heads. We use colours from the standard TDE palette +# for those with palettised displays. if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then xsetroot -solid "#618DCC" # sky blue fi @@ -141,9 +149,10 @@ fi # Unset this for Darwin since it will screw up TDE's dynamic-loading. unset DYLD_FORCE_FLAT_NAMESPACE -# Check whether prelinking is enabled. If yes, then exporting TDE_IS_PRELINKED improves -# loading TDE. The $TDE_IS_PRELINKED variable might already be set on some systems -# through /etc/profile.d. Therefore first check whether the variable exists. +# Check whether prelinking is enabled. If yes, then exporting +# TDE_IS_PRELINKED improves loading TDE. The $TDE_IS_PRELINKED variable +# might already be set on some systems through /etc/profile.d. Therefore +# first check whether the variable exists. if [ "$TDE_IS_PRELINKED" = "" ]; then if [ -r /etc/default/prelink ]; then . /etc/default/prelink @@ -157,93 +166,80 @@ fi # Boot sequence: # -# tdeinit is used to fork off processes which improves memory usage -# and startup time. +# tdeinit is used to fork processes to improve memory usage and +# startup time. # -# * tdeinit starts the dcopserver and tdelauncher first. -# * Then kded is started. kded is responsible for keeping the sycoca -# database up to date. When an up to date database is present it goes +# * tdeinit first starts dcopserver and tdelauncher. +# * Then kded is started, which is responsible for keeping the sycoca +# database up to date. When the database is updated the process goes # into the background and the startup continues. -# * Then tdeinit starts kcminit. kcminit performs initialisation of -# certain devices according to the user's settings -# -# * Then ksmserver is started which takes control of the rest of the startup sequence. - -# The user's personal TDE directory usually is $HOME/.trinity. -# This setting may be overridden by setting $TDEHOME. When migrating profiles -# must be careful here because $HOME/.kde was used commonly in the pre-KDE4 -# days for the user's TDE profile, but now with KDE4 common on systems, -# $HOME/.kde might point to KDE4 profile settings. The existence of KDE4 -# does not mean all people are using KDE4. - -if [ "$TDEHOME" != "" ]; then - echo "[starttde] TDEHOME is preset to $TDEHOME." 1>&2 - export TDEHOME=$TDEHOME -else - # $TDEHOME is NOT already preset in the environment. Try to help. - # This might be overkill but does provide flexibility. - # This script and kstandardirs.h and kstandardirs.cpp must match. - # The latter two must be edited/patched before compiling. - echo "[starttde] TDEHOME is not set." 1>&2 - # Default value: $HOME/.trinity. Most users will use this. +# * Then tdeinit starts kcminit. kcminit initializes devices according +# to the user's settings. +# * Then ksmserver starts and takes control of the remainder of the +# startup sequence. + +# The user's personal TDE directory usually is $HOME/.trinity. This setting +# may be overridden by setting $TDEHOME. +if [ "$TDEHOME" = "" ]; then + # Note: the default for TDEHOME must match the one in tdestandarddirs.h export TDEHOME=$HOME/.trinity - - if [ ! -d $HOME/.trinity ] && [ ! -f /usr/bin/kde4-config ] && [ "$TDEDIR" = "/usr" ] && [ -d $HOME/.kde ]; then - # Looks like Trinity is installed and not playing second fiddle to KDE4. - export TDEHOME=$HOME/.kde - fi - echo "[starttde] Set TDEHOME to $TDEHOME." 1>&2 fi +echo "[starttde] TDEHOME is set to $TDEHOME." 1>&2 -# tdesu needs something to find root's TDE profile. Set the TDEROOTHOME variable -# here as last resort. /root/.trinity is a safe presumption. If an admin wants -# a different location then set the TDEROOTHOME variable elsewhere. +# tdesu needs something to find root's TDE profile. Set the TDEROOTHOME +# variable here as a last resort. /root/.trinity is a safe presumption. +# If an admin wants a different location then set the TDEROOTHOME variable +# elsewhere. if [ "$TDEROOTHOME" = "" ]; then export TDEROOTHOME=/root/.trinity echo "[starttde] Setting TDEROOTHOME to $TDEROOTHOME." fi -# Modify the following environment variables only as necessary. - +# Modify the PATH environment variable only as necessary. +if [ -d /usr/games -o -d "$TDEDIR/games" ] || is_in_path PATH "/usr/games"; then + # Some distributions (e.g. Gentoo) don't use a separate directory for games. + # So don't add it to PATH unless there are any indications that in might be + # actually needed. if ! is_in_path PATH "$TDEDIR/games" ; then # Respect the traditional path order. Don't blindly place $TDEDIR/games # first in the path. Only place $TDEDIR/games before /usr/games. If packagers # are adding $TDEDIR/games elsewhere, then they need to ensure the traditional # search patch is respected. - # Is there a way we can check that $TDEDIR/games is always placed only just before - # /usr/games in the search path? + # This order is consistent with tdelibs/tdesu/stub.cpp. if is_in_path PATH "/usr/games"; then place_before_in_path PATH "$TDEDIR/games" "/usr/games" else export PATH=$TDEDIR/games:$PATH fi fi +fi - if ! is_in_path PATH "$TDEDIR/bin" ; then - # Respect the traditional path order. Don't blindly place $TDEDIR/bin - # first in the path. Only place $TDEDIR/bin before /usr/bin. This order is - # consistent with tdelibs/tdesu/stub.cpp. If packagers are adding $TDEDIR/bin - # elsewhere, then they need to ensure the traditional search patch is respected. - # Is there a way we can check that $TDEDIR/bin is always placed only just before - # /usr/bin in the search path? - if is_in_path PATH "/usr/bin"; then - place_before_in_path PATH "$TDEDIR/bin" "/usr/bin" - else - export PATH=$TDEDIR/bin:$PATH - fi - fi - - if [ -x /usr/bin/manpath ]; then - if [ "`manpath 2>/dev/null | grep \"$TDEDIR/share/man\"`" = "" ]; then - export MANPATH=$TDEDIR/share/man:$MANPATH - fi +# Modify the PATH environment variable only as necessary. +if ! is_in_path PATH "$TDEDIR/bin" ; then + # Respect the traditional path order. Don't blindly place $TDEDIR/bin first + # in the path. Only place $TDEDIR/bin before /usr/bin. If packagers are adding + # $TDEDIR/bin elsewhere, then they need to ensure the traditional search patch + # is respected. + # This order is consistent with tdelibs/tdesu/stub.cpp. + if is_in_path PATH "/usr/bin"; then + place_before_in_path PATH "$TDEDIR/bin" "/usr/bin" else - if [ "`echo $MANPATH | grep \"$TDEDIR/share/man\"`" = "" ]; then - export MANPATH=$TDEDIR/share/man:$MANPATH - fi + export PATH=$TDEDIR/bin:$PATH fi +fi +# Modify the MANPATH environment variable only as necessary. +if [ -x /usr/bin/manpath ]; then + if [ "$(manpath 2>/dev/null | grep "$TDEDIR/share/man")" = "" ]; then + export MANPATH=$TDEDIR/share/man:$MANPATH + fi +else + if [ "$(echo $MANPATH | grep "$TDEDIR/share/man")" = "" ]; then + export MANPATH=$TDEDIR/share/man:$MANPATH + fi +fi +# Set the XDG_CONFIG_DIRS environment variable. if [ "$XDG_CONFIG_DIRS" = "" ]; then if [ -d /etc/xdg ]; then XDG_CONFIG_DIRS=/etc/xdg @@ -267,7 +263,7 @@ elif [ -d $TDEDIR/tde/xdg ]; then TDE_XDG_DIR="$TDEDIR/tde/xdg" fi if [ -d $TDE_XDG_DIR ]; then - if [ "`echo $XDG_CONFIG_DIRS | grep \"$TDE_XDG_DIR\"`" = "" ]; then + if [ "$(echo $XDG_CONFIG_DIRS | grep "$TDE_XDG_DIR")" = "" ]; then if [ "$XDG_CONFIG_DIRS" = "" ]; then XDG_CONFIG_DIRS=$TDE_XDG_DIR else @@ -279,6 +275,8 @@ if [ "$XDG_CONFIG_DIRS" != "" ]; then export XDG_CONFIG_DIRS fi +echo "[starttde] XDG_CONFIG_DIRS: $XDG_CONFIG_DIRS" 1>&2 + # Explicitly set $XDG_DATA_DIRS only when Trinity is not installed in /usr. # Explicitly declaring $XDG_DATA_DIRS will override the default search path of /usr/share. # Explicitly declaring $XDG_DATA_DIRS will override $TDEDIRS, which must then be @@ -289,10 +287,11 @@ fi # set in $TDEDIRS are intended to override data files found in $TDEDIR. Those additional # directories should be placed before $TDEDIR and before /usr/share. if [ "$TDEDIR" != "/usr" ] && [ -d $TDEDIR/share ]; then - # If '/usr/share' is not already there, we include it at the last position. + # Include '/usr/share' only if missing and only at the last position. if ! is_in_path XDG_DATA_DIRS "/usr/share"; then + # If XDG_DATA_DIRS is empty then avoid a leading ':'. if [ "$XDG_DATA_DIRS" = "" ]; then - XDG_DATA_DIRS=/usr/share # In case XDG_DATA_DIRS is empty, to avoid a leading : + XDG_DATA_DIRS=/usr/share else XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share fi @@ -300,7 +299,7 @@ if [ "$TDEDIR" != "/usr" ] && [ -d $TDEDIR/share ]; then # If '/usr/local/share' is not already there, we include it before '/usr/share' if ! is_in_path XDG_DATA_DIRS "/usr/local/share"; then place_before_in_path XDG_DATA_DIRS "/usr/local/share" "/usr/share" - fi + fi # Ensure that $TDEDIR/share is always before '/usr/local/share' and '/usr/share'. if ! is_in_path XDG_DATA_DIRS "$TDEDIR/share" || @@ -328,24 +327,42 @@ fi echo "[starttde] XDG_DATA_DIRS: $XDG_DATA_DIRS" 1>&2 -test -n "$TDEHOME" && tdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"` +test -n "$TDEHOME" && tdehome=$(echo "$TDEHOME" | sed "s,^~/,$HOME/,") -# Allow interested applications, such as the Plasma control wrapper, -# to know that this is a Trinity desktop and not a KDE one. +# Help non-TDE software identify the desktop environment. +# +# DESKTOP_SESSION is considered legacy but retained for backwards +# compatibility. export DESKTOP_SESSION=trinity - -# Create profile directory. +# XDG_CURRENT_DESKTOP is considered the correct way to identify desktop +# environments. This is the variable xdg-utils uses although xdg-utils +# does not explicitly support TDE. Acceptable desktop identifiers are found in +# Appendix B of the Desktop Menu Specification: +# https://specifications.freedesktop.org/menu-spec/latest/apb.html +# Note: The variable should be already set by most modern DMs (including TDM +# since R14.0.12), but when launching TDE manually via startx, it's unlikely to +# be defined, so set it here. Also note that the variable is allowed to contain +# multiple colon-separated identifiers. +if [ -n "$XDG_CURRENT_DESKTOP" ]; then + echo "[starttde] Setting XDG_CURRENT_DESKTOP=TDE" 1>&2 + export XDG_CURRENT_DESKTOP=TDE +elif ! is_in_path XDG_CURRENT_DESKTOP "TDE"; then + echo "[starttde] Setting XDG_CURRENT_DESKTOP=TDE:$XDG_CURRENT_DESKTOP" 1>&2 + export XDG_CURRENT_DESKTOP=TDE:$XDG_CURRENT_DESKTOP +fi + +# If necessary create the profile directory. if [ ! -d "$tdehome" ]; then echo "[starttde] Creating $tdehome" 1>&2 mkdir -m 700 -p "$tdehome" fi if [ -d "$tdehome" ]; then # Run some R14 updates. - R14_UPDATED="`$TDEDIR/bin/kreadconfig --file kdeglobals --group "R14 XDG Updates" --key Updated --default false`" - R14_VERSION="`$TDEDIR/bin/kreadconfig --file kdeglobals --group "R14 XDG Updates" --key Version --default 0`" + R14_UPDATED="$($TDEDIR/bin/kreadconfig --file kdeglobals --group "R14 XDG Updates" --key Updated --default false)" + R14_VERSION="$($TDEDIR/bin/kreadconfig --file kdeglobals --group "R14 XDG Updates" --key Version --default 0)" if [ -e $TDEDIR/bin/r14-xdg-update ]; then # Script version index is used to allow automatic rerun - R14_SCRIPT="`sed -n "s/SCRIPT_VERSION=\([0-9]*\)/\1/p" $TDEDIR/bin/r14-xdg-update`" + R14_SCRIPT="$(sed -n "s/SCRIPT_VERSION=\([0-9]*\)/\1/p" $TDEDIR/bin/r14-xdg-update)" else R14_SCRIPT=0 fi @@ -365,7 +382,7 @@ if [ -d "$tdehome" ]; then fi # Get current font DPI configuration -CUR_ForceFontDPI="`$TDEDIR/bin/kreadconfig --file kcmfonts --group General --key forceFontDPI --default 0`" +CUR_ForceFontDPI="$($TDEDIR/bin/kreadconfig --file kcmfonts --group General --key forceFontDPI --default 0)" CUR_ForceFontDPIEnable=false [ $CUR_ForceFontDPI -gt 0 ] && CUR_ForceFontDPIEnable=true unset CUR_ForceFontDPI @@ -391,7 +408,8 @@ unset CUR_ForceFontDPIEnable if test $? -ne 0; then xmessage -center -geometry 500x100 "Could not start tdestartupconfig. Check your installation." fi -# $tdehome/share/config/startupconfig should exist but avoid script failure if not. +# $tdehome/share/config/startupconfig should exist but avoid script +# failure if not. if [ -r "$tdehome/share/config/startupconfig" ]; then . "$tdehome/share/config/startupconfig" fi @@ -408,7 +426,7 @@ EOF fi fi -# XCursor mouse theme needs to be applied here to work even for kded or ksmserver. +# An XCursor mouse theme is needed to work with kded or ksmserver. if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" if test $? -eq 10; then @@ -492,6 +510,8 @@ fi # Configuration of the gtk_qt_engine if not already set. +# Is the kgtk package installed? KGtk is a hack to allow some software +# to use the TDE file picker dialog. if test -n "$TDEDIRS"; then tdedirs_first=${TDEDIRS%%:*} TGTK_RC_ENGINE=$tdedirs_first/share/kgtk/gtk-qt-engine.rc.sh @@ -502,39 +522,39 @@ else TGTK_RC_TDE1=$TDEDIR/share/kgtk/.gtkrc-2.0-kde4 TGTK_RC_TDE2=$TDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4 fi - if [ ! -e "$tdehome/env/gtk-qt-engine.rc.sh" ] && [ -e $TGTK_RC_ENGINE ]; then mkdir -p "$tdehome/env" cp -f $TGTK_RC_ENGINE "$tdehome/env" chmod 755 "$tdehome/env/gtk-qt-engine.rc.sh" fi -if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e $TGTK_RC_TDE1 ] -then +if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e $TGTK_RC_TDE1 ]; then cp -f $TGTK_RC_TDE1 $HOME fi - -if [ ! -e $HOME/.gtkrc-2.0-kde-kde4 ] && [ -e $TGTK_RC_TDE2 ] -then +if [ ! -e $HOME/.gtkrc-2.0-kde-kde4 ] && [ -e $TGTK_RC_TDE2 ]; then cp -f $TGTK_RC_TDE2 $HOME fi # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh # (where <localprefix> is $TDEHOME or ~/.trinity, and <prefixes> is where TDE is installed) # -# This is where you can define environment variables that will be available to -# all TDE programs. That is where to run agents using for example, eval `ssh-agent` -# or eval `gpg-agent --daemon`. -# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script. -# (Read the end of this script for running shutdown scripts). -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - -exepath=`tde-config --path exe | tr : '\n'` - -for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do +# # This is where to define environment variables that will be +# available to all TDE programs. For example, this is where to run +# agents using eval $(ssh-agent) or eval $(gpg-agent --daemon). +# Note: when doing that also include "ssh-agent -k" as a shutdown +# script. (Read the end of this script for running shutdown +# scripts). For anything else that doesn't set env vars, or needs a +# window manager, best to use the TDE Autostart folder. + +exepath=$(tde-config --path exe | tr : '\n') + +for prefix in $(echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'); do + echo "[starttde] Looking for sh scripts in $prefix" 1>&2 for file in "$prefix"*.sh; do - test -r "$file" && . "$file" + if [ -r "$file" ]; then + echo "[starttde] Sourcing $file" 1>&2 + . "$file" + fi done done @@ -545,9 +565,9 @@ done # There are two system directories. These belong to the administrator. # There are two user directories, where the user may add her own fonts. # -# The 'override' versions are for fonts that should come first in the list, -# i.e. if you have a font in your 'override' directory, it will be used in -# preference to any other. +# The 'override' versions are for fonts that should come first in the +# list. That is, if you have a font in your 'override' directory, it +# will be used in preference to any other. # # The preference order looks like this: # user override, system override, X, user, system. @@ -566,8 +586,8 @@ if test -r "$tde_fontpaths" ; then savifs=$IFS IFS=" " - for fpath in `grep -v '^[ ]*#' < "$tde_fontpaths"` ; do - rfpath=`echo $fpath | sed "s:^~:$HOME:g"` + for fpath in $(grep -v '^[ ]*#' < "$tde_fontpaths") ; do + rfpath=$(echo $fpath | sed "s:^~:$HOME:g") if test -s "$rfpath"/fonts.dir; then xset fp+ "$rfpath" if test "$rfpath" = "$usr_fdir"; then @@ -615,9 +635,9 @@ if [ "$TGTK_PRELOAD" != "" ]; then export LD_PRELOAD=$TGTK_PRELOAD:$TGTK_NSPR_PRELOAD$LD_PRELOAD fi -# We run mkfontdir on the user's font dirs (if we have permission) to pick -# up any new fonts they may have installed. If mkfontdir fails, we still -# add the user's dirs to the font path, as they might simply have been made +# Run mkfontdir on the user's font dirs (if we have permission) to find +# any new fonts they may have installed. If mkfontdir fails, we still add +# the user's dirs to the font path, as they might simply have been made # read-only by the administrator, for whatever reason. # Only do usr_fdir and usr_odir if they are *not* listed in fontpaths. @@ -637,12 +657,13 @@ xset fp rehash # especially necessary on slow machines, where starting TDE takes one or two # minutes until anything appears on the screen. # -# If the user has overwritten fonts, the cursor font may be different now -# so don't move this up. +# If the user has overwritten fonts, the cursor font may be different +# now so don't move this up. # xsetroot -cursor_name left_ptr -# Get Ghostscript to look into user's TDE fonts dir for additional Fontmap. +# Get Ghostscript to look into user's TDE fonts dir for additional +# Fontmap. if test -n "$GS_LIB" ; then GS_LIB=$usr_fdir:$GS_LIB export GS_LIB @@ -652,11 +673,11 @@ else fi # Link "tmp" "socket" and "cache" resources to directory in $TMP. -# Creates: -# - a directory $TMP/tde-$USER and is linked from $TDEHOME/tmp-$HOSTNAME to it. -# - a directory $TMP/tdesocket-$USER and is linked from $TDEHOME/socket-$HOSTNAME to it. -# - a directory /var/tmp/tdecache-$USER and is linked from $TDEHOME/cache-$HOSTNAME to it. -# Note: temporary locations can be overridden through the TDETMP and TDEVARTMP +# Create: +# $TMP/tde-$USER linked from $TDEHOME/tmp-$HOSTNAME. +# $TMP/tdesocket-$USER linked from $TDEHOME/socket-$HOSTNAME. +# /var/tmp/tdecache-$USER linked from $TDEHOME/cache-$HOSTNAME. +# Temporary locations may be overridden through the TDETMP and TDEVARTMP # environment variables. for resource in tmp cache socket; do if ! lnusertemp $resource >/dev/null; then @@ -697,7 +718,7 @@ fi # Detect any running Xorg composition managers. $TDEDIR/bin/kdetcompmgr -# Run KPersonalizer before the session if this is the first login. +# Run KPersonalizer before the session if this is the first TDE login. if test "$kpersonalizerrc_general_firstlogin" = "true"; then if [ ! -x $TDEDIR/bin/kpersonalizer ]; then echo "[starttde] kpersonalizer not found! Please install in order to properly configure your user profile." 1>&2 @@ -720,7 +741,8 @@ fi $TDEDIR/bin/tdeinit_displayconfig EXIT_CODE="$?" -# Remove moodin cache if we have a new wallpaper installed, jriddell. Distro-specific. +# Remove moodin cache if there is new wallpaper installed. +# jriddell; distro-specific. if [ -d "$tdehome/share/apps/ksplash/cache/Moodin/kubuntu" ]; then if is_newer /usr/share/wallpapers/kubuntu-wallpaper.png \ "$tdehome/share/apps/ksplash/cache/Moodin/kubuntu/" @@ -728,7 +750,7 @@ if [ -d "$tdehome/share/apps/ksplash/cache/Moodin/kubuntu" ]; then rm -rf "$tdehome/share/apps/ksplash/cache/Moodin/kubuntu/" fi fi -# The is_newer function will no longer be used, so we unset it +# The 'is_newer' function will no longer be used, so unset unset is_newer if test -z "$dl"; then @@ -747,12 +769,13 @@ if test -z "$dl"; then esac fi -# Mark that full TDE session is running (for example, Konqueror preloading works only -# with full TDE running). The TDE_FULL_SESSION property can be detected by -# any X client connected to the same X session, even if not launched -# directly from the TDE session but for example, using "ssh -X", tdesu. $TDE_FULL_SESSION -# however guarantees that the application is launched in the same environment -# like the TDE session and that for example, TDE utilities/libraries are available. +# Mark that full TDE session is running (for example, Konqueror +# preloading works only with full TDE running). The TDE_FULL_SESSION +# property can be detected by any X client connected to the same X +# session, even if not launched directly from the TDE session but for +# example, using "ssh -X", tdesu. $TDE_FULL_SESSION guarantees the +# application is launched in the same environment like the TDE session +# and that for example, TDE utilities/libraries are available. # The matching tests are: # For $TDE_FULL_SESSION: # if test -n "$TDE_FULL_SESSION"; then ... whatever @@ -761,18 +784,19 @@ fi # if test $? -eq 0; then ... whatever # # Additionally there is $TDE_SESSION_UID with the uid of the user -# running the TDE session. It should be rarely needed (for example, -# after sudo to prevent desktop-wide functionality in the new user's kded). -# +# running the TDE session. That rarely should be needed (for example, +# after sudo to prevent desktop-wide functionality in the new user's +# kded). + TDE_FULL_SESSION=true export TDE_FULL_SESSION xprop -root -f TDE_FULL_SESSION 8s -set TDE_FULL_SESSION true echo "[starttde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2 -TDE_SESSION_UID=`id -u` +TDE_SESSION_UID=$(id -u) export TDE_SESSION_UID echo "[starttde] TDE_SESSION_UID: $TDE_SESSION_UID" 1>&2 -# We set LD_BIND_NOW to increase the efficiency of tdeinit. +# Set LD_BIND_NOW to increase the efficiency of tdeinit. # tdeinit unsets this variable before loading applications. LD_BIND_NOW=true $TDEDIR/bin/start_tdeinit_wrapper --new-startup +kcminit_startup if test $? -ne 0; then @@ -782,17 +806,16 @@ if test $? -ne 0; then fi echo "[starttde] tdeinit started successfully." 1>&2 -# Finally, give the session control to the session manager. -# See tdebase/ksmserver for the description of the rest of the startup sequence. -# When set, the TDEWM environment variable will be used as Trinity's -# window manager instead of twin. -# When TDEWM is not set, ksmserver will ensure twin is started. +# Finally, give the session control to the session manager. Refer to +# tdebase/ksmserver for the description of the remainder of the startup +# sequence. When set, the TDEWM environment variable will be used as +# Trinity's window manager instead of twin. When TDEWM is not set then +# ksmserver will ensure twin is started. # kwrapper is used to reduce startup time and memory usage. -# kwrapper does not return useful error codes such as the exit code of ksmserver. -# We only check for 255, which means the ksmserver process could not be -# started. Any problems thereafter, for example, ksmserver failing to initialize, -# will remain undetected. -# tdeinit_phase1 is still experimental. +# kwrapper does not return useful error codes such as the exit code of +# ksmserver. Thus only check for 255, which means ksmserver could not +# start. Any problems thereafter, for example, ksmserver failing to +# initialize, remain undetected. $TDEDIR/bin/tdeinit_phase1 EXIT_CODE="$?" # If tdeinit_phase1 should cause problems, here is the old way: @@ -816,10 +839,6 @@ echo "[starttde] Shutting down Trinity..." 1>&2 $TDEDIR/bin/tdeinit_shutdown $TDEDIR/bin/dcopserver_shutdown --wait $TDEDIR/bin/artsshell -q terminate -# KDE4 support. -if [ -f /usr/bin/kdeinit4_shutdown ]; then - /usr/bin/kde4 kdeinit4_shutdown 2>/dev/null -fi echo "[starttde] Running Trinity shutdown scripts..." 1>&2 @@ -830,8 +849,8 @@ echo "[starttde] Running Trinity shutdown scripts..." 1>&2 # Presumed is $TDEDIRS/bin exists. Create $TDEDIRS/bin even when # only using the shutdown directory or this snippet will fail to find # that shutdown directory. -for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do - for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do +for prefix in $(echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'); do + for file in $(ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'); do if [ -x "${prefix}${file}" ]; then echo "[starttde] Running ${prefix}${file}." 1>&2 sh ${prefix}${file} diff --git a/tdeioslave/about/tdeio_about.cpp b/tdeioslave/about/tdeio_about.cpp index 7ed4a5719..6c93a094b 100644 --- a/tdeioslave/about/tdeio_about.cpp +++ b/tdeioslave/about/tdeio_about.cpp @@ -22,7 +22,7 @@ #include <stdlib.h> #include <tqstring.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kurl.h> using namespace TDEIO; diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp index 6fae4e5bd..c1e4ced35 100644 --- a/tdeioslave/cgi/cgi.cpp +++ b/tdeioslave/cgi/cgi.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeprocess.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/tdeioslave/filter/filter.cpp b/tdeioslave/filter/filter.cpp index 79e9977e2..ff0d4ece7 100644 --- a/tdeioslave/filter/filter.cpp +++ b/tdeioslave/filter/filter.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdio.h> #include <stdlib.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <kmimemagic.h> #include <kfilterbase.h> diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp index 1605435b9..dd44030cf 100644 --- a/tdeioslave/finger/tdeio_finger.cpp +++ b/tdeioslave/finger/tdeio_finger.cpp @@ -28,7 +28,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdelocale.h> diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp index edac73fe0..70e42758b 100644 --- a/tdeioslave/fish/fish.cpp +++ b/tdeioslave/fish/fish.cpp @@ -63,7 +63,7 @@ #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdelocale.h> diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp index daa3cd9a0..4f9227b1e 100644 --- a/tdeioslave/floppy/tdeio_floppy.cpp +++ b/tdeioslave/floppy/tdeio_floppy.cpp @@ -42,7 +42,7 @@ #include "tdeio_floppy.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdeio/global.h> #include <tdelocale.h> diff --git a/tdeioslave/info/info.cpp b/tdeioslave/info/info.cpp index 53badf3b4..f436ffeee 100644 --- a/tdeioslave/info/info.cpp +++ b/tdeioslave/info/info.cpp @@ -11,7 +11,7 @@ #include <tdeprocess.h> #include <tdestandarddirs.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include "info.h" diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index 6bba50dcd..61afd6b62 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -10,7 +10,7 @@ #include <netinet/in.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #ifdef HAVE_SASL_SASL_H //prefer libsasl2 diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp index 8832d267c..fb6bed31e 100644 --- a/tdeioslave/mac/tdeio_mac.cpp +++ b/tdeioslave/mac/tdeio_mac.cpp @@ -18,7 +18,7 @@ #define PARTITION "/dev/hda11" -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp index 5e67d8db5..ea0dda8ec 100644 --- a/tdeioslave/man/kmanpart.cpp +++ b/tdeioslave/man/kmanpart.cpp @@ -20,7 +20,7 @@ #include "kmanpart.h" #include <tqstring.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp index a40ae979d..9a67b8f5c 100644 --- a/tdeioslave/man/tdeio_man.cpp +++ b/tdeioslave/man/tdeio_man.cpp @@ -32,7 +32,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdeprocess.h> diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp index 2f114c29b..b29c66681 100644 --- a/tdeioslave/nfs/tdeio_nfs.cpp +++ b/tdeioslave/nfs/tdeio_nfs.cpp @@ -49,7 +49,7 @@ #include <tqdir.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdeio/global.h> diff --git a/tdeioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp index 241b00294..1aba9025b 100644 --- a/tdeioslave/nntp/nntp.cpp +++ b/tdeioslave/nntp/nntp.cpp @@ -15,7 +15,7 @@ #include <tqdir.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/tdeioslave/pop3/pop3.cpp b/tdeioslave/pop3/pop3.cpp index 494c4a6a3..0132dc92c 100644 --- a/tdeioslave/pop3/pop3.cpp +++ b/tdeioslave/pop3/pop3.cpp @@ -52,7 +52,7 @@ extern "C" { #include <tqregexp.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <kmdcodec.h> #include <tdeprotocolmanager.h> diff --git a/tdeioslave/settings/tdeio_settings.cpp b/tdeioslave/settings/tdeio_settings.cpp index 6371c2f4f..3bdbd00eb 100644 --- a/tdeioslave/settings/tdeio_settings.cpp +++ b/tdeioslave/settings/tdeio_settings.cpp @@ -18,7 +18,7 @@ */ #include <tdeio/slavebase.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tqtextstream.h> #include <tdelocale.h> diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h index 56c296c31..f56b11cbd 100644 --- a/tdeioslave/smb/tdeio_smb.h +++ b/tdeioslave/smb/tdeio_smb.h @@ -49,7 +49,7 @@ // KDE includes //-------------- #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/global.h> #include <tdeio/slavebase.h> #include <kurl.h> diff --git a/tdeioslave/smtp/smtp.cpp b/tdeioslave/smtp/smtp.cpp index 76e79f8a5..1197de853 100644 --- a/tdeioslave/smtp/smtp.cpp +++ b/tdeioslave/smtp/smtp.cpp @@ -61,7 +61,7 @@ using KioSMTP::TransactionState; #include <tdeemailsettings.h> #include <ksock.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> #include <tdelocale.h> diff --git a/tdeioslave/tar/ktartest.cpp b/tdeioslave/tar/ktartest.cpp index efb1e42fe..2fe00d32c 100644 --- a/tdeioslave/tar/ktartest.cpp +++ b/tdeioslave/tar/ktartest.cpp @@ -1,7 +1,7 @@ #include "ktar.h" #include <stdio.h> #include <tqfile.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> void recursive_print( const KTarDirectory * dir, const TQString & path ) diff --git a/tdeioslave/tar/tar.cpp b/tdeioslave/tar/tar.cpp index 428a65971..a006d537f 100644 --- a/tdeioslave/tar/tar.cpp +++ b/tdeioslave/tar/tar.cpp @@ -12,7 +12,7 @@ #include <tdeglobal.h> #include <kurl.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <ktar.h> #include <kzip.h> #include <kar.h> diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp index 2915c9999..4efcbe569 100644 --- a/tdeprint/slave/tdeio_print.cpp +++ b/tdeprint/slave/tdeio_print.cpp @@ -28,7 +28,7 @@ #include <tqtextstream.h> #include <tdelocale.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/global.h> #include <tdestandarddirs.h> #include <kiconloader.h> diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 3c9b0e9f1..9377e53fb 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -23,7 +23,7 @@ #include <tdeprint/kiconselectaction.h> #include <tdeaction.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index e79049c74..8bef2cfac 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/tdesu/tdesud/tdesud.cpp @@ -64,7 +64,7 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdelocale.h> #include <tdecmdlineargs.h> diff --git a/tdm/backend/session.c b/tdm/backend/session.c index 0bcd92d5f..060a20b5f 100644 --- a/tdm/backend/session.c +++ b/tdm/backend/session.c @@ -585,7 +585,7 @@ ManageSession( struct display *d ) start_tsak = d->useSAK; #endif if (start_tsak) { - if (system(KDE_BINDIR "/tsak checkdeps") != 0) { + if (system(TDE_BINDIR "/tsak checkdeps") != 0) { start_tsak = 0; } } @@ -593,7 +593,7 @@ ManageSession( struct display *d ) int ret_pid = fork(); if (ret_pid == 0) { // Child process - system(KDE_BINDIR "/tsak"); + system(TDE_BINDIR "/tsak"); exit(0); } } diff --git a/tdm/config.def b/tdm/config.def index 43de11c71..09215227f 100644 --- a/tdm/config.def +++ b/tdm/config.def @@ -2645,7 +2645,7 @@ Key: Preloader Type: string Default: "" User: greeter-c -Instance: */KDE_BINDIR "/preloadkde" +Instance: */TDE_BINDIR "/preloadtde" Comment: & Description: A program to run while the greeter is visible. It is supposed to preload diff --git a/tdmlib/tdmtsak.h b/tdmlib/tdmtsak.h index 34a1953c3..c1bd76ecf 100644 --- a/tdmlib/tdmtsak.h +++ b/tdmlib/tdmtsak.h @@ -63,7 +63,7 @@ inline int tde_sak_verify_calling_process() printf("Parent executable name and full path is: %s\n", procparent.ascii()); #endif - TQString tdeBinaryPath = TQString(KDE_BINDIR "/"); + TQString tdeBinaryPath = TQString(TDE_BINDIR "/"); #ifdef DEBUG printf("The TDE binary path is: %s\n", tdeBinaryPath.ascii()); #endif @@ -121,7 +121,7 @@ inline int tde_sak_verify_calling_process() printf("Environment is: %s\n", tdeinitEnvironment.ascii()); #endif - if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(KDE_BINDIR))) { + if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(TDE_BINDIR))) { authorized = true; } else { diff --git a/translations/desktop_files/drkonqi-presets/zh_CN.po b/translations/desktop_files/drkonqi-presets/zh_CN.po index c1416a6a7..f98b38f18 100644 --- a/translations/desktop_files/drkonqi-presets/zh_CN.po +++ b/translations/desktop_files/drkonqi-presets/zh_CN.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Toad114514 <xiaolan2332021@163.com>, 2025. 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: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-09-12 05:21+0000\n" +"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n" +"Language-Team: Chinese (Simplified Han script) <https://mirror.git." +"trinitydesktop.org/weblate/projects/tdebase/drkonqi-presets/zh_Hans/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: developerrc:2 @@ -116,10 +117,10 @@ msgid "" "include as much information as possible, maybe the original documents. If " "you have a way to reproduce the error, include this also." msgstr "" -"您可能想要为此程序发送错误报告。请检查该错误是否已经在 http://bugs." -"trinitydesktop.org 列出来了。如果尚未列出来的话，就需要联系作者。请尽可能提供" -"详细的信息，比如当时程序使用的文档。如果您有办法重现错误，请同时提供这样的方" -"法。" +"您可能想给该程序发送错误报告。请先去看看该错误是否已经在 http://" +"bugs.trinitydesktop.org 发现了。如果没有的话，就得联系作者了。请您尽可能提供" +"详细的信息，例如当时程序使用的文档。如果您有办法复现bug的话，请同时提供bug的" +"复现方法。" #. Comment #: enduserrc:21 diff --git a/translations/desktop_files/kappfinder-data/ru.po b/translations/desktop_files/kappfinder-data/ru.po index 67a1718e1..a5d33c3dc 100644 --- a/translations/desktop_files/kappfinder-data/ru.po +++ b/translations/desktop_files/kappfinder-data/ru.po @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024. +# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024, 2025. # Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" 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: 2024-03-02 05:44+0000\n" +"PO-Revision-Date: 2025-11-02 15:58+0000\n" "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/kappfinder-data/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 #: Development/Forte.desktop:2 @@ -61,9 +61,8 @@ msgstr "Редактор интерфейса приложений Qt" #. Name #: Development/dlgedit.desktop:2 -#, fuzzy msgid "Qt DlgEdit" -msgstr "Редактор диалогов для Qt" +msgstr "Qt DlgEdit" #. GenericName #: Development/dlgedit.desktop:3 @@ -441,9 +440,8 @@ msgstr "Rogue" #. GenericName #: Games/Roguelikes/rogue.desktop:3 -#, fuzzy msgid "The Original" -msgstr "Терминал" +msgstr "Та самая, оригинальная" #. Name #: Games/Roguelikes/tome.desktop:2 @@ -452,9 +450,8 @@ msgstr "ToME" #. Name #: Games/Roguelikes/zangband.desktop:2 -#, fuzzy msgid "ZAngband" -msgstr "Ангбанд" +msgstr "ZAngband" #. GenericName #: Games/Roguelikes/zangband.desktop:3 @@ -494,12 +491,12 @@ msgstr "Свободный клон Scorched Earth для UNIX и X" #. Name #: Games/Toys/xeyes.desktop:2 msgid "X Eyes" -msgstr "" +msgstr "X-глазки" #. Name #: Games/Toys/xpinguin.desktop:2 msgid "Tux" -msgstr "" +msgstr "Tux" #. GenericName #: Games/Toys/xpinguin.desktop:3 @@ -519,7 +516,7 @@ msgstr "Игра" #. Name #: Games/penguin-command.desktop:3 msgid "Penguin Command" -msgstr "" +msgstr "Penguin Command" #. Name #: Games/xshipwars.desktop:3 @@ -529,7 +526,7 @@ msgstr "XShipWars" #. Name #: Graphics/ElectricEyes.desktop:2 msgid "Electric Eyes" -msgstr "" +msgstr "Electric Eyes" #. GenericName #: Graphics/ElectricEyes.desktop:3 @@ -559,7 +556,7 @@ msgstr "Редактор значков GNOME" #. Name #: Graphics/Gqview.desktop:2 msgid "Gqview" -msgstr "" +msgstr "Gqview" #. GenericName #: Graphics/Gqview.desktop:3 @@ -569,7 +566,7 @@ msgstr "Программа просмотра рисунков" #. Name #: Graphics/Sketch.desktop:2 msgid "Sketch" -msgstr "" +msgstr "Sketch" #. GenericName #: Graphics/Sketch.desktop:3 @@ -589,7 +586,7 @@ msgstr "Утилиты PhotoCD" #. Name #: Graphics/Xwpick.desktop:2 msgid "Xwpick" -msgstr "" +msgstr "Xwpick" #. GenericName #: Graphics/Xwpick.desktop:3 @@ -599,7 +596,7 @@ msgstr "Снимок экрана" #. Name #: Graphics/bitmap.desktop:2 msgid "X Bitmap" -msgstr "" +msgstr "X Bitmap" #. GenericName #: Graphics/bitmap.desktop:3 @@ -659,12 +656,12 @@ msgstr "Векторная графика" #. Name #: Graphics/sodipodi.desktop:2 msgid "Sodipodi" -msgstr "" +msgstr "Sodipodi" #. Name #: Graphics/tgif.desktop:2 msgid "TGif" -msgstr "" +msgstr "TGif" #. GenericName #: Graphics/tgif.desktop:3 Graphics/xfig.desktop:3 @@ -684,7 +681,7 @@ msgstr "Программа просмотра DVI" #. Name #: Graphics/xfig.desktop:2 msgid "Xfig" -msgstr "" +msgstr "Xfig" #. Name #: Graphics/xpaint.desktop:2 @@ -709,7 +706,7 @@ msgstr "Программа просмотра рисунков" #. Name #: Internet/BlueFish.desktop:2 msgid "BlueFish" -msgstr "" +msgstr "BlueFish" #. GenericName #: Internet/BlueFish.desktop:3 @@ -719,7 +716,7 @@ msgstr "Редактор HTML" #. Name #: Internet/Dpsftp.desktop:2 msgid "Dpsftp" -msgstr "" +msgstr "Dpsftp" #. GenericName #: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3 Internet/xftp.desktop:3 @@ -729,7 +726,7 @@ msgstr "FTP-браузер" #. Name #: Internet/DrakSync.desktop:2 msgid "DrakSync" -msgstr "" +msgstr "DrakSync" #. GenericName #: Internet/DrakSync.desktop:3 diff --git a/translations/desktop_files/kcontrol-color-schemes/az.po b/translations/desktop_files/kcontrol-color-schemes/az.po index 849a5d91c..891f4d6b4 100644 --- a/translations/desktop_files/kcontrol-color-schemes/az.po +++ b/translations/desktop_files/kcontrol-color-schemes/az.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Alexander Golubev <fatzer2@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-26 18:11+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: 2025-11-02 15:58+0000\n" +"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"Language-Team: Azerbaijani <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/color-schemes/az/>\n" "Language: az\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 #: AtlasGreen.kcsrc:3 @@ -79,7 +80,7 @@ msgstr "" #. Name #: Jewels-Aquamarine.kcsrc:2 msgid "Jewels - Aquamarine" -msgstr "" +msgstr "Самоцветы — Аквамарин" #. Name #: Jewels-Carbon.kcsrc:2 diff --git a/translations/desktop_files/kcontrol-color-schemes/es_AR.po b/translations/desktop_files/kcontrol-color-schemes/es_AR.po index 0a2d98283..e0c8fd7d7 100644 --- a/translations/desktop_files/kcontrol-color-schemes/es_AR.po +++ b/translations/desktop_files/kcontrol-color-schemes/es_AR.po @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Sergio Ricardo Vicari <sercari@gmail.com>, 2020. -# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024. +# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-26 18:11+0000\n" -"PO-Revision-Date: 2024-06-23 16:10+0000\n" +"PO-Revision-Date: 2025-11-03 18:25+0000\n" "Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n" "Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/" "weblate/projects/tdebase/color-schemes/es_AR/>\n" @@ -16,7 +16,7 @@ msgstr "" "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.17\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: AtlasGreen.kcsrc:3 @@ -157,7 +157,7 @@ msgstr "Lagarto" #. Name #: MediaPeach.kcsrc:2 msgid "Media Peach" -msgstr "Color melocotón medio" +msgstr "Color durazno medio" #. Name #: Next.kcsrc:2 @@ -192,7 +192,7 @@ msgstr "Verde Point Reyes" #. Name #: Pumpkin.kcsrc:3 msgid "Pumpkin" -msgstr "Calabaza" +msgstr "Zapallo" #. Name #: Seasons-Autumn.kcsrc:2 diff --git a/translations/desktop_files/kcontrol-color-schemes/ru.po b/translations/desktop_files/kcontrol-color-schemes/ru.po index 0b421ba00..4c76b09cd 100644 --- a/translations/desktop_files/kcontrol-color-schemes/ru.po +++ b/translations/desktop_files/kcontrol-color-schemes/ru.po @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # blu.256 <mavridisf@gmail.com>, 2022. -# Alexander Golubev <fatzer2@gmail.com>, 2024. +# Alexander Golubev <fatzer2@gmail.com>, 2024, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-26 18:11+0000\n" -"PO-Revision-Date: 2024-03-02 05:44+0000\n" +"PO-Revision-Date: 2025-11-02 15:58+0000\n" "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/color-schemes/ru/>\n" @@ -15,9 +15,9 @@ msgstr "" "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.17\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 #: AtlasGreen.kcsrc:3 @@ -32,7 +32,7 @@ msgstr "BeOS" #. Name #: BlackOnWhite.kcsrc:2 msgid "High Contrast Black Text" -msgstr "Высококонтрастный чёрный текст" +msgstr "Высококонтрастная — чёрный текст" #. Name #: BlueSlate.kcsrc:3 @@ -57,7 +57,7 @@ msgstr "Красная пустыня" #. Name #: Different.kcsrc:2 msgid "Different" -msgstr "" +msgstr "Иной" #. Name #: DigitalCDE.kcsrc:3 @@ -77,42 +77,42 @@ msgstr "Человек" #. Name #: Jewels-Amethyst.kcsrc:2 msgid "Jewels - Amethyst" -msgstr "" +msgstr "Самоцветы — Аметист" #. Name #: Jewels-Aquamarine.kcsrc:2 msgid "Jewels - Aquamarine" -msgstr "" +msgstr "Самоцветы — Аквамарин" #. Name #: Jewels-Carbon.kcsrc:2 msgid "Jewels - Carbon" -msgstr "" +msgstr "Самоцветы — Углерод" #. Name #: Jewels-Citrin.kcsrc:2 msgid "Jewels - Citrin" -msgstr "" +msgstr "Самоцветы — Цитрин" #. Name #: Jewels-Emerald.kcsrc:2 msgid "Jewels - Emerald" -msgstr "" +msgstr "Самоцветы — Изумруд" #. Name #: Jewels-Ruby.kcsrc:2 msgid "Jewels - Ruby" -msgstr "" +msgstr "Самоцветы — Рубин" #. Name #: Jewels-Sapphire.kcsrc:2 msgid "Jewels - Sapphire" -msgstr "" +msgstr "Самоцветы — Сапфир" #. Name #: Jewels-Topaz.kcsrc:2 msgid "Jewels - Topaz" -msgstr "" +msgstr "Самоцветы — Топаз" #. Name #: KDEOne.kcsrc:2 @@ -147,7 +147,7 @@ msgstr "Last.fm" #. Name #: Lila.kcsrc:2 msgid "Lila" -msgstr "" +msgstr "Лила" #. Name #: Lizard.kcsrc:2 @@ -172,7 +172,7 @@ msgstr "Тусклый серый" #. Name #: Pinkie.kcsrc:2 msgid "Pinkie" -msgstr "" +msgstr "Пинки" #. Name #: Plastik.kcsrc:2 @@ -187,7 +187,7 @@ msgstr "Платина" #. Name #: PointReyesGreen.kcsrc:2 msgid "Point Reyes Green" -msgstr "Зелёный из Point Reyes" +msgstr "Зелёный Поинт Рейс" #. Name #: Pumpkin.kcsrc:3 @@ -197,22 +197,22 @@ msgstr "Тыква" #. Name #: Seasons-Autumn.kcsrc:2 msgid "Seasons - Autumn" -msgstr "" +msgstr "Сезоны — Осень" #. Name #: Seasons-Spring.kcsrc:2 msgid "Seasons - Spring" -msgstr "" +msgstr "Сезоны — Весна" #. Name #: Seasons-Summer.kcsrc:2 msgid "Seasons - Summer" -msgstr "" +msgstr "Сезоны — Лето" #. Name #: Seasons-Winter.kcsrc:2 msgid "Seasons - Winter" -msgstr "" +msgstr "Сезоны — Зима" #. Name #: Sienna.kcsrc:2 @@ -242,7 +242,7 @@ msgstr "WedgieWeb" #. Name #: WhiteOnBlack.kcsrc:2 msgid "High Contrast White Text" -msgstr "Высококонтрастный белый текст" +msgstr "Высококонтрастная — белый текст" #. Name #: Windows2000.kcsrc:2 @@ -262,4 +262,4 @@ msgstr "Редмонд XP" #. Name #: YellowOnBlue.kcsrc:2 msgid "High Contrast Yellow on Blue" -msgstr "Высококонтрастный жёлтый на синем" +msgstr "Высококонтрастная — жёлтый на синем" diff --git a/translations/desktop_files/kcontrol-color-schemes/sv.po b/translations/desktop_files/kcontrol-color-schemes/sv.po index c7ceaaba1..0cd210660 100644 --- a/translations/desktop_files/kcontrol-color-schemes/sv.po +++ b/translations/desktop_files/kcontrol-color-schemes/sv.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-26 18:11+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: 2025-08-25 00:28+0000\n" +"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n" +"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/color-schemes/sv/>\n" "Language: sv\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 #: AtlasGreen.kcsrc:3 @@ -24,7 +25,7 @@ msgstr "Atlasgrön" #. Name #: BeOS.kcsrc:3 msgid "BeOS" -msgstr "" +msgstr "BeOS" #. Name #: BlackOnWhite.kcsrc:2 @@ -39,7 +40,7 @@ msgstr "Blå skiffer" #. Name #: CDE.kcsrc:3 msgid "CDE" -msgstr "" +msgstr "CDE" #. Name #: DarkBlue.kcsrc:2 @@ -59,73 +60,72 @@ msgstr "" #. Name #: DigitalCDE.kcsrc:3 msgid "Digital CDE" -msgstr "" +msgstr "Digital CDE" #. Name #: EveX.kcsrc:2 msgid "EveX" -msgstr "" +msgstr "EveX" #. Name #: Human.kcsrc:2 msgid "Human" -msgstr "" +msgstr "Human" #. Name #: Jewels-Amethyst.kcsrc:2 msgid "Jewels - Amethyst" -msgstr "" +msgstr "Juveler - Ametist" #. Name #: Jewels-Aquamarine.kcsrc:2 msgid "Jewels - Aquamarine" -msgstr "" +msgstr "Juveler - Akvamarin" #. Name #: Jewels-Carbon.kcsrc:2 msgid "Jewels - Carbon" -msgstr "" +msgstr "Juveler - Kol" #. Name #: Jewels-Citrin.kcsrc:2 msgid "Jewels - Citrin" -msgstr "" +msgstr "Juveler - Citrin" #. Name #: Jewels-Emerald.kcsrc:2 msgid "Jewels - Emerald" -msgstr "" +msgstr "Juveler - Smaragd" #. Name #: Jewels-Ruby.kcsrc:2 msgid "Jewels - Ruby" -msgstr "" +msgstr "Juveler - Rubin" #. Name #: Jewels-Sapphire.kcsrc:2 msgid "Jewels - Sapphire" -msgstr "" +msgstr "Juveler - Safir" #. Name #: Jewels-Topaz.kcsrc:2 msgid "Jewels - Topaz" -msgstr "" +msgstr "Juveler - Topas" #. Name #: KDEOne.kcsrc:2 msgid "KDE 1" -msgstr "" +msgstr "KDE 1" #. Name #: KDETwo.kcsrc:2 msgid "KDE 2" -msgstr "" +msgstr "KDE 2" #. Name #: Keramik.kcsrc:2 -#, fuzzy msgid "Keramik" -msgstr "Vit Keramik" +msgstr "Keramik" #. Name #: KeramikEmerald.kcsrc:2 @@ -140,17 +140,17 @@ msgstr "Vit Keramik" #. Name #: Last.fm.kcsrc:2 msgid "Last.fm" -msgstr "" +msgstr "Last.fm" #. Name #: Lila.kcsrc:2 msgid "Lila" -msgstr "" +msgstr "Lila" #. Name #: Lizard.kcsrc:2 msgid "Lizard" -msgstr "" +msgstr "Ödla" #. Name #: MediaPeach.kcsrc:2 @@ -160,7 +160,7 @@ msgstr "" #. Name #: Next.kcsrc:2 msgid "Next" -msgstr "" +msgstr "NeXT" #. Name #: PaleGray.kcsrc:3 @@ -170,7 +170,7 @@ msgstr "Blekgrå" #. Name #: Pinkie.kcsrc:2 msgid "Pinkie" -msgstr "" +msgstr "Rosa" #. Name #: Plastik.kcsrc:2 @@ -195,27 +195,27 @@ msgstr "Pumpa" #. Name #: Seasons-Autumn.kcsrc:2 msgid "Seasons - Autumn" -msgstr "" +msgstr "Årstider - Höst" #. Name #: Seasons-Spring.kcsrc:2 msgid "Seasons - Spring" -msgstr "" +msgstr "Årstider - Vår" #. Name #: Seasons-Summer.kcsrc:2 msgid "Seasons - Summer" -msgstr "" +msgstr "Årstider - Sommar" #. Name #: Seasons-Winter.kcsrc:2 msgid "Seasons - Winter" -msgstr "" +msgstr "Årstider - Vinter" #. Name #: Sienna.kcsrc:2 msgid "Sienna" -msgstr "" +msgstr "Sienna" #. Name #: SolarisCDE.kcsrc:2 @@ -225,7 +225,7 @@ msgstr "" #. Name #: Storm.kcsrc:3 msgid "Storm" -msgstr "" +msgstr "Storm" #. Name #: System.kcsrc:2 @@ -235,7 +235,7 @@ msgstr "" #. Name #: WedgieWeb.kcsrc:2 msgid "WedgieWeb" -msgstr "" +msgstr "Webb" #. Name #: WhiteOnBlack.kcsrc:2 @@ -245,17 +245,17 @@ msgstr "Vit text med hög kontrast" #. Name #: Windows2000.kcsrc:2 msgid "Redmond 2000" -msgstr "" +msgstr "Redmond 2000" #. Name #: Windows95.kcsrc:3 msgid "Redmond 95" -msgstr "" +msgstr "Redmond 95" #. Name #: WindowsXP.kcsrc:2 msgid "Redmond XP" -msgstr "" +msgstr "Redmond XP" #. Name #: YellowOnBlue.kcsrc:2 diff --git a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po b/translations/desktop_files/kcontrol-color-schemes/zh_CN.po index 360a83f09..bb5c5fea9 100644 --- a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po +++ b/translations/desktop_files/kcontrol-color-schemes/zh_CN.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-26 18:11+0000\n" -"PO-Revision-Date: 2025-04-24 12:44+0000\n" +"PO-Revision-Date: 2025-08-28 20:46+0000\n" "Last-Translator: Toad114514 <xiaolan2332021@163.com>\n" -"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/" -"weblate/projects/tdebase/color-schemes/zh_Hans/>\n" +"Language-Team: Chinese (Simplified Han script) <https://mirror.git." +"trinitydesktop.org/weblate/projects/tdebase/color-schemes/zh_Hans/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: AtlasGreen.kcsrc:3 @@ -215,7 +215,7 @@ msgstr "季节 - 冬天" #. Name #: Sienna.kcsrc:2 msgid "Sienna" -msgstr "" +msgstr "黄土" #. Name #: SolarisCDE.kcsrc:2 diff --git a/translations/desktop_files/kcontrol-desktops/ia.po b/translations/desktop_files/kcontrol-desktops/ia.po index 4eb03b70e..24be1f540 100644 --- a/translations/desktop_files/kcontrol-desktops/ia.po +++ b/translations/desktop_files/kcontrol-desktops/ia.po @@ -1,30 +1,31 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# giovanni <assecoibalcu@yahoo.it>, 2025. 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: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-10-14 16:16+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" "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 #: access/kaccess.desktop:3 msgid "Accessibility Tool" -msgstr "" +msgstr "Instrumento de Accessibilitate" #. Name #: access/kcmaccess.desktop:12 msgid "Accessibility" -msgstr "" +msgstr "Accessibilitate" #. Comment #: access/kcmaccess.desktop:14 @@ -59,7 +60,7 @@ msgstr "" #. Name #: background/background.desktop:12 msgid "Background" -msgstr "" +msgstr "Fundo" #. Comment #: background/background.desktop:14 @@ -76,7 +77,7 @@ msgstr "" #. Name #: bell/bell.desktop:13 msgid "System Bell" -msgstr "" +msgstr "Campana de systema" #. Comment #: bell/bell.desktop:15 @@ -91,12 +92,12 @@ msgstr "" #. Name #: clock/clock.desktop:13 msgid "Date & Time" -msgstr "" +msgstr "Date & Tempore" #. Comment #: clock/clock.desktop:15 msgid "Date and time settings" -msgstr "" +msgstr "Preferentias de Data e Tempore" #. Keywords #: clock/clock.desktop:17 @@ -106,12 +107,12 @@ msgstr "" #. Name #: colors/colors.desktop:12 msgid "Colors" -msgstr "" +msgstr "Colores" #. Comment #: colors/colors.desktop:14 msgid "Color settings" -msgstr "" +msgstr "Preferentias de color" #. Keywords #: colors/colors.desktop:16 @@ -152,7 +153,7 @@ msgstr "" #. Name #: componentchooser/componentservices/kcm_browser.desktop:1 msgid "Web Browser" -msgstr "" +msgstr "Navigator Web" #. Comment #: componentchooser/componentservices/kcm_browser.desktop:3 @@ -165,7 +166,7 @@ msgstr "" #: componentchooser/componentservices/kcm_filemanager.desktop:1 #: konq/filebrowser.desktop:12 msgid "File Manager" -msgstr "" +msgstr "Gerente de File" #. Comment #: componentchooser/componentservices/kcm_filemanager.desktop:3 @@ -178,7 +179,7 @@ msgstr "" #. Name #: componentchooser/componentservices/kcm_kemail.desktop:1 msgid "Email Client" -msgstr "" +msgstr "Cliente de E-Posta" #. Comment #: componentchooser/componentservices/kcm_kemail.desktop:3 @@ -191,7 +192,7 @@ msgstr "" #. Name #: componentchooser/componentservices/kcm_terminal.desktop:1 msgid "Terminal Emulator" -msgstr "" +msgstr "Emulator de terminal" #. Comment #: componentchooser/componentservices/kcm_terminal.desktop:3 @@ -204,7 +205,7 @@ msgstr "" #. Name #: crypto/crypto.desktop:10 msgid "Crypto" -msgstr "" +msgstr "Crypto" #. Comment #: crypto/crypto.desktop:12 @@ -221,27 +222,27 @@ msgstr "" #. Name #: css/kcmcss.desktop:12 msgid "Stylesheets" -msgstr "" +msgstr "Stylesheets (Folios de stilo)" #. Comment #: css/kcmcss.desktop:14 msgid "Configure the stylesheets used to render web pages" -msgstr "" +msgstr "Configura le folios de stilo usate pro render paginas web" #. Keywords #: css/kcmcss.desktop:16 msgid "CSS;HTML;style;stylesheet;accessibility;" -msgstr "" +msgstr "CSS,HTML,stilo,folio de stilo,accessibilitate;" #. Name #: display/display.desktop:11 msgid "Display" -msgstr "" +msgstr "Monstrator" #. Comment #: display/display.desktop:13 msgid "Display Settings" -msgstr "" +msgstr "Preferentias de monstrator" #. Name #: displayconfig/displayconfig.desktop:12 @@ -251,7 +252,7 @@ msgstr "" #. Comment #: displayconfig/displayconfig.desktop:14 msgid "Configure display" -msgstr "" +msgstr "Configura Monstrator" #. Keywords #: displayconfig/displayconfig.desktop:16 @@ -271,7 +272,7 @@ msgstr "" #. Name #: ebrowsing/ebrowsing.desktop:12 msgid "Web Shortcuts" -msgstr "" +msgstr "Vias Breve de web" #. Comment #: ebrowsing/ebrowsing.desktop:14 @@ -298,12 +299,12 @@ msgstr "" #. Comment #: ebrowsing/plugins/ikws/searchprovider.desktop:4 msgid "Search Engine" -msgstr "" +msgstr "Motor de cerca" #. Name #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3 msgid "Acronym Database" -msgstr "" +msgstr "Base de Datos Acronym" #. Query #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6 @@ -354,7 +355,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:4 msgid "All Music Guide" -msgstr "" +msgstr "All Music Guide" #. Query #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:5 @@ -364,7 +365,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:3 msgid "KDE App Search" -msgstr "" +msgstr "Cerca de KDE App" #. Query #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:6 @@ -384,7 +385,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3 msgid "Debian Backports Search" -msgstr "" +msgstr "Cerca de Debian Backports" #. Query #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4 @@ -416,7 +417,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/call.desktop:5 msgid "QRZ.com Callsign Database" -msgstr "" +msgstr "QRZ.com base de datos Callsign" #. Query #: ebrowsing/plugins/ikws/searchproviders/call.desktop:6 @@ -439,7 +440,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:5 msgid "CiteSeer: Scientific Literature Digital Library" -msgstr "" +msgstr "CiteSeer: Libreria Digital de litteratura Scientific" #. Query #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:6 @@ -450,6 +451,8 @@ msgstr "" #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:3 msgid "CPAN - Comprehensive Perl Archive Network" msgstr "" +"CPAN - Comprehensive Perl Archive Network (Rete Comprehensive de Archivo de " +"Perl)" #. Query #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:4 @@ -461,6 +464,8 @@ msgstr "" #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:3 msgid "CTAN - Comprehensive TeX Archive Network" msgstr "" +"CTAN - Comprehensive TeX Archive Network (Rete Comprehensive de Archivo de " +"TeX)" #. Query #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:4 @@ -472,7 +477,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3 msgid "CTAN Catalog" -msgstr "" +msgstr "Catalogo CTAN" #. Query #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:4 @@ -483,7 +488,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:3 msgid "Debian BTS Bug Search" -msgstr "" +msgstr "Cerca de Bug Debian BTS" #. Query #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:4 @@ -493,7 +498,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5 msgid "dict.cc Translation: German to English" -msgstr "" +msgstr "dict.cc Traduction: Germano a Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6 @@ -504,7 +509,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3 msgid "LEO - Translate Between German and French" -msgstr "" +msgstr "LEO - Traducer inter Germano e Francese" #. Query #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:6 @@ -515,7 +520,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:3 msgid "Debian Package Search" -msgstr "" +msgstr "Cerca de Pacchetto Debian" #. Query #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:4 @@ -525,7 +530,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:3 msgid "Open Directory" -msgstr "" +msgstr "Aperi directorio" #. Query #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6 @@ -535,7 +540,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5 msgid "DocBook - The Definitive Guide" -msgstr "" +msgstr "DocBook - Le Guida Definitive" #. Query #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:6 @@ -545,7 +550,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:5 msgid "Digital Object Identifier" -msgstr "" +msgstr "Identificator de Objecto Digital" #. Query #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:6 @@ -555,12 +560,12 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5 msgid "dict.cc Translation: English to German" -msgstr "" +msgstr "dict.cc Traduction: Anglese a Germano" #. Name #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:5 msgid "WordReference.com Translation: English to Spanish" -msgstr "" +msgstr "WordReference.com Traduction: Anglese a Espaniol" #. Query #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:6 @@ -570,7 +575,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:5 msgid "WordReference.com Translation: English to French" -msgstr "" +msgstr "WordReference.com Traduction: Anglese a Francese" #. Query #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:6 @@ -580,7 +585,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:5 msgid "WordReference.com Translation: English to Italian" -msgstr "" +msgstr "WordReference.com Traduction: Anglese a Italiano" #. Query #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:6 @@ -590,7 +595,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:5 msgid "WordReference.com Translation: Spanish to English" -msgstr "" +msgstr "WordReference.com Traduction: Espaniol a Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:6 @@ -610,7 +615,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:3 msgid "Feedster" -msgstr "" +msgstr "Feedster" #. Query #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:6 @@ -621,6 +626,8 @@ msgstr "" #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:3 msgid "Free On-Line Dictionary of Computing" msgstr "" +"Free On-Line Dictionary of Computing (Dictionario gratuite in linea de " +"Computatores)" #. Query #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:6 @@ -630,12 +637,12 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:3 msgid "LEO - Translate Between French and German" -msgstr "" +msgstr "LEO - Traduce inter Francese e Germano" #. Name #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:5 msgid "WordReference.com Translation: French to English" -msgstr "" +msgstr "WordReference.com Traduction: Francese a Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:6 @@ -645,12 +652,12 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:3 msgid "FreeDB" -msgstr "" +msgstr "FreeDB" #. Query #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:6 msgid "http://www.freedb.org/freedb_search.php?words=\\{@}" -msgstr "" +msgstr "http://www.freedb.org/freedb_search.php?words=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:3 @@ -675,7 +682,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:3 msgid "FSF/UNESCO Free Software Directory" -msgstr "" +msgstr "FSF/UNESCO Free Software Directory (Directorio de software libere)" #. Query #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:6 @@ -685,7 +692,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/google.desktop:3 msgid "Google" -msgstr "" +msgstr "Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google.desktop:6 @@ -695,7 +702,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:3 msgid "Google Advanced Search" -msgstr "" +msgstr "Google Advanced Search : cerca avantiate de Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:4 @@ -710,7 +717,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3 msgid "Google Groups" -msgstr "" +msgstr "Google Groups : Gruppos de Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:6 @@ -720,7 +727,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:3 msgid "Google Image Search" -msgstr "" +msgstr "Google Image Search : cerca de Imagine de Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:6 @@ -730,7 +737,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:3 msgid "Google (I'm Feeling Lucky)" -msgstr "" +msgstr "Google (Io sente me fortunate)" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:6 @@ -743,7 +750,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:3 msgid "Google Movies" -msgstr "" +msgstr "Google Movies" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:6 @@ -753,7 +760,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:3 msgid "Google News" -msgstr "" +msgstr "Google News - Novas de Google" #. Query #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:6 @@ -773,7 +780,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5 msgid "Great Dictionary of the Catalan Language (GRan Enciclopèdia Catalana)" -msgstr "" +msgstr "Grande Dictionario del Linguage Catalan (GRan Enciclopèdia Catalana)" #. Query #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:6 @@ -793,27 +800,27 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:3 msgid "HyperDictionary.com" -msgstr "" +msgstr "HyperDictionary.com" #. Query #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:6 msgid "http://www.hyperdictionary.com/search.aspx?define=\\{@}" -msgstr "" +msgstr "http://www.hyperdictionary.com/search.aspx?define=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:3 msgid "HyperDictionary.com Thesaurus" -msgstr "" +msgstr "HyperDictionary.com Thesauro" #. Query #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:6 msgid "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}" -msgstr "" +msgstr "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}" #. Name #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:3 msgid "Internet Movie Database" -msgstr "" +msgstr "Base de datos de internet de films" #. Query #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:6 @@ -823,7 +830,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:5 msgid "WordReference.com Translation: Italian to English" -msgstr "" +msgstr "WordReference.com Traduction: Italiano a Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:6 @@ -833,7 +840,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:3 msgid "Ask Jeeves" -msgstr "" +msgstr "Ask Jeeves" #. Query #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:6 @@ -855,7 +862,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:5 msgid "KDE API Documentation" -msgstr "" +msgstr "Documentation de KDE API" #. Query #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:6 @@ -875,7 +882,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:3 msgid "LEO-Translate" -msgstr "" +msgstr "LEO-Traduce" #. Query #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:6 @@ -905,7 +912,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:3 msgid "MetaCrawler" -msgstr "" +msgstr "MetaCrawler" #. Query #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:6 @@ -918,7 +925,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3 msgid "Microsoft Developer Network Search" -msgstr "" +msgstr "Microsoft Developer Network Search" #. Query #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:6 @@ -931,7 +938,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:3 msgid "Netcraft" -msgstr "" +msgstr "Netcraft" #. Query #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:6 @@ -941,7 +948,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:2 msgid "Telephonebook Search Provider" -msgstr "" +msgstr "Fornitor de cerca Telephonebook" #. Query #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:6 @@ -956,7 +963,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:2 msgid "Teletekst Search Provider" -msgstr "" +msgstr "Fornitor de cerca Teletekst" #. Query #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:6 @@ -966,7 +973,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:3 msgid "OpenPGP Key Search" -msgstr "" +msgstr "Cerca de clave OpenPGP" #. Query #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:4 @@ -976,7 +983,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/php.desktop:3 msgid "PHP Search" -msgstr "" +msgstr "Cerca PHP" #. Query #: ebrowsing/plugins/ikws/searchproviders/php.desktop:4 @@ -986,7 +993,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/python.desktop:5 msgid "Python Reference Manual" -msgstr "" +msgstr "Manual de referentia de Python" #. Query #: ebrowsing/plugins/ikws/searchproviders/python.desktop:6 @@ -1009,7 +1016,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:5 msgid "Qt3 Online Documentation" -msgstr "" +msgstr "Documentation in linea de Qt3" #. Query #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:6 @@ -1019,7 +1026,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:5 msgid "Dictionary of the Spanish Academy (RAE)" -msgstr "" +msgstr "Dictionario del Academia Espaniol (RAE)" #. Query #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:6 @@ -1031,7 +1038,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3 msgid "IETF Requests for Comments" -msgstr "" +msgstr "IETF Requestas pro Commentos" #. Query #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:4 @@ -1041,7 +1048,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:3 msgid "RPM-Find" -msgstr "" +msgstr "RPM-Find" #. Query #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:6 @@ -1051,7 +1058,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:3 msgid "Ruby Application Archive" -msgstr "" +msgstr "Archivo de application de Ruby" #. Query #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:6 @@ -1073,7 +1080,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3 msgid "SourceForge" -msgstr "" +msgstr "SourceForge" #. Query #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:4 @@ -1085,7 +1092,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3 msgid "Technorati" -msgstr "" +msgstr "Technorati" #. Query #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6 @@ -1095,7 +1102,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:3 msgid "Technorati Tags" -msgstr "" +msgstr "Technorati Etiquettas" #. Query #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:6 @@ -1105,7 +1112,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:3 msgid "Merriam-Webster Thesaurus" -msgstr "" +msgstr "Merriam-Webster Thesauro" #. Query #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:6 @@ -1115,7 +1122,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:4 msgid "TV Tome" -msgstr "" +msgstr "TV Tome" #. Query #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:6 @@ -1125,7 +1132,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:5 msgid "U.S. Patent Database" -msgstr "" +msgstr "U.S. Patent Database" #. Query #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:6 @@ -1133,6 +1140,8 @@ msgid "" "http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}" "&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50" msgstr "" +"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\" +"{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50" #. Name #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3 @@ -1150,7 +1159,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:3 msgid "Voila" -msgstr "" +msgstr "Voila" #. Query #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:6 @@ -1162,7 +1171,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:3 msgid "Merriam-Webster Dictionary" -msgstr "" +msgstr "Merriam-Webster Dictionario" #. Query #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:6 @@ -1183,7 +1192,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:3 msgid "Wikipedia - The Free Encyclopedia" -msgstr "" +msgstr "Wikipedia - Le Encyclopedia Libere e Gratuite" #. Query #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:6 @@ -1193,7 +1202,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3 msgid "Wiktionary - The Free Dictionary" -msgstr "" +msgstr "Wiktionary - Le Dictionario Libere e Gratuite" #. Query #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6 @@ -1203,7 +1212,7 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:5 msgid "WordReference.com English Dictionary" -msgstr "" +msgstr "WordReference.com Dictionario Anglese" #. Query #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:6 @@ -1238,28 +1247,30 @@ msgstr "" #. Name #: filetypes/filetypes.desktop:12 msgid "File Associations" -msgstr "" +msgstr "Associationes de file" #. Comment #: filetypes/filetypes.desktop:14 msgid "Configure file associations" -msgstr "" +msgstr "Configura associationes de file" #. Keywords #: filetypes/filetypes.desktop:16 msgid "Filetypes;File Associations;Mime Types;File Patterns;Files;Pattern;" msgstr "" +"Typos de file;Associationes de file;Typos Mime;Patronos de " +"File;Files;Patrono;" #. Name #: fonts/fonts.desktop:12 konqhtml/tdehtml_fonts.desktop:11 #: tdefontinst/tdeio/fonts.desktop:5 msgid "Fonts" -msgstr "" +msgstr "Fonts" #. Comment #: fonts/fonts.desktop:14 msgid "Font settings" -msgstr "" +msgstr "Preferentias de font" #. Keywords #: fonts/fonts.desktop:16 @@ -1313,12 +1324,12 @@ msgstr "" #. Name #: iccconfig/iccconfig.desktop:18 msgid "Color Profile" -msgstr "" +msgstr "Profilo de Color" #. Name #: icons/icons.desktop:12 msgid "Icons" -msgstr "" +msgstr "Icones" #. Comment #: icons/icons.desktop:14 @@ -1348,7 +1359,7 @@ msgstr "" #. Name #: info/devices.desktop:13 msgid "Devices" -msgstr "" +msgstr "Dispositivos" #. Comment #: info/devices.desktop:15 @@ -1378,17 +1389,17 @@ msgstr "" #. Name #: info/interrupts.desktop:13 msgid "Interrupts" -msgstr "" +msgstr "Interruptiones" #. Comment #: info/interrupts.desktop:15 msgid "Interrupt information" -msgstr "" +msgstr "Information de Interrupt" #. Keywords #: info/interrupts.desktop:17 msgid "Interrupts;IRQ;System Information;" -msgstr "" +msgstr "Interruptiones;IRQ;Information de systema;" #. Name #: info/ioports.desktop:13 @@ -1408,12 +1419,12 @@ msgstr "" #. Name #: info/memory.desktop:12 msgid "Memory" -msgstr "" +msgstr "Memoria" #. Comment #: info/memory.desktop:14 msgid "Memory information" -msgstr "" +msgstr "Information de memoria" #. Keywords #: info/memory.desktop:16 @@ -1425,12 +1436,12 @@ msgstr "" #. Name #: info/opengl.desktop:13 msgid "OpenGL" -msgstr "" +msgstr "OpenGL" #. Comment #: info/opengl.desktop:15 msgid "OpenGL information" -msgstr "" +msgstr "Information de OpenGL" #. Keywords #: info/opengl.desktop:17 @@ -1438,6 +1449,8 @@ msgid "" "OpenGL;DRI;GLX;3D;VideoCard;Hardware Acceleration;Graphics;X;X11;Xserver;X-" "Server;XFree86;Display;" msgstr "" +"OpenGL;DRI;GLX;3D;Scheda video;Acceleration " +"hardware;Graphiches;X;X11;XServer;Servitor de X;XFree86;Monstrator;" #. Name #: info/partitions.desktop:13 @@ -1457,22 +1470,22 @@ msgstr "" #. Name #: info/pci.desktop:12 msgid "PCI" -msgstr "" +msgstr "PCI" #. Comment #: info/pci.desktop:14 msgid "PCI information" -msgstr "" +msgstr "Information de PCI" #. Keywords #: info/pci.desktop:16 msgid "PCI;PCI-Devices;PCI-Bus;System Information;" -msgstr "" +msgstr "PCI;Dispositivos PCI;Bus PCI;Information de systema;" #. Name #: info/processor.desktop:12 msgid "Processor" -msgstr "" +msgstr "Processor" #. Comment #: info/processor.desktop:14 @@ -1487,7 +1500,7 @@ msgstr "" #. Name #: info/scsi.desktop:12 msgid "SCSI" -msgstr "" +msgstr "SCSI" #. Comment #: info/scsi.desktop:14 @@ -1502,7 +1515,7 @@ msgstr "" #. Name #: info/sound.desktop:12 msgid "Sound" -msgstr "" +msgstr "Sono" #. Comment #: info/sound.desktop:14 @@ -1517,22 +1530,23 @@ msgstr "" #. Name #: info/xserver.desktop:12 msgid "X-Server" -msgstr "" +msgstr "Servitor-X" #. Comment #: info/xserver.desktop:14 msgid "X-Server information" -msgstr "" +msgstr "Information de Servitor X" #. Keywords #: info/xserver.desktop:16 msgid "X;X-Server;XServer;XFree86;Display;VideoCard;System Information;" msgstr "" +"X;Servitor-X;XServer;XFree86;Monstrator;Scheda video;Information de systema;" #. Name #: input/mouse.desktop:13 msgid "Mouse" -msgstr "" +msgstr "Mus" #. Comment #: input/mouse.desktop:15 @@ -1550,12 +1564,12 @@ msgstr "" #. Name #: input/touchpad.desktop:13 msgid "Touchpad" -msgstr "" +msgstr "Touchpad" #. Comment #: input/touchpad.desktop:14 msgid "Touchpad settings" -msgstr "" +msgstr "Preferentias de Touchpad (pannello tactile)" #. Keywords #: input/touchpad.desktop:15 @@ -1603,7 +1617,7 @@ msgstr "" #. Name #: keys/keys.desktop:12 msgid "Keyboard Shortcuts" -msgstr "" +msgstr "Vias breve de claviero" #. Comment #: keys/keys.desktop:14 @@ -1620,7 +1634,7 @@ msgstr "" #. Name #: kicker/kicker_config.desktop:11 msgid "Layout" -msgstr "" +msgstr "Disposition" #. Comment #: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13 @@ -1642,7 +1656,7 @@ msgstr "" #. Name #: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11 msgid "Appearance" -msgstr "" +msgstr "Apparentia" #. Comment #: kicker/kicker_config_appearance.desktop:13 @@ -1652,7 +1666,7 @@ msgstr "" #. Name #: kicker/kicker_config_arrangement.desktop:11 msgid "Arrangement" -msgstr "" +msgstr "Arrangiamento" #. Name #: kicker/kicker_config_hiding.desktop:11 @@ -1667,7 +1681,7 @@ msgstr "" #. Name #: kicker/kicker_config_menus.desktop:11 msgid "Menus" -msgstr "" +msgstr "Minus" #. Comment #: kicker/kicker_config_menus.desktop:13 @@ -1677,7 +1691,7 @@ msgstr "" #. Name #: kicker/panel.desktop:10 msgid "Panels" -msgstr "" +msgstr "Pannellos" #. Comment #: kicker/panel.desktop:12 @@ -1687,7 +1701,7 @@ msgstr "" #. Name #: knotify/kcmnotify.desktop:11 msgid "System Notifications" -msgstr "" +msgstr "Notificationes de Systema" #. Comment #: knotify/kcmnotify.desktop:13 @@ -1717,7 +1731,7 @@ msgstr "" #. Name #: konq/desktopbehavior.desktop:12 konq/filebehavior.desktop:11 msgid "Behavior" -msgstr "" +msgstr "Comportamento" #. Comment #: konq/desktopbehavior.desktop:14 @@ -1734,7 +1748,7 @@ msgstr "" #. Name #: konq/desktoppath.desktop:11 msgid "Paths" -msgstr "" +msgstr "Percursos" #. Comment #: konq/desktoppath.desktop:13 @@ -1794,12 +1808,12 @@ msgstr "" #. Name #: konqhtml/tdehtml_behavior.desktop:11 msgid "Web Behavior" -msgstr "" +msgstr "Comportamento de Web" #. Comment #: konqhtml/tdehtml_behavior.desktop:13 msgid "Configure the browser behavior" -msgstr "" +msgstr "Configura le comportamento de web" #. Keywords #: konqhtml/tdehtml_behavior.desktop:15 @@ -1811,12 +1825,12 @@ msgstr "" #. Name #: konqhtml/tdehtml_filter.desktop:10 msgid "AdBlocK Filters" -msgstr "" +msgstr "Filtros AdBlock" #. Comment #: konqhtml/tdehtml_filter.desktop:12 msgid "Configure Konqueror AdBlocK filters" -msgstr "" +msgstr "Configura le filtros AdBlock de Konqueror" #. Comment #: konqhtml/tdehtml_fonts.desktop:13 @@ -1832,12 +1846,12 @@ msgstr "" #. Name #: konqhtml/tdehtml_java_js.desktop:11 msgid "Java & JavaScript" -msgstr "" +msgstr "Java & JavaScript" #. Comment #: konqhtml/tdehtml_java_js.desktop:13 msgid "Configure the behavior of Java and JavaScript" -msgstr "" +msgstr "Configura le comportamento de Java e JavaScript" #. Keywords #: konqhtml/tdehtml_java_js.desktop:15 @@ -1847,7 +1861,7 @@ msgstr "" #. Name #: konqhtml/tdehtml_userinterface.desktop:11 msgid "User Interface" -msgstr "" +msgstr "Interfacie de usator" #. Comment #: konqhtml/tdehtml_userinterface.desktop:13 @@ -1862,7 +1876,7 @@ msgstr "" #. Name #: konsole/kcmkonsole.desktop:10 msgid "Konsole" -msgstr "" +msgstr "Konsole" #. Comment #: konsole/kcmkonsole.desktop:12 @@ -1904,7 +1918,7 @@ msgstr "" #. Name #: launch/kcmlaunch.desktop:12 msgid "Launch Feedback" -msgstr "" +msgstr "Retorno de lanceamento" #. Comment #: launch/kcmlaunch.desktop:14 @@ -1944,23 +1958,23 @@ msgstr "" #. Name #: nics/nic.desktop:12 msgid "Network Interfaces" -msgstr "" +msgstr "Interfacies de rete" #. Comment #: nics/nic.desktop:14 msgid "Network interface information" -msgstr "" +msgstr "Information de interfacie de rete" #. Name #: performance/kcmkonqyperformance.desktop:11 #: performance/kcmperformance.desktop:11 msgid "Performance" -msgstr "" +msgstr "Prestation" #. Comment #: performance/kcmkonqyperformance.desktop:13 msgid "Configure settings that can improve Konqueror performance" -msgstr "" +msgstr "Configura preferentias que pote meliorar le prestation de Konqueror" #. Keywords #: performance/kcmkonqyperformance.desktop:15 @@ -2025,12 +2039,12 @@ msgstr "" #. Name #: samba/smbstatus.desktop:12 msgid "Samba Status" -msgstr "" +msgstr "Stato de Samba" #. Comment #: samba/smbstatus.desktop:14 msgid "Samba status monitor" -msgstr "" +msgstr "Monitor de stato de Samba" #. Keywords #: samba/smbstatus.desktop:16 @@ -2040,7 +2054,7 @@ msgstr "" #. Name #: screensaver/screensaver.desktop:12 msgid "Screen Saver" -msgstr "" +msgstr "Salvator de schermo" #. Comment #: screensaver/screensaver.desktop:14 @@ -2055,7 +2069,7 @@ msgstr "" #. Name #: smartcard/smartcard.desktop:11 msgid "Smartcards" -msgstr "" +msgstr "Smartcards" #. Comment #: smartcard/smartcard.desktop:13 @@ -2070,7 +2084,7 @@ msgstr "" #. Name #: smserver/kcmsmserver.desktop:12 msgid "Session Manager" -msgstr "" +msgstr "Gerente de session" #. Comment #: smserver/kcmsmserver.desktop:14 @@ -2085,7 +2099,7 @@ msgstr "" #. Name #: spellchecking/spellchecking.desktop:11 msgid "Spell Checker" -msgstr "" +msgstr "Controlator Orthographic" #. Comment #: spellchecking/spellchecking.desktop:13 @@ -2100,7 +2114,7 @@ msgstr "" #. Name #: style/style.desktop:13 msgid "Style" -msgstr "" +msgstr "Stilo" #. Comment #: style/style.desktop:15 @@ -2117,7 +2131,7 @@ msgstr "" #. Name #: taskbar/kcmtaskbar.desktop:11 msgid "Taskbar" -msgstr "" +msgstr "Barra de Carga" #. Comment #: taskbar/kcmtaskbar.desktop:13 @@ -2132,12 +2146,12 @@ msgstr "" #. Name #: tdefontinst/installfont.desktop:6 msgid "Install" -msgstr "" +msgstr "Installa" #. Name #: tdefontinst/kcmfontinst/kcmfontinst.desktop:14 msgid "Font Installer" -msgstr "" +msgstr "Installator de Font" #. Comment #: tdefontinst/kcmfontinst/kcmfontinst.desktop:16 @@ -2172,7 +2186,7 @@ msgstr "" #. Name #: tdefontinst/thumbnail/fontthumbnail.desktop:3 msgid "Font Files" -msgstr "" +msgstr "Files de font" #. Name #: tdefontinst/viewpart/tdefontview.desktop:2 @@ -2189,7 +2203,7 @@ msgstr "" #. Name #: tdeio/cache.desktop:12 msgid "Cache" -msgstr "" +msgstr "Cache" #. Comment #: tdeio/cache.desktop:14 @@ -2204,12 +2218,12 @@ msgstr "" #. Name #: tdeio/cookies.desktop:12 msgid "Cookies" -msgstr "" +msgstr "Cookies" #. Comment #: tdeio/cookies.desktop:14 msgid "Configure the way cookies work" -msgstr "" +msgstr "Configura le modo de functionar del cookies" #. Keywords #: tdeio/cookies.desktop:16 @@ -2235,6 +2249,8 @@ msgstr "" #: tdeio/netpref.desktop:2 msgid "Configure generic network preferences, like timeout values" msgstr "" +"Configura le preferentia de rete generic, como valores pro expirationes de " +"tempore" #. Keywords #: tdeio/netpref.desktop:5 @@ -2244,17 +2260,17 @@ msgstr "" #. Name #: tdeio/netpref.desktop:6 msgid "Connection Preferences" -msgstr "" +msgstr "Preferentias de connexion" #. Name #: tdeio/proxy.desktop:12 msgid "Proxy" -msgstr "" +msgstr "Proxy" #. Comment #: tdeio/proxy.desktop:14 msgid "Configure the proxy servers used" -msgstr "" +msgstr "Configura le servitores de proxy usate" #. Keywords #: tdeio/proxy.desktop:16 @@ -2290,15 +2306,13 @@ msgstr "UADescription (IE 4.01 super Win 2000)" #. Name #: tdeio/uasproviders/ie45onwinnt5.desktop:2 -#, fuzzy msgid "UADescription (IE 4.5 on Win 2000)" -msgstr "UADescription (IE 5.5 super Win 2000)" +msgstr "Description de AU (IE 4.5 super Win 2000)" #. Name #: tdeio/uasproviders/ie501onwinnt5.desktop:2 -#, fuzzy msgid "UADescription (IE 5.01 on Win 2000)" -msgstr "UADescription (IE 4.01 super Win 2000)" +msgstr "Description de AU (IE 5.01 super Win 2000)" #. Name #: tdeio/uasproviders/ie50onppc.desktop:2 @@ -2307,9 +2321,8 @@ msgstr "UADescription (IE 5.0 super Mac PPC)" #. Name #: tdeio/uasproviders/ie55onwin98.desktop:2 -#, fuzzy msgid "UADescription (IE 5.5 on Win 98)" -msgstr "UADescription (IE 5.5 super Win 2000)" +msgstr "Description de AU (IE 5.5 super Win 98)" #. Name #: tdeio/uasproviders/ie55onwinnt5.desktop:2 @@ -2343,9 +2356,8 @@ msgstr "UADescription (Netscape 7.1 super XP)" #. Name #: tdeio/uasproviders/op75oncurrent.desktop:2 -#, fuzzy msgid "UADescription (Opera 7.55 on current)" -msgstr "UADescription (Netscape 7.1 super le currente)" +msgstr "Description de AU (Opera 7.55 super le currente)" #. Name #: tdeio/uasproviders/w3moncurrent.desktop:2 @@ -2360,7 +2372,7 @@ msgstr "UADescritpion (Wget 1.11.4)" #. Name #: tdeio/useragent.desktop:12 msgid "Browser Identification" -msgstr "" +msgstr "Identification de Navigator" #. Comment #: tdeio/useragent.desktop:14 @@ -2392,7 +2404,7 @@ msgstr "" #. Name #: usbview/kcmusb.desktop:10 msgid "USB Devices" -msgstr "" +msgstr "Dispositivos USB" #. Comment #: usbview/kcmusb.desktop:12 diff --git a/translations/desktop_files/kcontrol-desktops/ru.po b/translations/desktop_files/kcontrol-desktops/ru.po index ef078a99b..7b8e48875 100644 --- a/translations/desktop_files/kcontrol-desktops/ru.po +++ b/translations/desktop_files/kcontrol-desktops/ru.po @@ -7,7 +7,7 @@ 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-07-21 06:11+0000\n" +"PO-Revision-Date: 2025-10-26 04:17+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" @@ -1787,6 +1787,10 @@ msgid "" "konqueror;filemanager;kfm;tips;file tips;separate window;spawn windows;" "behavior;behaviour;memory usage;Home URL;" msgstr "" +"konqueror;filemanager;kfm;tips;file tips;separate window;spawn " +"windows;behavior;behaviour;memory usage;Home URL;файловый менеджер;советы;" +"отдельное окно;создание окон;поведение;использование памяти;домашняя " +"страница;" #. Name #: konq/desktoppath.desktop:11 @@ -1827,6 +1831,11 @@ msgid "" "behavior;behaviour;memory usage;Home URL;network operations;progress dialog;" "trash can;delete;confirmation;" msgstr "" +"konqueror;filemanager;kfm;tips;file tips;separate window;spawn " +"windows;behavior;behaviour;memory usage;Home URL;network operations;progress " +"dialog;trash can;delete;confirmation;файловый менеджер;советы;отдельное окно;" +"создание окон;поведение;использование памяти;домашняя страница;сетевые " +"операции;ход выполнения;диалог хода выполнения;корзина;удалить;подтверждение;" #. Comment #: konq/filebrowser.desktop:14 diff --git a/translations/desktop_files/kcontrol-desktops/sv.po b/translations/desktop_files/kcontrol-desktops/sv.po index 329b05b02..22be13170 100644 --- a/translations/desktop_files/kcontrol-desktops/sv.po +++ b/translations/desktop_files/kcontrol-desktops/sv.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025. 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: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-08-30 19:11+0000\n" +"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n" +"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/kcontrol-desktop-files/sv/>\n" "Language: sv\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 #: access/kaccess.desktop:3 @@ -180,14 +181,13 @@ msgstr "Filhanterare" #. Comment #: componentchooser/componentservices/kcm_filemanager.desktop:3 -#, fuzzy msgid "" "This service allows you to configure your default file manager. All TDE " "applications which invoke a file manager application should honor this " "setting." msgstr "" "Den här tjänsten låter dig anpassa din förvalda terminalemulator. Alla TDE-" -"program som startar ett terminalprogram ska använda den här inställningen" +"program som startar ett terminalprogram ska använda den här inställningen." #. Name #: componentchooser/componentservices/kcm_kemail.desktop:1 @@ -202,7 +202,7 @@ msgid "" "this setting." msgstr "" "Den här tjänsten låter dig anpassa förvald e-postklient. Alla TDE-program " -"som behöver använda e-postklient ska använda den här inställningen" +"som behöver använda e-postklient ska använda den här inställningen." #. Name #: componentchooser/componentservices/kcm_terminal.desktop:1 @@ -217,7 +217,7 @@ msgid "" "setting." msgstr "" "Den här tjänsten låter dig anpassa din förvalda terminalemulator. Alla TDE-" -"program som startar ett terminalprogram ska använda den här inställningen" +"program som startar ett terminalprogram ska använda den här inställningen." #. Name #: crypto/crypto.desktop:10 @@ -267,18 +267,17 @@ msgstr "Anpassa bildskärm" #. Name #: displayconfig/displayconfig.desktop:12 msgid "Monitor & Display" -msgstr "" +msgstr "Bildskärmar" #. Comment #: displayconfig/displayconfig.desktop:14 -#, fuzzy msgid "Configure display" -msgstr "Anpassa tjänstupptäckt" +msgstr "Anpassa skärmar" #. Keywords #: displayconfig/displayconfig.desktop:16 msgid "monitor;resolution;display;" -msgstr "" +msgstr "skärm;upplösning;display;" #. Name #: dnssd/kcm_tdednssd.desktop:18 @@ -327,7 +326,7 @@ msgstr "Sökmotor" #. Name #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3 msgid "Acronym Database" -msgstr "" +msgstr "Akronymdatabas" #. Query #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6 @@ -336,9 +335,8 @@ msgstr "" #. Name #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3 -#, fuzzy msgid "Alexa" -msgstr "Alexa webbadress" +msgstr "Alexa" #. Query #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6 @@ -1307,46 +1305,43 @@ msgstr "" #. Name #: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2 #: hwmanager/hwdevicetray.desktop:4 -#, fuzzy msgid "Device Monitor" -msgstr "Flera bildskärmar" +msgstr "Enhetsövervakare" #. Comment #: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6 msgid "Monitor hardware devices from the system tray" -msgstr "" +msgstr "Övervaka hårdvaruenheter från systemfältet" #. Name #: hwmanager/hwmanager.desktop:11 -#, fuzzy msgid "Device Manager" -msgstr "Tjänsthanterare" +msgstr "Enhetshanterare" #. Comment #: hwmanager/hwmanager.desktop:13 -#, fuzzy msgid "Configure hardware devices" -msgstr "Anpassa webbläsarens beteende" +msgstr "Konfigurera hårdvaruenheter" #. Keywords #: hwmanager/hwmanager.desktop:15 msgid "hardware;devices;manager;" -msgstr "" +msgstr "hårdvara;enheter;hanterare;" #. Comment #: iccconfig/iccconfig.desktop:14 msgid "Configure display ICC color profile" -msgstr "" +msgstr "Anpassa skärmens ICC-färgprofil" #. Keywords #: iccconfig/iccconfig.desktop:16 msgid "ICC;display;color;profile;" -msgstr "" +msgstr "ICC;skärm;färg;profil;" #. Name #: iccconfig/iccconfig.desktop:18 msgid "Color Profile" -msgstr "" +msgstr "Färgprofil" #. Name #: icons/icons.desktop:12 @@ -1460,7 +1455,7 @@ msgstr "" #. Name #: info/opengl.desktop:13 msgid "OpenGL" -msgstr "" +msgstr "OpenGL" #. Comment #: info/opengl.desktop:15 @@ -1494,7 +1489,7 @@ msgstr "Partitioner;Hårddisk;HD;Systeminformation;" #. Name #: info/pci.desktop:12 msgid "PCI" -msgstr "" +msgstr "PCI" #. Comment #: info/pci.desktop:14 @@ -1508,9 +1503,8 @@ msgstr "PCI;PCI-enheter;PCI-buss;Systeminformation;" #. Name #: info/processor.desktop:12 -#, fuzzy msgid "Processor" -msgstr "Processorinformation" +msgstr "Processor" #. Comment #: info/processor.desktop:14 @@ -1525,7 +1519,7 @@ msgstr "Processor;CPU;FPU;MHz;Systeminformation;" #. Name #: info/scsi.desktop:12 msgid "SCSI" -msgstr "" +msgstr "SCSI" #. Comment #: info/scsi.desktop:14 @@ -1591,29 +1585,21 @@ msgstr "" #. Name #: input/touchpad.desktop:13 msgid "Touchpad" -msgstr "" +msgstr "Pekplatta" #. Comment #: input/touchpad.desktop:14 -#, fuzzy -#| msgid "Mouse settings" msgid "Touchpad settings" -msgstr "Anpassa mus" +msgstr "Anpassa pekplatta" #. Keywords #: input/touchpad.desktop:15 -#, fuzzy -#| msgid "" -#| "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;" msgid "" "Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;" "Click;mapping;right handed;left handed;" msgstr "" -"Mus;Musacceleration;Muströskel;Musknappar;Val;Markörutseende;" -"Inmatningsenheter;Knapptolkning;klickning;ikoner;respons;Pekare;Drag;" -"Dubbelklick;Tolkning;högerhänt;vänsterhänt;" +"Pekplatta;Knacka för att klicka;Mus;Musknappar;Inmatningsenheter;Tangentmappn" +"ing;Tryck;Klick;mappning;högerhänt;vänsterhänt;" #. Name #: joystick/joystick.desktop:12 @@ -1673,7 +1659,7 @@ msgstr "" #. Name #: kicker/kicker_config.desktop:11 msgid "Layout" -msgstr "" +msgstr "Layout" #. Comment #: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13 @@ -1916,26 +1902,23 @@ msgstr "" #. Name #: konqhtml/tdehtml_userinterface.desktop:11 -#, fuzzy msgid "User Interface" -msgstr "Nätverksgränssnitt" +msgstr "Användargränssnitt" #. Comment #: konqhtml/tdehtml_userinterface.desktop:13 -#, fuzzy msgid "Configure user interface options" -msgstr "Anpassa webbcacheinställningar" +msgstr "Anpassa gränssnittsinställningar" #. Keywords #: konqhtml/tdehtml_userinterface.desktop:15 -#, fuzzy msgid "konqueror;kfm;user;interface;tabbed;browsing;" -msgstr "konqueror;återanvändning;förladdning;" +msgstr "konqueror;kfm;användare;gränssnitt;flikar;bläddring;" #. Name #: konsole/kcmkonsole.desktop:10 msgid "Konsole" -msgstr "" +msgstr "Konsole" #. Comment #: konsole/kcmkonsole.desktop:12 @@ -2090,7 +2073,7 @@ msgstr "ändra storlek;rotera;skärm;färg;djup;storlek;horisontell;vertikal;" #. 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 @@ -2272,7 +2255,7 @@ msgstr "Teckensnittsvisning" #. Name #: tdeio/cache.desktop:12 msgid "Cache" -msgstr "" +msgstr "Cache" #. Comment #: tdeio/cache.desktop:14 diff --git a/translations/desktop_files/kdesktop-icons/sv.po b/translations/desktop_files/kdesktop-icons/sv.po index 416295ac6..d95290156 100644 --- a/translations/desktop_files/kdesktop-icons/sv.po +++ b/translations/desktop_files/kdesktop-icons/sv.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Simon Stockhaus <simon.stockhaus.95@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: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-08-30 19:11+0000\n" +"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n" +"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/kdesktop-icons/sv/>\n" "Language: sv\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 #: Home.desktop:2 @@ -28,29 +29,28 @@ msgstr "Personliga filer" #. Comment #: Home.desktop:6 -#, fuzzy msgid "Contains personal files" -msgstr "Personliga filer" +msgstr "Innehåller personliga filer" #. Name #: My_Computer:5 msgid "My Computer" -msgstr "" +msgstr "Den här datorn" #. Comment #: My_Computer:7 msgid "Access to storage media" -msgstr "" +msgstr "Åtkomst till lagringsmedia" #. Name #: My_Documents:5 msgid "My Documents" -msgstr "Dokumentkatalog" +msgstr "Mina dokument" #. Comment #: My_Documents:7 msgid "Contains personal documents" -msgstr "" +msgstr "Innehåller personliga dokument" #. Name #: My_Network_Places:5 @@ -60,7 +60,7 @@ msgstr "Fjärrplatser" #. Comment #: My_Network_Places:7 msgid "Access to network places and remote hosts" -msgstr "" +msgstr "Åtkomst till fjärrplatser och fjärrvärdar" #. Name #: Printers:5 @@ -70,12 +70,12 @@ msgstr "Skrivare" #. Comment #: Printers:7 msgid "Manage print jobs" -msgstr "" +msgstr "Hantera utskriftsjobb" #. Name #: System.desktop:2 msgid "System" -msgstr "" +msgstr "System" #. GenericName #: System.desktop:4 @@ -85,7 +85,7 @@ msgstr "Systemplatser" #. Comment #: System.desktop:6 msgid "Access to system places" -msgstr "" +msgstr "Åtkomst till systemplatser" #. Name #: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12 @@ -106,7 +106,7 @@ msgstr "Ange katalognamn:" #. Name #: Templates/Floppy.desktop:3 msgid "Format" -msgstr "" +msgstr "Formattera" #. Name #: Templates/HTMLFile.desktop:2 @@ -201,7 +201,7 @@ msgstr "Ny magneto-optisk enhet" #. Name #: Templates/linkNFS.desktop:2 msgid "NFS..." -msgstr "" +msgstr "NFS..." #. Comment #: Templates/linkNFS.desktop:3 @@ -241,28 +241,28 @@ msgstr "Ny Zip-enhet" #. Name #: Trash:8 msgid "Trash" -msgstr "Skräp" +msgstr "Papperskorg" #. Comment #: Trash:10 msgid "Contains removed files" -msgstr "" +msgstr "Innehåller borttagna filer" #. Name #. GenericName #: Web_Browser:6 Web_Browser:8 msgid "Web Browser" -msgstr "Webbläsaren" +msgstr "Webbläsare" #. Comment #: Web_Browser:10 msgid "Browse the World Wide Web" -msgstr "" +msgstr "Surfa på nätet" #. Name #: directory.autostart:3 msgid "Autostart" -msgstr "" +msgstr "Autostart" #. Name #: directory.desktop:5 diff --git a/translations/desktop_files/l10n-desktops/sv.po b/translations/desktop_files/l10n-desktops/sv.po index 166698a84..4bafb7edd 100644 --- a/translations/desktop_files/l10n-desktops/sv.po +++ b/translations/desktop_files/l10n-desktops/sv.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-16 18:21+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: 2025-08-30 19:11+0000\n" +"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n" +"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdebase/l10n-desktop-files/sv/>\n" "Language: sv\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 #: caribbean.desktop:2 @@ -54,7 +55,7 @@ msgstr "Europa, öst" #. Name #: middleeast.desktop:2 msgid "Middle-East" -msgstr "Mellersta östern" +msgstr "Mellanöstern" #. Name #: northafrica.desktop:2 @@ -119,7 +120,7 @@ msgstr "Förval" #. Name #: ad/entry.desktop:2 msgid "Andorra" -msgstr "" +msgstr "Andorra" #. Name #: ae/entry.desktop:2 @@ -139,7 +140,7 @@ msgstr "Antigua och Barbuda" #. Name #: ai/entry.desktop:2 msgid "Anguilla" -msgstr "" +msgstr "Anguila" #. Name #: al/entry.desktop:2 @@ -158,14 +159,13 @@ msgstr "Nederländska Antillerna" #. Name #: ao/entry.desktop:2 -#, fuzzy msgid "Angola" -msgstr "Mongoliet" +msgstr "Angola" #. Name #: ar/entry.desktop:2 msgid "Argentina" -msgstr "" +msgstr "Argentina" #. Name #: as/entry.desktop:2 @@ -185,7 +185,7 @@ msgstr "Australien" #. Name #: aw/entry.desktop:2 msgid "Aruba" -msgstr "" +msgstr "Aruba" #. Name #: ax/entry.desktop:2 @@ -195,7 +195,7 @@ msgstr "Åland" #. Name #: az/entry.desktop:2 msgid "Azerbaijan" -msgstr "" +msgstr "Azerbajdzjan" #. Name #: ba/entry.desktop:2 @@ -205,12 +205,12 @@ msgstr "Bosnien och Herzegovina" #. Name #: bb/entry.desktop:2 msgid "Barbados" -msgstr "" +msgstr "Barbados" #. Name #: bd/entry.desktop:2 msgid "Bangladesh" -msgstr "" +msgstr "Bangladesh" #. Name #: be/entry.desktop:2 @@ -220,7 +220,7 @@ msgstr "Belgien" #. Name #: bf/entry.desktop:2 msgid "Burkina Faso" -msgstr "" +msgstr "Burkina Faso" #. Name #: bg/entry.desktop:2 @@ -235,27 +235,27 @@ msgstr "Bahrein" #. Name #: bi/entry.desktop:2 msgid "Burundi" -msgstr "" +msgstr "Burundi" #. Name #: bj/entry.desktop:2 msgid "Benin" -msgstr "" +msgstr "Benin" #. Name #: bm/entry.desktop:2 msgid "Bermuda" -msgstr "" +msgstr "Bermuda" #. Name #: bn/entry.desktop:3 msgid "Brunei Darussalam" -msgstr "" +msgstr "Brunei Darussalam" #. Name #: bo/entry.desktop:2 msgid "Bolivia" -msgstr "" +msgstr "Bolivia" #. Name #: br/entry.desktop:2 @@ -265,22 +265,22 @@ msgstr "Brasilien" #. Name #: braille/entry.desktop:2 msgid "Braille" -msgstr "" +msgstr "Blindskrift" #. Name #: bs/entry.desktop:2 msgid "Bahamas" -msgstr "" +msgstr "Bahamas" #. Name #: bt/entry.desktop:3 msgid "Bhutan" -msgstr "" +msgstr "Bhutan" #. Name #: bw/entry.desktop:2 msgid "Botswana" -msgstr "" +msgstr "Botswana" #. Name #: by/entry.desktop:3 @@ -290,7 +290,7 @@ msgstr "Vitryssland" #. Name #: bz/entry.desktop:2 msgid "Belize" -msgstr "" +msgstr "Belize" #. Name #: ca/entry.desktop:5 @@ -335,7 +335,7 @@ msgstr "Cooköarna" #. Name #: cl/entry.desktop:2 msgid "Chile" -msgstr "" +msgstr "Chile" #. Name #: cm/entry.desktop:2 @@ -350,12 +350,12 @@ msgstr "Kina" #. Name #: co/entry.desktop:2 msgid "Colombia" -msgstr "" +msgstr "Colombia" #. Name #: cr/entry.desktop:2 msgid "Costa Rica" -msgstr "" +msgstr "Costa Rica" #. Name #: cu/entry.desktop:2 @@ -390,7 +390,7 @@ msgstr "Tyskland" #. Name #: dj/entry.desktop:2 msgid "Djibouti" -msgstr "" +msgstr "Djibouti" #. Name #: dk/entry.desktop:3 @@ -399,9 +399,8 @@ msgstr "Danmark" #. Name #: dm/entry.desktop:2 -#, fuzzy msgid "Dominica" -msgstr "Dominikanska republiken" +msgstr "Dominica" #. Name #: do/entry.desktop:2 @@ -416,7 +415,7 @@ msgstr "Algeriet" #. Name #: ec/entry.desktop:2 msgid "Ecuador" -msgstr "" +msgstr "Ecuador" #. Name #: ee/entry.desktop:2 @@ -436,12 +435,12 @@ msgstr "Västsahara" #. Name #: eo/entry.desktop:2 msgid "Esperanto" -msgstr "" +msgstr "Esperanto" #. Name #: er/entry.desktop:2 msgid "Eritrea" -msgstr "" +msgstr "Eritrea" #. Name #: es/entry.desktop:2 @@ -455,14 +454,13 @@ msgstr "Etiopien" #. Name #: fi/entry.desktop:3 -#, fuzzy msgid "Finland" -msgstr "Grönland" +msgstr "Finland" #. Name #: fj/entry.desktop:2 msgid "Fiji" -msgstr "" +msgstr "Fiji" #. Name #: fk/entry.desktop:2 @@ -487,7 +485,7 @@ msgstr "Frankrike" #. Name #: ga/entry.desktop:2 msgid "Gabon" -msgstr "" +msgstr "Gabon" #. Name #: gb/entry.desktop:2 @@ -496,9 +494,8 @@ msgstr "Storbritannien" #. Name #: gd/entry.desktop:2 -#, fuzzy msgid "Grenada" -msgstr "Kanada" +msgstr "Grenada" #. Name #: ge/entry.desktop:2 @@ -508,12 +505,12 @@ msgstr "Georgien" #. Name #: gh/entry.desktop:2 msgid "Ghana" -msgstr "" +msgstr "Ghana" #. Name #: gi/entry.desktop:2 msgid "Gibraltar" -msgstr "" +msgstr "Gibraltar" #. Name #: gl/entry.desktop:2 @@ -523,17 +520,17 @@ msgstr "Grönland" #. Name #: gm/entry.desktop:2 msgid "Gambia" -msgstr "" +msgstr "Gambia" #. Name #: gn/entry.desktop:2 msgid "Guinea" -msgstr "" +msgstr "Guinea" #. Name #: gp/entry.desktop:2 msgid "Guadeloupe" -msgstr "" +msgstr "Guadeloupe" #. Name #: gq/entry.desktop:2 @@ -548,22 +545,22 @@ msgstr "Grekland" #. Name #: gt/entry.desktop:2 msgid "Guatemala" -msgstr "" +msgstr "Guatemala" #. Name #: gu/entry.desktop:2 msgid "Guam" -msgstr "" +msgstr "Guam" #. Name #: gw/entry.desktop:2 msgid "Guinea-Bissau" -msgstr "" +msgstr "Guinea-Bissau" #. Name #: gy/entry.desktop:2 msgid "Guyana" -msgstr "" +msgstr "Guyana" #. Name #: hk/entry.desktop:2 @@ -573,7 +570,7 @@ msgstr "Hong Kong (Kina)" #. Name #: hn/entry.desktop:2 msgid "Honduras" -msgstr "" +msgstr "Honduras" #. Name #: hr/entry.desktop:2 @@ -583,7 +580,7 @@ msgstr "Kroatien" #. Name #: ht/entry.desktop:2 msgid "Haiti" -msgstr "" +msgstr "Haiti" #. Name #: hu/entry.desktop:2 @@ -603,7 +600,7 @@ msgstr "Irland" #. Name #: il/entry.desktop:3 msgid "Israel" -msgstr "" +msgstr "Israel" #. Name #: in/entry.desktop:2 @@ -618,7 +615,7 @@ msgstr "Irak" #. Name #: ir/entry.desktop:2 msgid "Iran" -msgstr "" +msgstr "Iran" #. Name #: is/entry.desktop:2 @@ -633,7 +630,7 @@ msgstr "Italien" #. Name #: jm/entry.desktop:2 msgid "Jamaica" -msgstr "" +msgstr "Jamaica" #. Name #: jo/entry.desktop:2 @@ -643,19 +640,17 @@ msgstr "Jordanien" #. Name #: jp/entry.desktop:2 msgid "Japan" -msgstr "" +msgstr "Japan" #. Name #: jv/entry.desktop:2 -#, fuzzy -#| msgid "Indonesia" msgid "Indonesia (Java)" msgstr "Indonesien" #. Name #: ke/entry.desktop:2 msgid "Kenya" -msgstr "" +msgstr "Kenya" #. Name #: kg/entry.desktop:2 @@ -670,7 +665,7 @@ msgstr "Kambodja" #. Name #: ki/entry.desktop:2 msgid "Kiribati" -msgstr "" +msgstr "Kiribati" #. Name #: km/entry.desktop:2 @@ -695,7 +690,7 @@ msgstr "Sydkorea" #. Name #: kw/entry.desktop:2 msgid "Kuwait" -msgstr "" +msgstr "Kuwait" #. Name #: ky/entry.desktop:2 @@ -710,7 +705,7 @@ msgstr "Kazakstan" #. Name #: la/entry.desktop:2 msgid "Laos" -msgstr "" +msgstr "Laos" #. Name #: lb/entry.desktop:2 @@ -720,27 +715,27 @@ msgstr "Libanon" #. Name #: lc/entry.desktop:2 msgid "St. Lucia" -msgstr "" +msgstr "St. Lucia" #. Name #: li/entry.desktop:2 msgid "Liechtenstein" -msgstr "" +msgstr "Liechtenstein" #. Name #: lk/entry.desktop:2 msgid "Sri Lanka" -msgstr "" +msgstr "Sri Lanka" #. Name #: lr/entry.desktop:2 msgid "Liberia" -msgstr "" +msgstr "Liberia" #. Name #: ls/entry.desktop:2 msgid "Lesotho" -msgstr "" +msgstr "Lesotho" #. Name #: lt/entry.desktop:2 @@ -770,7 +765,7 @@ msgstr "Marocko" #. Name #: mc/entry.desktop:2 msgid "Monaco" -msgstr "" +msgstr "Monaco" #. Name #: md/entry.desktop:2 @@ -780,7 +775,7 @@ msgstr "Moldavien" #. Name #: me/entry.desktop:3 msgid "Montenegro" -msgstr "" +msgstr "Montenegro" #. Name #: mg/entry.desktop:2 @@ -805,12 +800,12 @@ msgstr "Makedonien" #. Name #: ml/entry.desktop:2 msgid "Mali" -msgstr "" +msgstr "Mali" #. Name #: mm/entry.desktop:2 msgid "Myanmar" -msgstr "" +msgstr "Myanmar" #. Name #: mn/entry.desktop:2 @@ -824,9 +819,8 @@ msgstr "Macao (Kina)" #. Name #: mq/entry.desktop:2 -#, fuzzy msgid "Martinique" -msgstr "Moçambique" +msgstr "Martinique" #. Name #: mr/entry.desktop:2 @@ -836,18 +830,17 @@ msgstr "Mauretanien" #. Name #: ms/entry.desktop:2 msgid "Montserrat" -msgstr "" +msgstr "Montserrat" #. Name #: mt/entry.desktop:3 msgid "Malta" -msgstr "" +msgstr "Malta" #. Name #: mu/entry.desktop:2 -#, fuzzy msgid "Mauritius" -msgstr "Mauretanien" +msgstr "Mauritius" #. Name #: mv/entry.desktop:2 @@ -857,17 +850,17 @@ msgstr "Maldiverna" #. Name #: mw/entry.desktop:2 msgid "Malawi" -msgstr "" +msgstr "Malawi" #. Name #: mx/entry.desktop:2 msgid "Mexico" -msgstr "" +msgstr "Mexico" #. Name #: my/entry.desktop:2 msgid "Malaysia" -msgstr "" +msgstr "Malaysia" #. Name #: mz/entry.desktop:2 @@ -877,7 +870,7 @@ msgstr "Moçambique" #. Name #: na/entry.desktop:2 msgid "Namibia" -msgstr "" +msgstr "Namibia" #. Name #: nc/entry.desktop:2 @@ -887,7 +880,7 @@ msgstr "Nya Caledonien" #. Name #: ne/entry.desktop:2 msgid "Niger" -msgstr "" +msgstr "Niger" #. Name #: nf/entry.desktop:2 @@ -896,14 +889,13 @@ msgstr "Norfolkön" #. Name #: ng/entry.desktop:2 -#, fuzzy msgid "Nigeria" -msgstr "Algeriet" +msgstr "Nigeria" #. Name #: ni/entry.desktop:2 msgid "Nicaragua" -msgstr "" +msgstr "Nicaragua" #. Name #: nl/entry.desktop:3 @@ -918,32 +910,32 @@ msgstr "Norge" #. Name #: np/entry.desktop:2 msgid "Nepal" -msgstr "" +msgstr "Nepal" #. Name #: nr/entry.desktop:2 msgid "Nauru" -msgstr "" +msgstr "Nauru" #. Name #: nu/entry.desktop:2 msgid "Niue" -msgstr "" +msgstr "Niue" #. Name #: om/entry.desktop:2 msgid "Oman" -msgstr "" +msgstr "Oman" #. Name #: pa/entry.desktop:2 msgid "Panama" -msgstr "" +msgstr "Panama" #. Name #: pe/entry.desktop:2 msgid "Peru" -msgstr "" +msgstr "Peru" #. Name #: pf/entry.desktop:2 @@ -962,9 +954,8 @@ msgstr "Filippinerna" #. Name #: pk/entry.desktop:2 -#, fuzzy msgid "Pakistan" -msgstr "Tadzjikistan" +msgstr "Pakistan" #. Name #: pl/entry.desktop:2 @@ -979,12 +970,12 @@ msgstr "Saint Pierre och Miquelon" #. Name #: pn/entry.desktop:2 msgid "Pitcairn" -msgstr "" +msgstr "Pitcairnöarna" #. Name #: pr/entry.desktop:2 msgid "Puerto Rico" -msgstr "" +msgstr "Puerto Rico" #. Name #: ps/entry.desktop:2 @@ -994,22 +985,22 @@ msgstr "Palestina" #. Name #: pt/entry.desktop:3 msgid "Portugal" -msgstr "" +msgstr "Portugal" #. Name #: pw/entry.desktop:2 msgid "Palau" -msgstr "" +msgstr "Palau" #. Name #: py/entry.desktop:2 msgid "Paraguay" -msgstr "" +msgstr "Paraguay" #. Name #: qa/entry.desktop:2 msgid "Qatar" -msgstr "" +msgstr "Qatar" #. Name #: ro/entry.desktop:2 @@ -1029,7 +1020,7 @@ msgstr "Ryssland" #. Name #: rw/entry.desktop:2 msgid "Rwanda" -msgstr "" +msgstr "Rwanda" #. Name #: sa/entry.desktop:2 @@ -1049,7 +1040,7 @@ msgstr "Seychellerna" #. Name #: sd/entry.desktop:2 msgid "Sudan" -msgstr "" +msgstr "Sudan" #. Name #: se/entry.desktop:2 @@ -1059,12 +1050,12 @@ msgstr "Sverige" #. Name #: sg/entry.desktop:2 msgid "Singapore" -msgstr "" +msgstr "Singapore" #. Name #: sh/entry.desktop:2 msgid "Saint Helena" -msgstr "" +msgstr "Sankta Helena" #. Name #: si/entry.desktop:2 @@ -1079,17 +1070,17 @@ msgstr "Slovakien" #. Name #: sm/entry.desktop:2 msgid "San Marino" -msgstr "" +msgstr "San Marino" #. Name #: sn/entry.desktop:2 msgid "Senegal" -msgstr "" +msgstr "Senegal" #. Name #: so/entry.desktop:2 msgid "Somalia" -msgstr "" +msgstr "Somalia" #. Name #: sr/entry.desktop:2 @@ -1104,7 +1095,7 @@ msgstr "São Tomé och Príncipe" #. Name #: sv/entry.desktop:2 msgid "El Salvador" -msgstr "" +msgstr "El Salvador" #. Name #: sy/entry.desktop:2 @@ -1113,9 +1104,8 @@ msgstr "Syrien" #. Name #: sz/entry.desktop:2 -#, fuzzy msgid "Swaziland" -msgstr "Schweiz" +msgstr "Swaziland" #. Name #: tc/entry.desktop:2 @@ -1130,12 +1120,12 @@ msgstr "Tchad" #. Name #: tg/entry.desktop:2 msgid "Togo" -msgstr "" +msgstr "Togo" #. Name #: th/entry.desktop:2 msgid "Thailand" -msgstr "" +msgstr "Thailand" #. Name #: tj/entry.desktop:2 @@ -1145,13 +1135,12 @@ msgstr "Tadzjikistan" #. Name #: tk/entry.desktop:2 msgid "Tokelau" -msgstr "" +msgstr "Tokelau" #. Name #: tm/entry.desktop:2 -#, fuzzy msgid "Turkmenistan" -msgstr "Tadzjikistan" +msgstr "Turkmenistan" #. Name #: tn/entry.desktop:2 @@ -1161,7 +1150,7 @@ msgstr "Tunisien" #. Name #: to/entry.desktop:2 msgid "Tonga" -msgstr "" +msgstr "Tonga" #. Name #: tp/entry.desktop:2 @@ -1181,12 +1170,12 @@ msgstr "Trinidad och Tobago" #. Name #: tv/entry.desktop:2 msgid "Tuvalu" -msgstr "" +msgstr "Tuvalu" #. Name #: tw/entry.desktop:3 msgid "Taiwan" -msgstr "" +msgstr "Taiwan" #. Name #: tz/entry.desktop:2 @@ -1201,7 +1190,7 @@ msgstr "Ukraina" #. Name #: ug/entry.desktop:2 msgid "Uganda" -msgstr "" +msgstr "Uganda" #. Name #: us/entry.desktop:2 @@ -1211,13 +1200,12 @@ msgstr "Amerikas förenta stater" #. Name #: uy/entry.desktop:2 msgid "Uruguay" -msgstr "" +msgstr "Uruguay" #. Name #: uz/entry.desktop:2 -#, fuzzy msgid "Uzbekistan" -msgstr "Tadzjikistan" +msgstr "Uzbekistan" #. Name #: va/entry.desktop:2 @@ -1232,7 +1220,7 @@ msgstr "St. Vincent och Grenadinerna" #. Name #: ve/entry.desktop:2 msgid "Venezuela" -msgstr "" +msgstr "Venezuela" #. Name #: vg/entry.desktop:2 @@ -1247,12 +1235,12 @@ msgstr "Amerikanska Jungfruöarna" #. Name #: vn/entry.desktop:2 msgid "Vietnam" -msgstr "" +msgstr "Vietnam" #. Name #: vu/entry.desktop:2 msgid "Vanuatu" -msgstr "" +msgstr "Vanuatu" #. Name #: wf/entry.desktop:2 @@ -1262,7 +1250,7 @@ msgstr "Wallis och Futuna" #. Name #: ws/entry.desktop:3 msgid "Samoa" -msgstr "" +msgstr "Samoa" #. Name #: ye/entry.desktop:2 @@ -1277,9 +1265,9 @@ msgstr "Sydafrika" #. Name #: zm/entry.desktop:2 msgid "Zambia" -msgstr "" +msgstr "Zambia" #. Name #: zw/entry.desktop:2 msgid "Zimbabwe" -msgstr "" +msgstr "Zimbabwe" diff --git a/translations/desktop_files/tdeioslave-desktops/ru.po b/translations/desktop_files/tdeioslave-desktops/ru.po index 586e95cf1..2701352ae 100644 --- a/translations/desktop_files/tdeioslave-desktops/ru.po +++ b/translations/desktop_files/tdeioslave-desktops/ru.po @@ -1,13 +1,14 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Andrei Stepanov <adem4ik@gmail.com>, 2024, 2025. +# 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-06-29 05:58+0000\n" -"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"PO-Revision-Date: 2025-10-26 04:17+0000\n" +"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/tdeioslave-desktop-files/ru/>\n" "Language: ru\n" @@ -31,7 +32,7 @@ msgstr "Настройка CGI TDEIO slave" #. Keywords #: cgi/kcmcgi/kcmcgi.desktop:13 msgid "CGI;TDEIO;Slave;Paths;" -msgstr "" +msgstr "CGI;TDEIO;Slave;Paths;Пути" #. Name #: home/kdedmodule/homedirnotify.desktop:4 @@ -40,14 +41,15 @@ msgstr "Уведомление о смене базового адреса KDED" #. Comment #: home/kdedmodule/homedirnotify.desktop:6 -#, fuzzy msgid "Provides change notification for user's home folder ($HOME)" -msgstr "Отслеживание изменений в сетевых папках" +msgstr "" +"Предоставляет уведомления об изменениях в домашнем каталоге пользователя " +"($HOME)" #. Name #: man/kmanpart.desktop:4 msgid "KManPart" -msgstr "" +msgstr "KManPart" #. Comment #: man/kmanpart.desktop:6 @@ -97,12 +99,12 @@ msgstr "Чистый DVD" #. Comment #: media/mimetypes/bluray_encrypted_locked.desktop:7 msgid "Encrypted Locked BLURAY" -msgstr "" +msgstr "Зашифрованный заблокированный диск BLURAY" #. Comment #: media/mimetypes/bluray_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked BLURAY" -msgstr "" +msgstr "Зашифрованный разблокированный диск BLURAY" #. Comment #: media/mimetypes/bluray_mounted.desktop:6 @@ -132,12 +134,12 @@ msgstr "Неподключённая камера" #. Comment #: media/mimetypes/cd-r_encrypted_locked.desktop:7 msgid "Encrypted Locked CD-R" -msgstr "" +msgstr "Зашифрованный заблокированный CD-R" #. Comment #: media/mimetypes/cd-r_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked CD-R" -msgstr "" +msgstr "Зашифрованный разблокированный CD-R" #. Comment #: media/mimetypes/cd-r_mounted.desktop:6 @@ -152,12 +154,12 @@ msgstr "Отмонтированный CD (с возможностью запи #. Comment #: media/mimetypes/cd-rw_encrypted_locked.desktop:7 msgid "Encrypted Locked CD-RW" -msgstr "" +msgstr "Зашифрованный заблокированный CD-RW" #. Comment #: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked CD-RW" -msgstr "" +msgstr "Зашифрованный разблокированный CD-RW" #. Comment #: media/mimetypes/cd-rw_mounted.desktop:6 @@ -172,12 +174,12 @@ msgstr "Отмонтированный CD (с возможностью запи #. Comment #: media/mimetypes/cdrom_encrypted_locked.desktop:7 msgid "Encrypted Locked CD-ROM" -msgstr "" +msgstr "Зашифрованный заблокированный CD-ROM" #. Comment #: media/mimetypes/cdrom_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked CD-ROM" -msgstr "" +msgstr "Зашифрованный разблокированный CD-ROM" #. Comment #: media/mimetypes/cdrom_mounted.desktop:6 @@ -192,12 +194,12 @@ msgstr "Отмонтированный CD" #. Comment #: media/mimetypes/dvd_encrypted_locked.desktop:7 msgid "Encrypted Locked DVD" -msgstr "" +msgstr "Зашифрованный заблокированный DVD" #. Comment #: media/mimetypes/dvd_encrypted_unlocked.desktop:7 msgid "Encrypted Unlocked DVD" -msgstr "" +msgstr "Зашифрованный разблокированный DVD" #. Comment #: media/mimetypes/dvd_mounted.desktop:6 @@ -241,15 +243,13 @@ msgstr "Камера" #. Comment #: media/mimetypes/hdd_encrypted_locked.desktop:7 -#, fuzzy msgid "Encrypted Locked Hard Disk Volume" -msgstr "Смонтированный раздел жёсткого диска" +msgstr "Зашифрованный заблокированный раздел жёсткого диска" #. Comment #: media/mimetypes/hdd_encrypted_unlocked.desktop:7 -#, fuzzy msgid "Encrypted Unlocked Hard Disk Volume" -msgstr "Отмонтированный раздел жёсткого диска" +msgstr "Зашифрованный разблокированный раздел жёсткого диска" #. Comment #: media/mimetypes/hdd_mounted.desktop:6 @@ -264,19 +264,17 @@ msgstr "Отмонтированный раздел жёсткого диска" #. Comment #: media/mimetypes/mycomputer.desktop:6 msgid "My Computer" -msgstr "" +msgstr "Мой компьютер" #. Comment #: media/mimetypes/mydocuments.desktop:6 -#, fuzzy msgid "My Documents" -msgstr "Документы" +msgstr "Мои документы" #. Comment #: media/mimetypes/mynetworkplaces.desktop:6 -#, fuzzy msgid "My Network Places" -msgstr "Сетевые ресурсы" +msgstr "Мои сетевые ресурсы" #. Comment #: media/mimetypes/nfs_mounted.desktop:6 @@ -291,19 +289,17 @@ msgstr "Отмонтированный ресурс NFS" #. Comment #: media/mimetypes/printers.desktop:6 msgid "Printers" -msgstr "" +msgstr "Принтеры" #. Comment #: media/mimetypes/removable_encrypted_locked.desktop:7 -#, fuzzy msgid "Encrypted Locked Removable Medium" -msgstr "Смонтированный внешний диск" +msgstr "Зашифрованный заблокированный внешний диск" #. Comment #: media/mimetypes/removable_encrypted_unlocked.desktop:7 -#, fuzzy msgid "Encrypted Unlocked Removable Medium" -msgstr "Отмонтированный внешний диск" +msgstr "Зашифрованный разблокированный внешний диск" #. Comment #: media/mimetypes/removable_mounted.desktop:6 @@ -328,7 +324,7 @@ msgstr "Отмонтированный ресурс сети Microsoft" #. Comment #: media/mimetypes/svcd.desktop:6 msgid "Super Video CD" -msgstr "" +msgstr "Super Video CD" #. Comment #. Name @@ -339,14 +335,13 @@ msgstr "Корзина" #. Comment #: media/mimetypes/vcd.desktop:6 -#, fuzzy msgid "Video CD" -msgstr "DVD с видео" +msgstr "Video CD" #. Comment #: media/mimetypes/webbrowser.desktop:6 msgid "Web Browser" -msgstr "" +msgstr "Веб-браузер" #. Comment #: media/mimetypes/zip_mounted.desktop:6 @@ -378,7 +373,7 @@ msgstr "Извлечь" #. Name #: media/services/media_lock.desktop:10 msgid "Lock" -msgstr "" +msgstr "Заблокировать" #. Name #: media/services/media_mount.desktop:10 @@ -398,7 +393,7 @@ msgstr "Безопасно извлечь" #. Name #: media/services/media_unlock.desktop:10 msgid "Unlock" -msgstr "" +msgstr "Разблокировать" #. Name #: media/services/media_unmount.desktop:10 @@ -477,11 +472,12 @@ msgstr "Проверка изменения локальных файлов" #. Comment #: system/kdedmodule/systemdirnotify.desktop:6 -#, fuzzy msgid "" "Provides change notification for folders monitored by the system:/ tdeio " "plugin" -msgstr "Отслеживание изменений в сетевых папках" +msgstr "" +"Предоставляет уведомления об изменениях в каталогах отслеживаемых в tdeio-" +"плагине system:/" #. Comment #: system/mimetypes/system_directory.desktop:6 @@ -533,6 +529,7 @@ msgstr "Свойства мусора" #: trash/kcmtrash.desktop:15 msgid "trash;properties;size;limits;delete" msgstr "" +"trash;properties;size;limits;delete;корзина;свойства;размер;лимиты;удалить" #. Name #: trash/tdefile-plugin/tdefile_trash.desktop:4 diff --git a/translations/desktop_files/tdm-sessions/ru.po b/translations/desktop_files/tdm-sessions/ru.po index 1fa334753..410a2edca 100644 --- a/translations/desktop_files/tdm-sessions/ru.po +++ b/translations/desktop_files/tdm-sessions/ru.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Alexander Golubev <fatzer2@gmail.com>, 2022. +# Alexander Golubev <fatzer2@gmail.com>, 2022, 2025. 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: 2022-02-14 23:01+0000\n" +"PO-Revision-Date: 2025-11-02 15:58+0000\n" "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/tdm-sessions/ru/>\n" @@ -14,9 +14,9 @@ msgstr "" "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.10.1\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 #: tde.desktop.cmake:7 @@ -35,7 +35,7 @@ msgstr "" #. Name #: 9wm.desktop:6 msgid "9WM" -msgstr "" +msgstr "9WM" #. Comment #: 9wm.desktop:8 @@ -45,17 +45,17 @@ msgstr "Эмуляция оконного менеджера Plan 9" #. Name #: admin.desktop:7 msgid "admin" -msgstr "" +msgstr "Администрирование" #. Comment #: admin.desktop:9 msgid "Yast Admin Session" -msgstr "" +msgstr "Сессия администратора Yast" #. Name #: aewm++.desktop:6 msgid "AEWM++" -msgstr "" +msgstr "AEWM++" #. Comment #: aewm++.desktop:8 @@ -64,12 +64,12 @@ msgid "" "partial GNOME support" msgstr "" "Минимальный оконный менеджер на основе AEWM, имеющий частичную поддержку " -"GNOME." +"GNOME" #. Name #: aewm.desktop:6 msgid "AEWM" -msgstr "" +msgstr "AEWM" #. Comment #: aewm.desktop:8 @@ -79,7 +79,7 @@ msgstr "Минимальный оконный менеджер" #. Name #: afterstep.desktop:6 msgid "AfterStep" -msgstr "" +msgstr "AfterStep" #. Comment #: afterstep.desktop:8 @@ -89,7 +89,7 @@ msgstr "Оконный менеджер на основе FVWM, повторяю #. Name #: amaterus.desktop:6 msgid "AMATERUS" -msgstr "" +msgstr "AMATERUS" #. Comment #: amaterus.desktop:8 @@ -99,7 +99,7 @@ msgstr "Оконный менеджер на основе GTK+ c функцие #. Name #: amiwm.desktop:6 msgid "AmiWM" -msgstr "" +msgstr "AmiWM" #. Comment #: amiwm.desktop:8 @@ -109,7 +109,7 @@ msgstr "Оконный менеджер в стиле Amiga" #. Name #: asclassic.desktop:6 msgid "ASClassic" -msgstr "" +msgstr "ASClassic" #. Comment #: asclassic.desktop:8 @@ -119,7 +119,7 @@ msgstr "AfterStep Classic, оконный менеджер на основе Aft #. Name #: blackbox.desktop:6 msgid "Blackbox" -msgstr "" +msgstr "Blackbox" #. Comment #: blackbox.desktop:8 @@ -129,7 +129,7 @@ msgstr "Быстрый и лёгкий оконный менеджер" #. Name #: cde.desktop:6 msgid "CDE" -msgstr "" +msgstr "CDE" #. Comment #: cde.desktop:8 @@ -141,17 +141,19 @@ msgstr "Common Desktop Environment, промышленный стандарт р #. 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 "Claude's Tab Window Manager - улучшенная версия TWM" +msgstr "" +"Claude's Tab Window Manager — улучшенная версия TWM с виртуальными рабочими " +"столами и т.п." #. Name #: cwwm.desktop:6 msgid "CWWM" -msgstr "" +msgstr "CWWM" #. Comment #: cwwm.desktop:8 @@ -161,7 +163,7 @@ msgstr "ChezWam Window Manager - минимальный оконный мене #. Name #: enlightenment.desktop:6 msgid "Enlightenment" -msgstr "" +msgstr "Enlightenment" #. Comment #: enlightenment.desktop:8 @@ -171,7 +173,7 @@ msgstr "Многофункциональный, поддерживающий т #. Name #: evilwm.desktop:6 msgid "EvilWM" -msgstr "" +msgstr "EvilWM" #. Comment #: evilwm.desktop:8 @@ -181,7 +183,7 @@ msgstr "Минимальный оконный менеджер, основанн #. Name #: fluxbox.desktop:6 msgid "Fluxbox" -msgstr "" +msgstr "Fluxbox" #. Comment #: fluxbox.desktop:8 @@ -191,7 +193,7 @@ msgstr "Настраиваемый оконный менеджер, основа #. Name #: flwm.desktop:6 msgid "FLWM" -msgstr "" +msgstr "FLWM" #. Comment #: flwm.desktop:8 @@ -201,7 +203,7 @@ msgstr "Быстрый и лёгкий оконный менеджер, осно #. Name #: fvwm.desktop:6 msgid "FVWM" -msgstr "" +msgstr "FVWM" #. Comment #: fvwm.desktop:8 fvwm2.desktop:8 @@ -213,12 +215,12 @@ msgstr "" #. Name #: fvwm2.desktop:6 msgid "FVWM2" -msgstr "" +msgstr "FVWM2" #. Name #: fvwm95.desktop:6 msgid "FVWM95" -msgstr "" +msgstr "FVWM95" #. Comment #: fvwm95.desktop:8 @@ -228,7 +230,7 @@ msgstr "Клон FVWM в стиле Windows 95" #. Name #: gnome.desktop:6 msgid "GNOME" -msgstr "" +msgstr "GNOME" #. Comment #: gnome.desktop:8 @@ -242,7 +244,7 @@ msgstr "" #. Name #: golem.desktop:6 msgid "Golem" -msgstr "" +msgstr "Golem" #. Comment #: golem.desktop:8 @@ -252,7 +254,7 @@ msgstr "Лёгкий оконный менеджер" #. Name #: icewm.desktop:6 msgid "IceWM" -msgstr "" +msgstr "IceWM" #. Comment #: icewm.desktop:8 @@ -262,7 +264,7 @@ msgstr "Оконный менеджер в стиле Windows95-OS/2-Motif" #. Name #: ion.desktop:6 msgid "Ion" -msgstr "" +msgstr "Ion" #. Comment #: ion.desktop:8 @@ -292,7 +294,7 @@ msgstr "Окружение рабочего стола от команды KDE" #. Name #: larswm.desktop:6 msgid "LarsWM" -msgstr "" +msgstr "LarsWM" #. Comment #: larswm.desktop:8 @@ -302,7 +304,7 @@ msgstr "Оконный менеджер на основе 9wm" #. Name #: lwm.desktop:6 msgid "LWM" -msgstr "" +msgstr "LWM" #. Comment #: lwm.desktop:8 @@ -312,7 +314,7 @@ msgstr "Облегчённый, не настраиваемый простой #. Name #: matchbox.desktop:6 msgid "Matchbox" -msgstr "" +msgstr "Matchbox" #. Comment #: matchbox.desktop:8 @@ -322,7 +324,7 @@ msgstr "Оконный менеджер для мобильных устройс #. Name #: metacity.desktop:6 msgid "Metacity" -msgstr "" +msgstr "Metacity" #. Comment #: metacity.desktop:8 @@ -332,7 +334,7 @@ msgstr "Лёгкий оконный менеджер на основе GTK2" #. Name #: mwm.desktop:6 msgid "MWM" -msgstr "" +msgstr "MWM" #. Comment #: mwm.desktop:8 @@ -342,7 +344,7 @@ msgstr "Оконный менеджер Motif" #. Name #: olvwm.desktop:6 msgid "OLVWM" -msgstr "" +msgstr "OLVWM" #. Comment #: olvwm.desktop:8 @@ -355,7 +357,7 @@ msgstr "" #. Name #: olwm.desktop:6 msgid "OLWM" -msgstr "" +msgstr "OLWM" #. Comment #: olwm.desktop:8 @@ -365,7 +367,7 @@ msgstr "Традиционный оконный менеджер системы #. Name #: openbox.desktop:6 msgid "Openbox" -msgstr "" +msgstr "Openbox" #. Comment #: openbox.desktop:8 @@ -375,7 +377,7 @@ msgstr "Лёгкий оконный менеджер, основанный на #. Name #: oroborus.desktop:6 msgid "Oroborus" -msgstr "" +msgstr "Oroborus" #. Comment #: oroborus.desktop:8 @@ -385,7 +387,7 @@ msgstr "Лёгкий оконный менеджер, поддерживающи #. Name #: phluid.desktop:6 msgid "Phluid" -msgstr "" +msgstr "Phluid" #. Comment #: phluid.desktop:8 @@ -395,7 +397,7 @@ msgstr "Оконный менеджер на основе imlib2" #. Name #: pwm.desktop:6 msgid "PWM" -msgstr "" +msgstr "PWM" #. Comment #: pwm.desktop:8 @@ -407,7 +409,7 @@ msgstr "" #. Name #: qvwm.desktop:6 msgid "QVWM" -msgstr "" +msgstr "QVWM" #. Comment #: qvwm.desktop:8 @@ -417,7 +419,7 @@ msgstr "Оконный менеджер в стиле Windows 95" #. Name #: ratpoison.desktop:6 msgid "Ratpoison" -msgstr "" +msgstr "Ratpoison" #. Comment #: ratpoison.desktop:8 @@ -437,7 +439,7 @@ msgstr "Минимальный, но настраиваемый оконный #. Name #: sawfish.desktop:6 msgid "Sawfish" -msgstr "" +msgstr "Sawfish" #. Comment #: sawfish.desktop:8 @@ -448,7 +450,7 @@ msgstr "Расширяемый скриптами Lisp наподобие Emacs #. Name #: twm.desktop:6 msgid "TWM" -msgstr "" +msgstr "TWM" #. Comment #: twm.desktop:8 @@ -458,7 +460,7 @@ msgstr "Традиционный оконный менеджер системы #. Name #: ude.desktop:6 msgid "UDE" -msgstr "" +msgstr "UDE" #. Comment #: ude.desktop:8 @@ -468,7 +470,7 @@ msgstr "UNIX Desktop Environment" #. Name #: vtwm.desktop:6 msgid "VTWM" -msgstr "" +msgstr "VTWM" #. Comment #: vtwm.desktop:8 @@ -478,7 +480,7 @@ msgstr "Вариант TWM, имеющий виртуальные экраны #. Name #: w9wm.desktop:6 msgid "W9WM" -msgstr "" +msgstr "W9WM" #. Comment #: w9wm.desktop:8 @@ -491,7 +493,7 @@ msgstr "" #. Name #: waimea.desktop:6 msgid "Waimea" -msgstr "" +msgstr "Waimea" #. Comment #: waimea.desktop:8 @@ -501,7 +503,7 @@ msgstr "Настраиваемый оконный менеджер, основа #. Name #: wm2.desktop:6 msgid "WM2" -msgstr "" +msgstr "WM2" #. Comment #: wm2.desktop:8 @@ -510,9 +512,8 @@ msgstr "Маленький, не настраиваемый оконный ме #. Name #: wmaker.desktop:6 -#, fuzzy msgid "WindowMaker" -msgstr "Традиционный оконный менеджер системы X11" +msgstr "WindowMaker" #. Comment #: wmaker.desktop:8 @@ -522,7 +523,7 @@ msgstr "Простой оконный менеджер, воспроизводя #. Name #: xfce.desktop:6 msgid "XFce" -msgstr "" +msgstr "XFce" #. Comment #: xfce.desktop:8 @@ -534,7 +535,7 @@ msgstr "\"Не содержащая холестерина\" рабочая ср #. Name #: xfce4.desktop:6 msgid "XFce 4" -msgstr "" +msgstr "XFce 4" #. Comment #: xfce4.desktop:8 diff --git a/translations/desktop_files/tdm-sessions/zh_CN.po b/translations/desktop_files/tdm-sessions/zh_CN.po index 6646ae7e8..3be6e3afb 100644 --- a/translations/desktop_files/tdm-sessions/zh_CN.po +++ b/translations/desktop_files/tdm-sessions/zh_CN.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Toad114514 <xiaolan2332021@163.com>, 2025. 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: 2025-09-12 05:21+0000\n" +"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n" +"Language-Team: Chinese (Simplified Han script) <https://mirror.git." +"trinitydesktop.org/weblate/projects/tdebase/tdm-sessions/zh_Hans/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: tde.desktop.cmake:7 @@ -26,7 +27,7 @@ msgstr "" msgid "" "The Trinity Desktop Environment. A powerful Open Source graphical desktop " "environment" -msgstr "三位一体 桌面环境。强大的开放源代码图形桌面环境" +msgstr "Trinity 桌面环境。既复古又强大的开源图形桌面环境" #. Name #: 9wm.desktop:6 diff --git a/translations/desktop_files/twin-desktops/ru.po b/translations/desktop_files/twin-desktops/ru.po index 76611bee5..0fe6ee023 100644 --- a/translations/desktop_files/twin-desktops/ru.po +++ b/translations/desktop_files/twin-desktops/ru.po @@ -1,13 +1,14 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Andrei Stepanov <adem4ik@gmail.com>, 2024. +# Alexander Golubev <fatzer2@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-04 18:14+0000\n" -"PO-Revision-Date: 2024-05-13 16:01+0000\n" -"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"PO-Revision-Date: 2025-10-26 04:17+0000\n" +"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdebase/twin-desktop-files/ru/>\n" "Language: ru\n" @@ -16,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 #: kcmtwin/showdesktop.desktop:4 @@ -85,7 +86,7 @@ msgid "" "aerosnap;" msgstr "" "window behavior;windows;frame;titlebar;borders;corners;active " -"borders;aerosnap;поведение;окна;границы;углы;активные границы;" +"borders;aerosnap;поведение;окна;поведение окон;границы;углы;активные границы;" #. Name #: kcmtwin/twinoptions/twinadvanced.desktop:11 @@ -143,12 +144,12 @@ msgstr "" #. Name #: kcmtwin/twinoptions/twinoptions.desktop:11 msgid "Window Behavior" -msgstr "Поведение окна" +msgstr "Поведение окон" #. Comment #: kcmtwin/twinoptions/twinoptions.desktop:13 msgid "Configure the window behavior" -msgstr "Настройка поведения браузера" +msgstr "Настройка поведения окон" #. Keywords #: kcmtwin/twinoptions/twinoptions.desktop:15 @@ -157,8 +158,8 @@ msgid "" "titlebar;doubleclick;" msgstr "" "focus;placement;window behavior;animation;raise;auto " -"raise;windows;frame;titlebar;doubleclick;фокус;размещение;поведение " -"окна;анимация;окна;рамка;панель заголовка;двойной щелчок;" +"raise;windows;frame;titlebar;doubleclick;фокус;размещение;поведение;" +"поведение окон;анимация;окна;рамка;панель заголовка;двойной щелчок;" #. Name #: kcmtwin/twinoptions/twintranslucency.desktop:11 @@ -192,8 +193,8 @@ msgid "" "rules;" msgstr "" "size;position;state;window behavior;windows;specific;workarounds;remember;rul" -"es;размер;положение;состояние;поведение окна;окна;специфические;обходные " -"пути;запоминание;правила;" +"es;размер;положение;состояние;поведение;окна;поведение окон;специфические;" +"обходные пути;запоминание;правила;" #. Description #: data/fsp_workarounds_1.twinrules:2 diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index f771229fc..c37abc81d 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <dcopclient.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> int main( int argc, char* argv[] ) diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index 422bb30c5..d4b525691 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <netwm_def.h> #include <tdeconfig.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <dcopclient.h> struct SessionInfo diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 6adad44fe..3e09d03ef 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -1915,12 +1915,12 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust ) TQRect clientArea = workspace()->clientArea( MaximizeArea, this ); // save sizes for restoring, if maximalizing - if( !activeTiled && !adjust && !( y() == clientArea.top() && height() == clientArea.height())) + if( !adjust && !( y() == clientArea.top() && height() == clientArea.height())) { geom_restore.setTop( y()); geom_restore.setHeight( height()); } - if( !activeTiled && !adjust && !( x() == clientArea.left() && width() == clientArea.width())) + if( !adjust && !( x() == clientArea.left() && width() == clientArea.width())) { geom_restore.setLeft( x()); geom_restore.setWidth( width()); diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 408bd563c..360417123 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -455,7 +455,7 @@ void KWinDecorationModule::createThirdPartyWMList() TQString wmExecutable; TQStringList wmNames; TQStringList wmAvailableNames; - wmNames << TQString("kwin ").append(i18n("(KDE4's window manager)")) << TQString("compiz ").append(i18n("(Compiz Effects Manager)")) << TQString("icewm ").append(i18n("(Simple, fast window manager)")); + wmNames << TQString("kwin ").append(i18n("(KDE's window manager)")) << TQString("compiz ").append(i18n("(Compiz Effects Manager)")) << TQString("icewm ").append(i18n("(Simple, fast window manager)")); wmNames.sort(); wmNames.prepend(TQString("twin ").append(i18n("(Default TDE window manager)"))); for (it = wmNames.begin(); it != wmNames.end(); ++it) |
