Merge branch 'master' of git.calculate.ru:calculate-templates

14 years ago · 315ca48b6e
parent a02cb3b367 0b90fe2a82
commit 315ca48b6e
4 changed files with 8 additions and 8 deletions
--- a/desktop/desktop/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc
+++ b/desktop/desktop/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc
@ -413,10 +413,10 @@ immutability=1
 plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(app-dicts/goldendict)!=#
+#?pkg(app-dicts/goldendict)!=||pkg(app-text/goldendict)!=#
 Url=file:///usr/share/applications/goldendict.desktop
 #pkg#
-#?pkg(app-dicts/goldendict)==#
+#?pkg(app-dicts/goldendict)==&&pkg(app-text/goldendict)==#
 Url=file:///usr/share/applications/qstardict.desktop
 #pkg#

--- a/desktop/desktop/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
+++ b/desktop/desktop/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
@ -330,10 +330,10 @@ immutability=1
 plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(app-dicts/goldendict)!=#
+#?pkg(app-dicts/goldendict)!=||pkg(app-text/goldendict)!=#
 Url=file:///usr/share/applications/goldendict.desktop
 #pkg#
-#?pkg(app-dicts/goldendict)==#
+#?pkg(app-dicts/goldendict)==&&pkg(app-text/goldendict)==#
 Url=file:///usr/share/applications/qstardict.desktop
 #pkg#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
--- a/desktop/desktop/20-kde-4.5/.kde4/share/config/plasma-desktop-appletsrc
+++ b/desktop/desktop/20-kde-4.5/.kde4/share/config/plasma-desktop-appletsrc
@ -335,10 +335,10 @@ immutability=1
 plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(app-dicts/goldendict)!=#
+#?pkg(app-dicts/goldendict)!=||pkg(app-text/goldendict)!=#
 Url=file:///usr/share/applications/goldendict.desktop
 #pkg#
-#?pkg(app-dicts/goldendict)==#
+#?pkg(app-dicts/goldendict)==&&pkg(app-text/goldendict)==#
 Url=file:///usr/share/applications/qstardict.desktop
 #pkg#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
--- a/desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc
+++ b/desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc
@ -335,10 +335,10 @@ immutability=1
 plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(app-dicts/goldendict)!=#
+#?pkg(app-dicts/goldendict)!=||pkg(app-text/goldendict)!=#
 Url=file:///usr/share/applications/goldendict.desktop
 #pkg#
-#?pkg(app-dicts/goldendict)==#
+#?pkg(app-dicts/goldendict)==&&pkg(app-text/goldendict)==#
 Url=file:///usr/share/applications/qstardict.desktop
 #pkg#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]