summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-05-22 19:47:54 +0200
committeranonym <anonym@riseup.net>2016-05-22 19:47:54 +0200
commit469b1ec04686fa99077652d0f0ef89f4dafcee7a (patch)
tree517296a80e2364187ee8d6a21d19872ec993cebf
parent6a1b6439835ef84477e023586d68d661a4c5f505 (diff)
parenta380bd3f32479efd8e13ca65596696e474701bb1 (diff)
Merge remote-tracking branch 'origin/feature/11075-remove-power-menu-entries' into devel
Fix-committed: #11075
-rw-r--r--config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in9
-rw-r--r--config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in9
-rw-r--r--po/POTFILES.in2
3 files changed, 0 insertions, 20 deletions
diff --git a/config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in b/config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in
deleted file mode 100644
index 2474270..0000000
--- a/config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=sudo -n reboot
-_Name=Reboot
-_Comment=Immediately reboot computer
-Icon=gtk-refresh
-Categories=Application;System;Settings
diff --git a/config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in b/config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in
deleted file mode 100644
index e3b2189..0000000
--- a/config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=sudo -n halt
-_Name=Power Off
-_Comment=Immediately shut down computer
-Icon=system-shutdown
-Categories=Application;System;Settings
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9ff01b6..8a9aeff 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,8 +22,6 @@ config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in
config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in
config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in
config/chroot_local-includes/usr/share/applications/tails-about.desktop.in
-config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in
-config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in
config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in
config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in
config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in