saving uncommitted changes in /etc prior to emerge run

diff --git a/plasma/startup/10-agent-startup.sh b/plasma/startup/10-agent-startup.sh
index e2c50188365f479673e89f0a19558b50b080d8ab..fc5ba70539d960444ec9384cdc9e8e0be7da111f 100644 (file)
--- a/plasma/startup/10-agent-startup.sh
+++ b/plasma/startup/10-agent-startup.sh
@@ -14,6 +14,10 @@
 # must be selected either with eselect pinentry or adding an entry to
 # $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt4".
 #
+# If using gnupg-2.1 or later with gpg-agent for ssh instead of ssh-agent,
+# $HOME/.gnupg/gpg-agent.conf must be edited to include "enable-ssh-support".
+# See bug #547544 for details of why.
+#
 # pinentry-curses or pinentry-tty will not work because the agent started here
 # is in a different tty than where it is used, so the agent does not know where
 # to request the passphrase and fails.

diff --git a/xdg/autostart/krunner.desktop b/xdg/autostart/krunner.desktop
index 270bffbc47aa1b79a67a454956134ceaeabe9852..2d3ccfc898fe0ee996f09ac4bcab14e35931c204 100644 (file)
--- a/xdg/autostart/krunner.desktop
+++ b/xdg/autostart/krunner.desktop
@@ -13,6 +13,7 @@ Name[el]=KRunner
 Name[en_GB]=KRunner
 Name[es]=KRunner
 Name[et]=KRunner
+Name[eu]=KRunner
 Name[fi]=KRunner
 Name[fr]=KRunner
 Name[gl]=KRunner

diff --git a/xdg/autostart/plasmashell.desktop b/xdg/autostart/plasmashell.desktop
index c186f5a2d09a2e258377c819012876d2d295f606..f5a7201a604426e06ede82a2186a34fca4a4d523 100644 (file)
--- a/xdg/autostart/plasmashell.desktop
+++ b/xdg/autostart/plasmashell.desktop
@@ -13,6 +13,7 @@ Name[el]=Χώρος επιφάνειας εργασίας Plasma
 Name[en_GB]=Plasma Desktop Workspace
 Name[es]=Espacio de trabajo del escritorio Plasma
 Name[et]=Plasma töölaua töötsoon
+Name[eu]=Plasma mahaigainaren lanerako guneak
 Name[fi]=Plasma-työpöytä
 Name[fr]=Espace de travail Plasma
 Name[ga]=Spás Oibre Deisce Plasma

diff --git a/xdg/autostart/xembedsniproxy.desktop b/xdg/autostart/xembedsniproxy.desktop
index a75ea4ad773328c2b67f94e6763e7514ead44bf2..ff08628b042b46fea06118598bedc13bd8be353a 100644 (file)
--- a/xdg/autostart/xembedsniproxy.desktop
+++ b/xdg/autostart/xembedsniproxy.desktop
@@ -11,6 +11,7 @@ Name[el]=XembedSniProxy
 Name[en_GB]=XembedSniProxy
 Name[es]=XembedSniProxy
 Name[et]=XembedSniProxy
+Name[eu]=XembedSniProxy
 Name[fi]=XembedSniProxy
 Name[fr]=XembedSniProxy
 Name[gl]=XembedSniProxy

diff --git a/xdg/taskmanagerrulesrc b/xdg/taskmanagerrulesrc
index c0748c21a2c5ccc69ef5b5fdc460e08cf1b73dd7..9fac4e996a8edee747f28c948d68876ac21efd3a 100644 (file)
--- a/xdg/taskmanagerrulesrc
+++ b/xdg/taskmanagerrulesrc
@@ -14,7 +14,6 @@ oracle-ide-boot-Launcher=Oracle SQL Developer
 Dragon=dragonplayer
 [Settings]
 ManualOnly=Wine
-MatchCommandLineFirst=VirtualBox
 
 [Rewrite Rules][google-chrome][1]
 Property=ClassName