saving uncommitted changes in /etc prior to emerge run

diff --git a/xdg/autostart/xembedsniproxy.desktop b/xdg/autostart/xembedsniproxy.desktop
index 1da47c63530249fed37e33b270a9f12210ad85fa..a75ea4ad773328c2b67f94e6763e7514ead44bf2 100644 (file)
--- a/xdg/autostart/xembedsniproxy.desktop
+++ b/xdg/autostart/xembedsniproxy.desktop
@@ -12,6 +12,7 @@ Name[en_GB]=XembedSniProxy
 Name[es]=XembedSniProxy
 Name[et]=XembedSniProxy
 Name[fi]=XembedSniProxy
+Name[fr]=XembedSniProxy
 Name[gl]=XembedSniProxy
 Name[is]=XembedSniProxy
 Name[it]=XembedSniProxy

diff --git a/xdg/taskmanagerrulesrc b/xdg/taskmanagerrulesrc
index 56ff05bc4f0e630b96ad96a4b3ff0704a74c7994..c0748c21a2c5ccc69ef5b5fdc460e08cf1b73dd7 100644 (file)
--- a/xdg/taskmanagerrulesrc
+++ b/xdg/taskmanagerrulesrc
@@ -22,8 +22,28 @@ Identifier=DesktopEntryName
 Match=(?<=crx_)(?'match'[a-z]+)
 Target=chrome-%1-default
 
+# Google changed the class to be "Google-chrome" around version 54
+[Rewrite Rules][Google-chrome][1]
+Property=ClassName
+Identifier=DesktopEntryName
+Match=(?<=crx_)(?'match'[a-z]+)
+Target=chrome-%1-default
+
 [Rewrite Rules][chromium][1]
 Property=ClassName
 Identifier=DesktopEntryName
 Match=(?<=crx_)(?'match'[a-z]+)
 Target=chrome-%1-default
+
+[Rewrite Rules][chromium-browser][1]
+Property=ClassName
+Identifier=DesktopEntryName
+Match=(?<=crx_)(?'match'[a-z]+)
+Target=chrome-%1-default
+
+# Chromium changed the class too
+[Rewrite Rules][Chromium][1]
+Property=ClassName
+Identifier=DesktopEntryName
+Match=(?<=crx_)(?'match'[a-z]+)
+Target=chrome-%1-default

diff --git a/xdg/wallpaper.knsrc b/xdg/wallpaper.knsrc
index 6d55e3d6a2980da528b9da6f0b2e913935665751..bf646e6e3f1729adca839a16c265b7a87fd3753c 100644 (file)
--- a/xdg/wallpaper.knsrc
+++ b/xdg/wallpaper.knsrc
@@ -1,6 +1,6 @@
 [KNewStuff3]
 ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,KDE Wallpaper 1440x900,KDE Wallpaper 1600x1200,KDE Wallpaper 1680x1050,KDE Wallpaper 1920x1200,KDE Wallpaper 2560x1600,KDE Wallpaper (other),KDE Wallpaper (SVG)
+Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,KDE Wallpaper 1440x900,KDE Wallpaper 1600x1200,KDE Wallpaper (other)
 StandardResource=wallpaper
 Uncompress=archive