From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Wed, 18 Jun 2014 07:21:41 +0000 (+0200)
Subject: Current state
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=5ba23872da6eb304d18efbe7f373b28009990cf1;p=config%2Fsamara%2Fetc.git

Current state
---

diff --git a/bash_completion.d/pulseaudio-bash-completion.sh b/bash_completion.d/pulseaudio-bash-completion.sh
deleted file mode 100644
index 43f4a2c..0000000
--- a/bash_completion.d/pulseaudio-bash-completion.sh
+++ /dev/null
@@ -1,570 +0,0 @@
-#!/bin/bash
-
-__cards () {
-    while IFS=$'\t' read idx name _; do
-        printf "%s %s\n" "$idx" "$name"
-    done < <(pactl list cards short 2> /dev/null)
-}
-
-__sinks () {
-    while IFS=$'\t' read _ name _ _ _; do
-        printf "%s\n" "$name"
-    done < <(pactl list sinks short 2> /dev/null)
-}
-
-__sinks_idx () {
-    while IFS=$'\t' read idx _ _ _ _; do
-        printf "%s\n" "$idx"
-    done < <(pactl list sinks short 2> /dev/null)
-}
-
-__sources () {
-    while IFS=$'\t' read _ name _ _ _; do
-        printf "%s\n" "$name"
-    done < <(pactl list sources short 2> /dev/null)
-}
-
-__sink_inputs () {
-    while IFS=$'\t' read idx _ _ _ _; do
-        printf "%s\n" "$idx"
-    done < <(pactl list sink-inputs short 2> /dev/null)
-}
-
-__source_outputs () {
-    while IFS=$'\t' read idx _ _ _ _; do
-        printf "%s\n" "$idx"
-    done < <(pactl list source-outputs short 2> /dev/null)
-}
-
-__ports () {
-    pactl list cards 2> /dev/null | awk -e \
-        '/^\tPorts:/ {
-            flag=1; next
-         }
-
-         /^\t[A-Za-z]/ {
-             flag=0
-         }
-
-         flag {
-             if (/^\t\t[A-Za-z]/)
-                 ports = ports substr($0, 3, index($0, ":")-3) " "
-         }
-
-         END {
-             print ports
-         }'
-}
-
-__profiles () {
-    pactl list cards 2> /dev/null | awk -e \
-        '/^\tProfiles:/ {
-            flag=1; next
-        }
-
-        /^\t[A-Za-z]/ {
-            flag=0
-        }
-
-        flag {
-            if (/^\t\t[A-Za-z]/)
-                profiles = profiles substr($0, 3, index($0, ": ")-3) " "
-        }
-
-        END {
-            print profiles
-        }'
-}
-
-__all_modules () {
-    while read name; do
-        name=${name%% *}
-        printf "%s\n" "$name"
-    done < <(pulseaudio --dump-modules 2> /dev/null)
-}
-
-__loaded_modules () {
-    while IFS=$'\t' read idx name _; do
-        printf "%s %s\n" "$idx" "$name"
-    done < <(pactl list modules short 2> /dev/null)
-}
-
-__resample_methods () {
-    while read name; do
-        printf "%s\n" "$name"
-    done < <(pulseaudio --dump-resample-methods 2> /dev/null)
-}
-
-_pacat_file_formats () {
-    while IFS=$'\t' read name _; do
-        printf "%s\n" "$name"
-    done < <(pacat --list-file-formats 2> /dev/null)
-}
-
-in_array() {
-    local i
-    for i in "${@:2}"; do
-        [[ $1 = "$i" ]] && return
-    done
-}
-
-_pactl() {
-    local cur prev words cword preprev command
-    local comps
-    local flags='-h --help --version -s --server= --client-name='
-    local list_types='short sinks sources sink-inputs source outputs cards
-                    modules samples clients'
-    local commands=(stat info list exit upload-sample play-sample remove-sample
-                    load-module unload-module move-sink-input move-source-output
-                    suspend-sink suspend-source set-card-profile set-sink-port
-                    set-source-port set-sink-volume set-source-volume
-                    set-sink-input-volume set-source-output-volume set-sink-mute
-                    set-source-mute set-sink-input-mute set-source-output-mute
-                    set-sink-formats set-port-latency-offset subscribe help)
-
-    _init_completion -n = || return
-    preprev=${words[$cword-2]}
-
-    for word in "${COMP_WORDS[@]}"; do
-        if in_array "$word" "${commands[@]}"; then
-            command=$word
-            break
-        fi
-    done
-
-    case $preprev in
-        list) COMPREPLY=($(compgen -W 'short' -- "$cur")) ;;
-
-        play-sample)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        move-sink-input)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        move-source-output)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card-profile)
-            comps=$(__profiles)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*-port)
-            comps=$(__ports)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*-mute) COMPREPLY=($(compgen -W 'true false toggle' -- "$cur")) ;;
-
-        set-sink-formats)
-            ;; #TODO
-
-        set-port-*)
-            comps=$(__ports)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-        --server)
-            compopt +o nospace
-            _known_hosts_real "$cur"
-            ;;
-    esac
-    [[ $COMPREPLY ]] && return 0
-
-    case $prev in
-        list) COMPREPLY=($(compgen -W '${list_types[*]}' -- "$cur")) ;;
-
-        stat) COMPREPLY=($(compgen -W 'short' -- "$cur")) ;;
-
-        upload-sample) _filedir ;;
-
-        play-sample) ;; # TODO
-
-        remove-sample) ;; # TODO
-
-        load-module)
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        unload-module)
-            comps=$(__loaded_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *sink-input*)
-            comps=$(__sink_inputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source-output*)
-            comps=$(__source_outputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-sink-formats)
-            comps=$(__sinks_idx)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *sink*)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source*)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-port*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        -s)
-            _known_hosts_real "$cur" ;;
-    esac
-    [[ $COMPREPLY ]] && return 0
-
-    case $cur in
-        --server=*)
-            cur=${cur#*=}
-            _known_hosts_real "$cur"
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-
-        *)
-            [[ -z $command ]] && COMPREPLY=($(compgen -W '${commands[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pactl pactl
-
-_pacmd() {
-    local cur prev words cword preprev command
-    local comps
-    local flags='-h --help --version'
-    local commands=(exit help list-modules list-cards list-sinks list-sources list-clients
-                    list-samples list-sink-inputs list-source-outputs stat info
-                    load-module unload-module describe-module set-sink-volume
-                    set-source-volume set-sink-input-volume set-source-output-volume
-                    set-sink-mute set-source-mut set-sink-input-mute
-                    set-source-output-mute update-sink-proplist update-source-proplist
-                    update-sink-input-proplist update-source-output-proplist
-                    set-default-sink set-default-source kill-client kill-sink-input
-                    kill-source-output play-sample remove-sample load-sample
-                    load-sample-lazy load-sample-dir-lazy play-file dump
-                    move-sink-input move-source-output suspend-sink suspend-source
-                    suspend set-card-profile set-sink-port set-source-port
-                    set-port-latency-offset set-log-target set-log-level set-log-meta
-                    set-log-time set-log-backtrace)
-    _init_completion -n = || return
-    preprev=${words[$cword-2]}
-
-    for word in "${COMP_WORDS[@]}"; do
-        if in_array "$word" "${commands[@]}"; then
-            command=$word
-            break
-        fi
-    done
-
-    case $preprev in
-        play-sample|play-file)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        load-sample*) _filedir ;;
-
-        move-sink-input)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        move-source-output)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card-profile)
-            comps=$(__profiles)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*port*)
-            comps=$(__ports)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*-mute) COMPREPLY=($(compgen -W 'true false' -- "$cur"));;
-
-        set-sink-formats)
-            ;; #TODO
-    esac
-
-    case $prev in
-        list-*) ;;
-        describe-module|load-module)
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        unload-module)
-            comps=$(__loaded_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        load-sample-dir-lazy) _filedir -d ;;
-        play-file) _filedir ;;
-
-        *sink-input*)
-            comps=$(__sink_inputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source-output*)
-            comps=$(__source_outputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *sink*)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source*)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-port-*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-log-target)
-            COMPREPLY=($(compgen -W 'auto syslog stderr file: newfile:' -- "$cur"))
-            ;;
-
-        set-log-level)
-            COMPREPLY=($(compgen -W '{0..4}' -- "$cur"))
-            ;;
-
-        set-log-meta|set-log-time|suspend)
-            COMPREPLY=($(compgen -W 'true false' -- "$cur"))
-            ;;
-    esac
-
-    case $cur in
-        -*) COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur")) ;;
-        suspend)
-            COMPREPLY=($(compgen -W 'suspend suspend-sink suspend-source' -- "$cur"))
-            ;;
-
-        load-sample)
-            COMPREPLY=($(compgen -W 'load-sample load-sample-lazy load-sample-dir-lazy' -- "$cur"))
-            ;;
-
-        *)
-            [[ -z $command ]] && COMPREPLY=($(compgen -W '${commands[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pacmd pacmd
-
-_pasuspender () {
-    local cur prev
-    local flags='-h --help --version -s --server='
-
-    _init_completion -n = || return
-
-    case $cur in
-        --server=*)
-            cur=${cur#*=}
-            _known_hosts_real "$cur"
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-    esac
-
-    case $prev in
-        -s) _known_hosts_real "$cur" ;;
-    esac
-}
-complete -F _pasuspender pasuspender
-
-_padsp () {
-    local cur prev
-    local flags='-h -s -n -m -M -S -D -d'
-
-    _get_comp_words_by_ref cur prev
-
-    case $cur in
-        -*) COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur")) ;;
-    esac
-
-    case $prev in
-        -s) _known_hosts_real "$cur" ;;
-    esac
-}
-complete -F _padsp padsp
-
-_pacat () {
-    local cur prev comps
-    local flags='-h --help --version -r --record -p --playback -v --verbose -s
-                --server= -d --device= -n --client-name= --stream-name= --volume=
-                --rate= --format= --channels= --channel-map= --fix-format --fix-rate
-                --fix-channels --no-remix --no-remap --latency= --process-time=
-                --latency-msec= --process-time-msec= --property= --raw --passthrough
-                --file-format= --list-file-formats --monitor-stream='
-
-    _init_completion -n = || return
-
-    case $cur in
-        --server=*)
-            cur=${cur#*=}
-            _known_hosts_real "$cur"
-            ;;
-
-        --device=*)
-            cur=${cur#*=}
-            comps=$(__sinks)
-            comps+=" "$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --monitor-stream=*)
-            cur=${cur#*=}
-            comps=$(__sink_inputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --rate=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W '32000 44100 48000 9600 192000' -- "$cur"))
-            ;;
-
-        --file-format=*)
-            cur=${cur#*=}
-            comps=$(_pacat_file_formats)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --*=*)
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-        *) _filedir ;;
-    esac
-
-    case $prev in
-        -s) _known_hosts_real "$cur" ;;
-        -d)
-            comps=$(__sinks)
-            comps+=" "$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pacat pacat paplay parecord
-
-_pulseaudio()
-{
-    local cur prev words cword
-    local flags='-h --help --version --dump-conf --dump-resample-methods --cleanup-shm
-                --start -k --kill --check --system= -D --daemonize= --fail= --high-priority=
-                --realtime= --disallow-module-loading= --disallow-exit= --exit-idle-time=
-                --scache-idle-time= --log-level= -v --log-target= --log-meta= --log-time=
-                --log-backtrace= -p --dl-search-path= --resample-method= --use-pit-file=
-                --no-cpu-limit= --disable-shm= -L --load= -F --file= -C -n'
-    _init_completion -n = || return
-
-    case $cur in
-        --system=*|--daemonize=*|--fail=*|--high-priority=*|--realtime=*| \
-            --disallow-*=*|--log-meta=*|--log-time=*|--use-pid-file=*| \
-            --no-cpu-limit=*|--disable-shm=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W 'true false' -- "$cur"))
-            ;;
-
-        --log-target=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W 'auto syslog stderr file: newfile:' -- "$cur"))
-            ;;
-
-        --log-level=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W '{0..4}' -- "$cur"))
-            ;;
-
-        --dl-search-path=*)
-            cur=${cur#*=}
-            _filedir -d
-            ;;
-
-        --file=*)
-            cur=${cur#*=}
-            _filedir
-            ;;
-
-        --resample-method=*)
-            cur=${cur#*=}
-            comps=$(__resample_methods)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --load=*)
-            cur=${cur#*=}
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --*=*)
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-    esac
-
-    case $prev in
-        -D) COMPREPLY=($(compgen -W 'true false' -- "$cur")) ;;
-        -p) _filedir -d ;;
-        -F) _filedir ;;
-        -L)
-            cur=${cur#*=}
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pulseaudio pulseaudio
-
-#vim: set ft=zsh sw=4 ts=4 noet
diff --git a/conf.d/cpufrequtils b/conf.d/cpufrequtils
deleted file mode 100644
index 8959664..0000000
--- a/conf.d/cpufrequtils
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils
-
-# Options when starting cpufreq (given to the `cpufreq-set` program)
-START_OPTS="--governor ondemand"
-
-# Options when stopping cpufreq (given to the `cpufreq-set` program)
-STOP_OPTS="--governor performance"
-
-# Extra settings to write to sysfs cpufreq values.
-#SYSFS_EXTRA="ondemand/ignore_nice_load=1 ondemand/up_threshold=70"
-
diff --git a/config-archive/etc/inittab.dist.new b/config-archive/etc/inittab.dist.new
deleted file mode 100644
index 2f6af66..0000000
--- a/config-archive/etc/inittab.dist.new
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# /etc/inittab:  This file describes how the INIT process should set up
-#                the system in a certain run-level.
-#
-# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
-# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
-# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
-# Modified by:  Mike Frysinger, <vapier@gentoo.org>
-# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown 
-l0s:0:wait:/sbin/halt -dhp
-l1:1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-l6r:6:wait:/sbin/reboot -dk
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/rc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# extra at boot if /etc/init.d/xdm is not added
-# to the "default" runlevel.
-x:a:once:/etc/X11/startDM.sh
-
diff --git a/dbus-1/system.d/org.freedesktop.login1.conf b/dbus-1/system.d/org.freedesktop.login1.conf
index 0407609..1318328 100644
--- a/dbus-1/system.d/org.freedesktop.login1.conf
+++ b/dbus-1/system.d/org.freedesktop.login1.conf
@@ -50,19 +50,19 @@
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetSeat"/>
+                       send_member="GetUserByPID"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListSessions"/>
+                       send_member="GetSeat"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListUsers"/>
+                       send_member="ListSessions"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListMachines"/>
+                       send_member="ListUsers"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
@@ -140,6 +140,18 @@
                        send_interface="org.freedesktop.login1.Seat"
                        send_member="ActivateSession"/>
 
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchTo"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchToPrevious"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchToNext"/>
+
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="Activate"/>
@@ -148,6 +160,26 @@
                        send_interface="org.freedesktop.login1.Session"
                        send_member="SetIdleHint"/>
 
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="TakeControl"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="ReleaseControl"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="TakeDevice"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="ReleaseDevice"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="PauseDeviceComplete"/>
+
                 <allow receive_sender="org.freedesktop.login1"/>
         </policy>
 
diff --git a/dbus-1/system.d/org.freedesktop.machine1.conf b/dbus-1/system.d/org.freedesktop.machine1.conf
index b2d6df3..970ccd8 100644
--- a/dbus-1/system.d/org.freedesktop.machine1.conf
+++ b/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -44,6 +44,10 @@
                        send_interface="org.freedesktop.machine1.Manager"
                        send_member="GetMachine"/>
 
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Manager"
+                       send_member="GetMachineByPID"/>
+
                 <allow receive_sender="org.freedesktop.machine1"/>
         </policy>
 
diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata
index fa5b5c6..9e2792f 100755
--- a/etckeeper/pre-commit.d/30store-metadata
+++ b/etckeeper/pre-commit.d/30store-metadata
@@ -29,7 +29,7 @@ filter_ignore() {
 				;;
 			git)
 				git ls-files --others --ignore --exclude-standard --directory > "$listfile" || true
-				grep -Fvf "$listfile"
+				sed 's/^\.\///' | grep -xFvf "$listfile"
 				;;
 		esac
 		rm -f "$listfile"
diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore
index 8a4d614..3b368e8 100755
--- a/etckeeper/update-ignore.d/01update-ignore
+++ b/etckeeper/update-ignore.d/01update-ignore
@@ -101,7 +101,7 @@ writefile () {
 		nl
 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then
 		comment "new and old versions of conffiles, stored by emerge"
-		ignore "*.cfg_*"
+		ignore "*._cfg*"
 		nl
 	fi
 	
diff --git a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules
index bd3bde6..7028e3c 100644
--- a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules
+++ b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules
@@ -2,7 +2,7 @@
 # Automatically generated file, do not edit
 # Created by gtk-query-immodules-2.0-32 from gtk+-2.24.22
 #
-# ModulesPath = /var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/2.10.0/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules
+# ModulesPath = /var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406-r1/homedir/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406-r1/homedir/.gtk-2.0/2.10.0/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406-r1/homedir/.gtk-2.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406-r1/homedir/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules
 #
 "/usr/lib32/gtk-2.0/2.10.0/immodules/im-ipa.so" 
 "ipa" "IPA" "gtk20" "/usr/share/locale" "" 
diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap
index 8a46755..503f062 100644
--- a/hotplug/usb/libsane.usermap
+++ b/hotplug/usb/libsane.usermap
@@ -1,5 +1,5 @@
 # This file was automatically created based on description files (*.desc)
-# by sane-desc 3.5 from sane-backends 1.0.24 on Tue Jan 28 19:52:35 2014
+# by sane-desc 3.5 from sane-backends 1.0.24 on Tue Jun 17 19:41:14 2014
 #
 # The entries below are used to detect a USB device and change owner
 # and permissions on the "device node" used by libusb.
diff --git a/init.d/crypto-loop b/init.d/crypto-loop
deleted file mode 100755
index 853bae2..0000000
--- a/init.d/crypto-loop
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4 2008/10/26 03:16:48 vapier Exp $
-
-depend() {
-	if [ -x /etc/init.d/root ]; then
-		need root
-	else
-		need checkroot
-	fi
-	need modules
-	before localmount
-}
-
-start() {
-	local status="0"
-
-	ebegin "Starting crypto loop devices"
-
-	if [ -e /etc/conf.d/crypto-loop ] ; then
-		egrep "^loop" /etc/conf.d/crypto-loop | \
-		while read loopline ; do
-			eval ${loopline}
-
-			local configured=$(awk -v MOUNT="${device}" \
-				'($2 == MOUNT) { print "yes" }' /proc/mounts)
-
-			if [ "${configured}" != "yes" ] ; then
-				einfo "  Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): "
-
-				if [ -n "${hash}" ] ; then
-					/usr/sbin/hashalot -n ${keysize} ${hash} </dev/tty|\
-					/sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other}
-				else
-					/sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other}
-				fi
-
-				if [ $? -ne 0 ] ; then
-					ewarn "Failure configuring ${loop}.  Skipping."
-					status=1
-				fi
-			else
-				ewarn "  Loop ${loop} on device ${device} are already configured"
-			fi
-		done
-	fi
-	ewend ${status} "Failed to start some loop devices."
-
-	# We do not fail if some loop devices did not start ...
-	return 0
-}
-
-stop() {
-	local status="0"
-	for loop in $(ls /dev/loop[0-9] 2>/dev/null) ; do
-		losetup ${loop} > /dev/null 2>&1
-		if [ $? -eq 0 ] ; then
-			( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1
-			if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then
-				ewarn "Failure deconfiguring ${loop}."
-				status=1
-			fi
-		fi
-	done
-	ewend ${status}
-}
-
-
-# vim:ts=4
diff --git a/init.d/net.lo b/init.d/net.lo
index 5309423..ed6fe0d 100755
--- a/init.d/net.lo
+++ b/init.d/net.lo
@@ -463,7 +463,7 @@ _load_config()
 		fi
 	else
 		if [ -z "$1" ]; then
-			ewarn "No configuration specified; defaulting to DHCP"
+			ewarn "config_${IFVAR} not specified; defaulting to DHCP"
 			config_0="dhcp"
 			config_index=1
 		fi
diff --git a/inittab b/inittab
index ad7317f..ab61c63 100644
--- a/inittab
+++ b/inittab
@@ -9,7 +9,7 @@
 # Modified by:  Mike Frysinger, <vapier@gentoo.org>
 # Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $
 
 # Default runlevel.
 id:3:initdefault:
@@ -44,8 +44,8 @@ c5:2345:respawn:/sbin/agetty 38400 tty5 linux
 c6:2345:respawn:/sbin/agetty 38400 tty6 linux
 
 # SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100
+#s0:12345:respawn:/sbin/agetty -L 115200 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty -L 115200 ttyS1 vt100
 
 # What to do at the "Three Finger Salute".
 ca:12345:ctrlaltdel:/sbin/shutdown -r now
@@ -56,4 +56,3 @@ ca:12345:ctrlaltdel:/sbin/shutdown -r now
 # extra at boot if /etc/init.d/xdm is not added
 # to the "default" runlevel.
 x:a:once:/etc/X11/startDM.sh
-
diff --git a/localtime b/localtime
deleted file mode 120000
index 285b912..0000000
--- a/localtime
+++ /dev/null
@@ -1 +0,0 @@
-../usr/share/zoneinfo/Europe/Berlin
\ No newline at end of file
diff --git a/localtime b/localtime
new file mode 100644
index 0000000..96059c7
Binary files /dev/null and b/localtime differ
diff --git a/portage/make.conf b/portage/make.conf
index 49dc980..18fe101 100644
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -55,6 +55,7 @@ ACCEPT_LICENSE=" \
         skype-eula \
         skype-4.0.0.7-copyright \
         Oracle-BCLA-JavaSE \
+	FraunhoferFDK \
 "
 
 #FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index 8e84c2f..45526ac 100644
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -24,6 +24,7 @@ app-text/docbook2odf-xsl-stylesheets
 
 ~dev-vcs/gitg-0.2.5
 
+~dev-db/sqlite-3.8.5
 ~dev-db/virtuoso-odbc-6.1.4
 ~dev-db/virtuoso-server-6.1.4
 
diff --git a/portage/package.use b/portage/package.use
index 917a347..3179266 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -28,7 +28,7 @@ app-misc/strigi				hyperestraier inotify
 app-misc/tracker			-xine
 app-misc/tomboy				galago
 
-app-office/libreoffice			nlpsolver
+app-office/libreoffice			nlpsolver vlc
 
 app-portage/eix				optimization strong-optimization
 
@@ -236,7 +236,7 @@ media-video/mjpegtools                  yv12
 media-video/mplayer                     3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 nemesi nut opencore-amr pvr rar rtc srt teletext tga tivo xanim xvmc
 media-video/totem                       iplayer -tracker upnp-av
 media-video/transcode                   extrafilters fame lzo mjpeg network nuv postproc
-media-video/vlc                         atmo cdda cddax cdio corba daap dc1394 dirac egl fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil portaudio rtsp schroedinger shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm zvbi
+media-video/vlc                         atmo cdda cddax cdio chromaprint corba daap dc1394 dirac egl faad fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil opencv portaudio rdp rtsp schroedinger sftp shine shout skins stream switcher taglib tremor twolame vcdinfo vcdx vlm zvbi
 
 net-analyzer/nagios-nrpe                command-args
 net-analyzer/nagios-plugins             nagios-dns nagios-ntp nagios-ping nagios-ssh
@@ -306,7 +306,7 @@ sys-apps/pciutils                       network-cron -zlib
 sys-apps/portage                        epydoc python3
 sys-apps/ppd				development doc pb_pstorage
 sys-apps/usbutils                       network-cron
-sys-apps/util-linux                     ddate loop-aes
+sys-apps/util-linux                     ddate fdformat loop-aes tty-helpers
 sys-apps/vcb-python			development vcb
 
 sys-auth/consolekit                     policykit
diff --git a/revdep-rebuild/61-icedtea-bin-6 b/revdep-rebuild/61-icedtea-bin-6
index 309815c..59221b2 100644
--- a/revdep-rebuild/61-icedtea-bin-6
+++ b/revdep-rebuild/61-icedtea-bin-6
@@ -1 +1 @@
-SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.7"
+SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.13.3"
diff --git a/revdep-rebuild/61-oracle-jdk-bin-1.7 b/revdep-rebuild/61-oracle-jdk-bin-1.7
index a0ed67e..832ba5f 100644
--- a/revdep-rebuild/61-oracle-jdk-bin-1.7
+++ b/revdep-rebuild/61-oracle-jdk-bin-1.7
@@ -1 +1 @@
-SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.55"
+SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.60"
diff --git a/revdep-rebuild/61-oracle-jre-bin-1.7 b/revdep-rebuild/61-oracle-jre-bin-1.7
index 4fbb53f..285ae37 100644
--- a/revdep-rebuild/61-oracle-jre-bin-1.7
+++ b/revdep-rebuild/61-oracle-jre-bin-1.7
@@ -1 +1 @@
-SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.55"
+SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.60"
diff --git a/sane.d/canon_pp.conf b/sane.d/canon_pp.conf
deleted file mode 100644
index 14b3110..0000000
--- a/sane.d/canon_pp.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Define which port to use if one isn't specified - you should only have 
-# one of these lines!
-# This is the default port to be used - others will be detected
-ieee1284 parport0
-
-
-# Define the location of our pixel weight file, can begin with ~/ if needed.
-# You can have as many of these as you like - lines with ports that don't exist
-# will be ignored.
-#
-# Parameters are:
-# calibrate /path/to/calibration-file port-name
-#
-# The format of port-name is dependant on your OS version.
-#
-# If a file isn't speficied, the default name will be
-# ~/.sane/canon_pp-calibration-[port-name]
-
-calibrate ~/.sane/canon_pp-calibration-pp0 parport0
-
-# calibrate /etc/sane/my_calibration parport1
-
-
-# Enable the next line if you're having trouble with ECP mode such as I/O 
-# errors.  Nibble mode is slower, but more reliable.
-
-#force_nibble
-
-# Set a default initialisation mode for each port.  Valid modes are:
-# AUTO		(attempts to automatically detect by trying both methods)
-# FB620P	(10101010 style.. also works for FB320P)
-# FB630P	(11001100 style.. also works for FB330P, N340P, N640P)
-
-init_mode AUTO parport0
-# init_mode FB620P parport0
-# init_mode FB630P parport0
diff --git a/sane.d/hpsj5s.conf b/sane.d/hpsj5s.conf
deleted file mode 100644
index 77fb4e4..0000000
--- a/sane.d/hpsj5s.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-#hpsj5s.conf
-#parport0
\ No newline at end of file
diff --git a/sane.d/mustek_pp.conf b/sane.d/mustek_pp.conf
deleted file mode 100644
index 17f0e26..0000000
--- a/sane.d/mustek_pp.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-# For documentation see sane-mustek_pp(5)
-
-# Global options:
-# ===============
-#
-# option no_epp
-#
-#	    Disable parallel port mode EPP: works around a known bug in
-#	    the Linux parport code. Enable this option, if the backend
-#	    hangs when trying to access the parallel port in EPP mode:
-#
-#	          # SANE_DEBUG_SANEI_PA4S2=128 scanimage -L
-#	          ...
-#  hangs here  -> [sanei_pa4s2] sanei_pa4s2_readbyte: read in EPP mode
-#	 
-# Scanner definition template:
-# ============================
-#
-#  scanner <name> <port> <type>
-#     option <optname> <optval>?
-#     option <optname> <optval>?
-#     ...
-#
-#  where:
-#
-#     <name> is an arbitrary name for the scanner (eg. Mustek-1200CP)
-#
-#     <port> is the parallel port to which the scanner is connected
-#            Possible values are 0x378, 0x278, and 0x3bc. For Linux, the
-#            mapping between ports an numbers is different for kernel
-#            version 2.2 and 2.4. Port 0x378 corresponds to lp0 on 2.4 kernel.
-#            If you are using libieee1284, you can as well use parport0, etc..
-#	     If you use the magic value * the port is probed.
-#
-#     <type> is an identification of the scanner type.
-#            Possible values are:
-#              - cis600    (for Mustek 600CP & OEM versions),
-#              - cis1200   (for Mustek 1200CP & OEM versions),
-#              - cis1200+  (for Mustek 1200CP+ & OEM versions),
-#              - ccd300    (for Mustek 600 III EPP & OEM versions)
-#	       - ... more types will be added in the future
-#     
-#     <optname> is a name of an option, and <optval> an optional value
-#               for the option.
-#               Currently available options for *CIS* type scanners are:
-#                 - top_adjust <value>: 
-#                      Vertical adjustment of origin, in millimeter.
-#                      Values between -5.0 and +5.0 mm are possible 
-#                      (floating point).
-#                      Default: 0.0
-#                 - slow_skip: 
-#                      Boolean option. Disables fast skipping to the start
-#                      of the scan region. May be necessary in case fast
-#                      skipping results in inaccuracies.
-#                      Default: fast skipping enabled             
-#                 - bw <value>:
-#                      Black/white discrimination value for lineart scans.
-#                      Pixel values below that value are considered black,
-#                      others are considered white. Range: 0-255.
-#                      Default: 127
-#
-#		Currently available options for *CCD* type scanners are:
-#		  - wait_bank <value>
-#		       usecs to wait for a bank change. Positive integer
-#		       values are possible. You shouldn't mess with this
-#		       parameter.
-#		       Default: 700
-#		  - bw <value>
-#                      Black/white discrimination value for lineart scans.
-#                      Pixel values below that value are considered black,
-#                      others are considered white. Range: 0-255.
-#                      Default: 127
-#		  - top <value>
-#		       Scanlines to skip to the top area. Positive integer
-#		       values are possible. 47 and 56 are values I know of.
-#		       Default: 47
-#
-#
-# Example for a LifeTec LT9350 (Mustek 1200CP clone):
-#
-#    scanner LT9350 0x378 cis1200
-#       option top_adjust 0
-#       option bw 127
-#
-# Example for Mustek 6000P
-#
-#    scanner 6000P 0x378 ccd300
-#        option top 56
-#
-#
-# Uncomment/customize to your needs
-#
-# scanner Mustek-600CP 0x378 cis600
-# scanner Mustek-1200CP 0x378 cis1200
-# scanner Mustek-1200CP+ 0x378 cis1200+
-# scanner Mustek-600-IIIEP 0x378 ccd300
-#
-# auto probing:
-#
-# scanner mustek-cis600 * cis600
-# scanner mustek-cis1200 * cis1200
-# scanner mustek-cis1200+ * cis1200+
-# scanner mustek-ccd300 * ccd300
diff --git a/sound/events/mate-battstat_applet.soundlist b/sound/events/mate-battstat_applet.soundlist
index 94e9a71..9514165 100644
--- a/sound/events/mate-battstat_applet.soundlist
+++ b/sound/events/mate-battstat_applet.soundlist
@@ -5,7 +5,7 @@ description[ar]=أداة حالة البطارية
 description[as]=বেটাৰি'ৰ অৱস্থা নিৰীক্ষণৰ সৰঞ্জাম
 description[ast]=Utilidá d'estau de la batería
 description[az]=Batareya Vəziyyəti Tə'minatı
-description[be]=Утулка стану зараду батарэі
+description[be]=Утыліта стану батарэі
 description[be@latin]=Pryłada adsočvańnia stanu akumulatara
 description[bg]=Инструмент за състоянието на батерията
 description[bn]=ব্যাটারি'র অবস্থা নিরীক্ষণের সরঞ্জাম
@@ -14,6 +14,7 @@ description[br]=Merour stad ar batiri
 description[bs]=Alatka za status baterije
 description[ca]=Utilitat de l'estat de la bateria
 description[ca@valencia]=Utilitat de l'estat de la bateria
+description[cmn]=電池狀態公用程式
 description[crh]=Pil Durumu Aracı
 description[cs]=Nástroj stavu baterie
 description[cy]=Cyfleuster Cyflwr Batri
@@ -65,7 +66,6 @@ description[ka]=ელემენტის მდგომარეობის
 description[kn]=ಬ್ಯಾಟರಿ ಸ್ಥಿತಿಯ ಸೌಲಭ್ಯ
 description[ko]=배터리 상태 유틸리티
 description[ku]=Amûra rewşa bataryayê
-description[ky]=Батарея Абалы Индикатору
 description[lt]=Baterijos būsenos pagalbinė programa
 description[lv]=Baterijas statusa utilīta
 description[mai]=बैटरी स्थिति उपयोगिता
@@ -100,6 +100,7 @@ description[th]=แอพเพล็ตแสดงสถานะแบตเ
 description[tr]=Pil Durumu Aracı
 description[ug]=باتارېيە ھالەت قورالى
 description[uk]=Утиліта індикації стану акумулятора
+description[ur]=بیٹری حالت سہولت
 description[vi]=Tiện ích xem trạng thái pin
 description[xh]=Isixhobo soBume beBhetri
 description[zh_CN]=电池状态工具
@@ -110,11 +111,12 @@ description[zh_TW]=電池狀態公用程式
 file=
 description=Battery power low
 description[af]=Battery amper pap
+description[am]=የባትሪው ሐይል ዝቅተኛ ነው 
 description[ar]=طاقة البطارية منخفضة
 description[as]=বেটাৰিৰ ক্ষমতা কম
 description[ast]=Batería baxa
 description[az]=Batareya həcmi alçaqdır
-description[be]=Зарад батарэі нізкі
+description[be]=Мала энергіі ў батарэі
 description[be@latin]=Akumulatar razradžany
 description[bg]=Ниска мощност на батерията
 description[bn]=ব্যাটারির ক্ষমতা কম
@@ -123,6 +125,7 @@ description[br]=Izel youll ar pod-tredan
 description[bs]=Baterija skoro prazna
 description[ca]=Bateria amb càrrega baixa
 description[ca@valencia]=Bateria amb càrrega baixa
+description[cmn]=電池電量過低
 description[crh]=Pil gücü zayıf
 description[cs]=Téměř vybité baterie
 description[cy]=Mae pŵer y batri'n isel
@@ -173,7 +176,6 @@ description[ka]=დაბალი ძაბვა
 description[kn]=ಕೆಳಮಟ್ಟದಲ್ಲಿರುವ ಬ್ಯಾಟರಿ ವಿದ್ಯುಚ್ಚಕ್ತಿ
 description[ko]=배터리 전력이 부족합니다
 description[ku]=Hêza bataryayê qels e
-description[ky]=Батарея заряды толук түгөндү
 description[lt]=Baterija beveik išsikrovusi
 description[lv]=Baterijas enerģija zema
 description[mai]=बैटरी पावर कम
@@ -191,13 +193,13 @@ description[oc]=Batariá febla
 description[or]=ବ୍ଯାଟେରୀ  ବିଦ୍ଯୁତ କମ ଅଛି
 description[pa]=ਬੈਟਰੀ ਪਾਵਰ ਘੱਟ ਹੈ
 description[pl]=Akumulator jest na wyczerpaniu
-description[pt]=Bateria fraca
+description[pt]=Energia da bateria em baixo
 description[pt_BR]=Bateria fraca
 description[ro]=Acumulator pe terminate
 description[ru]=Батарея разряжена
 description[si]=වියළි කොෂ බලය අවම වී ඇත
 description[sk]=Batéria je slabá
-description[sl]=Baterija je skoraj prazna
+description[sl]=Napetost baterije je nizka
 description[sq]=Ngarkesë e ulët e baterisë
 description[sr]=Батерија слаба
 description[sr@latin]=Baterija slaba
@@ -208,6 +210,7 @@ description[th]=แบตเตอรี่ใกล้หมด
 description[tr]=Pil gücü zayıf
 description[ug]=باتارېيىدە توك ئاز قالدى
 description[uk]=Акумулятор розряджений
+description[ur]=بیٹری کی توانائی پست ہے
 description[vi]=Pin thấp
 description[wa]=Li batreye est flåwe
 description[xh]=Amandla ebhetri asezantsi
@@ -219,11 +222,11 @@ description[zh_TW]=電池電量過低
 file=
 description=Battery fully re-charged
 description[af]=Battery ten volle gelaai
-description[ar]=أُعيد شحن البطارية تماما
+description[ar]=أُعيد شحن البطارية تمامًا
 description[as]=বেটাৰি সম্পূৰ্ণৰূপে চাৰ্জ কৰা হৈছে
 description[ast]=Batería llena
 description[az]=Batareya tamamilə dolduruldu
-description[be]=Батарэя поўнасьцю перазараджана
+description[be]=Батарэя цалкам перанасілкована
 description[be@latin]=Akumulatar całkam zaradžany
 description[bg]=Батерията е напълно презаредена
 description[bn]=ব্যাটারি সম্পূর্ণরূপে চার্জ করা হয়েছে
@@ -232,6 +235,7 @@ description[br]=Pod-tredan adleuniet penn da benn
 description[bs]=Baterija je napunjena
 description[ca]=La bateria està completament carregada
 description[ca@valencia]=La bateria està completament carregada
+description[cmn]=電池電量全滿
 description[crh]=Pil tamamen doldu
 description[cs]=Baterie jsou plně nabity
 description[cy]=Mae'r batri wedi ail-drydanu’n llwyr
@@ -282,7 +286,6 @@ description[ka]=ელემენტი ბოლომდეა დამუ
 description[kn]=ಸಂಪೂರ್ಣವಾಗಿ ಮರು-ಚಾರ್ಜ್ ಆದಂತಹ ಬ್ಯಾಟರಿ
 description[ko]=배터리가 완전히 충전되었습니다!
 description[ku]=Batarya bi tevahî şarj bû
-description[ky]=Батарея толук заряддалды
 description[lt]=Baterija yra pilnai įkrauta.
 description[lv]=Baterija pilnīgi uzlādēta
 description[mai]=बैटरी पूर्णतः पुनः चार्ज
@@ -291,7 +294,7 @@ description[mk]=Батеријата е целосно наполнета
 description[ml]=ബാറ്ററി ചാര്‍ജ്ജ് നിറഞ്ഞു
 description[mn]=Зай дахин бүрэн цэнэглэгдлээ!
 description[mr]=बॅटरी पूर्णतः पुनःभारित
-description[ms]=Bateri dicas sepenuhnya
+description[ms]=Bateri dicas-semula sepenuhnya
 description[nb]=Batteriet er fullt oppladet
 description[ne]=ब्याट्री पूरा रिचार्ज भयो
 description[nl]=Accu is volledig opgeladen
@@ -300,13 +303,13 @@ description[oc]=Batariá completament recargada
 description[or]=ବ୍ଯାଟେରୀ  ପୂର୍ଣ୍ଣ ଭାବରେ ପୁନଃ-ଚାର୍ଜ ହୋଇଛି
 description[pa]=ਬੈਟਰੀ ਪੂਰੀ ਮੁੜ-ਚਾਰਜ ਹੋ ਗਈ ਹੈ
 description[pl]=Akumulator jest w pełni naładowany
-description[pt]=Bateria completamente carregada
+description[pt]=Bateria completamente recarregada
 description[pt_BR]=A bateria está totalmente recarregada
 description[ro]=Acumulator complet reîncărcat
 description[ru]=Батарея полностью заряжена
 description[si]=වියළි කෝෂය සම්පූර්ණයෙන්ම බලගැන්වී ඇත
 description[sk]=Batéria je plne nabitá
-description[sl]=Baterija je znova povsem napolnjena.
+description[sl]=Baterija je znova povsem napolnjena
 description[sq]=Bateria e ringarkuar plot
 description[sr]=Батерија у потпуности напуњена
 description[sr@latin]=Baterija u potpunosti napunjena
@@ -316,7 +319,8 @@ description[te]=బాటరీ పూర్తిగా తిరిగి ఛ
 description[th]=แบตเตอรี่อัดเต็มแล้ว
 description[tr]=Pil tamamen doldu
 description[ug]=باتارېيە زەرەتلىنىپ بولدى
-description[uk]=Акумулятор повністю перезаряджено
+description[uk]=Акумулятор повністю заряджено
+description[ur]=بیٹری مکمل طور پر دوبارہ چارج ہوگئی ہے
 description[vi]=Pin đã được sạc đầy.
 description[wa]=Li batreye est tcherdjeye a make
 description[xh]=Ibhetri sele igcwaliswe ngokupheleleyo kwakhona
diff --git a/sysstat b/sysstat
index 348add6..8694e31 100644
--- a/sysstat
+++ b/sysstat
@@ -1,4 +1,4 @@
-# sysstat-10.2.0 configuration file.
+# sysstat-10.2.1 configuration file.
 
 # How long to keep log files (in days).
 # If value is greater than 28, then log files are kept in
diff --git a/systemd/journald.conf b/systemd/journald.conf
index 54f6833..d106d00 100644
--- a/systemd/journald.conf
+++ b/systemd/journald.conf
@@ -26,8 +26,10 @@
 #ForwardToSyslog=yes
 #ForwardToKMsg=no
 #ForwardToConsole=no
+#ForwardToWall=yes
 #TTYPath=/dev/console
 #MaxLevelStore=debug
 #MaxLevelSyslog=debug
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
+#MaxLevelWall=emerg
diff --git a/systemd/logind.conf b/systemd/logind.conf
index c0abf01..79f96ec 100644
--- a/systemd/logind.conf
+++ b/systemd/logind.conf
@@ -24,3 +24,5 @@
 #LidSwitchIgnoreInhibited=yes
 #IdleAction=ignore
 #IdleActionSec=30min
+#RuntimeDirectorySize=10%
+#RemoveIPC=yes
diff --git a/systemd/system.conf b/systemd/system.conf
index 7b03c87..65a35a0 100644
--- a/systemd/system.conf
+++ b/systemd/system.conf
@@ -17,14 +17,24 @@
 #ShowStatus=yes
 #CrashChVT=1
 #CPUAffinity=1 2
-#DefaultStandardOutput=journal
-#DefaultStandardError=inherit
 #JoinControllers=cpu,cpuacct net_cls,net_prio
 #RuntimeWatchdogSec=0
 #ShutdownWatchdogSec=10min
 #CapabilityBoundingSet=
+#SystemCallArchitectures=
 #TimerSlackNSec=
+#DefaultTimerAccuracySec=1min
+#DefaultStandardOutput=journal
+#DefaultStandardError=inherit
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
 #DefaultEnvironment=
+#DefaultCPUAccounting=no
+#DefaultBlockIOAccounting=no
+#DefaultMemoryAccounting=no
 #DefaultLimitCPU=
 #DefaultLimitFSIZE=
 #DefaultLimitDATA=
diff --git a/systemd/system/getty.target.wants/getty@tty1.service b/systemd/system/getty.target.wants/getty@tty1.service
index 7bfe080..baabfc6 120000
--- a/systemd/system/getty.target.wants/getty@tty1.service
+++ b/systemd/system/getty.target.wants/getty@tty1.service
@@ -1 +1 @@
-/usr/lib/systemd/system/getty@.service
\ No newline at end of file
+../../../../usr/lib/systemd/system/getty@.service
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/remote-fs.target b/systemd/system/multi-user.target.wants/remote-fs.target
index 2bc8b1c..e6177c7 120000
--- a/systemd/system/multi-user.target.wants/remote-fs.target
+++ b/systemd/system/multi-user.target.wants/remote-fs.target
@@ -1 +1 @@
-/usr/lib/systemd/system/remote-fs.target
\ No newline at end of file
+../../../../usr/lib/systemd/system/remote-fs.target
\ No newline at end of file
diff --git a/systemd/user.conf b/systemd/user.conf
index 4a0129a..8c7ecde 100644
--- a/systemd/user.conf
+++ b/systemd/user.conf
@@ -12,5 +12,30 @@
 #LogTarget=console
 #LogColor=yes
 #LogLocation=no
+#SystemCallArchitectures=
+#TimerSlackNSec=
+#DefaultTimerAccuracySec=1min
 #DefaultStandardOutput=inherit
 #DefaultStandardError=inherit
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
+#DefaultEnvironment=
+#DefaultLimitCPU=
+#DefaultLimitFSIZE=
+#DefaultLimitDATA=
+#DefaultLimitSTACK=
+#DefaultLimitCORE=
+#DefaultLimitRSS=
+#DefaultLimitNOFILE=
+#DefaultLimitAS=
+#DefaultLimitNPROC=
+#DefaultLimitMEMLOCK=
+#DefaultLimitLOCKS=
+#DefaultLimitSIGPENDING=
+#DefaultLimitMSGQUEUE=
+#DefaultLimitNICE=
+#DefaultLimitRTPRIO=
+#DefaultLimitRTTIME=
diff --git a/xdg/autostart/mate-power-manager.desktop b/xdg/autostart/mate-power-manager.desktop
index 2051dbc..b57a28c 100644
--- a/xdg/autostart/mate-power-manager.desktop
+++ b/xdg/autostart/mate-power-manager.desktop
@@ -16,7 +16,7 @@ OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-power-manager
 X-MATE-Bugzilla-Component=mate-power-manager
-X-MATE-Bugzilla-Version=1.6.3
+X-MATE-Bugzilla-Version=1.8.0
 X-MATE-Bugzilla-ExtraInfoScript=mate-power-bugreport.sh
 #X-MATE-AutoRestart=true
 
diff --git a/xdg/autostart/mate-screensaver.desktop b/xdg/autostart/mate-screensaver.desktop
index 80e56d4..3709cde 100644
--- a/xdg/autostart/mate-screensaver.desktop
+++ b/xdg/autostart/mate-screensaver.desktop
@@ -17,4 +17,4 @@ X-MATE-Autostart-Notify=true
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-screensaver
 X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.6.1
+X-MATE-Bugzilla-Version=1.8.0
diff --git a/xdg/autostart/polkit-mate-authentication-agent-1.desktop b/xdg/autostart/polkit-mate-authentication-agent-1.desktop
index 230662d..500ed89 100644
--- a/xdg/autostart/polkit-mate-authentication-agent-1.desktop
+++ b/xdg/autostart/polkit-mate-authentication-agent-1.desktop
@@ -1,8 +1,12 @@
 [Desktop Entry]
 Name=PolicyKit Authentication Agent
-Name[de]=Legitimationsdienst von PolicyKit
+Name[de]=PolicyKit-Legitimationsagent
 Name[en_GB]=PolicyKit Authentication Agent
+Name[ru]=Агент аутентификации PolicyKit
 Comment=PolicyKit Authentication Agent for the MATE Desktop
+Comment[de]=PolicyKit-Legitimationsagent für die MATE-Arbeitsumgebung
+Comment[en_GB]=PolicyKit Authentication Agent for the MATE Desktop
+Comment[ru]=Агент аутентификации PolicyKit для рабочей среды MATE
 Exec=/usr/libexec/polkit-mate-authentication-agent-1
 Terminal=false
 Type=Application
diff --git a/xdg/menus/mate-applications.menu b/xdg/menus/mate-applications.menu
index 2b917cc..258494b 100644
--- a/xdg/menus/mate-applications.menu
+++ b/xdg/menus/mate-applications.menu
@@ -17,6 +17,7 @@
 
   <!-- Read in overrides and child menus from applications-merged/ -->
   <DefaultMergeDirs/>
+  <MergeDir>applications-merged</MergeDir>
 
   <!-- Accessories submenu -->
   <Menu>
diff --git a/xdg/menus/mate-settings.menu b/xdg/menus/mate-settings.menu
index 18b7e17..29e07b7 100644
--- a/xdg/menus/mate-settings.menu
+++ b/xdg/menus/mate-settings.menu
@@ -12,6 +12,7 @@
 
   <!-- Read in overrides and child menus from applications-merged/ -->
   <DefaultMergeDirs/>
+  <MergeDir>preferences-merged</MergeDir>
 
   <!-- Add a link to the control center -->
   <Include>
@@ -33,6 +34,7 @@
         </Not>
       </And>
     </Include>
+    <MergeFile>mate-preferences-categories.menu</MergeFile>
   </Menu>
 
   <!-- System Settings -->
diff --git a/xdg/systemd/user b/xdg/systemd/user
index 3bc1f8c..1c75bd3 120000
--- a/xdg/systemd/user
+++ b/xdg/systemd/user
@@ -1 +1 @@
-/etc/systemd/user
\ No newline at end of file
+../../systemd/user
\ No newline at end of file
diff --git a/xinetd.d/cvspserver b/xinetd.d/cvspserver
deleted file mode 100644
index 0f2edb0..0000000
--- a/xinetd.d/cvspserver
+++ /dev/null
@@ -1,14 +0,0 @@
-service cvspserver
-{
-	disable		= yes
-	socket_type	= stream
-	wait		= no
-	user		= root
-	log_type	= FILE /var/log/cvspserver
-	protocol	= tcp
-	env		= HOME=/var/cvsroot
-	log_on_failure	+= USERID
-	port		= 2401
-	server		= /usr/bin/cvs
-	server_args	= -f --allow-root=/var/cvsroot pserver
-}