[pulseaudio] 01/04: Imported Upstream version 5.99.3

Luke Yelavich themuso-guest at moszumanska.debian.org
Tue Jan 27 01:13:03 UTC 2015


This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch debian/experimental
in repository pulseaudio.

commit 9a1fd06400eb5ecb995a6bbdf4f9e2b9e633b985
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Jan 27 11:55:47 2015 +1100

    Imported Upstream version 5.99.3
---
 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 Makefile.am                                        |    4 +-
 Makefile.in                                        |    4 +-
 bootstrap.sh                                       |    3 +-
 configure                                          |   24 +-
 configure.ac                                       |    7 +-
 doxygen/Makefile.am                                |    4 +-
 doxygen/Makefile.in                                |    4 +-
 git-version-gen                                    |    4 +-
 man/Makefile.am                                    |    4 +-
 man/Makefile.in                                    |    4 +-
 man/default.pa.5.xml.in                            |    4 +-
 man/esdcompat.1.xml.in                             |    4 +-
 man/pacat.1.xml.in                                 |    4 +-
 man/pacmd.1.xml.in                                 |    4 +-
 man/pactl.1.xml.in                                 |    4 +-
 man/padsp.1.xml.in                                 |    4 +-
 man/paplay.1.xml.in                                |    4 +-
 man/pasuspender.1.xml.in                           |    4 +-
 man/pax11publish.1.xml.in                          |    4 +-
 man/pulse-cli-syntax.5.xml.in                      |    4 +-
 man/pulse-client.conf.5.xml.in                     |    4 +-
 man/pulse-daemon.conf.5.xml.in                     |    4 +-
 man/pulseaudio.1.xml.in                            |    4 +-
 man/start-pulseaudio-x11.1.xml.in                  |    4 +-
 man/xmltoman                                       |    3 +-
 man/xmltoman.css                                   |    3 +-
 man/xmltoman.dtd                                   |    3 +-
 man/xmltoman.xsl                                   |    3 +-
 po/LINGUAS                                         |    1 +
 po/as.po                                           |    9 +-
 po/bn_IN.po                                        |    9 +-
 po/ca.po                                           |   10 +-
 po/cs.po                                           |    8 +-
 po/de.po                                           |    8 +-
 po/de_CH.po                                        |    5 +-
 po/el.po                                           |   10 +-
 po/es.po                                           |   11 +-
 po/fi.po                                           |    8 +-
 po/fr.po                                           |   10 +-
 po/gu.po                                           |    8 +-
 po/he.po                                           |    5 +-
 po/hi.po                                           |   10 +-
 po/hu.po                                           |   10 +-
 po/id.po                                           |   21 +-
 po/it.po                                           |   14 +-
 po/ja.po                                           |    8 +-
 po/kn.po                                           |    8 +-
 po/ml.po                                           |   10 +-
 po/mr.po                                           |    9 +-
 po/nl.po                                           |   10 +-
 po/or.po                                           |   10 +-
 po/pa.po                                           |    9 +-
 po/pl.po                                           |   10 +-
 po/pt.po                                           |   10 +-
 po/pt_BR.po                                        |   10 +-
 po/ru.po                                           |   10 +-
 po/sk.po                                           |    5 +-
 po/sr.po                                           |   10 +-
 po/sr at latin.po                                     |   10 +-
 po/sv.po                                           | 4019 +++++++++++---------
 po/ta.po                                           |   10 +-
 po/te.po                                           |   10 +-
 po/{pl.po => tr.po}                                | 1770 ++++-----
 po/uk.po                                           |   11 +-
 po/zh_CN.po                                        |    9 +-
 po/zh_TW.po                                        |   13 +-
 src/Makefile.am                                    |    4 +-
 src/Makefile.in                                    |    4 +-
 src/daemon/caps.c                                  |    4 +-
 src/daemon/caps.h                                  |    4 +-
 src/daemon/cmdline.c                               |    4 +-
 src/daemon/cmdline.h                               |    4 +-
 src/daemon/cpulimit.c                              |    4 +-
 src/daemon/cpulimit.h                              |    4 +-
 src/daemon/daemon-conf.c                           |    4 +-
 src/daemon/daemon-conf.h                           |    4 +-
 src/daemon/daemon.conf.in                          |    4 +-
 src/daemon/default.pa.in                           |    3 +-
 src/daemon/dumpmodules.c                           |    4 +-
 src/daemon/dumpmodules.h                           |    4 +-
 src/daemon/esdcompat.in                            |    4 +-
 src/daemon/ltdl-bind-now.c                         |    4 +-
 src/daemon/ltdl-bind-now.h                         |    4 +-
 src/daemon/main.c                                  |    6 +-
 src/daemon/pulseaudio-system.conf                  |    4 +-
 src/daemon/server-lookup.c                         |    6 +-
 src/daemon/server-lookup.h                         |    8 +-
 src/daemon/start-pulseaudio-x11.in                 |    4 +-
 src/daemon/system.pa.in                            |    3 +-
 src/depmod.py                                      |    4 +-
 src/modules/alsa/alsa-mixer.c                      |    4 +-
 src/modules/alsa/alsa-mixer.h                      |    4 +-
 src/modules/alsa/alsa-sink.c                       |    4 +-
 src/modules/alsa/alsa-sink.h                       |    4 +-
 src/modules/alsa/alsa-source.c                     |    4 +-
 src/modules/alsa/alsa-source.h                     |    4 +-
 src/modules/alsa/alsa-ucm.c                        |    4 +-
 src/modules/alsa/alsa-ucm.h                        |    4 +-
 src/modules/alsa/alsa-util.c                       |    6 +-
 src/modules/alsa/alsa-util.h                       |    4 +-
 src/modules/alsa/mixer/paths/analog-input-aux.conf |    3 +-
 .../alsa/mixer/paths/analog-input-dock-mic.conf    |    3 +-
 src/modules/alsa/mixer/paths/analog-input-fm.conf  |    3 +-
 .../alsa/mixer/paths/analog-input-front-mic.conf   |    3 +-
 .../mixer/paths/analog-input-headphone-mic.conf    |    3 +-
 .../alsa/mixer/paths/analog-input-headset-mic.conf |    3 +-
 .../paths/analog-input-internal-mic-always.conf    |    3 +-
 .../mixer/paths/analog-input-internal-mic.conf     |    3 +-
 .../alsa/mixer/paths/analog-input-linein.conf      |    3 +-
 .../alsa/mixer/paths/analog-input-mic-line.conf    |    3 +-
 src/modules/alsa/mixer/paths/analog-input-mic.conf |    3 +-
 .../alsa/mixer/paths/analog-input-mic.conf.common  |    3 +-
 .../alsa/mixer/paths/analog-input-rear-mic.conf    |    3 +-
 .../alsa/mixer/paths/analog-input-tvtuner.conf     |    3 +-
 .../alsa/mixer/paths/analog-input-video.conf       |    3 +-
 src/modules/alsa/mixer/paths/analog-input.conf     |    3 +-
 .../alsa/mixer/paths/analog-input.conf.common      |    3 +-
 .../mixer/paths/analog-output-headphones-2.conf    |    3 +-
 .../alsa/mixer/paths/analog-output-headphones.conf |    3 +-
 .../alsa/mixer/paths/analog-output-lineout.conf    |   20 +-
 .../alsa/mixer/paths/analog-output-mono.conf       |    3 +-
 .../mixer/paths/analog-output-speaker-always.conf  |    3 +-
 .../alsa/mixer/paths/analog-output-speaker.conf    |    3 +-
 src/modules/alsa/mixer/paths/analog-output.conf    |    3 +-
 .../alsa/mixer/paths/analog-output.conf.common     |    3 +-
 .../alsa/mixer/paths/iec958-stereo-output.conf     |    3 +-
 .../alsa/mixer/profile-sets/90-pulseaudio.rules    |    3 +-
 src/modules/alsa/mixer/profile-sets/default.conf   |    3 +-
 .../profile-sets/force-speaker-and-int-mic.conf    |    3 +-
 .../alsa/mixer/profile-sets/force-speaker.conf     |    3 +-
 .../alsa/mixer/profile-sets/kinect-audio.conf      |    3 +-
 .../mixer/profile-sets/maudio-fasttrack-pro.conf   |    3 +-
 .../profile-sets/native-instruments-audio4dj.conf  |    3 +-
 .../profile-sets/native-instruments-audio8dj.conf  |    3 +-
 .../native-instruments-korecontroller.conf         |    3 +-
 .../native-instruments-traktor-audio10.conf        |    3 +-
 .../native-instruments-traktor-audio2.conf         |    3 +-
 .../native-instruments-traktor-audio6.conf         |    3 +-
 .../native-instruments-traktorkontrol-s4.conf      |    3 +-
 src/modules/alsa/module-alsa-card.c                |    4 +-
 src/modules/alsa/module-alsa-sink.c                |    4 +-
 src/modules/alsa/module-alsa-source.c              |    4 +-
 src/modules/bluetooth/a2dp-codecs.h                |    3 +-
 src/modules/bluetooth/backend-native.c             |    4 +-
 src/modules/bluetooth/backend-ofono.c              |    4 +-
 src/modules/bluetooth/bluez4-util.c                |    4 +-
 src/modules/bluetooth/bluez4-util.h                |    4 +-
 src/modules/bluetooth/bluez5-util.c                |    4 +-
 src/modules/bluetooth/bluez5-util.h                |    4 +-
 src/modules/bluetooth/module-bluetooth-discover.c  |    4 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |    4 +-
 src/modules/bluetooth/module-bluez4-device.c       |    4 +-
 src/modules/bluetooth/module-bluez4-discover.c     |    4 +-
 src/modules/bluetooth/module-bluez5-device.c       |    4 +-
 src/modules/bluetooth/module-bluez5-discover.c     |    4 +-
 src/modules/bluetooth/rtp.h                        |    4 +-
 src/modules/dbus/iface-card-profile.c              |    4 +-
 src/modules/dbus/iface-card-profile.h              |    8 +-
 src/modules/dbus/iface-card.c                      |    4 +-
 src/modules/dbus/iface-card.h                      |    8 +-
 src/modules/dbus/iface-client.c                    |    4 +-
 src/modules/dbus/iface-client.h                    |    8 +-
 src/modules/dbus/iface-core.c                      |    4 +-
 src/modules/dbus/iface-core.h                      |    8 +-
 src/modules/dbus/iface-device-port.c               |    4 +-
 src/modules/dbus/iface-device-port.h               |    8 +-
 src/modules/dbus/iface-device.c                    |    4 +-
 src/modules/dbus/iface-device.h                    |    8 +-
 src/modules/dbus/iface-memstats.c                  |    4 +-
 src/modules/dbus/iface-memstats.h                  |    8 +-
 src/modules/dbus/iface-module.c                    |    4 +-
 src/modules/dbus/iface-module.h                    |    8 +-
 src/modules/dbus/iface-sample.c                    |    4 +-
 src/modules/dbus/iface-sample.h                    |    8 +-
 src/modules/dbus/iface-stream.c                    |    4 +-
 src/modules/dbus/iface-stream.h                    |    8 +-
 src/modules/dbus/module-dbus-protocol.c            |    4 +-
 src/modules/echo-cancel/adrian.c                   |    4 +-
 src/modules/echo-cancel/adrian.h                   |    4 +-
 src/modules/echo-cancel/echo-cancel.h              |    4 +-
 src/modules/echo-cancel/module-echo-cancel.c       |    4 +-
 src/modules/echo-cancel/speex.c                    |    4 +-
 src/modules/echo-cancel/webrtc.cc                  |    4 +-
 src/modules/gconf/gconf-helper.c                   |    4 +-
 src/modules/gconf/module-gconf.c                   |    4 +-
 src/modules/jack/module-jack-sink.c                |    4 +-
 src/modules/jack/module-jack-source.c              |    4 +-
 src/modules/jack/module-jackdbus-detect.c          |    4 +-
 src/modules/ladspa.h                               |    5 +-
 src/modules/macosx/module-bonjour-publish.c        |    4 +-
 src/modules/macosx/module-coreaudio-detect.c       |    4 +-
 src/modules/macosx/module-coreaudio-device.c       |    4 +-
 src/modules/module-always-sink.c                   |    4 +-
 src/modules/module-augment-properties.c            |    4 +-
 src/modules/module-card-restore.c                  |    4 +-
 src/modules/module-cli.c                           |    4 +-
 src/modules/module-combine-sink.c                  |    4 +-
 src/modules/module-combine.c                       |    4 +-
 src/modules/module-console-kit.c                   |    4 +-
 src/modules/module-default-device-restore.c        |    4 +-
 src/modules/module-detect.c                        |    4 +-
 src/modules/module-device-manager.c                |    4 +-
 src/modules/module-device-restore.c                |    4 +-
 src/modules/module-equalizer-sink.c                |    4 +-
 src/modules/module-esound-compat-spawnfd.c         |    4 +-
 src/modules/module-esound-compat-spawnpid.c        |    4 +-
 src/modules/module-esound-sink.c                   |    4 +-
 src/modules/module-filter-apply.c                  |    4 +-
 src/modules/module-filter-heuristics.c             |    4 +-
 src/modules/module-hal-detect-compat.c             |    4 +-
 src/modules/module-intended-roles.c                |    4 +-
 src/modules/module-ladspa-sink.c                   |    4 +-
 src/modules/module-lirc.c                          |    4 +-
 src/modules/module-loopback.c                      |    4 +-
 src/modules/module-match.c                         |    4 +-
 src/modules/module-mmkbd-evdev.c                   |    4 +-
 src/modules/module-native-protocol-fd.c            |    4 +-
 src/modules/module-null-sink.c                     |    4 +-
 src/modules/module-null-source.c                   |    4 +-
 src/modules/module-pipe-sink.c                     |    4 +-
 src/modules/module-pipe-source.c                   |    4 +-
 src/modules/module-position-event-sounds.c         |    4 +-
 src/modules/module-protocol-stub.c                 |    4 +-
 src/modules/module-remap-sink.c                    |    4 +-
 src/modules/module-remap-source.c                  |    4 +-
 src/modules/module-rescue-streams.c                |    4 +-
 src/modules/module-role-cork.c                     |    4 +-
 src/modules/module-role-ducking.c                  |    4 +-
 src/modules/module-rygel-media-server.c            |    4 +-
 src/modules/module-sine-source.c                   |    4 +-
 src/modules/module-sine.c                          |    4 +-
 src/modules/module-solaris.c                       |    4 +-
 src/modules/module-stream-restore.c                |    4 +-
 src/modules/module-suspend-on-idle.c               |    4 +-
 src/modules/module-switch-on-connect.c             |    4 +-
 src/modules/module-switch-on-port-available.c      |    4 +-
 src/modules/module-systemd-login.c                 |    4 +-
 src/modules/module-tunnel-sink-new.c               |   13 +-
 src/modules/module-tunnel-source-new.c             |    4 +-
 src/modules/module-tunnel.c                        |    6 +-
 src/modules/module-udev-detect.c                   |    4 +-
 src/modules/module-virtual-sink.c                  |    4 +-
 src/modules/module-virtual-source.c                |    4 +-
 src/modules/module-virtual-surround-sink.c         |    4 +-
 src/modules/module-volume-restore.c                |    4 +-
 src/modules/module-waveout.c                       |    4 +-
 src/modules/module-zeroconf-discover.c             |    4 +-
 src/modules/module-zeroconf-publish.c              |    4 +-
 src/modules/oss/module-oss.c                       |    4 +-
 src/modules/oss/oss-util.c                         |    4 +-
 src/modules/oss/oss-util.h                         |    4 +-
 src/modules/raop/base64.c                          |    4 +-
 src/modules/raop/base64.h                          |    4 +-
 src/modules/raop/module-raop-discover.c            |    4 +-
 src/modules/raop/module-raop-sink.c                |    4 +-
 src/modules/raop/raop_client.c                     |    4 +-
 src/modules/raop/raop_client.h                     |    4 +-
 src/modules/reserve-wrap.c                         |    4 +-
 src/modules/reserve-wrap.h                         |    4 +-
 src/modules/rtp/headerlist.c                       |    4 +-
 src/modules/rtp/headerlist.h                       |    4 +-
 src/modules/rtp/module-rtp-recv.c                  |    4 +-
 src/modules/rtp/module-rtp-send.c                  |    4 +-
 src/modules/rtp/rtp.c                              |    4 +-
 src/modules/rtp/rtp.h                              |    4 +-
 src/modules/rtp/rtsp_client.c                      |    4 +-
 src/modules/rtp/rtsp_client.h                      |    4 +-
 src/modules/rtp/sap.c                              |    4 +-
 src/modules/rtp/sap.h                              |    4 +-
 src/modules/rtp/sdp.c                              |    4 +-
 src/modules/rtp/sdp.h                              |    4 +-
 src/modules/udev-util.c                            |    4 +-
 src/modules/udev-util.h                            |    4 +-
 src/modules/x11/module-x11-bell.c                  |    4 +-
 src/modules/x11/module-x11-cork-request.c          |    4 +-
 src/modules/x11/module-x11-publish.c               |    4 +-
 src/modules/x11/module-x11-xsmp.c                  |    4 +-
 src/modules/xen/module-xenpv-sink.c                |    4 +-
 src/pulse/cdecl.h                                  |    4 +-
 src/pulse/channelmap.c                             |    4 +-
 src/pulse/channelmap.h                             |    4 +-
 src/pulse/client-conf-x11.c                        |    4 +-
 src/pulse/client-conf-x11.h                        |    4 +-
 src/pulse/client-conf.c                            |    4 +-
 src/pulse/client-conf.h                            |    4 +-
 src/pulse/client.conf.in                           |    4 +-
 src/pulse/context.c                                |    4 +-
 src/pulse/context.h                                |    4 +-
 src/pulse/def.h                                    |    4 +-
 src/pulse/direction.c                              |    4 +-
 src/pulse/direction.h                              |    4 +-
 src/pulse/error.c                                  |    4 +-
 src/pulse/error.h                                  |    4 +-
 src/pulse/ext-device-manager.c                     |    4 +-
 src/pulse/ext-device-manager.h                     |    4 +-
 src/pulse/ext-device-restore.c                     |    4 +-
 src/pulse/ext-device-restore.h                     |    4 +-
 src/pulse/ext-stream-restore.c                     |    4 +-
 src/pulse/ext-stream-restore.h                     |    4 +-
 src/pulse/fork-detect.c                            |    4 +-
 src/pulse/fork-detect.h                            |    4 +-
 src/pulse/format.c                                 |    4 +-
 src/pulse/format.h                                 |    4 +-
 src/pulse/gccmacro.h                               |    4 +-
 src/pulse/glib-mainloop.c                          |    4 +-
 src/pulse/glib-mainloop.h                          |    4 +-
 src/pulse/internal.h                               |    4 +-
 src/pulse/introspect.c                             |    4 +-
 src/pulse/introspect.h                             |    4 +-
 src/pulse/mainloop-api.c                           |    4 +-
 src/pulse/mainloop-api.h                           |    4 +-
 src/pulse/mainloop-signal.c                        |    4 +-
 src/pulse/mainloop-signal.h                        |    4 +-
 src/pulse/mainloop.c                               |    4 +-
 src/pulse/mainloop.h                               |    4 +-
 src/pulse/operation.c                              |    4 +-
 src/pulse/operation.h                              |    4 +-
 src/pulse/proplist.c                               |    4 +-
 src/pulse/proplist.h                               |    4 +-
 src/pulse/pulseaudio.h                             |    4 +-
 src/pulse/rtclock.c                                |    4 +-
 src/pulse/rtclock.h                                |    4 +-
 src/pulse/sample.c                                 |    4 +-
 src/pulse/sample.h                                 |    4 +-
 src/pulse/scache.c                                 |    4 +-
 src/pulse/scache.h                                 |    4 +-
 src/pulse/simple.c                                 |    4 +-
 src/pulse/simple.h                                 |    4 +-
 src/pulse/stream.c                                 |    4 +-
 src/pulse/stream.h                                 |    4 +-
 src/pulse/subscribe.c                              |    4 +-
 src/pulse/subscribe.h                              |    4 +-
 src/pulse/thread-mainloop.c                        |    4 +-
 src/pulse/thread-mainloop.h                        |    4 +-
 src/pulse/timeval.c                                |    4 +-
 src/pulse/timeval.h                                |    4 +-
 src/pulse/utf8.c                                   |    8 +-
 src/pulse/utf8.h                                   |    4 +-
 src/pulse/util.c                                   |    4 +-
 src/pulse/util.h                                   |    4 +-
 src/pulse/version.h                                |    4 +-
 src/pulse/version.h.in                             |    4 +-
 src/pulse/volume.c                                 |    4 +-
 src/pulse/volume.h                                 |    4 +-
 src/pulse/xmalloc.c                                |    4 +-
 src/pulse/xmalloc.h                                |    4 +-
 src/pulsecore/arpa-inet.c                          |    4 +-
 src/pulsecore/asyncmsgq.c                          |    4 +-
 src/pulsecore/asyncmsgq.h                          |    4 +-
 src/pulsecore/asyncq.c                             |    4 +-
 src/pulsecore/asyncq.h                             |    4 +-
 src/pulsecore/atomic.h                             |    4 +-
 src/pulsecore/aupdate.c                            |    4 +-
 src/pulsecore/aupdate.h                            |    4 +-
 src/pulsecore/auth-cookie.c                        |    4 +-
 src/pulsecore/auth-cookie.h                        |    4 +-
 src/pulsecore/authkey.c                            |    4 +-
 src/pulsecore/authkey.h                            |    4 +-
 src/pulsecore/avahi-wrap.c                         |    4 +-
 src/pulsecore/avahi-wrap.h                         |    4 +-
 src/pulsecore/bitset.c                             |    4 +-
 src/pulsecore/bitset.h                             |    4 +-
 src/pulsecore/card.c                               |    4 +-
 src/pulsecore/card.h                               |    4 +-
 src/pulsecore/cli-command.c                        |    4 +-
 src/pulsecore/cli-command.h                        |    4 +-
 src/pulsecore/cli-text.c                           |    4 +-
 src/pulsecore/cli-text.h                           |    4 +-
 src/pulsecore/cli.c                                |    4 +-
 src/pulsecore/cli.h                                |    4 +-
 src/pulsecore/client.c                             |    4 +-
 src/pulsecore/client.h                             |    4 +-
 src/pulsecore/conf-parser.c                        |    4 +-
 src/pulsecore/conf-parser.h                        |    4 +-
 src/pulsecore/core-error.c                         |    4 +-
 src/pulsecore/core-error.h                         |    4 +-
 src/pulsecore/core-format.c                        |    4 +-
 src/pulsecore/core-format.h                        |    4 +-
 src/pulsecore/core-rtclock.c                       |    4 +-
 src/pulsecore/core-rtclock.h                       |    4 +-
 src/pulsecore/core-scache.c                        |    4 +-
 src/pulsecore/core-scache.h                        |    4 +-
 src/pulsecore/core-subscribe.c                     |    4 +-
 src/pulsecore/core-subscribe.h                     |    4 +-
 src/pulsecore/core-util.c                          |    4 +-
 src/pulsecore/core-util.h                          |    4 +-
 src/pulsecore/core.c                               |    4 +-
 src/pulsecore/core.h                               |    4 +-
 src/pulsecore/cpu-arm.c                            |    4 +-
 src/pulsecore/cpu-arm.h                            |    4 +-
 src/pulsecore/cpu-orc.c                            |    4 +-
 src/pulsecore/cpu-orc.h                            |    4 +-
 src/pulsecore/cpu-x86.c                            |    4 +-
 src/pulsecore/cpu-x86.h                            |    4 +-
 src/pulsecore/cpu.h                                |    4 +-
 src/pulsecore/creds.h                              |    4 +-
 src/pulsecore/database-gdbm.c                      |    4 +-
 src/pulsecore/database-simple.c                    |    4 +-
 src/pulsecore/database-tdb.c                       |    4 +-
 src/pulsecore/database.h                           |    4 +-
 src/pulsecore/dbus-shared.c                        |    4 +-
 src/pulsecore/dbus-shared.h                        |    4 +-
 src/pulsecore/dbus-util.c                          |    4 +-
 src/pulsecore/dbus-util.h                          |    4 +-
 src/pulsecore/device-port.c                        |    4 +-
 src/pulsecore/device-port.h                        |    4 +-
 src/pulsecore/dllmain.c                            |    4 +-
 src/pulsecore/dynarray.c                           |    4 +-
 src/pulsecore/dynarray.h                           |    4 +-
 src/pulsecore/endianmacros.h                       |    4 +-
 src/pulsecore/esound.h                             |    4 +-
 src/pulsecore/fdsem.c                              |    4 +-
 src/pulsecore/fdsem.h                              |    4 +-
 src/pulsecore/ffmpeg/avcodec.h                     |    3 +-
 src/pulsecore/ffmpeg/resample2.c                   |    3 +-
 src/pulsecore/flist.c                              |    4 +-
 src/pulsecore/flist.h                              |    4 +-
 src/pulsecore/hashmap.c                            |    4 +-
 src/pulsecore/hashmap.h                            |    4 +-
 src/pulsecore/hook-list.c                          |    4 +-
 src/pulsecore/hook-list.h                          |    4 +-
 src/pulsecore/i18n.c                               |    4 +-
 src/pulsecore/i18n.h                               |    4 +-
 src/pulsecore/idxset.c                             |    4 +-
 src/pulsecore/idxset.h                             |    4 +-
 src/pulsecore/iochannel.c                          |    4 +-
 src/pulsecore/iochannel.h                          |    4 +-
 src/pulsecore/ioline.c                             |    4 +-
 src/pulsecore/ioline.h                             |    4 +-
 src/pulsecore/ipacl.c                              |    4 +-
 src/pulsecore/ipacl.h                              |    4 +-
 src/pulsecore/llist.h                              |    4 +-
 src/pulsecore/lock-autospawn.c                     |    4 +-
 src/pulsecore/lock-autospawn.h                     |    4 +-
 src/pulsecore/log.c                                |    4 +-
 src/pulsecore/log.h                                |    4 +-
 src/pulsecore/ltdl-helper.c                        |    4 +-
 src/pulsecore/ltdl-helper.h                        |    4 +-
 src/pulsecore/macro.h                              |    4 +-
 src/pulsecore/mcalign.c                            |    4 +-
 src/pulsecore/mcalign.h                            |    4 +-
 src/pulsecore/memblock.c                           |   10 +-
 src/pulsecore/memblock.h                           |    4 +-
 src/pulsecore/memblockq.c                          |    4 +-
 src/pulsecore/memblockq.h                          |    4 +-
 src/pulsecore/memchunk.c                           |    4 +-
 src/pulsecore/memchunk.h                           |    4 +-
 src/pulsecore/memtrap.c                            |    4 +-
 src/pulsecore/memtrap.h                            |    4 +-
 src/pulsecore/mime-type.c                          |    4 +-
 src/pulsecore/mime-type.h                          |    4 +-
 src/pulsecore/mix.c                                |    4 +-
 src/pulsecore/mix.h                                |    4 +-
 src/pulsecore/modargs.c                            |    4 +-
 src/pulsecore/modargs.h                            |    4 +-
 src/pulsecore/modinfo.c                            |    4 +-
 src/pulsecore/modinfo.h                            |    4 +-
 src/pulsecore/module.c                             |    4 +-
 src/pulsecore/module.h                             |    4 +-
 src/pulsecore/msgobject.c                          |    4 +-
 src/pulsecore/msgobject.h                          |    4 +-
 src/pulsecore/mutex-posix.c                        |    4 +-
 src/pulsecore/mutex-win32.c                        |    4 +-
 src/pulsecore/mutex.h                              |    4 +-
 src/pulsecore/namereg.c                            |    4 +-
 src/pulsecore/namereg.h                            |    4 +-
 src/pulsecore/native-common.h                      |    4 +-
 src/pulsecore/object.c                             |    4 +-
 src/pulsecore/object.h                             |    4 +-
 src/pulsecore/once.c                               |    4 +-
 src/pulsecore/once.h                               |    4 +-
 src/pulsecore/packet.c                             |    4 +-
 src/pulsecore/packet.h                             |    4 +-
 src/pulsecore/parseaddr.c                          |    4 +-
 src/pulsecore/parseaddr.h                          |    4 +-
 src/pulsecore/pdispatch.c                          |    4 +-
 src/pulsecore/pdispatch.h                          |    4 +-
 src/pulsecore/pid.c                                |    4 +-
 src/pulsecore/pid.h                                |    4 +-
 src/pulsecore/pipe.c                               |    4 +-
 src/pulsecore/pipe.h                               |    4 +-
 src/pulsecore/play-memblockq.c                     |    4 +-
 src/pulsecore/play-memblockq.h                     |    4 +-
 src/pulsecore/play-memchunk.c                      |    4 +-
 src/pulsecore/play-memchunk.h                      |    4 +-
 src/pulsecore/poll-posix.c                         |    4 +-
 src/pulsecore/poll.h                               |    4 +-
 src/pulsecore/proplist-util.c                      |    4 +-
 src/pulsecore/proplist-util.h                      |    4 +-
 src/pulsecore/protocol-cli.c                       |    4 +-
 src/pulsecore/protocol-cli.h                       |    4 +-
 src/pulsecore/protocol-dbus.c                      |    4 +-
 src/pulsecore/protocol-dbus.h                      |    4 +-
 src/pulsecore/protocol-esound.c                    |    4 +-
 src/pulsecore/protocol-esound.h                    |    4 +-
 src/pulsecore/protocol-http.c                      |    4 +-
 src/pulsecore/protocol-http.h                      |    4 +-
 src/pulsecore/protocol-native.c                    |    8 +-
 src/pulsecore/protocol-native.h                    |    4 +-
 src/pulsecore/protocol-simple.c                    |    4 +-
 src/pulsecore/protocol-simple.h                    |    4 +-
 src/pulsecore/pstream-util.c                       |    4 +-
 src/pulsecore/pstream-util.h                       |    4 +-
 src/pulsecore/pstream.c                            |    4 +-
 src/pulsecore/pstream.h                            |    4 +-
 src/pulsecore/queue.c                              |    4 +-
 src/pulsecore/queue.h                              |    4 +-
 src/pulsecore/random.c                             |    4 +-
 src/pulsecore/random.h                             |    4 +-
 src/pulsecore/ratelimit.c                          |    4 +-
 src/pulsecore/ratelimit.h                          |    4 +-
 src/pulsecore/refcnt.h                             |    4 +-
 src/pulsecore/remap.c                              |    4 +-
 src/pulsecore/remap.h                              |    4 +-
 src/pulsecore/remap_mmx.c                          |    4 +-
 src/pulsecore/remap_sse.c                          |    4 +-
 src/pulsecore/resampler.c                          |    4 +-
 src/pulsecore/resampler.h                          |    4 +-
 src/pulsecore/resampler/ffmpeg.c                   |    4 +-
 src/pulsecore/resampler/libsamplerate.c            |    4 +-
 src/pulsecore/resampler/peaks.c                    |    4 +-
 src/pulsecore/resampler/speex.c                    |    4 +-
 src/pulsecore/resampler/trivial.c                  |    4 +-
 src/pulsecore/rtpoll.c                             |    4 +-
 src/pulsecore/rtpoll.h                             |    4 +-
 src/pulsecore/sample-util.c                        |    4 +-
 src/pulsecore/sample-util.h                        |    4 +-
 src/pulsecore/sconv-s16be.c                        |    4 +-
 src/pulsecore/sconv-s16be.h                        |    4 +-
 src/pulsecore/sconv-s16le.c                        |    4 +-
 src/pulsecore/sconv-s16le.h                        |    4 +-
 src/pulsecore/sconv.c                              |    4 +-
 src/pulsecore/sconv.h                              |    4 +-
 src/pulsecore/sconv_sse.c                          |    4 +-
 src/pulsecore/semaphore-osx.c                      |    4 +-
 src/pulsecore/semaphore-posix.c                    |    4 +-
 src/pulsecore/semaphore-win32.c                    |    4 +-
 src/pulsecore/semaphore.h                          |    4 +-
 src/pulsecore/shared.c                             |    4 +-
 src/pulsecore/shared.h                             |    4 +-
 src/pulsecore/shm.c                                |    4 +-
 src/pulsecore/shm.h                                |    4 +-
 src/pulsecore/sink-input.c                         |    4 +-
 src/pulsecore/sink-input.h                         |    6 +-
 src/pulsecore/sink.c                               |    4 +-
 src/pulsecore/sink.h                               |    6 +-
 src/pulsecore/sioman.c                             |    4 +-
 src/pulsecore/sioman.h                             |    4 +-
 src/pulsecore/sndfile-util.c                       |    4 +-
 src/pulsecore/sndfile-util.h                       |    4 +-
 src/pulsecore/socket-client.c                      |    4 +-
 src/pulsecore/socket-client.h                      |    4 +-
 src/pulsecore/socket-server.c                      |    4 +-
 src/pulsecore/socket-server.h                      |    4 +-
 src/pulsecore/socket-util.c                        |    4 +-
 src/pulsecore/socket-util.h                        |    4 +-
 src/pulsecore/sound-file-stream.c                  |    4 +-
 src/pulsecore/sound-file-stream.h                  |    4 +-
 src/pulsecore/sound-file.c                         |    4 +-
 src/pulsecore/sound-file.h                         |    4 +-
 src/pulsecore/source-output.c                      |    4 +-
 src/pulsecore/source-output.h                      |    6 +-
 src/pulsecore/source.c                             |    4 +-
 src/pulsecore/source.h                             |    6 +-
 src/pulsecore/srbchannel.c                         |    4 +-
 src/pulsecore/srbchannel.h                         |    4 +-
 src/pulsecore/start-child.c                        |    4 +-
 src/pulsecore/start-child.h                        |    4 +-
 src/pulsecore/strbuf.c                             |    4 +-
 src/pulsecore/strbuf.h                             |    4 +-
 src/pulsecore/stream-util.c                        |    4 +-
 src/pulsecore/stream-util.h                        |    4 +-
 src/pulsecore/strlist.c                            |    4 +-
 src/pulsecore/strlist.h                            |    4 +-
 src/pulsecore/svolume.orc                          |    8 +-
 src/pulsecore/svolume_arm.c                        |    4 +-
 src/pulsecore/svolume_c.c                          |    4 +-
 src/pulsecore/svolume_mmx.c                        |    4 +-
 src/pulsecore/svolume_orc.c                        |    4 +-
 src/pulsecore/svolume_sse.c                        |    4 +-
 src/pulsecore/tagstruct.c                          |    4 +-
 src/pulsecore/tagstruct.h                          |    4 +-
 src/pulsecore/thread-mq.c                          |    4 +-
 src/pulsecore/thread-mq.h                          |    4 +-
 src/pulsecore/thread-posix.c                       |    4 +-
 src/pulsecore/thread-win32.c                       |    4 +-
 src/pulsecore/thread.h                             |    4 +-
 src/pulsecore/time-smoother.c                      |    4 +-
 src/pulsecore/time-smoother.h                      |    4 +-
 src/pulsecore/tokenizer.c                          |    4 +-
 src/pulsecore/tokenizer.h                          |    4 +-
 src/pulsecore/usergroup.c                          |    4 +-
 src/pulsecore/usergroup.h                          |    4 +-
 src/pulsecore/x11prop.c                            |    4 +-
 src/pulsecore/x11prop.h                            |    4 +-
 src/pulsecore/x11wrap.c                            |    4 +-
 src/pulsecore/x11wrap.h                            |    4 +-
 src/tests/asyncmsgq-test.c                         |    4 +-
 src/tests/asyncq-test.c                            |    4 +-
 src/tests/connect-stress.c                         |    4 +-
 src/tests/cpu-mix-test.c                           |    4 +-
 src/tests/cpu-remap-test.c                         |    4 +-
 src/tests/cpu-sconv-test.c                         |    4 +-
 src/tests/cpu-volume-test.c                        |    4 +-
 src/tests/cpulimit-test.c                          |    4 +-
 src/tests/extended-test.c                          |    4 +-
 src/tests/flist-test.c                             |    4 +-
 src/tests/format-test.c                            |    4 +-
 src/tests/get-binary-name-test.c                   |    4 +-
 src/tests/gtk-test.c                               |    4 +-
 src/tests/interpol-test.c                          |    4 +-
 src/tests/lo-latency-test.c                        |    4 +-
 src/tests/lo-test-util.c                           |    4 +-
 src/tests/lo-test-util.h                           |    4 +-
 src/tests/lock-autospawn-test.c                    |    4 +-
 src/tests/mainloop-test.c                          |    4 +-
 src/tests/mcalign-test.c                           |    4 +-
 src/tests/memblock-test.c                          |    4 +-
 src/tests/memblockq-test.c                         |    4 +-
 src/tests/mix-test.c                               |    4 +-
 src/tests/mult-s16-test.c                          |    4 +-
 src/tests/once-test.c                              |    4 +-
 src/tests/pacat-simple.c                           |    4 +-
 src/tests/parec-simple.c                           |    4 +-
 src/tests/proplist-test.c                          |    4 +-
 src/tests/queue-test.c                             |    4 +-
 src/tests/remix-test.c                             |    4 +-
 src/tests/resampler-test.c                         |    4 +-
 src/tests/rtpoll-test.c                            |    4 +-
 src/tests/rtstutter.c                              |    4 +-
 src/tests/sig2str-test.c                           |    4 +-
 src/tests/sigbus-test.c                            |    4 +-
 src/tests/smoother-test.c                          |    4 +-
 src/tests/srbchannel-test.c                        |    4 +-
 src/tests/stripnul.c                               |    4 +-
 src/tests/sync-playback.c                          |    4 +-
 src/tests/thread-mainloop-test.c                   |    4 +-
 src/tests/thread-test.c                            |    4 +-
 src/tests/usergroup-test.c                         |    4 +-
 src/tests/volume-test.c                            |    4 +-
 src/utils/pacat.c                                  |    4 +-
 src/utils/pacmd.c                                  |    6 +-
 src/utils/pactl.c                                  |   12 +-
 src/utils/padsp.c                                  |    4 +-
 src/utils/padsp.in                                 |    4 +-
 src/utils/pasuspender.c                            |    4 +-
 src/utils/pax11publish.c                           |    4 +-
 vala/libpulse-simple.vapi                          |    4 +-
 vala/libpulse.vapi                                 |    4 +-
 651 files changed, 4023 insertions(+), 4642 deletions(-)

diff --git a/.tarball-version b/.tarball-version
index 0d530ba..8e2be86 100644
--- a/.tarball-version
+++ b/.tarball-version
@@ -1 +1 @@
-5.99.2
+5.99.3
diff --git a/.version b/.version
index 0d530ba..8e2be86 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-5.99.2
+5.99.3
diff --git a/Makefile.am b/Makefile.am
index 665736d..75b784f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/Makefile.in b/Makefile.in
index 42816ca..3f72b0a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,9 +27,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
diff --git a/bootstrap.sh b/bootstrap.sh
index 011aa13..644d014 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 case $(uname) in
 	*Darwin*)
diff --git a/configure b/configure
index 27a1345..94a60a7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.2.
+# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.3.
 #
 # Report bugs to <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pulseaudio'
 PACKAGE_TARNAME='pulseaudio'
-PACKAGE_VERSION='5.99.2'
-PACKAGE_STRING='pulseaudio 5.99.2'
+PACKAGE_VERSION='5.99.3'
+PACKAGE_STRING='pulseaudio 5.99.3'
 PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org'
 PACKAGE_URL='http://pulseaudio.org/'
 
@@ -1733,7 +1733,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pulseaudio 5.99.2 to adapt to many kinds of systems.
+\`configure' configures pulseaudio 5.99.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1803,7 +1803,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pulseaudio 5.99.2:";;
+     short | recursive ) echo "Configuration of pulseaudio 5.99.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1833,7 +1833,7 @@ Optional Features:
   --disable-largefile     omit support for large files
   --disable-x11           Disable optional X11 support
   --disable-tests         Disable unit tests
-  --disable-samplerate    Disable optional libsamplerate support
+  --enable-samplerate     Enable optional libsamplerate support (DEPRECATED)
   --disable-oss-output    Disable optional OSS output support
   --disable-oss-wrapper   Disable optional OSS wrapper support
   --disable-coreaudio-output
@@ -2098,7 +2098,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pulseaudio configure 5.99.2
+pulseaudio configure 5.99.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2688,7 +2688,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pulseaudio $as_me 5.99.2, which was
+It was created by pulseaudio $as_me 5.99.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3640,7 +3640,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pulseaudio'
- VERSION='5.99.2'
+ VERSION='5.99.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24287,7 +24287,7 @@ if test "${enable_samplerate+set}" = set; then :
 fi
 
 
-if test "x$enable_samplerate" != "xno"; then :
+if test "x$enable_samplerate" = "xyes"; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSAMPLERATE" >&5
@@ -28693,7 +28693,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pulseaudio $as_me 5.99.2, which was
+This file was extended by pulseaudio $as_me 5.99.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28760,7 +28760,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pulseaudio config.status 5.99.2
+pulseaudio config.status 5.99.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 6843729..3c71472 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
 
@@ -673,9 +672,9 @@ fi
 #### Libsamplerate support (optional) ####
 
 AC_ARG_ENABLE([samplerate],
-    AS_HELP_STRING([--disable-samplerate],[Disable optional libsamplerate support]))
+    AS_HELP_STRING([--enable-samplerate],[Enable optional libsamplerate support (DEPRECATED)]))
 
-AS_IF([test "x$enable_samplerate" != "xno"],
+AS_IF([test "x$enable_samplerate" = "xyes"],
     [PKG_CHECK_MODULES(LIBSAMPLERATE, [ samplerate >= 0.1.0 ], HAVE_LIBSAMPLERATE=1, HAVE_LIBSAMPLERATE=0)],
     HAVE_LIBSAMPLERATE=0)
 
diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index 60b0060..4696fb2 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -11,9 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 doxygen: doxygen.conf
 	doxygen $<
diff --git a/doxygen/Makefile.in b/doxygen/Makefile.in
index c841996..e7072c6 100644
--- a/doxygen/Makefile.in
+++ b/doxygen/Makefile.in
@@ -27,9 +27,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
diff --git a/git-version-gen b/git-version-gen
index 724da66..7546884 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -15,9 +15,7 @@ scriptversion=2012-09-25.20
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
 # It may be run two ways:
diff --git a/man/Makefile.am b/man/Makefile.am
index d80ba6a..5ba4e68 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -11,9 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 DISTCLEANFILES = \
 	$(noinst_DATA)
diff --git a/man/Makefile.in b/man/Makefile.in
index 159167f..f33463e 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -27,9 +27,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index 5690541..306e976 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="default.pa" section="5" desc="PulseAudio Sound Server Startup Script">
diff --git a/man/esdcompat.1.xml.in b/man/esdcompat.1.xml.in
index 8ef16ff..36f6667 100644
--- a/man/esdcompat.1.xml.in
+++ b/man/esdcompat.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="esdcompat" section="1" desc="PulseAudio ESD wrapper script">
diff --git a/man/pacat.1.xml.in b/man/pacat.1.xml.in
index 1c5a6c0..ba213ff 100644
--- a/man/pacat.1.xml.in
+++ b/man/pacat.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pacat" section="1" desc="Play back or record raw or encoded audio streams on a PulseAudio sound server">
diff --git a/man/pacmd.1.xml.in b/man/pacmd.1.xml.in
index 7a555fe..b11eb24 100644
--- a/man/pacmd.1.xml.in
+++ b/man/pacmd.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pacmd" section="1" desc="Reconfigure a PulseAudio sound server during runtime">
diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in
index cf6570e..c2064ca 100644
--- a/man/pactl.1.xml.in
+++ b/man/pactl.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pactl" section="1" desc="Control a running PulseAudio sound server">
diff --git a/man/padsp.1.xml.in b/man/padsp.1.xml.in
index 9bbe3d1..2ee1e11 100644
--- a/man/padsp.1.xml.in
+++ b/man/padsp.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="padsp" section="1" desc="PulseAudio OSS Wrapper">
diff --git a/man/paplay.1.xml.in b/man/paplay.1.xml.in
index 843b172..a459cfd 100644
--- a/man/paplay.1.xml.in
+++ b/man/paplay.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="paplay" section="1" desc="Play back audio files on a PulseAudio sound server">
diff --git a/man/pasuspender.1.xml.in b/man/pasuspender.1.xml.in
index 52deae6..086e175 100644
--- a/man/pasuspender.1.xml.in
+++ b/man/pasuspender.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pasuspender" section="1" desc="Temporarily suspend PulseAudio">
diff --git a/man/pax11publish.1.xml.in b/man/pax11publish.1.xml.in
index 0628b9d..6f6039a 100644
--- a/man/pax11publish.1.xml.in
+++ b/man/pax11publish.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pax11publish" section="1" desc="PulseAudio X11 Credential Utility">
diff --git a/man/pulse-cli-syntax.5.xml.in b/man/pulse-cli-syntax.5.xml.in
index a061c05..b2ba5e5 100644
--- a/man/pulse-cli-syntax.5.xml.in
+++ b/man/pulse-cli-syntax.5.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pulse-cli-syntax" section="5" desc="PulseAudio Command Line Interface Syntax">
diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in
index 45f02da..1002dbe 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pulse-client.conf" section="5" desc="PulseAudio client configuration file">
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 754312e..d37de25 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pulse-daemon.conf" section="5" desc="PulseAudio daemon configuration file">
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index 7a97379..aed21f6 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="pulseaudio" section="1" desc="The PulseAudio Sound System">
diff --git a/man/start-pulseaudio-x11.1.xml.in b/man/start-pulseaudio-x11.1.xml.in
index 32f1571..66fe476 100644
--- a/man/start-pulseaudio-x11.1.xml.in
+++ b/man/start-pulseaudio-x11.1.xml.in
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <manpage name="start-pulseaudio-x11" section="1" desc="PulseAudio Sound Server X11 Startup Script">
diff --git a/man/xmltoman b/man/xmltoman
index 6a7489a..92422f0 100755
--- a/man/xmltoman
+++ b/man/xmltoman
@@ -15,8 +15,7 @@
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 use XML::Parser;
 
diff --git a/man/xmltoman.css b/man/xmltoman.css
index 113aeec..2ddb867 100644
--- a/man/xmltoman.css
+++ b/man/xmltoman.css
@@ -12,8 +12,7 @@
   for more details.
 
   You should have received a copy of the GNU General Public License
-  along with PulseAudio; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. 
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 body { color: black; background-color: white; } 
diff --git a/man/xmltoman.dtd b/man/xmltoman.dtd
index 4760638..e0e211c 100644
--- a/man/xmltoman.dtd
+++ b/man/xmltoman.dtd
@@ -12,8 +12,7 @@
   for more details.
 
   You should have received a copy of the GNU General Public License
-  along with PulseAudio; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <!ELEMENT manpage (synopsis | description | section | options | seealso)*>
diff --git a/man/xmltoman.xsl b/man/xmltoman.xsl
index 766ab25..1271064 100644
--- a/man/xmltoman.xsl
+++ b/man/xmltoman.xsl
@@ -15,8 +15,7 @@
   for more details.
 
   You should have received a copy of the GNU General Public License
-  along with PulseAudio; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <xsl:output method="xml" version="1.0" encoding="iso-8859-15" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes"/>
diff --git a/po/LINGUAS b/po/LINGUAS
index addf24a..71c73a5 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -31,6 +31,7 @@ sr
 sv
 ta
 te
+tr
 uk
 zh_CN
 zh_TW
diff --git a/po/as.po b/po/as.po
index c0e8422..45d1e40 100644
--- a/po/as.po
+++ b/po/as.po
@@ -397,13 +397,14 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "আপনি সিস্টেম মোডে PA সঞ্চালিত কৰছেন এবং এটি না কৰাই বাঞ্ছনীয়।\n"
 "এৰ ফলে প্ৰত্যাশামত ফলাফল না পাওয়াৰ সম্ভাবনা ৰয়েছে।\n"
-"সিস্টেম মোডে ব্যৱহাৰেৰ সমস্যা সম্পৰ্কে জানতে হলে http://pulseaudio.org/wiki/"
-"WhatIsWrongWithSystemMode দেখুন।"
+"সিস্টেম মোডে ব্যৱহাৰেৰ সমস্যা সম্পৰ্কে জানতে হলে http://www.freedesktop.org/wiki/"
+"Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ দেখুন।"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 1c35a2d..83e6137 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -401,13 +401,14 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "আপনি সিস্টেম মোডে PA সঞ্চালিত করছেন এবং এটি না করাই বাঞ্ছনীয়।\n"
 "এর ফলে প্রত্যাশামত ফলাফল না পাওয়ার সম্ভাবনা রয়েছে।\n"
-"সিস্টেম মোডে ব্যবহারের সমস্যা সম্পর্কে জানতে হলে http://pulseaudio.org/wiki/"
-"WhatIsWrongWithSystemMode দেখুন।"
+"সিস্টেম মোডে ব্যবহারের সমস্যা সম্পর্কে জানতে হলে http://www.freedesktop.org/wiki/"
+"Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ দেখুন।"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/ca.po b/po/ca.po
index 6867f5e..3e1648e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -423,15 +423,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Esteu utilitzant el PA en mode sistema. Tingueu en compte que molt "
 "probablement no hauríeu de fer-ho.\n"
 "No obstant això, si ho feu és la vostra responsabilitat si no funciona com "
 "s'esperava.\n"
-"Si us plau, llegiu http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode per "
-"a una explicació de per què el mode sistema sol ser una mala idea."
+"Si us plau, llegiu http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ per a una explicació de per "
+"què el mode sistema sol ser una mala idea."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/cs.po b/po/cs.po
index 0d6689a..454fc33 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -401,15 +401,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Dobrá, máte tedy PA spuštěn v systémovém režimu. Vemte prosím na vědomí, že "
 "k tomuto by až na výjimečné situace němelo docházet.\n"
 "Pokud v této činnosti přesto budete pokračovat, nesete riziko za možné "
 "špatné a nepředvídatelné chování systému.\n"
 "Vysvětlení, proč je systémový režim obvykle velmi špatný nápad, si můžete "
-"přečíst na http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode."
+"přečíst na http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/"
+"User/WhatIsWrongWithSystemWide/ ."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/de.po b/po/de.po
index 7d7cc6a..d8c81f0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -407,14 +407,16 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "OK, nun wird PA im System Mode betrieben. Vorsicht, dies sollte man nicht "
 "tun.\n"
 "Bei Nichtbeachtung, selber Schuld wenn Dinge nicht funktionieren.\n"
 "Für eine Erklärung warum System Mode eine schlechte Idee ist, bitte http://"
-"pulseaudio.org/wiki/WhatIsWrongWithSystemMode lesen"
+"www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/ lesen"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/de_CH.po b/po/de_CH.po
index 4cd49d3..6424bd5 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -399,8 +399,9 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 
 #: ../src/daemon/main.c:981
diff --git a/po/el.po b/po/el.po
index 8b3b475..cfa0e46 100644
--- a/po/el.po
+++ b/po/el.po
@@ -757,15 +757,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Εντάξει, εκτελείτε PA σε λειτουργία συστήματος. Παρακαλούμε, σημειώστε ότι "
 "κατά πάσα πιθανότητα δεν θα έπρεπε να το κάνετε.\n"
 "Αν παρόλα αυτά το κάνετε, τότε είναι δικό σας σφάλμα, αν τα πράγματα δεν "
 "δουλέψουν όπως αναμενόταν.\n"
-"Παρακαλούμε, διαβάστε http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode "
-"για μια εξήγηση γιατί η λειτουργία συστήματος είναι συνήθως μια άσχημη ιδέα."
+"Παρακαλούμε, διαβάστε http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ για μια εξήγηση γιατί η "
+"λειτουργία συστήματος είναι συνήθως μια άσχημη ιδέα."
 
 #: ../src/daemon/main.c:996
 msgid "pa_pid_file_create() failed."
diff --git a/po/es.po b/po/es.po
index e950c6a..d75c7ee 100644
--- a/po/es.po
+++ b/po/es.po
@@ -409,16 +409,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Bien, o sea que está ejecutando PA en modo de sistema. Por favor entienda "
 "que, en general, no debería estar haciéndolo.\n"
 "Si insiste en seguir utilizando este modo, será debido a su propio accionar "
 "que las cosas no funcionen como se esperaba.\n"
-"Por favor lea http://pulseaudio.org/wiki/WhatIsWrongWithSystemMod para "
-"obtener una explicación acerca de por qué es una mala idea utilizar el  modo "
-"sistema."
+"Por favor lea http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ para obtener una explicación "
+"acerca de por qué es una mala idea utilizar el  modo sistema."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/fi.po b/po/fi.po
index 0dfbc67..01e4139 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -406,13 +406,15 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "PA:ta suoritetaan järjestelmätilassa. Näin ei luultavasti pitäisi tehdä.\n"
 "Jos silti teet näin, on sinun vikasi jos kaikki ei toimikaan odotetusti.\n"
 "Lisätietoja siitä, miksi järjestelmätilan käyttäminen on yleensä huono "
-"ajatus on osoitteessa http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+"ajatus on osoitteessa http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/fr.po b/po/fr.po
index b9d0d04..4c0eac9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -415,15 +415,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Vous exécutez PA dans un mode système. Sachez que vous ne devriez pas faire "
 "cela.\n"
 "Si vous choisissez malgré tout de le faire, vous êtes responsable de tout "
 "dysfonctionnement inattendu.\n"
-"Veuillez lire http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode pour "
-"comprendre pourquoi le mode système est généralement une mauvaise idée."
+"Veuillez lire http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ pour comprendre pourquoi le "
+"mode système est généralement une mauvaise idée."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/gu.po b/po/gu.po
index 65374c7..7300602 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -400,14 +400,16 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "બરાબર, તેથી તમે સિસ્ટમ સ્થિતિમાં PA ચલાવી રહ્યા છો. મહેરબાની કરીને નોંધો કે જે તમારે "
 "મોટેભાગે કરવુ જોઇએ નહિં.\n"
 "જો તમે તેનાં વગર કરે તો પછી તે તમારી ભૂલ થે જો ઇચ્છિત રીતે તે કામ કરતુ ન હોય તો.\n"
 "શા માટે સિસ્ટમ સ્થિતિ સામાન્ય રીતે ખરાબ વિચાર છે તે માટે વિગતવાર જાણકારી માટે મહેરબાની "
-"કરીને http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode આને વાંચો."
+"કરીને http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/ આને વાંચો."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/he.po b/po/he.po
index 39b9eaf..daf4a56 100644
--- a/po/he.po
+++ b/po/he.po
@@ -376,8 +376,9 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 
 #: ../src/daemon/main.c:981
diff --git a/po/hi.po b/po/hi.po
index 644c9ac..da46916 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -404,13 +404,15 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "तो आप PA तंत्र मोड में चला रहे हैं. कृपया नोट करें कि आपको ऐसा नहीं करना चाहिए.\n"
 "यदि आप इसे करते हैं तो यह आपकी गलती है यदि कुछ अप्रत्याशित होता है.\n"
-"कृपया http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode को पढ़ें जानने के लिए "
-"कि क्यों तंत्र मोड एक बढ़िया विचार नहीं है."
+"कृपया http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/ को पढ़ें जानने के लिए कि क्यों तंत्र मोड एक बढ़िया विचार "
+"नहीं है."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/hu.po b/po/hu.po
index 7a610e1..eefb22b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -408,15 +408,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "A PulseAudio rendszer üzemmódban fut. Általánosságban ezen üzemmód "
 "használata nem ajánlott.\n"
 "Ha mindenképpen ilyen üzemmódban kívánja futtatni a PulseAudio rendszert, ne "
 "lepődjön meg, ha egyes funkciók esetleg nem az elvárások szerint működnek.\n"
-"További tájékoztatás: http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode "
-"amelyből megtudhatja miért nem tanácsos a rendszer üzemmód használata."
+"További tájékoztatás: http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ amelyből megtudhatja miért nem "
+"tanácsos a rendszer üzemmód használata."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/id.po b/po/id.po
index dac5f86..f360805 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PulseAudio\n"
-"Report-Msgid-Bugs-To: http://pulseaudio.org/wiki/Community#BugsPatchesTranslations\n"
+"Report-Msgid-Bugs-To: http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Community/#bugspatchestranslations\n"
 "POT-Creation-Date: 2010-11-27 01:08+0000\n"
 "PO-Revision-Date: 2012-09-22 04:49+0000\n"
 "Last-Translator: Andika Triwidada <andika at gmail.com>\n"
@@ -355,10 +355,21 @@ msgstr "Berjalan pada mode sistem: %s"
 
 #: ../src/daemon/main.c:893
 msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an explanation why system mode is usually a bad idea."
-msgstr "OK, jadi Anda menjalankan PA dalam mode sistem. Mohon catat bahwa sangat boleh jadi Anda tak perlu melakukan ini.\nNamun bila Anda melakukannya juga, salah Anda sendiri bila semua tak bekerja seperti yang diharapkan.\nSilakan baca http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode bagi penjelasan mengapa mode sistem biasanya adalah ide buruk."
+"OK, so you are running PA in system mode. Please note that you most likely "
+"shouldn't be doing that.\n"
+"If you do it nonetheless then it's your own fault if things don't work as "
+"expected.\n"
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
+msgstr ""
+"OK, jadi Anda menjalankan PA dalam mode sistem. Mohon catat bahwa sangat "
+"boleh jadi Anda tak perlu melakukan ini.\n"
+"Namun bila Anda melakukannya juga, salah Anda sendiri bila semua tak bekerja "
+"seperti yang diharapkan.\n"
+"Silakan baca http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ bagi penjelasan mengapa mode "
+"sistem biasanya adalah ide buruk."
 
 #: ../src/daemon/main.c:910
 msgid "pa_pid_file_create() failed."
diff --git a/po/it.po b/po/it.po
index 1f769d0..f3105b8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -409,15 +409,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "PulseAudio è in esecuzione in modalità sistema. È sconsigliato eseguire "
 "PulseAudio in questa modalità.\n"
 "Continuando a usarlo in questo modo molte cose potrebbero non funzionare "
 "come atteso.\n"
-"Consultare http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode per maggiori "
-"informazioni sul perché la modalità sistema è una pessima idea."
+"Consultare http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/"
+"User/WhatIsWrongWithSystemWide/ per maggiori informazioni sul perché la "
+"modalità sistema è una pessima idea."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
@@ -2044,7 +2046,7 @@ msgstr "\tProfilo attivo: %s\n"
 # Sink input
 # A stream that is connected to an output device, i.e. an input for a sink.
 #
-# from http://pulseaudio.org/wiki/WritingVolumeControlUIs
+# from http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/WritingVolumeControlUIs/
 #: ../src/utils/pactl.c:593 ../src/utils/pactl.c:868
 #, c-format
 msgid "Failed to get sink input information: %s"
@@ -2091,7 +2093,7 @@ msgstr ""
 # Source output
 # A stream that is connected to an input device, i.e. an output of a source.
 #
-# from http://pulseaudio.org/wiki/WritingVolumeControlUIs
+# from http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/WritingVolumeControlUIs/
 #: ../src/utils/pactl.c:663 ../src/utils/pactl.c:887
 #, c-format
 msgid "Failed to get source output information: %s"
diff --git a/po/ja.po b/po/ja.po
index 54bf44a..75d8296 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -411,15 +411,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "そうすると、ユーザーはシステムモードで PA を実行しているわけです。その場合、"
 "実際にはそうすべきでないことに注意して下さい。\n"
 "それでも実行するのでしたら、期待どおりに機能しなくても責任はユーザー自身にあ"
 "ります。\n"
 "システムモードの使用が通常は良くない方針であることの説明については、http://"
-"pulseaudio.org/wiki/WhatIsWrongWithSystemMode をお読み下さい。"
+"www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/ をお読み下さい。"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/kn.po b/po/kn.po
index e28279b..f75dd7f 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -405,15 +405,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "ಸರಿ, ನೀವು PA ಅನ್ನು ವ್ಯವಸ್ಥೆಯ ಕ್ರಮದಲ್ಲಿ (ಸಿಸ್ಟಮ್ ಮೋಡ್) ಚಲಾಯಿಸುತ್ತಿದ್ದೀರಿ. ಸಾಮಾನ್ಯವಾಗಿ "
 "ನೀವು ಹಾಗೆ ಮಾಡಬಾರದು ಎನ್ನುವುದನ್ನು ದಯವಿಟ್ಟು ನೆನಪಿಡಿ.\n"
 "ನೀವು ಹಾಗೆ ಮಾಡಿದಲ್ಲಿ, ಮುಂದೆ ಏನಾದರೂ ತೊಂದರೆ ಆದಲ್ಲಿ ಅದು ನಿಮ್ಮದೆ ತಪ್ಪಿನ "
 "ಕಾರಣದಿಂದಾಗಿರುತ್ತದೆ.\n"
 "ವ್ಯವಸ್ಥೆಯ ಕ್ರಮವು (ಸಿಸ್ಟಮ್ ಮೋಡ್) ಏಕೆ ಒಂದು ಸರಿಯಲ್ಲದ ಬಳಕೆ ಎಂದು ಅರಿಯಲು ದಯವಿಟ್ಟು http://"
-"pulseaudio.org/wiki/WhatIsWrongWithSystemMode ಅನ್ನು ನೋಡಿ."
+"www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/ ಅನ್ನು ನೋಡಿ."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/ml.po b/po/ml.po
index 91ff254..4659d00 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -392,13 +392,15 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "ശരി, അപ്പോള്‍ നിങ്ങള്‍ പിഎ സിസ്റ്റം മോഡിലാണു് പ്രവര്‍ത്തിപ്പിക്കുന്നതു്. ദയവായി ഇതുപേക്ഷിക്കുക.\n"
 "ഇങ്ങനെ ചെയ്തുണ്ടാകുന്ന സകല തകരാറുകളുടേയും ഉത്തരവാദി നിങ്ങള്‍ സ്വയമാകുന്നു.\n"
-"സിസ്റ്റം മോഡിലുള്ള പ്രവര്‍ത്തനം ഉത്തമമല്ലാത്തതിന്റെ കാരണങ്ങള്‍ക്കായിhttp://pulseaudio.org/"
-"wiki/WhatIsWrongWithSystemMode കാണുക."
+"സിസ്റ്റം മോഡിലുള്ള പ്രവര്‍ത്തനം ഉത്തമമല്ലാത്തതിന്റെ കാരണങ്ങള്‍ക്കായിhttp://www.freedesktop."
+"org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ "
+"കാണുക."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/mr.po b/po/mr.po
index cee6b76..bcb5774 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -396,15 +396,16 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "ठिक आहे, तुम्ही PA प्रणाली मोडमध्ये चालवत आहात. कृपया लक्षात ठेवा असे करण्यास फारशी "
 "आवश्यकता नाही.\n"
 "असे कार्यान्वीत केल्यास, काहिक घटक योग्यप्रकारे कार्य नसेल करत असल्यास त्याला तुम्हीच "
 "जबाबदार राहणार.\n"
-"प्रणाली मोड दोकादायक आहे यासाठी कृपया http://pulseaudio.org/wiki/"
-"WhatIsWrongWithSystemMode वाचा."
+"प्रणाली मोड दोकादायक आहे यासाठी कृपया http://www.freedesktop.org/wiki/Software/"
+"PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ वाचा."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/nl.po b/po/nl.po
index 2e6d57c..e5be84d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -402,15 +402,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "OK, dus u draait PA in systeemmodus. Merk op dat u dit waarschijnlijk beter "
 "niet kunt doen.\n"
 "Als u het toch doet dan is het uw eigen schuld als dingen niet werken zoals "
 "verwacht.\n"
-"Lees http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode voor een uitleg "
-"waarom systeemmodus gewoonlijk een slecht idee is."
+"Lees http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/ voor een uitleg waarom systeemmodus gewoonlijk "
+"een slecht idee is."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/or.po b/po/or.po
index edf4ca2..68be2ec 100644
--- a/po/or.po
+++ b/po/or.po
@@ -416,14 +416,16 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "OK, ଆପଣ PA କୁ ତନ୍ତ୍ର ଧାରାରେ ଚଲାଉଛନ୍ତି। ଦୟାକରି ମନେ ରଖନ୍ତୁ ଯେ ଆପଣ ପ୍ରାୟତଃ ତାହା "
 "କରୁନାହାନ୍ତି।\n"
 "ଯଦି ଆପଣ ତାହା କରନ୍ତି ଏବଂ ସବୁକିଛି ଠିକରେ ନଚାଲେ ତେବେ ତାହା ଆପଣଙ୍କର ନିଜର ଦୋଷ।\n"
-"ତନ୍ତ୍ର ଧାରାଟି ସାଧାରଣତଃ କାହିଁକି ଖରାପ ତାହା ବିଷୟରେ ଜାଣିବା ପାଇଁ ଦୟାକରି http://pulseaudio."
-"org/wiki/WhatIsWrongWithSystemMode କୁ ପଢ଼ନ୍ତୁ।"
+"ତନ୍ତ୍ର ଧାରାଟି ସାଧାରଣତଃ କାହିଁକି ଖରାପ ତାହା ବିଷୟରେ ଜାଣିବା ପାଇଁ ଦୟାକରି http://www."
+"freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/ କୁ ପଢ଼ନ୍ତୁ।"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/pa.po b/po/pa.po
index c630293..ac33eb0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -394,14 +394,15 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "ਠੀਕ ਹੈ, ਤਾਂ ਤੁਸੀਂ PA ਨੂੰ ਸਿਸਟਮ ਮੋਡ ਵਿੱਚ ਚਲਾ ਰਹੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ ਧਿਆਨ ਰੱਖੋ ਕਿ ਤੁਹਾਨੂੰ ਇਹ ਕਰਨਾ "
 "ਨਹੀਂ ਚਾਹੀਦਾ।\n"
 "ਜੇ ਤੁਸੀਂ ਅਜਿਹਾ ਕੀਤਾ ਹੈ ਤਾਂ ਇਹ ਤੁਹਾਡੀ ਗਲਤੀ ਹੈ ਜੇ ਲੋੜ-ਮੁਤਾਬਕ ਠੀਕ ਕੰਮ ਨਾ ਚੱਲਿਆ।\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਸਿਸਟਮ ਮੋਡ ਦੇ ਗਲਤ ਹੋਣ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ http://pulseaudio.org/wiki/"
-"WhatIsWrongWithSystemMode ਵੇਖੋ।"
+"ਕਿਰਪਾ ਕਰਕੇ ਸਿਸਟਮ ਮੋਡ ਦੇ ਗਲਤ ਹੋਣ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ http://www.freedesktop.org/"
+"wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ ਵੇਖੋ।"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/pl.po b/po/pl.po
index e94e908..ee9efc4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -532,15 +532,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "OK, więc PA jest uruchomione w trybie systemowym. Proszę zauważyć, że "
 "prawdopodobnie tak nie powinno być.\n"
 "Jeśli mimo to tak jest, to wina użytkownika, jeśli coś nie działa tak jak "
 "powinno.\n"
-"Proszę przeczytać http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode, "
-"gdzie wyjaśniono, dlaczego tryb systemowy jest zwykle złym pomysłem."
+"Proszę przeczytać http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ , gdzie wyjaśniono, dlaczego "
+"tryb systemowy jest zwykle złym pomysłem."
 
 #: ../src/daemon/main.c:993
 msgid "pa_pid_file_create() failed."
diff --git a/po/pt.po b/po/pt.po
index 5d80217..bb542c1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -404,15 +404,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Ok, então está a correr PA em modo de sistema. Por favor repare que não "
 "deveria estar a fazê-lo.\n"
 "Se, na mesma, o continuar a fazer e as coisas não correrem como esperado, a "
 "culpa será sua.\n"
-"Por favor leia http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode para uma "
-"explicação de como o modo de sistema é usualmente uma má ideia."
+"Por favor leia http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ para uma explicação de como o "
+"modo de sistema é usualmente uma má ideia."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f425228..0543857 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -684,15 +684,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "OK, então você está executando o PA no modo de sistema. Por favor, note que "
 "é mais provável que você não deveria estar fazendo isso.\n"
 "Todavia, se você o fizer, então a culpa será sua se as coisas não "
 "funcionarem como esperado.\n"
-"Por favor, leia o http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode para "
-"obter um explicação sobre porque o modo de sistema é uma má ideia."
+"Por favor, leia o http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ para obter um explicação sobre "
+"porque o modo de sistema é uma má ideia."
 
 #: ../src/daemon/main.c:964
 msgid "pa_pid_file_create() failed."
diff --git a/po/ru.po b/po/ru.po
index 6ac08f1..2e81b07 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -695,15 +695,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Вы запустили PulseAudio в общесистемном режиме. Помните, что вам, скорее "
 "всего, не следует делать этого.\n"
 "Если вы это всё равно делаете, то ваша вина, если что-то работает не как "
 "ожидалось.\n"
-"Пожалуйста, прочитайте http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode "
-"для понимания, почему общесистемный режим обычно является плохой практикой."
+"Пожалуйста, прочитайте http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ для понимания, почему "
+"общесистемный режим обычно является плохой практикой."
 
 #: ../src/daemon/main.c:996
 msgid "pa_pid_file_create() failed."
diff --git a/po/sk.po b/po/sk.po
index 6300aed..e5a8b00 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -440,8 +440,9 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 
 #: ../src/daemon/main.c:967
diff --git a/po/sr.po b/po/sr.po
index aad1df6..c93976f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -405,15 +405,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "У реду, значи извршавате PA у системском режиму. Примите к знању да то "
 "вероватно не би требало да радите.\n"
 "Ако то свеједно чините онда је ваша кривица ако ствари не раде онако како се "
 "очекује.\n"
-"Прочитајте http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode ради "
-"објашњења зашто је системски режим обично лоша идеја."
+"Прочитајте http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/"
+"User/WhatIsWrongWithSystemWide/ ради објашњења зашто је системски режим "
+"обично лоша идеја."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 59945fc..428f2f5 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -406,15 +406,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "U redu, znači izvršavate PA u sistemskom režimu. Primite k znanju da to "
 "verovatno ne bi trebalo da radite.\n"
 "Ako to svejedno činite onda je vaša krivica ako stvari ne rade onako kako se "
 "očekuje.\n"
-"Pročitajte http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode radi "
-"objašnjenja zašto je sistemski režim obično loša ideja."
+"Pročitajte http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/"
+"User/WhatIsWrongWithSystemWide/ radi objašnjenja zašto je sistemski režim "
+"obično loša ideja."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/sv.po b/po/sv.po
index 9740d7e..683e28d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,380 +1,534 @@
 # Swedish translation for pulseaudio.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright © 2008-2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the pulseaudio package.
 # Daniel Nylander <po at danielnylander.se>, 2008, 2012.
+# Josef Andersson <josef.andersson at fripost.org>, 2014.
 #
+#
+# Termer:
+# input/output: ingång/utgång (det handlar om ljud)
+# latency: latens
+# delay: fördröjning
+# boost: öka
+# gain: förstärkning
+# channel map: kanalmappning
+# passthrough: genomströmning
+# och en hel del termer som inte översätts inom ljuddomänen, ex. surround.
 msgid ""
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 10:10+0000\n"
-"PO-Revision-Date: 2012-01-30 09:56+0000\n"
-"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
+"product=PulseAudio&keywords=I18N+L10N&component=misc\n"
+"POT-Creation-Date: 2014-12-18 11:29+0000\n"
+"PO-Revision-Date: 2014-12-15 11:38+0100\n"
+"Last-Translator: Josef Andersson <josef.andersson at fripost.org>\n"
+"Language-Team: Svenska <tp-sv at listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1204
+#: ../src/daemon/cmdline.c:113
 #, c-format
 msgid ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"%s [options]\n"
+"\n"
+"COMMANDS:\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"      --dump-conf                       Dump default configuration\n"
+"      --dump-modules                    Dump list of available modules\n"
+"      --dump-resample-methods           Dump available resample methods\n"
+"      --cleanup-shm                     Cleanup stale shared memory "
+"segments\n"
+"      --start                           Start the daemon if it is not "
+"running\n"
+"  -k  --kill                            Kill a running daemon\n"
+"      --check                           Check for a running daemon (only "
+"returns exit code)\n"
+"\n"
+"OPTIONS:\n"
+"      --system[=BOOL]                   Run as system-wide instance\n"
+"  -D, --daemonize[=BOOL]                Daemonize after startup\n"
+"      --fail[=BOOL]                     Quit when startup fails\n"
+"      --high-priority[=BOOL]            Try to set high nice level\n"
+"                                        (only available as root, when SUID "
+"or\n"
+"                                        with elevated RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
+"                                        (only available as root, when SUID "
+"or\n"
+"                                        with elevated RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  Disallow module user requested "
+"module\n"
+"                                        loading/unloading after startup\n"
+"      --disallow-exit[=BOOL]            Disallow user requested exit\n"
+"      --exit-idle-time=SECS             Terminate the daemon when idle and "
+"this\n"
+"                                        time passed\n"
+"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
+"and\n"
+"                                        this time passed\n"
+"      --log-level[=LEVEL]               Increase or set verbosity level\n"
+"  -v  --verbose                         Increase the verbosity level\n"
+"      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+"                                        Specify the log target\n"
+"      --log-meta[=BOOL]                 Include code location in log "
+"messages\n"
+"      --log-time[=BOOL]                 Include timestamps in log messages\n"
+"      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
+"  -p, --dl-search-path=PATH             Set the search path for dynamic "
+"shared\n"
+"                                        objects (plugins)\n"
+"      --resample-method=METHOD          Use the specified resampling method\n"
+"                                        (See --dump-resample-methods for\n"
+"                                        possible values)\n"
+"      --use-pid-file[=BOOL]             Create a PID file\n"
+"      --no-cpu-limit[=BOOL]             Do not install CPU load limiter on\n"
+"                                        platforms that support it.\n"
+"      --disable-shm[=BOOL]              Disable shared memory support.\n"
+"\n"
+"STARTUP SCRIPT:\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
+"with\n"
+"                                        the specified argument\n"
+"  -F, --file=FILENAME                   Run the specified script\n"
+"  -C                                    Open a command line on the running "
+"TTY\n"
+"                                        after startup\n"
+"\n"
+"  -n                                    Don't load default script file\n"
 msgstr ""
+"%s [flaggor]\n"
+"\n"
+"KOMMANDON:\n"
+"  -h, --help                            Visa denna hjälp\n"
+"      --version                         Visa version\n"
+"      --dump-conf                       Dumpa standardkonfiguration\n"
+"      --dump-modules                    Dumpa lista över tillgängliga "
+"moduler\n"
+"      --dump-resample-methods           Dumpa tillgängliga "
+"omsamplingsmetoder\n"
+"      --cleanup-shm                     Städa upp utgångna delade "
+"minnessegment\n"
+"      --start                           Starta demonen om den inte redan "
+"körs\n"
+"  -k  --kill                            Döda en demon\n"
+"      --check                           Kontrollera om det finns någon "
+"körande demon (returnerar bara returkod)\n"
+"\n"
+"FLAGGOR:\n"
+"      --system[=BOOL]                   Kör som en systemomfattande instans\n"
+"  -D, --daemonize[=BOOL]                Demonisera efter start\n"
+"      --fail[=BOOL]                     Avsluta om start misslyckas\n"
+"      --high-priority[=BOOL]            Försök att sätta en hög nice-nivå\n"
+"                                        (bara tillgängligt som root, när "
+"SUID eller\n"
+"                                        med förhöjd RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 Försök att aktivera "
+"realtidsschemaläggning\n"
+"                                        (bara tillgängligt som root, när "
+"SUID eller\n"
+"                                        med förhöjd RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  Förbjud modulanvändning av "
+"användarbegärd\n"
+"                                        inläsning/urläsning efter start\n"
+"      --disallow-exit[=BOOL]            Förbjud användarbegärt avslut\n"
+"      --exit-idle-time=SECS             Avsluta demonen vid inaktivitet och "
+"efter\n"
+"                                        denna tid\n"
+"      --scache-idle-time=SECS           Inaktivera autoinlästa samplingar "
+"vid inaktivitet och\n"
+"                                        efter denna tid\n"
+"      --log-level[=LEVEL]               Öka eller bestäm informativa nivån\n"
+"  -v  --verbose                         Öka informativa nivån\n"
+"      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+"                                        Ange mål för loggen\n"
+"      --log-meta[=BOOL]                 Inkludera kodplats i "
+"loggmeddelanden\n"
+"      --log-time[=BOOL]                 Inkludera tidsstämpel i "
+"loggmeddelanden\n"
+"      --log-backtrace=FRAMES            Inkluderar bakåtspårning i "
+"loggmeddelanden\n"
+"  -p, --dl-search-path=PATH             Ange sökvägen för dynamiskt delade\n"
+"                                        objekt (insticksmoduler)\n"
+"      --resample-method=METHOD          Använd den angivna "
+"omsamplingsmetoden\n"
+"                                        (Se --dump-resample-methods för\n"
+"                                        möjliga värden)\n"
+"      --use-pid-file[=BOOL]             Skapa en PID-fil\n"
+"      --no-cpu-limit[=BOOL]             Installera inte en CPU-"
+"belastningsbegränsare\n"
+"                                        på plattformar som stöder det.\n"
+"      --disable-shm[=BOOL]              Inaktivera stöd för delat minne.\n"
+"\n"
+"STARTSKRIPT:\n"
+"  -L, --load=”MODUL ARGUMENT”           Läs in den angivna insticksmodulen "
+"med\n"
+"                                        det specificerade argumentet\n"
+"  -F, --file=FILNAMN                    Kör det angivna skriptet\n"
+"  -C                                    Öppna en kommandorad på körande TTY\n"
+"                                        efter start\n"
+"\n"
+"  -n                                    Läs inte in standardskriptfil\n"
 
-#: ../src/modules/alsa/alsa-util.c:1179
-#, c-format
-msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
-"%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
+#: ../src/daemon/cmdline.c:245
+msgid "--daemonize expects boolean argument"
+msgstr "--daemonize förväntar sig ett booleskt argument"
 
-#: ../src/modules/alsa/alsa-util.c:1220
-#, c-format
-msgid ""
-"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
-"%lu.\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
+#: ../src/daemon/cmdline.c:253
+msgid "--fail expects boolean argument"
+msgstr "--fail förväntar sig ett booleskt argument"
 
-#: ../src/modules/alsa/alsa-util.c:1263
-#, c-format
+#: ../src/daemon/cmdline.c:264
 msgid ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
 msgstr ""
+"--log-level förväntar sig loggnivåargument (antagligen numeriska i "
+"intervallet 0..4 eller en av debug, info, notice, warn, error)."
 
-#: ../src/modules/module-always-sink.c:38
-msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr ""
+#: ../src/daemon/cmdline.c:276
+msgid "--high-priority expects boolean argument"
+msgstr "--high-priority förväntar sig ett booleskt argument"
 
-#: ../src/modules/module-always-sink.c:82
-msgid "Dummy Output"
-msgstr ""
+#: ../src/daemon/cmdline.c:284
+msgid "--realtime expects boolean argument"
+msgstr "--realtime förväntar sig ett booleskt argument"
 
-#: ../src/modules/module-ladspa-sink.c:48
-msgid "Virtual LADSPA sink"
-msgstr ""
+#: ../src/daemon/cmdline.c:292
+msgid "--disallow-module-loading expects boolean argument"
+msgstr "--disallow-module-loading förväntar sig ett booleskt argument"
+
+#: ../src/daemon/cmdline.c:300
+msgid "--disallow-exit expects boolean argument"
+msgstr "--disallow-exit förväntar sig ett booleskt argument"
 
-#: ../src/modules/module-ladspa-sink.c:52
+#: ../src/daemon/cmdline.c:308
+msgid "--use-pid-file expects boolean argument"
+msgstr "--use-pid-file förväntar sig ett booleskt argument"
+
+#: ../src/daemon/cmdline.c:327
 msgid ""
-"sink_name=<name for the sink> sink_properties=<properties for the sink> "
-"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
-"plugin name> label=<ladspa plugin label> control=<comma separated list of "
-"input control values> input_ladspaport_map=<comma separated list of input "
-"LADSPA port names> output_ladspaport_map=<comma separated list of output "
-"LADSPA port names> "
+"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
 msgstr ""
+"Ogiltigt mål för loggen: använd ”syslog”, ”journal”, ”stderr”, ”auto” eller "
+"ett giltigt filnamn ”file:<sökväg>“, ”newfile:<sökväg>”."
 
-#: ../src/modules/module-null-sink.c:49
-msgid "Clocked NULL sink"
+#: ../src/daemon/cmdline.c:329
+msgid ""
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
+"name 'file:<path>', 'newfile:<path>'."
 msgstr ""
+"Ogiltigt mål för loggen: använd ”syslog”, ”journal”, ”stderr”, ”auto” eller "
+"ett giltigt filnamn ”file:<sökväg>“, ”newfile:<sökväg>”."
 
-#: ../src/modules/module-null-sink.c:284
-msgid "Null Output"
-msgstr ""
+#: ../src/daemon/cmdline.c:337
+msgid "--log-time expects boolean argument"
+msgstr "--log-time förväntar sig ett booleskt argument"
 
-#: ../src/pulsecore/sink.c:3349
-#, fuzzy
-msgid "Built-in Audio"
-msgstr "Internt fel"
+#: ../src/daemon/cmdline.c:345
+msgid "--log-meta expects boolean argument"
+msgstr "--log-meta förväntar sig ett booleskt argument"
 
-#: ../src/pulsecore/sink.c:3354
-msgid "Modem"
-msgstr ""
+#: ../src/daemon/cmdline.c:365
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "Ogiltig omsamplingsmetod ”%s”."
 
-#: ../src/daemon/ltdl-bind-now.c:127
-msgid "Failed to find original lt_dlopen loader."
-msgstr ""
+#: ../src/daemon/cmdline.c:372
+msgid "--system expects boolean argument"
+msgstr "--system förväntar sig ett booleskt argument"
 
-#: ../src/daemon/ltdl-bind-now.c:132
-#, fuzzy
-msgid "Failed to allocate new dl loader."
-msgstr "Misslyckades med att öppna ljudfil.\n"
+#: ../src/daemon/cmdline.c:380
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "--no-cpu-limit förväntar sig ett booleskt argument"
 
-#: ../src/daemon/ltdl-bind-now.c:145
-msgid "Failed to add bind-now-loader."
-msgstr ""
+#: ../src/daemon/cmdline.c:388
+msgid "--disable-shm expects boolean argument"
+msgstr "--disable-shm förväntar sig ett booleskt argument"
 
-#: ../src/daemon/main.c:139
+#: ../src/daemon/daemon-conf.c:260
 #, c-format
-msgid "Got signal %s."
-msgstr "Fick signal %s."
-
-#: ../src/daemon/main.c:166
-msgid "Exiting."
-msgstr "Avslutar."
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] Ogiltigt mål för loggen ”%s”."
 
-#: ../src/daemon/main.c:184
+#: ../src/daemon/daemon-conf.c:275
 #, c-format
-msgid "Failed to find user '%s'."
-msgstr "Misslyckades med att hitta användaren \"%s\"."
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] Ogiltig loggnivå ”%s”."
 
-#: ../src/daemon/main.c:189
+#: ../src/daemon/daemon-conf.c:290
 #, c-format
-msgid "Failed to find group '%s'."
-msgstr "Misslyckades med att hitta gruppen \"%s\"."
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] Ogiltig omsamplingsmetod ”%s”."
 
-#: ../src/daemon/main.c:193
+#: ../src/daemon/daemon-conf.c:312
 #, c-format
-msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
-msgstr ""
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] Ogiltig rlimit ”%s”."
 
-#: ../src/daemon/main.c:198
+#: ../src/daemon/daemon-conf.c:332
 #, c-format
-msgid "GID of user '%s' and of group '%s' don't match."
-msgstr ""
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr "[%s:%u] Ogiltigt samplingsformat ”%s”."
 
-#: ../src/daemon/main.c:203
+#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
 #, c-format
-msgid "Home directory of user '%s' is not '%s', ignoring."
-msgstr "Hemkatalogen för användaren \"%s\" är inte \"%s\", ignorerar."
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr "[%s:%u] Ogiltig samplingsfrekvens ”%s”."
 
-#: ../src/daemon/main.c:206 ../src/daemon/main.c:211
+#: ../src/daemon/daemon-conf.c:389
 #, c-format
-msgid "Failed to create '%s': %s"
-msgstr "Misslyckades med att skapa \"%s\": %s"
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr "[%s:%u] Ogiltiga samplingskanaler ”%s”."
 
-#: ../src/daemon/main.c:218
+#: ../src/daemon/daemon-conf.c:406
 #, c-format
-msgid "Failed to change group list: %s"
-msgstr ""
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr "[%s:%u] Ogiltig kanalmappning ”%s”."
 
-#: ../src/daemon/main.c:234
+#: ../src/daemon/daemon-conf.c:423
 #, c-format
-msgid "Failed to change GID: %s"
-msgstr ""
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr "[%s:%u] Ogiltigt antal fragment ”%s”."
 
-#: ../src/daemon/main.c:250
+#: ../src/daemon/daemon-conf.c:440
 #, c-format
-msgid "Failed to change UID: %s"
-msgstr ""
-
-#: ../src/daemon/main.c:269
-msgid "Successfully dropped root privileges."
-msgstr ""
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr "[%s:%u] Ogiltig fragmentstorlek ”%s”."
 
-#: ../src/daemon/main.c:277
-msgid "System wide mode unsupported on this platform."
-msgstr ""
+#: ../src/daemon/daemon-conf.c:457
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr "[%s:%u] Ogiltig nice-nivå ”%s”."
 
-#: ../src/daemon/main.c:295
+#: ../src/daemon/daemon-conf.c:500
 #, c-format
-msgid "setrlimit(%s, (%u, %u)) failed: %s"
-msgstr "setrlimit(%s, (%u, %u)) misslyckades: %s"
+msgid "[%s:%u] Invalid server type '%s'."
+msgstr "[%s:%u] Ogiltig servertyp ”%s”."
 
-#: ../src/daemon/main.c:496
-msgid "Failed to parse command line."
-msgstr ""
+#: ../src/daemon/daemon-conf.c:613
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "Misslyckades med att öppna konfigurationsfil: %s"
 
-#: ../src/daemon/main.c:529
+#: ../src/daemon/daemon-conf.c:629
 msgid ""
-"System mode refused for non-root user. Only starting the D-Bus server lookup "
-"service."
+"The specified default channel map has a different number of channels than "
+"the specified default number of channels."
 msgstr ""
+"Den angivna standardkanalmappningen har ett annat antal kanaler än den "
+"angivna standardkanalmappningens antal."
 
-#: ../src/daemon/main.c:611
-msgid "Daemon not running"
-msgstr ""
+#: ../src/daemon/daemon-conf.c:716
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### Läs från konfigurationsfilen: %s ###\n"
 
-#: ../src/daemon/main.c:613
+#: ../src/daemon/dumpmodules.c:59
 #, c-format
-msgid "Daemon running as PID %u"
-msgstr ""
+msgid "Name: %s\n"
+msgstr "Namn: %s\n"
 
-#: ../src/daemon/main.c:628
+#: ../src/daemon/dumpmodules.c:62
 #, c-format
-msgid "Failed to kill daemon: %s"
-msgstr ""
+msgid "No module information available\n"
+msgstr "Ingen modulinformation tillgänglig\n"
 
-#: ../src/daemon/main.c:657
-msgid ""
-"This program is not intended to be run as root (unless --system is "
-"specified)."
-msgstr ""
-"Detta program är inte tänkt att köras som root (såvida inte --system har "
-"angivits)."
+#: ../src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Version: %s\n"
+msgstr "Version: %s\n"
 
-#: ../src/daemon/main.c:660
-#, fuzzy
-msgid "Root privileges required."
-msgstr "Root-behörighet krävs."
+#: ../src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Description: %s\n"
+msgstr "Beskrivning: %s\n"
 
-#: ../src/daemon/main.c:667
-msgid "--start not supported for system instances."
-msgstr "--start stöds inte för systeminstanser."
+#: ../src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Author: %s\n"
+msgstr "Upphovsman: %s\n"
 
-#: ../src/daemon/main.c:707
+#: ../src/daemon/dumpmodules.c:71
 #, c-format
-msgid "User-configured server at %s, refusing to start/autospawn."
-msgstr ""
+msgid "Usage: %s\n"
+msgstr "Användning: %s\n"
 
-#: ../src/daemon/main.c:713
+#: ../src/daemon/dumpmodules.c:72
 #, c-format
-msgid ""
-"User-configured server at %s, which appears to be local. Probing deeper."
-msgstr ""
+msgid "Load Once: %s\n"
+msgstr "Läs in en gång: %s\n"
 
-#: ../src/daemon/main.c:718
-msgid "Running in system mode, but --disallow-exit not set!"
-msgstr ""
+#: ../src/daemon/dumpmodules.c:74
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "FÖRÅLDRADVARNING: %s\n"
 
-#: ../src/daemon/main.c:721
-msgid "Running in system mode, but --disallow-module-loading not set!"
-msgstr ""
+#: ../src/daemon/dumpmodules.c:78
+#, c-format
+msgid "Path: %s\n"
+msgstr "Sökväg: %s\n"
 
-#: ../src/daemon/main.c:724
-msgid "Running in system mode, forcibly disabling SHM mode!"
-msgstr ""
+#: ../src/daemon/ltdl-bind-now.c:77
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "Misslyckades med att öppna modulen %s: %s"
 
-#: ../src/daemon/main.c:729
-msgid "Running in system mode, forcibly disabling exit idle time!"
-msgstr ""
+#: ../src/daemon/ltdl-bind-now.c:128
+msgid "Failed to find original lt_dlopen loader."
+msgstr "Misslyckades med att hitta original-lt_dlopen loader."
 
-#: ../src/daemon/main.c:757
-msgid "Failed to acquire stdio."
-msgstr ""
+#: ../src/daemon/ltdl-bind-now.c:133
+msgid "Failed to allocate new dl loader."
+msgstr "Misslyckades med att allokera en ny dl loader."
 
-#: ../src/daemon/main.c:763 ../src/daemon/main.c:828
-#, fuzzy, c-format
-msgid "pipe() failed: %s"
-msgstr "pipe misslyckades: %s"
+#: ../src/daemon/ltdl-bind-now.c:146
+msgid "Failed to add bind-now-loader."
+msgstr "Misslyckades med att lägga till bind-now-loader."
 
-#: ../src/daemon/main.c:768 ../src/daemon/main.c:833
+#: ../src/daemon/main.c:162
 #, c-format
-msgid "fork() failed: %s"
-msgstr "fork() misslyckades: %s"
+msgid "Failed to find user '%s'."
+msgstr "Misslyckades med att hitta användaren ”%s”."
 
-#: ../src/daemon/main.c:783 ../src/daemon/main.c:848 ../src/utils/pacat.c:550
+#: ../src/daemon/main.c:167
 #, c-format
-msgid "read() failed: %s"
-msgstr "read() misslyckades: %s"
-
-#: ../src/daemon/main.c:789
-msgid "Daemon startup failed."
-msgstr ""
-
-#: ../src/daemon/main.c:791
-msgid "Daemon startup successful."
-msgstr ""
-
-#: ../src/daemon/main.c:816
-#, fuzzy, c-format
-msgid "setsid() failed: %s"
-msgstr "read() misslyckades: %s"
+msgid "Failed to find group '%s'."
+msgstr "Misslyckades med att hitta gruppen ”%s”."
 
-#: ../src/daemon/main.c:901
+#: ../src/daemon/main.c:176
 #, c-format
-msgid "This is PulseAudio %s"
-msgstr "Detta är PulseAudio %s"
+msgid "GID of user '%s' and of group '%s' don't match."
+msgstr "GID för användare ”%s” och för grupp ”%s” stämmer inte överens."
 
-#: ../src/daemon/main.c:902
+#: ../src/daemon/main.c:181
 #, c-format
-msgid "Compilation host: %s"
-msgstr ""
+msgid "Home directory of user '%s' is not '%s', ignoring."
+msgstr "Hemkatalogen för användaren ”%s” är inte ”%s”, ignorerar."
 
-#: ../src/daemon/main.c:903 ../src/tests/resampler-test.c:418
+#: ../src/daemon/main.c:184 ../src/daemon/main.c:189
 #, c-format
-msgid "Compilation CFLAGS: %s"
-msgstr ""
+msgid "Failed to create '%s': %s"
+msgstr "Misslyckades med att skapa ”%s”: %s"
 
-#: ../src/daemon/main.c:906
+#: ../src/daemon/main.c:196
 #, c-format
-msgid "Running on host: %s"
-msgstr ""
+msgid "Failed to change group list: %s"
+msgstr "Misslyckades med att ändra grupplista: %s"
 
-#: ../src/daemon/main.c:909
+#: ../src/daemon/main.c:212
 #, c-format
-msgid "Found %u CPUs."
-msgstr ""
+msgid "Failed to change GID: %s"
+msgstr "Misslyckades med att ändra GID: %s"
 
-#: ../src/daemon/main.c:911
+#: ../src/daemon/main.c:228
 #, c-format
-msgid "Page size is %lu bytes"
-msgstr ""
+msgid "Failed to change UID: %s"
+msgstr "Misslyckades med att ändra UID: %s"
 
-#: ../src/daemon/main.c:914
-msgid "Compiled with Valgrind support: yes"
-msgstr ""
+#: ../src/daemon/main.c:257
+msgid "System wide mode unsupported on this platform."
+msgstr "Systemomfattande läge stöds inte på denna plattform."
+
+#: ../src/daemon/main.c:486
+msgid "Failed to parse command line."
+msgstr "Misslyckades med att tolka kommandoraden."
 
-#: ../src/daemon/main.c:916
-msgid "Compiled with Valgrind support: no"
+#: ../src/daemon/main.c:525
+msgid ""
+"System mode refused for non-root user. Only starting the D-Bus server lookup "
+"service."
 msgstr ""
+"Systemläge vägrades för icke-rootanvändare. Startar bara D-Bus-"
+"serveruppslagningstjänsten."
 
-#: ../src/daemon/main.c:919
+#: ../src/daemon/main.c:624
 #, c-format
-msgid "Running in valgrind mode: %s"
+msgid "Failed to kill daemon: %s"
+msgstr "Misslyckades med att döda demonen: %s"
+
+#: ../src/daemon/main.c:653
+msgid ""
+"This program is not intended to be run as root (unless --system is "
+"specified)."
 msgstr ""
+"Detta program är inte tänkt att köras som root (såvida inte --system har "
+"angivits)."
+
+#: ../src/daemon/main.c:656
+msgid "Root privileges required."
+msgstr "Root-behörighet krävs."
+
+#: ../src/daemon/main.c:663
+msgid "--start not supported for system instances."
+msgstr "--start stöds inte för systeminstanser."
 
-#: ../src/daemon/main.c:921
+#: ../src/daemon/main.c:703
 #, c-format
-msgid "Running in VM: %s"
-msgstr ""
+msgid "User-configured server at %s, refusing to start/autospawn."
+msgstr "Användaranpassad server på %s, vägrar starta/autostarta."
 
-#: ../src/daemon/main.c:924
-msgid "Optimized build: yes"
+#: ../src/daemon/main.c:709
+#, c-format
+msgid ""
+"User-configured server at %s, which appears to be local. Probing deeper."
 msgstr ""
+"Användaranpassad server på %s, som ser ut att vara lokal. Undersöker djupare."
 
-#: ../src/daemon/main.c:926
-msgid "Optimized build: no"
-msgstr ""
+#: ../src/daemon/main.c:714
+msgid "Running in system mode, but --disallow-exit not set!"
+msgstr "Kör i systemläge, men --disallow-exit är inte angett!"
 
-#: ../src/daemon/main.c:930
-msgid "NDEBUG defined, all asserts disabled."
-msgstr ""
+#: ../src/daemon/main.c:717
+msgid "Running in system mode, but --disallow-module-loading not set!"
+msgstr "Kör i systemläge, men --disallow-module-loading är inte angett!"
 
-#: ../src/daemon/main.c:932
-msgid "FASTPATH defined, only fast path asserts disabled."
-msgstr ""
+#: ../src/daemon/main.c:720
+msgid "Running in system mode, forcibly disabling SHM mode!"
+msgstr "Kör i systemläge, tvingar fram inaktivering av SHM-läge!"
 
-#: ../src/daemon/main.c:934
-msgid "All asserts enabled."
-msgstr ""
+#: ../src/daemon/main.c:725
+msgid "Running in system mode, forcibly disabling exit idle time!"
+msgstr "Kör i systemläge, tvingar fram avslut vid inaktivitet!"
 
-#: ../src/daemon/main.c:938
-msgid "Failed to get machine ID"
-msgstr ""
+#: ../src/daemon/main.c:758
+msgid "Failed to acquire stdio."
+msgstr "Misslyckades med att få stdio."
 
-#: ../src/daemon/main.c:941
+#: ../src/daemon/main.c:764 ../src/daemon/main.c:835
 #, c-format
-msgid "Machine ID is %s."
-msgstr ""
+msgid "pipe() failed: %s"
+msgstr "pipe() misslyckades: %s"
 
-#: ../src/daemon/main.c:945
+#: ../src/daemon/main.c:769 ../src/daemon/main.c:840
 #, c-format
-msgid "Session ID is %s."
-msgstr ""
+msgid "fork() failed: %s"
+msgstr "fork() misslyckades: %s"
 
-#: ../src/daemon/main.c:951
+#: ../src/daemon/main.c:784 ../src/daemon/main.c:855 ../src/utils/pacat.c:569
 #, c-format
-msgid "Using runtime directory %s."
-msgstr ""
+msgid "read() failed: %s"
+msgstr "read() misslyckades: %s"
 
-#: ../src/daemon/main.c:956
-#, c-format
-msgid "Using state directory %s."
-msgstr ""
+#: ../src/daemon/main.c:790
+msgid "Daemon startup failed."
+msgstr "Demonstart misslyckades."
 
-#: ../src/daemon/main.c:959
+#: ../src/daemon/main.c:823
 #, c-format
-msgid "Using modules directory %s."
-msgstr ""
+msgid "setsid() failed: %s"
+msgstr "setsid() misslyckades: %s"
 
-#: ../src/daemon/main.c:961
-#, c-format
-msgid "Running in system mode: %s"
-msgstr ""
+#: ../src/daemon/main.c:950
+msgid "Failed to get machine ID"
+msgstr "Misslyckades med att hämta maskin-ID"
 
-#: ../src/daemon/main.c:964
+#: ../src/daemon/main.c:976
 msgid ""
 "OK, so you are running PA in system mode. Please note that you most likely "
 "shouldn't be doing that.\n"
@@ -383,328 +537,598 @@ msgid ""
 "Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
 "explanation why system mode is usually a bad idea."
 msgstr ""
+"Ok, du kör PA i systemläge. Antagligen borde du inte göra detta.\n"
+"Om du ändå väljer att göra det är det ditt fel om saker inte fungerar som "
+"förväntat.\n"
+"Läs http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode för en förklaring "
+"till varför systemläge är en dålig idé."
 
-#: ../src/daemon/main.c:981
+#: ../src/daemon/main.c:993
 msgid "pa_pid_file_create() failed."
 msgstr "pa_pid_file_create() misslyckades."
 
-#: ../src/daemon/main.c:991
-msgid "Fresh high-resolution timers available! Bon appetit!"
-msgstr ""
-
-#: ../src/daemon/main.c:993
-msgid ""
-"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
-"resolution timers enabled!"
-msgstr ""
-
-#: ../src/daemon/main.c:1011
+#: ../src/daemon/main.c:1023
 msgid "pa_core_new() failed."
 msgstr "pa_core_new() misslyckades."
 
-#: ../src/daemon/main.c:1087
+#: ../src/daemon/main.c:1090
 msgid "Failed to initialize daemon."
-msgstr ""
+msgstr "Misslyckades med att initiera demon."
 
-#: ../src/daemon/main.c:1092
+#: ../src/daemon/main.c:1095
 msgid "Daemon startup without any loaded modules, refusing to work."
-msgstr ""
+msgstr "Demonen startade utan inlästa moduler, fungerar inte."
 
-#: ../src/daemon/main.c:1130
-msgid "Daemon startup complete."
-msgstr ""
+#: ../src/daemon/pulseaudio.desktop.in.h:1
+msgid "PulseAudio Sound System"
+msgstr "PulseAudio ljudsystem"
 
-#: ../src/daemon/main.c:1136
-msgid "Daemon shutdown initiated."
-msgstr ""
+#: ../src/daemon/pulseaudio.desktop.in.h:2
+msgid "Start the PulseAudio Sound System"
+msgstr "Starta ljudsystemet PulseAudio"
 
-#: ../src/daemon/main.c:1167
-msgid "Daemon terminated."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2293
+msgid "Input"
+msgstr "Ingång"
 
-#: ../src/daemon/cmdline.c:113
-#, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"COMMANDS:\n"
-"  -h, --help                            Show this help\n"
-"      --version                         Show version\n"
-"      --dump-conf                       Dump default configuration\n"
-"      --dump-modules                    Dump list of available modules\n"
-"      --dump-resample-methods           Dump available resample methods\n"
-"      --cleanup-shm                     Cleanup stale shared memory "
-"segments\n"
-"      --start                           Start the daemon if it is not "
-"running\n"
-"  -k  --kill                            Kill a running daemon\n"
-"      --check                           Check for a running daemon (only "
-"returns exit code)\n"
-"\n"
-"OPTIONS:\n"
-"      --system[=BOOL]                   Run as system-wide instance\n"
-"  -D, --daemonize[=BOOL]                Daemonize after startup\n"
-"      --fail[=BOOL]                     Quit when startup fails\n"
-"      --high-priority[=BOOL]            Try to set high nice level\n"
-"                                        (only available as root, when SUID "
-"or\n"
-"                                        with elevated RLIMIT_NICE)\n"
-"      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
-"                                        (only available as root, when SUID "
-"or\n"
-"                                        with elevated RLIMIT_RTPRIO)\n"
-"      --disallow-module-loading[=BOOL]  Disallow module user requested "
-"module\n"
-"                                        loading/unloading after startup\n"
-"      --disallow-exit[=BOOL]            Disallow user requested exit\n"
-"      --exit-idle-time=SECS             Terminate the daemon when idle and "
-"this\n"
-"                                        time passed\n"
-"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
-"and\n"
-"                                        this time passed\n"
-"      --log-level[=LEVEL]               Increase or set verbosity level\n"
-"  -v                                    Increase the verbosity level\n"
-"      --log-target={auto,syslog,stderr,file:PATH}\n"
-"                                        Specify the log target\n"
-"      --log-meta[=BOOL]                 Include code location in log "
-"messages\n"
-"      --log-time[=BOOL]                 Include timestamps in log messages\n"
-"      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
-"  -p, --dl-search-path=PATH             Set the search path for dynamic "
-"shared\n"
-"                                        objects (plugins)\n"
-"      --resample-method=METHOD          Use the specified resampling method\n"
-"                                        (See --dump-resample-methods for\n"
-"                                        possible values)\n"
-"      --use-pid-file[=BOOL]             Create a PID file\n"
-"      --no-cpu-limit[=BOOL]             Do not install CPU load limiter on\n"
-"                                        platforms that support it.\n"
-"      --disable-shm[=BOOL]              Disable shared memory support.\n"
-"\n"
-"STARTUP SCRIPT:\n"
-"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
-"with\n"
-"                                        the specified argument\n"
-"  -F, --file=FILENAME                   Run the specified script\n"
-"  -C                                    Open a command line on the running "
-"TTY\n"
-"                                        after startup\n"
-"\n"
-"  -n                                    Don't load default script file\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2294
+msgid "Docking Station Input"
+msgstr "Ingång för dockningsstation"
 
-#: ../src/daemon/cmdline.c:244
-msgid "--daemonize expects boolean argument"
-msgstr "--daemonize förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2295
+msgid "Docking Station Microphone"
+msgstr "Mikrofon för dockningsstation"
 
-#: ../src/daemon/cmdline.c:251
-msgid "--fail expects boolean argument"
-msgstr "--fail förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2296
+msgid "Docking Station Line In"
+msgstr "Linje in för dockningsstation"
 
-#: ../src/daemon/cmdline.c:261
-msgid ""
-"--log-level expects log level argument (either numeric in range 0..4 or one "
-"of debug, info, notice, warn, error)."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2297 ../src/modules/alsa/alsa-mixer.c:2382
+msgid "Line In"
+msgstr "Linje in"
 
-#: ../src/daemon/cmdline.c:273
-msgid "--high-priority expects boolean argument"
-msgstr "--high-priority förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2376
+#: ../src/modules/bluetooth/module-bluez4-device.c:2104
+#: ../src/modules/bluetooth/module-bluez5-device.c:1712
+msgid "Microphone"
+msgstr "Mikrofon"
 
-#: ../src/daemon/cmdline.c:280
-msgid "--realtime expects boolean argument"
-msgstr "--realtime förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377
+msgid "Front Microphone"
+msgstr "Frontmikrofon"
 
-#: ../src/daemon/cmdline.c:287
-msgid "--disallow-module-loading expects boolean argument"
-msgstr "--disallow-module-loading förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378
+msgid "Rear Microphone"
+msgstr "Bakre mikrofon"
 
-#: ../src/daemon/cmdline.c:294
-#, fuzzy
-msgid "--disallow-exit expects boolean argument"
-msgstr "--disallow-exit booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2301
+msgid "External Microphone"
+msgstr "Extern mikrofon"
 
-#: ../src/daemon/cmdline.c:301
-msgid "--use-pid-file expects boolean argument"
-msgstr "--use-pid-file förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2302 ../src/modules/alsa/alsa-mixer.c:2380
+msgid "Internal Microphone"
+msgstr "Intern mikrofon"
 
-#: ../src/daemon/cmdline.c:318
-msgid ""
-"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
-"name 'file:<path>'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2383
+msgid "Radio"
+msgstr "Radio"
 
-#: ../src/daemon/cmdline.c:325
-#, fuzzy
-msgid "--log-time expects boolean argument"
-msgstr "--realtime förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2384
+msgid "Video"
+msgstr "Video"
 
-#: ../src/daemon/cmdline.c:332
-#, fuzzy
-msgid "--log-meta expects boolean argument"
-msgstr "--disallow-exit booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2305
+msgid "Automatic Gain Control"
+msgstr "Automatisk förstärkningskontroll"
 
-#: ../src/daemon/cmdline.c:351
-#, c-format
-msgid "Invalid resample method '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2306
+msgid "No Automatic Gain Control"
+msgstr "Ingen automatisk förstärkningskontroll"
 
-#: ../src/daemon/cmdline.c:358
-msgid "--system expects boolean argument"
-msgstr "--system förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2307
+msgid "Boost"
+msgstr "Ökning"
 
-#: ../src/daemon/cmdline.c:365
-msgid "--no-cpu-limit expects boolean argument"
-msgstr "--no-cpu-limit förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2308
+msgid "No Boost"
+msgstr "Ingen ökning"
 
-#: ../src/daemon/cmdline.c:372
-msgid "--disable-shm expects boolean argument"
-msgstr "--disable-shm förväntar sig ett booleskt argument"
+#: ../src/modules/alsa/alsa-mixer.c:2309
+msgid "Amplifier"
+msgstr "Förstärkare"
 
-#: ../src/daemon/dumpmodules.c:59
-#, c-format
-msgid "Name: %s\n"
-msgstr "Namn: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2310
+msgid "No Amplifier"
+msgstr "Ingen förstärkare"
 
-#: ../src/daemon/dumpmodules.c:62
-#, c-format
-msgid "No module information available\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2311
+msgid "Bass Boost"
+msgstr "Basökning"
 
-#: ../src/daemon/dumpmodules.c:65
-#, c-format
-msgid "Version: %s\n"
-msgstr "Version: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2312
+msgid "No Bass Boost"
+msgstr "Ingen basökning"
 
-#: ../src/daemon/dumpmodules.c:67
-#, c-format
-msgid "Description: %s\n"
-msgstr "Beskrivning: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2313
+#: ../src/modules/bluetooth/module-bluez4-device.c:2109
+#: ../src/modules/bluetooth/module-bluez5-device.c:1719
+msgid "Speaker"
+msgstr "Högtalare"
 
-#: ../src/daemon/dumpmodules.c:69
-#, c-format
-msgid "Author: %s\n"
-msgstr "Upphovsman: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2314 ../src/modules/alsa/alsa-mixer.c:2386
+msgid "Headphones"
+msgstr "Hörlurar"
 
-#: ../src/daemon/dumpmodules.c:71
-#, c-format
-msgid "Usage: %s\n"
-msgstr "Användning: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2375
+msgid "Analog Input"
+msgstr "Analog ingång"
 
-#: ../src/daemon/dumpmodules.c:72
-#, c-format
-msgid "Load Once: %s\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2379
+msgid "Dock Microphone"
+msgstr "Dockmikrofon"
 
-#: ../src/daemon/dumpmodules.c:74
-#, c-format
-msgid "DEPRECATION WARNING: %s\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2381
+msgid "Headset Microphone"
+msgstr "Headset-mikrofon"
 
-#: ../src/daemon/dumpmodules.c:78
-#, c-format
-msgid "Path: %s\n"
-msgstr "Sökväg: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2385
+msgid "Analog Output"
+msgstr "Analog utgång"
 
-#: ../src/daemon/daemon-conf.c:275
-#, c-format
-msgid "[%s:%u] Invalid log target '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2387
+msgid "LFE on Separate Mono Output"
+msgstr "LFE på separat monoutgång"
 
-#: ../src/daemon/daemon-conf.c:291
-#, c-format
-msgid "[%s:%u] Invalid log level '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2388
+msgid "Line Out"
+msgstr "Linje ut"
 
-#: ../src/daemon/daemon-conf.c:307
-#, c-format
-msgid "[%s:%u] Invalid resample method '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2389
+msgid "Analog Mono Output"
+msgstr "Analog monoutgång"
+
+#: ../src/modules/alsa/alsa-mixer.c:2390
+msgid "Speakers"
+msgstr "Högtalare"
+
+#: ../src/modules/alsa/alsa-mixer.c:2391
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
+
+#: ../src/modules/alsa/alsa-mixer.c:2392
+msgid "Digital Output (S/PDIF)"
+msgstr "Digital utgång (S/PDIF)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2393
+msgid "Digital Input (S/PDIF)"
+msgstr "Digital ingång (S/PDIF)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2394
+msgid "Digital Passthrough (S/PDIF)"
+msgstr "Digital genomströmning (S/PDIF)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3900
+msgid "Analog Mono"
+msgstr "Analog mono"
+
+#: ../src/modules/alsa/alsa-mixer.c:3901
+msgid "Analog Stereo"
+msgstr "Analog stereo"
+
+#: ../src/modules/alsa/alsa-mixer.c:3902
+msgid "Multichannel"
+msgstr "Multikanal"
+
+#: ../src/modules/alsa/alsa-mixer.c:3903
+msgid "Analog Surround 2.1"
+msgstr "Analog surround 2.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3904
+msgid "Analog Surround 3.0"
+msgstr "Analog surround 3.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3905
+msgid "Analog Surround 3.1"
+msgstr "Analog surround 3.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3906
+msgid "Analog Surround 4.0"
+msgstr "Analog surround 4.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3907
+msgid "Analog Surround 4.1"
+msgstr "Analog surround 4.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3908
+msgid "Analog Surround 5.0"
+msgstr "Analog surround 5.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3909
+msgid "Analog Surround 5.1"
+msgstr "Analog surround 5.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3910
+msgid "Analog Surround 6.0"
+msgstr "Analog surround 6.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3911
+msgid "Analog Surround 6.1"
+msgstr "Analog surround 6.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3912
+msgid "Analog Surround 7.0"
+msgstr "Analog surround 7.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3913
+msgid "Analog Surround 7.1"
+msgstr "Analog surround 7.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3914
+msgid "Digital Stereo (IEC958)"
+msgstr "Digital stereo (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3915
+msgid "Digital Passthrough  (IEC958)"
+msgstr "Digital genomströmning (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3916
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Digital surround 4.0 (IEC958/AC3)"
 
-#: ../src/daemon/daemon-conf.c:330
+#: ../src/modules/alsa/alsa-mixer.c:3917
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Digital surround 5.1 (IEC958/AC3)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3918
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Digital surround 5.1 (IEC958/DTS)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3919
+msgid "Digital Stereo (HDMI)"
+msgstr "Digital stereo (HDMI)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3920
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Digital surround 5.1 (HDMI)"
+
+#: ../src/modules/alsa/alsa-mixer.c:4051
+msgid "Analog Mono Duplex"
+msgstr "Analog mono duplex"
+
+#: ../src/modules/alsa/alsa-mixer.c:4052
+msgid "Analog Stereo Duplex"
+msgstr "Analog stereo duplex"
+
+#: ../src/modules/alsa/alsa-mixer.c:4053
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "Digital stereo duplex (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:4054
+#: ../src/modules/alsa/module-alsa-card.c:192
+#: ../src/modules/bluetooth/module-bluez4-device.c:2300
+#: ../src/modules/bluetooth/module-bluez5-device.c:1943
+msgid "Off"
+msgstr "Av"
+
+#: ../src/modules/alsa/alsa-mixer.c:4153
 #, c-format
-msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr ""
+msgid "%s Output"
+msgstr "%s utgång"
 
-#: ../src/daemon/daemon-conf.c:351
+#: ../src/modules/alsa/alsa-mixer.c:4161
 #, c-format
-msgid "[%s:%u] Invalid sample format '%s'."
-msgstr ""
+msgid "%s Input"
+msgstr "%s ingång"
 
-#: ../src/daemon/daemon-conf.c:370 ../src/daemon/daemon-conf.c:389
+#: ../src/modules/alsa/alsa-sink.c:572 ../src/modules/alsa/alsa-sink.c:749
 #, c-format
-msgid "[%s:%u] Invalid sample rate '%s'."
+msgid ""
+"ALSA woke us up to write new data to the device, but there was actually "
+"nothing to write!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 msgstr ""
+"ALSA väckte oss för att skriva ny data till enheten, men det fanns inget att "
+"skriva!\n"
+"Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
+"detta problem till ALSA-utvecklarna.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 
-#: ../src/daemon/daemon-conf.c:413
+#: ../src/modules/alsa/alsa-source.c:531 ../src/modules/alsa/alsa-source.c:682
 #, c-format
-msgid "[%s:%u] Invalid sample channels '%s'."
+msgid ""
+"ALSA woke us up to read new data from the device, but there was actually "
+"nothing to read!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 msgstr ""
+"ALSA väckte oss för att läsa ny data från enheten, men det fanns inget att "
+"läsa!\n"
+"Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
+"detta problem till ALSA-utvecklarna.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 
-#: ../src/daemon/daemon-conf.c:431
+#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1211
 #, c-format
-msgid "[%s:%u] Invalid channel map '%s'."
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"snd_pcm_avail() returnerade ett värde som är exceptionellt stort: %lu byte "
+"(%lu ms).\n"
+"Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
+"problemet till ALSA-utvecklarna."
 
-#: ../src/daemon/daemon-conf.c:449
+#: ../src/modules/alsa/alsa-util.c:1186
 #, c-format
-msgid "[%s:%u] Invalid number of fragments '%s'."
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"snd_pcm_delay() returnerade ett värde som är exceptionellt stort: %li byte "
+"(%s%lu ms).\n"
+"Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
+"problemet till ALSA-utvecklarna."
 
-#: ../src/daemon/daemon-conf.c:467
+#: ../src/modules/alsa/alsa-util.c:1227
 #, c-format
-msgid "[%s:%u] Invalid fragment size '%s'."
+msgid ""
+"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
+"%lu.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"snd_pcm_avail_delay() returnerade konstiga värden: fördröjningen %lu är "
+"mindre än tillgängliga %lu.\n"
+"Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
+"problemet till ALSA-utvecklarna."
 
-#: ../src/daemon/daemon-conf.c:485
+#: ../src/modules/alsa/alsa-util.c:1270
 #, c-format
-msgid "[%s:%u] Invalid nice level '%s'."
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"snd_pcm_mmap_begin() returnerade ett värde som är exceptionellt stort: %lu "
+"byte (%lu ms).\n"
+"Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
+"problemet till ALSA-utvecklarna."
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2094
+#: ../src/modules/bluetooth/module-bluez5-device.c:1702
+msgid "Headset"
+msgstr "Headset"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2099
+#: ../src/modules/bluetooth/module-bluez5-device.c:1707
+msgid "Handsfree"
+msgstr "Handsfree"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2114
+#: ../src/modules/bluetooth/module-bluez5-device.c:1725
+msgid "Headphone"
+msgstr "Hörlurar"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2119
+#: ../src/modules/bluetooth/module-bluez5-device.c:1730
+msgid "Portable"
+msgstr "Bärbar"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2124
+#: ../src/modules/bluetooth/module-bluez5-device.c:1735
+msgid "Car"
+msgstr "Bil"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2129
+#: ../src/modules/bluetooth/module-bluez5-device.c:1740
+msgid "HiFi"
+msgstr "HiFi"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2134
+#: ../src/modules/bluetooth/module-bluez5-device.c:1745
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1697
+#: ../src/modules/bluetooth/module-bluez5-device.c:1713
+#: ../src/modules/bluetooth/module-bluez5-device.c:1751
+msgid "Bluetooth Output"
+msgstr "Bluetooth-utgång"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2145
+#: ../src/modules/bluetooth/module-bluez5-device.c:1696
+#: ../src/modules/bluetooth/module-bluez5-device.c:1718
+#: ../src/modules/bluetooth/module-bluez5-device.c:1724
+#: ../src/modules/bluetooth/module-bluez5-device.c:1750
+msgid "Bluetooth Input"
+msgstr "Bluetooth-ingång"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2181
+msgid "High Fidelity Playback (A2DP)"
+msgstr "High fidelity playback (A2DP)"
 
-#: ../src/daemon/daemon-conf.c:528
-#, fuzzy, c-format
-msgid "[%s:%u] Invalid server type '%s'."
-msgstr "Ogiltig server"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2192
+msgid "High Fidelity Capture (A2DP)"
+msgstr "High fidelity capture (A2DP)"
 
-#: ../src/daemon/daemon-conf.c:641
-#, c-format
-msgid "Failed to open configuration file: %s"
-msgstr "Misslyckades med att öppna konfigurationsfil: %s"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2203
+msgid "Telephony Duplex (HSP/HFP)"
+msgstr "Telephony duplex (HSP/HFP)"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2215
+msgid "Handsfree Gateway"
+msgstr "Handsfree gateway"
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1788
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "High fidelity playback (A2DP Sink)"
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1799
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "High fidelity capture (A2DP Source)"
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1810
+msgid "Headset Head Unit (HSP/HFP)"
+msgstr "Headset head unit (HSP/HFP)"
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1822
+msgid "Headset Audio Gateway (HSP/HFP)"
+msgstr "Headset audio gateway (HSP/HFP)"
 
-#: ../src/daemon/daemon-conf.c:657
+#: ../src/modules/echo-cancel/module-echo-cancel.c:63
 msgid ""
-"The specified default channel map has a different number of channels than "
-"the specified default number of channels."
+"source_name=<name for the source> source_properties=<properties for the "
+"source> source_master=<name of source to filter> sink_name=<name for the "
+"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
+"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
+"much drift to readjust after in ms> format=<sample format> rate=<sample "
+"rate> channels=<number of channels> channel_map=<channel map> "
+"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
+"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
+"loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
+"source_name=<namn på källa> source_properties=<egenskaper för källa> "
+"source_master=<namn på källa att filtrera> sink_name=<namn på mottagare> "
+"sink_properties=<egenskaper för mottagare> sink_master=<namn på mottagare "
+"att filtrera> adjust_time=<hur ofta frekvens ska justeras> "
+"adjust_threshold=<hur mycket avsteg ska justeras i ms> "
+"format=<samplingsformat> rate=<samplingshastighet> channels=<antal kanaler> "
+"channel_map=<kanalmappning> aec_method=<implementation att använda> "
+"aec_args=<parametrar för AEC-motorn> save_aec=<spara AEC-data i /tmp> "
+"autoloaded=<ange om denna modul läses in automatiskt> use_volume_sharing=<ja "
+"eller nej> "
+
+#. add on profile
+#: ../src/modules/macosx/module-coreaudio-device.c:756
+msgid "On"
+msgstr "På"
 
-#: ../src/daemon/daemon-conf.c:743
-#, c-format
-msgid "### Read from configuration file: %s ###\n"
-msgstr ""
+#: ../src/modules/module-always-sink.c:38
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr "Håll alltid minst en mottagare inläst även om den är null"
 
-#: ../src/daemon/caps.c:58
-#, fuzzy
-msgid "Cleaning up privileges."
-msgstr "Släpper root-behörighet."
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "Attrapputgång"
 
-#: ../src/daemon/pulseaudio.desktop.in.h:1
-msgid "PulseAudio Sound System"
-msgstr ""
+#: ../src/modules/module-equalizer-sink.c:72
+msgid "General Purpose Equalizer"
+msgstr "Allmän equalizer"
 
-#: ../src/daemon/pulseaudio.desktop.in.h:2
-msgid "Start the PulseAudio Sound System"
+#: ../src/modules/module-equalizer-sink.c:76
+msgid ""
+"sink_name=<name of the sink> sink_properties=<properties for the sink> "
+"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
+"this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
+"sink_name=<namn på mottagare> sink_properties=<egenskaper för mottagare> "
+"sink_master=<mottagare att ansluta till> format=<samplingsformat> "
+"rate=<samplingshastighet> channels=<antal kanaler> "
+"channel_map=<kanalmappning> autoloaded=<om denna modul läses in automatiskt> "
+"use_volume_sharing=<ja eller nej> "
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-msgid "PulseAudio Sound System KDE Routing Policy"
+#: ../src/modules/module-filter-apply.c:48
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr "autoclean=<automatiskt inaktivera oanvända filter?>"
+
+#: ../src/modules/module-ladspa-sink.c:53
+msgid "Virtual LADSPA sink"
+msgstr "Virtual LADSPA-mottagare"
+
+#: ../src/modules/module-ladspa-sink.c:57
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
+"plugin name> label=<ladspa plugin label> control=<comma separated list of "
+"input control values> input_ladspaport_map=<comma separated list of input "
+"LADSPA port names> output_ladspaport_map=<comma separated list of output "
+"LADSPA port names> "
 msgstr ""
+"sink_name=<namn på mottagare> sink_properties=<egenskaper för mottagare> "
+"master=<namn på mottagare att filtrera> format=<samplingsformat> "
+"rate=<samplingshastighet> channels=<antal kanaler> "
+"channel_map=<ingångskanalmappning> plugin=<namn på ladspa-instick> "
+"label=<etikett för ladspa-instick> control=<kommaseparerad lista över "
+"ingångskontrollvärden> input_ladspaport_map=<kommaseparerad lista över "
+"LADSPA-portnamn för ingång> output_ladspaport_map=<kommaseparerad lista över "
+"LADSPA-portnamn för utgång> "
+
+#: ../src/modules/module-null-sink.c:49
+msgid "Clocked NULL sink"
+msgstr "Klockad NULL-mottagare"
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-msgid "Start the PulseAudio Sound System with KDE Routing Policy"
+#: ../src/modules/module-null-sink.c:280
+msgid "Null Output"
+msgstr "Nullutgång"
+
+#: ../src/modules/module-rygel-media-server.c:510
+#: ../src/modules/module-rygel-media-server.c:548
+#: ../src/modules/module-rygel-media-server.c:907
+msgid "Output Devices"
+msgstr "Utgångsenheter"
+
+#: ../src/modules/module-rygel-media-server.c:511
+#: ../src/modules/module-rygel-media-server.c:549
+#: ../src/modules/module-rygel-media-server.c:908
+msgid "Input Devices"
+msgstr "Ingångsenheter"
+
+#: ../src/modules/module-rygel-media-server.c:1065
+msgid "Audio on @HOSTNAME@"
+msgstr "Ljud på @HOSTNAME@"
+
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
+#: ../src/modules/module-tunnel-sink-new.c:300
+#: ../src/modules/module-tunnel-source-new.c:307
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "Tunnel för %s@%s"
+
+#: ../src/modules/module-tunnel-sink-new.c:510
+#: ../src/modules/module-tunnel-source-new.c:518
+#, c-format
+msgid "Tunnel to %s/%s"
+msgstr "Tunnel till %s/%s"
+
+#: ../src/modules/module-virtual-surround-sink.c:49
+msgid "Virtual surround sink"
+msgstr "Virtual surround-mottagare"
+
+#: ../src/modules/module-virtual-surround-sink.c:53
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> "
+"use_volume_sharing=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
+"left_hrir.wav "
 msgstr ""
+"sink_name=<namn för mottagaren> sink_properties=<egenskaper för mottagaren> "
+"master=<namn på mottagare att filtrera> format=<samplingsformat> "
+"rate=<samplingshastighet> channels=<antal kanaler> "
+"channel_map=<kanalmappning> use_volume_sharing=<ja eller nej> "
+"force_flat_volume=<ja eller nej> hrir=/path/to/left_hrir.wav "
 
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:757
+#: ../src/modules/reserve-wrap.c:151
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio ljudserver"
+
+#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:760
 msgid "Mono"
 msgstr "Mono"
 
@@ -734,7 +1158,7 @@ msgstr "Höger bak"
 
 #: ../src/pulse/channelmap.c:115
 msgid "Subwoofer"
-msgstr ""
+msgstr "Subwoofer"
 
 #: ../src/pulse/channelmap.c:117
 msgid "Front Left-of-center"
@@ -754,191 +1178,281 @@ msgstr "Höger sida"
 
 #: ../src/pulse/channelmap.c:123
 msgid "Auxiliary 0"
-msgstr ""
+msgstr "Auxiliary 0"
 
 #: ../src/pulse/channelmap.c:124
 msgid "Auxiliary 1"
-msgstr ""
+msgstr "Auxiliary 1"
 
 #: ../src/pulse/channelmap.c:125
 msgid "Auxiliary 2"
-msgstr ""
+msgstr "Auxiliary 2"
 
 #: ../src/pulse/channelmap.c:126
 msgid "Auxiliary 3"
-msgstr ""
+msgstr "Auxiliary 3"
 
 #: ../src/pulse/channelmap.c:127
 msgid "Auxiliary 4"
-msgstr ""
+msgstr "Auxiliary 4"
 
 #: ../src/pulse/channelmap.c:128
 msgid "Auxiliary 5"
-msgstr ""
+msgstr "Auxiliary 5"
 
 #: ../src/pulse/channelmap.c:129
 msgid "Auxiliary 6"
-msgstr ""
+msgstr "Auxiliary 6"
 
 #: ../src/pulse/channelmap.c:130
 msgid "Auxiliary 7"
-msgstr ""
+msgstr "Auxiliary 7"
 
 #: ../src/pulse/channelmap.c:131
 msgid "Auxiliary 8"
-msgstr ""
+msgstr "Auxiliary 8"
 
 #: ../src/pulse/channelmap.c:132
 msgid "Auxiliary 9"
-msgstr ""
+msgstr "Auxiliary 9"
 
 #: ../src/pulse/channelmap.c:133
 msgid "Auxiliary 10"
-msgstr ""
+msgstr "Auxiliary 10"
 
 #: ../src/pulse/channelmap.c:134
 msgid "Auxiliary 11"
-msgstr ""
+msgstr "Auxiliary 11"
 
 #: ../src/pulse/channelmap.c:135
 msgid "Auxiliary 12"
-msgstr ""
+msgstr "Auxiliary 12"
 
 #: ../src/pulse/channelmap.c:136
 msgid "Auxiliary 13"
-msgstr ""
+msgstr "Auxiliary 13"
 
 #: ../src/pulse/channelmap.c:137
 msgid "Auxiliary 14"
-msgstr ""
+msgstr "Auxiliary 14"
 
 #: ../src/pulse/channelmap.c:138
 msgid "Auxiliary 15"
-msgstr ""
+msgstr "Auxiliary 15"
 
 #: ../src/pulse/channelmap.c:139
 msgid "Auxiliary 16"
-msgstr ""
+msgstr "Auxiliary 16"
 
 #: ../src/pulse/channelmap.c:140
 msgid "Auxiliary 17"
-msgstr ""
+msgstr "Auxiliary 17"
 
 #: ../src/pulse/channelmap.c:141
 msgid "Auxiliary 18"
-msgstr ""
+msgstr "Auxiliary 18"
 
 #: ../src/pulse/channelmap.c:142
 msgid "Auxiliary 19"
-msgstr ""
+msgstr "Auxiliary 19"
 
 #: ../src/pulse/channelmap.c:143
 msgid "Auxiliary 20"
-msgstr ""
+msgstr "Auxiliary 20"
 
 #: ../src/pulse/channelmap.c:144
 msgid "Auxiliary 21"
-msgstr ""
+msgstr "Auxiliary 21"
 
 #: ../src/pulse/channelmap.c:145
 msgid "Auxiliary 22"
-msgstr ""
+msgstr "Auxiliary 22"
 
 #: ../src/pulse/channelmap.c:146
 msgid "Auxiliary 23"
-msgstr ""
+msgstr "Auxiliary 23"
 
 #: ../src/pulse/channelmap.c:147
 msgid "Auxiliary 24"
-msgstr ""
+msgstr "Auxiliary 24"
 
 #: ../src/pulse/channelmap.c:148
 msgid "Auxiliary 25"
-msgstr ""
+msgstr "Auxiliary 25"
 
 #: ../src/pulse/channelmap.c:149
 msgid "Auxiliary 26"
-msgstr ""
+msgstr "Auxiliary 26"
 
 #: ../src/pulse/channelmap.c:150
 msgid "Auxiliary 27"
-msgstr ""
+msgstr "Auxiliary 27"
 
 #: ../src/pulse/channelmap.c:151
 msgid "Auxiliary 28"
-msgstr ""
+msgstr "Auxiliary 28"
 
 #: ../src/pulse/channelmap.c:152
 msgid "Auxiliary 29"
-msgstr ""
+msgstr "Auxiliary 29"
 
 #: ../src/pulse/channelmap.c:153
 msgid "Auxiliary 30"
-msgstr ""
+msgstr "Auxiliary 30"
 
 #: ../src/pulse/channelmap.c:154
 msgid "Auxiliary 31"
-msgstr ""
+msgstr "Auxiliary 31"
 
 #: ../src/pulse/channelmap.c:156
 msgid "Top Center"
-msgstr ""
+msgstr "Topp mitten"
 
 #: ../src/pulse/channelmap.c:158
 msgid "Top Front Center"
-msgstr ""
+msgstr "Topp fram mitten"
 
 #: ../src/pulse/channelmap.c:159
 msgid "Top Front Left"
-msgstr ""
+msgstr "Topp fram vänster"
 
 #: ../src/pulse/channelmap.c:160
 msgid "Top Front Right"
-msgstr ""
+msgstr "Upp fram höger"
 
 #: ../src/pulse/channelmap.c:162
 msgid "Top Rear Center"
-msgstr ""
+msgstr "Topp bak mitten"
 
 #: ../src/pulse/channelmap.c:163
 msgid "Top Rear Left"
-msgstr ""
+msgstr "Topp bak vänster"
 
 #: ../src/pulse/channelmap.c:164
 msgid "Top Rear Right"
-msgstr ""
+msgstr "Topp bak höger"
 
-#: ../src/pulse/channelmap.c:484 ../src/pulse/sample.c:169
-#: ../src/pulse/volume.c:297 ../src/pulse/volume.c:323
-#: ../src/pulse/volume.c:343 ../src/pulse/volume.c:373
-#: ../src/pulse/format.c:125
-#, fuzzy
+#: ../src/pulse/channelmap.c:481 ../src/pulse/format.c:123
+#: ../src/pulse/sample.c:177 ../src/pulse/volume.c:296
+#: ../src/pulse/volume.c:322 ../src/pulse/volume.c:342
+#: ../src/pulse/volume.c:374 ../src/pulse/volume.c:414
+#: ../src/pulse/volume.c:433
 msgid "(invalid)"
-msgstr "Ogiltig"
+msgstr "(ogiltig)"
 
-#: ../src/pulse/channelmap.c:761
+#: ../src/pulse/channelmap.c:764
 msgid "Stereo"
-msgstr ""
+msgstr "Stereo"
 
-#: ../src/pulse/channelmap.c:766
+#: ../src/pulse/channelmap.c:769
 msgid "Surround 4.0"
-msgstr ""
+msgstr "Surround 4.0"
 
-#: ../src/pulse/channelmap.c:772
+#: ../src/pulse/channelmap.c:775
 msgid "Surround 4.1"
-msgstr ""
+msgstr "Surround 4.1"
 
-#: ../src/pulse/channelmap.c:778
+#: ../src/pulse/channelmap.c:781
 msgid "Surround 5.0"
-msgstr ""
+msgstr "Surround 5.0"
 
-#: ../src/pulse/channelmap.c:784
+#: ../src/pulse/channelmap.c:787
 msgid "Surround 5.1"
-msgstr ""
+msgstr "Surround 5.1"
 
-#: ../src/pulse/channelmap.c:791
+#: ../src/pulse/channelmap.c:794
 msgid "Surround 7.1"
+msgstr "Surround 7.1"
+
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:99
+msgid "xcb_connect() failed"
+msgstr "xcb_connect() misslyckades"
+
+#: ../src/pulse/client-conf-x11.c:60 ../src/utils/pax11publish.c:104
+msgid "xcb_connection_has_error() returned true"
+msgstr "xcb_connection_has_error() returnerade true"
+
+#: ../src/pulse/client-conf-x11.c:96
+msgid "Failed to parse cookie data"
+msgstr "Misslyckades med att tolka kakdata"
+
+#: ../src/pulse/context.c:658
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: ../src/pulse/context.c:713
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: ../src/pulse/context.c:1414
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "Tog emot meddelande för okända tillägget ”%s”"
+
+#: ../src/pulse/direction.c:39
+msgid "input"
+msgstr "ingång"
+
+#: ../src/pulse/direction.c:41
+msgid "output"
+msgstr "utgång"
+
+#: ../src/pulse/direction.c:43
+msgid "bidirectional"
+msgstr "dubbelriktad"
+
+#: ../src/pulse/direction.c:45
+msgid "invalid"
+msgstr "ogiltig"
+
+#: ../src/pulsecore/core-util.c:1822
+#, c-format
+msgid ""
+"XDG_RUNTIME_DIR (%s) is not owned by us (uid %d), but by uid %d! (This could "
+"e g happen if you try to connect to a non-root PulseAudio as a root user, "
+"over the native protocol. Don't do that.)"
+msgstr ""
+"XDG_RUNTIME_DIR (%s) ägs inte av oss (uid %d), utan av %d! (Det kan hända om "
+"du exempelvis försöker att ansluta till en icke-root PulseAudio som en root-"
+"användare över det interna protokollet. Gör inte det.)"
+
+#: ../src/pulsecore/core-util.h:95
+msgid "yes"
+msgstr "ja"
+
+#: ../src/pulsecore/core-util.h:95
+msgid "no"
+msgstr "nej"
+
+#: ../src/pulsecore/lock-autospawn.c:143 ../src/pulsecore/lock-autospawn.c:229
+msgid "Cannot access autospawn lock."
+msgstr "Kan inte komma åt låset för autospawn."
+
+#: ../src/pulsecore/log.c:155
+#, c-format
+msgid "Failed to open target file '%s'."
+msgstr "Misslyckades med att öppna målfilen ”%s”."
+
+#: ../src/pulsecore/log.c:178
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
 msgstr ""
+"Försökte att öppna målfilen ”%s”, ”%s.1”, ”%s.2” … ”%s.%d” men misslyckades."
+
+#: ../src/pulsecore/log.c:633
+msgid "Invalid log target."
+msgstr "Ogiltigt mål för logg."
+
+#: ../src/pulsecore/sink.c:3429
+msgid "Built-in Audio"
+msgstr "Inbyggt ljud"
+
+#: ../src/pulsecore/sink.c:3434
+msgid "Modem"
+msgstr "Modem"
 
 #: ../src/pulse/error.c:40
 msgid "OK"
@@ -977,8 +1491,8 @@ msgid "Timeout"
 msgstr "Tidsgräns nåddes"
 
 #: ../src/pulse/error.c:49
-msgid "No authorization key"
-msgstr ""
+msgid "No authentication key"
+msgstr "Ingen autentiseringsnyckel"
 
 #: ../src/pulse/error.c:50
 msgid "Internal error"
@@ -990,7 +1504,7 @@ msgstr "Anslutningen terminerad"
 
 #: ../src/pulse/error.c:52
 msgid "Entity killed"
-msgstr ""
+msgstr "Entitet dödad"
 
 #: ../src/pulse/error.c:53
 msgid "Invalid server"
@@ -998,7 +1512,7 @@ msgstr "Ogiltig server"
 
 #: ../src/pulse/error.c:54
 msgid "Module initialization failed"
-msgstr ""
+msgstr "Misslyckades med att starta modul"
 
 #: ../src/pulse/error.c:55
 msgid "Bad state"
@@ -1006,11 +1520,11 @@ msgstr "Felaktigt tillstånd"
 
 #: ../src/pulse/error.c:56
 msgid "No data"
-msgstr "Inget data"
+msgstr "Ingen data"
 
 #: ../src/pulse/error.c:57
 msgid "Incompatible protocol version"
-msgstr ""
+msgstr "Inkompatibel protokollversion"
 
 #: ../src/pulse/error.c:58
 msgid "Too large"
@@ -1026,264 +1540,288 @@ msgstr "Okänd felkod"
 
 #: ../src/pulse/error.c:61
 msgid "No such extension"
-msgstr ""
+msgstr "Det finns inget sådant tillägg"
 
 #: ../src/pulse/error.c:62
 msgid "Obsolete functionality"
-msgstr ""
+msgstr "Föråldrad funktionalitet"
 
 #: ../src/pulse/error.c:63
 msgid "Missing implementation"
-msgstr ""
+msgstr "Implementering saknas"
 
 #: ../src/pulse/error.c:64
 msgid "Client forked"
-msgstr ""
+msgstr "Klienten förgrenad"
 
 #: ../src/pulse/error.c:65
 msgid "Input/Output error"
-msgstr ""
+msgstr "In-/utgångsfel"
 
 #: ../src/pulse/error.c:66
 msgid "Device or resource busy"
-msgstr ""
+msgstr "Enhet eller resurs upptagen"
 
-#: ../src/pulse/sample.c:171
+#: ../src/pulse/sample.c:179
 #, c-format
 msgid "%s %uch %uHz"
-msgstr ""
+msgstr "%s %u kan. %u Hz"
 
-#: ../src/pulse/sample.c:183
+#: ../src/pulse/sample.c:191
 #, c-format
 msgid "%0.1f GiB"
-msgstr ""
+msgstr "%0.1f GiB"
 
-#: ../src/pulse/sample.c:185
+#: ../src/pulse/sample.c:193
 #, c-format
 msgid "%0.1f MiB"
-msgstr ""
+msgstr "%0.1f MiB"
 
-#: ../src/pulse/sample.c:187
+#: ../src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
-msgstr ""
+msgstr "%0.1f KiB"
 
-#: ../src/pulse/sample.c:189
+#: ../src/pulse/sample.c:197
 #, c-format
 msgid "%u B"
-msgstr ""
-
-#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:100
-#, fuzzy
-msgid "xcb_connect() failed"
-msgstr "pa_context_new() misslyckades.\n"
-
-#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:105
-msgid "xcb_connection_has_error() returned true"
-msgstr ""
-
-#: ../src/pulse/client-conf-x11.c:97
-msgid "Failed to parse cookie data"
-msgstr ""
+msgstr "%u B"
 
-#: ../src/pulse/client-conf.c:117
+#: ../src/tests/resampler-test.c:257
 #, c-format
-msgid "Failed to open configuration file '%s': %s"
-msgstr "Misslyckades med att öppna konfigurationsfilen \"%s\": %s"
-
-#: ../src/pulse/context.c:528
-msgid "No cookie loaded. Attempting to connect without."
+msgid ""
+"%s [options]\n"
+"\n"
+"-h, --help                            Show this help\n"
+"-v, --verbose                         Print debug messages\n"
+"      --from-rate=SAMPLERATE          From sample rate in Hz (defaults to "
+"44100)\n"
+"      --from-format=SAMPLEFORMAT      From sample type (defaults to s16le)\n"
+"      --from-channels=CHANNELS        From number of channels (defaults to "
+"1)\n"
+"      --to-rate=SAMPLERATE            To sample rate in Hz (defaults to "
+"44100)\n"
+"      --to-format=SAMPLEFORMAT        To sample type (defaults to s16le)\n"
+"      --to-channels=CHANNELS          To number of channels (defaults to 1)\n"
+"      --resample-method=METHOD        Resample method (defaults to auto)\n"
+"      --seconds=SECONDS               From stream duration (defaults to 60)\n"
+"\n"
+"If the formats are not specified, the test performs all formats "
+"combinations,\n"
+"back and forth.\n"
+"\n"
+"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
+"alaw,\n"
+"s24le, s24be, s24-32le, s24-32be, s32le, s32be (defaults to s16ne)\n"
+"\n"
+"See --dump-resample-methods for possible values of resample methods.\n"
 msgstr ""
+"%s [flaggor]\n"
+"\n"
+"-h, --help                            Visa denna hjälp\n"
+"-v, --verbose                         Skriv ut felmeddelanden\n"
+"      --from-rate=SAMPLINGSFREKVENS   Från samplingsfrekvens i Hz (standard "
+"44100)\n"
+"      --from-format=SAMPLINGSFORMAT   Från samplingstyp (standard s16le)\n"
+"      --from-channels=KANALER         Från antal kanaler (standard 1)\n"
+"      --to-rate=SAMPLINGSFREKVENS     Till samplingsfrekvens i Hz (standard "
+"44100)\n"
+"      --to-format=SAMPLINGSFORMAT     Till samplingstyp (standard s16le)\n"
+"      --to-channels=KANALER           Till antal kanaler (standard 1)\n"
+"      --resample-method=METOD         Omsamplingsmetod (standard auto)\n"
+"      --seconds=SEKUNDER              Från strömuthållighet (standard 60)\n"
+"\n"
+"Om formaten inte är angivna utför testet alla formatkombinationer,\n"
+"fram och tillbaka.\n"
+"\n"
+"Samplingstyp måste vare en av s16le, s16be, u8, float32le, float32be, ulaw, "
+"alaw,\n"
+"s24le, s24be, s24-32le, s24-32be, s32le, s32be (standard s16ne)\n"
+"\n"
+"Se --dump-resample-methods för möjliga värden på omsamplingsmetoder.\n"
 
-#: ../src/pulse/context.c:675
-#, c-format
-msgid "fork(): %s"
-msgstr "fork(): %s"
-
-#: ../src/pulse/context.c:730
+#: ../src/tests/resampler-test.c:356
 #, c-format
-msgid "waitpid(): %s"
-msgstr "waitpid(): %s"
+msgid "%s %s\n"
+msgstr "%s %s\n"
 
-#: ../src/pulse/context.c:1431
+#: ../src/utils/pacat.c:118
 #, c-format
-msgid "Received message for unknown extension '%s'"
-msgstr ""
-
-#: ../src/utils/pacat.c:112
-#, fuzzy, c-format
 msgid "Failed to drain stream: %s"
-msgstr "Misslyckades med att hitta användaren \"%s\"."
+msgstr "Misslyckades med att dränera strömmen: %s"
 
-#: ../src/utils/pacat.c:117
+#: ../src/utils/pacat.c:123
 msgid "Playback stream drained."
-msgstr ""
+msgstr "Uppspelningsströmmen dränerad."
 
-#: ../src/utils/pacat.c:128
+#: ../src/utils/pacat.c:134
 msgid "Draining connection to server."
-msgstr ""
+msgstr "Dränerar anslutning till servern."
 
-#: ../src/utils/pacat.c:141
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:147
+#, c-format
 msgid "pa_stream_drain(): %s"
-msgstr "pa_stream_drain(): %s\n"
+msgstr "pa_stream_drain(): %s"
 
-#: ../src/utils/pacat.c:164
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:170
+#, c-format
 msgid "pa_stream_write() failed: %s"
-msgstr "pa_stream_write() misslyckades: %s\n"
+msgstr "pa_stream_write() misslyckades: %s"
 
-#: ../src/utils/pacat.c:205
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:211
+#, c-format
 msgid "pa_stream_begin_write() failed: %s"
-msgstr "pa_stream_write() misslyckades: %s\n"
+msgstr "pa_stream_begin_write() misslyckades: %s"
 
-#: ../src/utils/pacat.c:255 ../src/utils/pacat.c:285
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:261 ../src/utils/pacat.c:291
+#, c-format
 msgid "pa_stream_peek() failed: %s"
-msgstr "pa_stream_peek() misslyckades: %s\n"
+msgstr "pa_stream_peek() misslyckades: %s"
 
-#: ../src/utils/pacat.c:325
+#: ../src/utils/pacat.c:341
 msgid "Stream successfully created."
-msgstr ""
+msgstr "Strömmen skapad."
 
-#: ../src/utils/pacat.c:328
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:344
+#, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s"
-msgstr "pa_stream_get_buffer_attr() misslyckades: %s\n"
+msgstr "pa_stream_get_buffer_attr() misslyckades: %s"
 
-#: ../src/utils/pacat.c:332
+#: ../src/utils/pacat.c:348
 #, c-format
 msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
-msgstr ""
+msgstr "Buffertmått: maxlength=%u tlength=%u prebuf=%u minreq=%u"
 
-#: ../src/utils/pacat.c:335
+#: ../src/utils/pacat.c:351
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u"
-msgstr ""
+msgstr "Buffertmått: maxlength=%u fragsize=%u"
 
-#: ../src/utils/pacat.c:339
+#: ../src/utils/pacat.c:355
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'."
-msgstr ""
+msgstr "Använder samplingsspec ”%s”, kanalmappning ”%s”."
 
-#: ../src/utils/pacat.c:343
+#: ../src/utils/pacat.c:359
 #, c-format
-msgid "Connected to device %s (%u, %ssuspended)."
-msgstr ""
+msgid "Connected to device %s (index: %u, suspended: %s)."
+msgstr "Ansluten till enheten %s (index:%u, vänteläge: %s)."
 
-#: ../src/utils/pacat.c:353
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:369
+#, c-format
 msgid "Stream error: %s"
-msgstr "Strömfel: %s\n"
+msgstr "Strömfel: %s"
 
-#: ../src/utils/pacat.c:363
+#: ../src/utils/pacat.c:379
 #, c-format
 msgid "Stream device suspended.%s"
-msgstr ""
+msgstr "Strömenheten avstängd.%s"
 
-#: ../src/utils/pacat.c:365
+#: ../src/utils/pacat.c:381
 #, c-format
 msgid "Stream device resumed.%s"
-msgstr ""
+msgstr "Strömenheten återaktiverad.%s"
 
-#: ../src/utils/pacat.c:373
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:389
+#, c-format
 msgid "Stream underrun.%s"
-msgstr "Strömfel: %s\n"
+msgstr "Strömmen underskriden.%s"
 
-#: ../src/utils/pacat.c:380
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:396
+#, c-format
 msgid "Stream overrun.%s"
-msgstr "Strömfel: %s\n"
+msgstr "Strömmen överskriden.%s"
 
-#: ../src/utils/pacat.c:387
+#: ../src/utils/pacat.c:403
 #, c-format
 msgid "Stream started.%s"
-msgstr ""
+msgstr "Strömmen startad.%s"
 
-#: ../src/utils/pacat.c:394
+#: ../src/utils/pacat.c:410
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
-msgstr ""
+msgstr "Strömmen flyttad till enhet %s (%u, %savstängd).%s"
 
-#: ../src/utils/pacat.c:394
+#: ../src/utils/pacat.c:410
 msgid "not "
 msgstr "inte "
 
-#: ../src/utils/pacat.c:401
+#: ../src/utils/pacat.c:417
 #, c-format
 msgid "Stream buffer attributes changed.%s"
-msgstr ""
+msgstr "Strömbuffertattribut ändrade.%s"
 
-#: ../src/utils/pacat.c:416
+#: ../src/utils/pacat.c:432
 msgid "Cork request stack is empty: corking stream"
-msgstr ""
+msgstr "Korkningsbegäransstacken är tom: Korkar igen ström"
 
-#: ../src/utils/pacat.c:422
+#: ../src/utils/pacat.c:438
 msgid "Cork request stack is empty: uncorking stream"
-msgstr ""
+msgstr "Korkningsbegäransstacken är tom: Korkar ur ström"
 
-#: ../src/utils/pacat.c:426
+#: ../src/utils/pacat.c:442
 msgid "Warning: Received more uncork requests than cork requests!"
-msgstr ""
+msgstr "Varning: Mottog fler urkorkningsbegäran än korkningsbegäran!"
 
-#: ../src/utils/pacat.c:451
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:467
+#, c-format
 msgid "Connection established.%s"
-msgstr "Anslutning etablerad.\n"
+msgstr "Anslutning etablerad.%s"
 
-#: ../src/utils/pacat.c:454
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:470
+#, c-format
 msgid "pa_stream_new() failed: %s"
-msgstr "pa_stream_new() misslyckades: %s\n"
+msgstr "pa_stream_new() misslyckades: %s"
 
-#: ../src/utils/pacat.c:492
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:508
+#, c-format
 msgid "pa_stream_connect_playback() failed: %s"
-msgstr "pa_stream_connect_playback() misslyckades: %s\n"
+msgstr "pa_stream_connect_playback() misslyckades: %s"
+
+#: ../src/utils/pacat.c:514
+#, c-format
+msgid "Failed to set monitor stream: %s"
+msgstr "Misslyckades med att ange övervakningsströmmen: ”%s”."
 
-#: ../src/utils/pacat.c:498
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:518
+#, c-format
 msgid "pa_stream_connect_record() failed: %s"
-msgstr "pa_stream_connect_record() misslyckades: %s\n"
+msgstr "pa_stream_connect_record() misslyckades: %s"
 
-#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1252
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1448
+#, c-format
 msgid "Connection failure: %s"
-msgstr "Anslutningsfel: %s\n"
+msgstr "Anslutningsfel: %s"
 
-#: ../src/utils/pacat.c:545
-#, fuzzy
+#: ../src/utils/pacat.c:564
 msgid "Got EOF."
-msgstr "Fick filslut.\n"
+msgstr "Fick filslut."
 
-#: ../src/utils/pacat.c:582
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:601
+#, c-format
 msgid "write() failed: %s"
-msgstr "write() misslyckades: %s\n"
+msgstr "write() misslyckades: %s"
 
-#: ../src/utils/pacat.c:603
-#, fuzzy
+#: ../src/utils/pacat.c:622
 msgid "Got signal, exiting."
-msgstr "Fick signal %s."
+msgstr "Fick signal, avslutar."
 
-#: ../src/utils/pacat.c:617
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:636
+#, c-format
 msgid "Failed to get latency: %s"
-msgstr "Misslyckades med att få statistik: %s\n"
+msgstr "Misslyckades med att avgöra latens: %s"
 
-#: ../src/utils/pacat.c:622
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:641
+#, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Tid: %0.3f sec; Latens: %0.0f ms  \r"
+msgstr "Tid: %0.3f s; Latens: %0.0f μs."
 
-#: ../src/utils/pacat.c:643
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:662
+#, c-format
 msgid "pa_stream_update_timing_info() failed: %s"
-msgstr "pa_stream_update_timing_info() misslyckades: %s\n"
+msgstr "pa_stream_update_timing_info() misslyckades: %s"
 
-#: ../src/utils/pacat.c:653
+#: ../src/utils/pacat.c:672
 #, c-format
 msgid ""
 "%s [options]\n"
@@ -1319,16 +1857,16 @@ msgid ""
 "                                        (defaults to 2)\n"
 "      --channel-map=CHANNELMAP          Channel map to use instead of the "
 "default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --fix-format                      Take the sample format from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
 "      --fix-channels                    Take the number of channels and the "
 "channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"                                        from the sink/source the stream is "
+"being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
 "      --no-remap                        Map channels by index instead of "
 "name.\n"
@@ -1343,1329 +1881,1254 @@ msgid ""
 "      --property=PROPERTY=VALUE         Set the specified property to the "
 "specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
-"      --passthrough                     passthrough data \n"
+"      --passthrough                     Passthrough data.\n"
 "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
+"      --monitor-stream=INDEX            Record from the sink input with "
+"index INDEX.\n"
 msgstr ""
-
-#: ../src/utils/pacat.c:786
-#, c-format
-msgid ""
-"pacat %s\n"
-"Compiled with libpulse %s\n"
-"Linked with libpulse %s\n"
-msgstr ""
-
-#: ../src/utils/pacat.c:819 ../src/utils/pactl.c:1400
-#, fuzzy, c-format
-msgid "Invalid client name '%s'"
-msgstr "Ogiltig server"
-
-#: ../src/utils/pacat.c:834
-#, fuzzy, c-format
-msgid "Invalid stream name '%s'"
-msgstr "Ogiltig server"
-
-#: ../src/utils/pacat.c:871
-#, fuzzy, c-format
-msgid "Invalid channel map '%s'"
-msgstr "Ogiltig server"
-
-#: ../src/utils/pacat.c:900 ../src/utils/pacat.c:914
-#, c-format
-msgid "Invalid latency specification '%s'"
-msgstr ""
-
-#: ../src/utils/pacat.c:907 ../src/utils/pacat.c:921
-#, fuzzy, c-format
-msgid "Invalid process time specification '%s'"
-msgstr "Ogiltig server"
-
-#: ../src/utils/pacat.c:933
-#, fuzzy, c-format
-msgid "Invalid property '%s'"
-msgstr "Ogiltig server"
-
-#: ../src/utils/pacat.c:952
-#, c-format
-msgid "Unknown file format %s."
-msgstr ""
-
-#: ../src/utils/pacat.c:971
-#, fuzzy
-msgid "Invalid sample specification"
-msgstr "Misslyckades med att få modulinformation: %s\n"
-
-#: ../src/utils/pacat.c:981
-#, fuzzy, c-format
-msgid "open(): %s"
-msgstr "open(): %s\n"
-
-#: ../src/utils/pacat.c:986
-#, fuzzy, c-format
-msgid "dup2(): %s"
-msgstr "dup2(): %s\n"
-
-#: ../src/utils/pacat.c:993
-#, fuzzy
-msgid "Too many arguments."
-msgstr "För många argument.\n"
-
-#: ../src/utils/pacat.c:1004
-#, fuzzy
-msgid "Failed to generate sample specification for file."
-msgstr "Misslyckades med att få modulinformation: %s\n"
-
-#: ../src/utils/pacat.c:1030
-#, fuzzy
-msgid "Failed to open audio file."
-msgstr "Misslyckades med att öppna ljudfil.\n"
-
-#: ../src/utils/pacat.c:1036
-msgid ""
-"Warning: specified sample specification will be overwritten with "
-"specification from file."
-msgstr ""
-
-#: ../src/utils/pacat.c:1039 ../src/utils/pactl.c:1467
-#, fuzzy
-msgid "Failed to determine sample specification from file."
-msgstr "Misslyckades med att få modulinformation: %s\n"
-
-#: ../src/utils/pacat.c:1048
-msgid "Warning: Failed to determine channel map from file."
-msgstr ""
-
-#: ../src/utils/pacat.c:1059
-#, fuzzy
-msgid "Channel map doesn't match sample specification"
-msgstr "Misslyckades med att få modulinformation: %s\n"
-
-#: ../src/utils/pacat.c:1070
-msgid "Warning: failed to write channel map to file."
-msgstr ""
-
-#: ../src/utils/pacat.c:1085
-#, c-format
-msgid ""
-"Opening a %s stream with sample specification '%s' and channel map '%s'."
-msgstr ""
-
-#: ../src/utils/pacat.c:1086
-msgid "recording"
-msgstr ""
-
-#: ../src/utils/pacat.c:1086
-msgid "playback"
-msgstr ""
-
-#: ../src/utils/pacat.c:1110
-#, fuzzy
-msgid "Failed to set media name."
-msgstr "Misslyckades med att tolka kommandorad.\n"
-
-#: ../src/utils/pacat.c:1117 ../src/utils/pactl.c:1777
-#, fuzzy
-msgid "pa_mainloop_new() failed."
-msgstr "pa_mainloop_new() misslyckades.\n"
-
-#: ../src/utils/pacat.c:1136
-#, fuzzy
-msgid "io_new() failed."
-msgstr "io_new() misslyckades.\n"
-
-#: ../src/utils/pacat.c:1143 ../src/utils/pactl.c:1789
-#, fuzzy
-msgid "pa_context_new() failed."
-msgstr "pa_context_new() misslyckades.\n"
-
-#: ../src/utils/pacat.c:1151 ../src/utils/pactl.c:1795
-#, fuzzy, c-format
-msgid "pa_context_connect() failed: %s"
-msgstr "pa_context_new() misslyckades.\n"
-
-#: ../src/utils/pacat.c:1157
-#, fuzzy
-msgid "pa_context_rttime_new() failed."
-msgstr "pa_context_new() misslyckades.\n"
-
-#: ../src/utils/pacat.c:1164 ../src/utils/pactl.c:1800
-#, fuzzy
-msgid "pa_mainloop_run() failed."
-msgstr "pa_mainloop_run() misslyckades.\n"
-
-#: ../src/utils/pasuspender.c:79
-#, c-format
-msgid "fork(): %s\n"
-msgstr "fork(): %s\n"
-
-#: ../src/utils/pasuspender.c:90
-#, c-format
-msgid "execvp(): %s\n"
-msgstr "execvp(): %s\n"
-
-#: ../src/utils/pasuspender.c:107
-#, c-format
-msgid "Failure to suspend: %s\n"
-msgstr ""
-
-#: ../src/utils/pasuspender.c:122
-#, c-format
-msgid "Failure to resume: %s\n"
-msgstr ""
-
-#: ../src/utils/pasuspender.c:145
-#, c-format
-msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr ""
-
-#: ../src/utils/pasuspender.c:157
-#, c-format
-msgid "Connection failure: %s\n"
-msgstr "Anslutningsfel: %s\n"
-
-#: ../src/utils/pasuspender.c:174
-#, c-format
-msgid "Got SIGINT, exiting.\n"
-msgstr ""
-
-#: ../src/utils/pasuspender.c:192
-#, c-format
-msgid "WARNING: Child process terminated by signal %u\n"
-msgstr ""
-
-#: ../src/utils/pasuspender.c:210
-#, c-format
-msgid ""
-"%s [options] ... \n"
+"%s [flaggor]\n"
 "\n"
-"  -h, --help                            Show this help\n"
-"      --version                         Show version\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
+"  -h, --help                            Visa denna hjälp\n"
+"      --version                         Visa version\n"
 "\n"
-msgstr ""
-
-#: ../src/utils/pasuspender.c:248
+"  -r, --record                          Skapa en anslutning för inspelning\n"
+"  -p, --playback                        Skapa en anslutning för uppspelning\n"
+"\n"
+"  -v, --verbose                         Aktivera informativa åtgärder\n"
+"\n"
+"  -s, --server=SERVER                   Namn på server att ansluta till\n"
+"  -d, --device=ENHET                    Namn på mottagare/källa att ansluta "
+"till\n"
+"  -n, --client-name=NAMN                Hur denna klient ska anropas på "
+"servern\n"
+"      --stream-name=NAMN                Hur denna ström ska anropas på "
+"servern\n"
+"      --volume=VOLUM                    Ange initiala (linjära) volymen i "
+"intervallet 0...65536\n"
+"      --rate=SAMPLINGSFREKVENS          Samplingsfrekvens i Hz (standard "
+"44100)\n"
+"      --format=SAMPLINGSFORMAT          Samplingstyp, en av s16le, s16be, "
+"u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, "
+"s24le, s24be,\n"
+"                                        s24-32le, s24-32be (defaults to "
+"s16ne)\n"
+"      --channels=KANALER                Antalet kanaler, 1 för mono, 2 för "
+"stereo\n"
+"                                        (standard 2)\n"
+"      --channel-map=KANALMAPPNING       Kanalmappning att använda istället "
+"för standard\n"
+"      --fix-format                      Ta samplingsformatet från mottagaren/"
+"källan strömmen är\n"
+"                                        ansluten till.\n"
+"      --fix-rate                        Ta samplingsfrekvensen från "
+"mottagaren/källan strömmen är\n"
+"                                        ansluten till.\n"
+"      --fix-channels                    Ta antalet kanaler och "
+"kanalmappning\n"
+"                                        från mottagaren/källan strömmen är "
+"ansluten till.\n"
+"      --no-remix                        Mixa inte ner eller upp kanaler.\n"
+"      --no-remap                        Mappa kanaler med index istället för "
+"med namn.\n"
+"      --latency=BYTE                    Begär angiven latens i byte.\n"
+"      --process-time=BYTE               Begär angiven processtid per begäran "
+"i byte.\n"
+"      --latency-msec=ms                 Begär angiven latens i ms.\n"
+"      --process-time-msec=ms            Begär angiven processtid per begäran "
+"i ms.\n"
+"      --property=EGENSKAP=VÄRDE         Sätt angiven egenskap till angivet "
+"värde.\n"
+"      --raw                             Spela in/spela upp rå PCM-data.\n"
+"      --passthrough                     Genomströmningsdata.\n"
+"      --file-format[=FFORMAT]           Spela in/spela upp formaterad PCM-"
+"data.\n"
+"      --list-file-formats               Lista tillgängliga filformat.\n"
+"      --monitor-stream=INDEX            Spela in från mottagaringången med "
+"index INDEX.\n"
+
+#: ../src/utils/pacat.c:810
 #, c-format
 msgid ""
-"pasuspender %s\n"
+"pacat %s\n"
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 msgstr ""
-"pasuspender %s\n"
-"Kompilerad med libpulse %s\n"
-"Länkad med libpulse %s\n"
-
-#: ../src/utils/pasuspender.c:277
-#, c-format
-msgid "pa_mainloop_new() failed.\n"
-msgstr "pa_mainloop_new() misslyckades.\n"
-
-#: ../src/utils/pasuspender.c:290
-#, c-format
-msgid "pa_context_new() failed.\n"
-msgstr "pa_context_new() misslyckades.\n"
-
-#: ../src/utils/pasuspender.c:298
-#, c-format
-msgid "pa_mainloop_run() failed.\n"
-msgstr "pa_mainloop_run() misslyckades.\n"
-
-#: ../src/utils/pactl.c:150
-#, fuzzy, c-format
-msgid "Failed to get statistics: %s"
-msgstr "Misslyckades med att få statistik: %s\n"
-
-#: ../src/utils/pactl.c:156
-#, c-format
-msgid "Currently in use: %u blocks containing %s bytes total.\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:159
-#, c-format
-msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:162
-#, c-format
-msgid "Sample cache size: %s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:171
-#, fuzzy, c-format
-msgid "Failed to get server information: %s"
-msgstr "Misslyckades med att få modulinformation: %s\n"
-
-#: ../src/utils/pactl.c:176
-#, c-format
-msgid ""
-"Server String: %s\n"
-"Library Protocol Version: %u\n"
-"Server Protocol Version: %u\n"
-"Is Local: %s\n"
-"Client Index: %u\n"
-"Tile Size: %zu\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:192
-#, c-format
-msgid ""
-"User Name: %s\n"
-"Host Name: %s\n"
-"Server Name: %s\n"
-"Server Version: %s\n"
-"Default Sample Specification: %s\n"
-"Default Channel Map: %s\n"
-"Default Sink: %s\n"
-"Default Source: %s\n"
-"Cookie: %04x:%04x\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:830
-#, fuzzy, c-format
-msgid "Failed to get sink information: %s"
-msgstr "Misslyckades med att få klientinformation: %s\n"
-
-#: ../src/utils/pactl.c:270
-#, c-format
-msgid ""
-"Sink #%u\n"
-"\tState: %s\n"
-"\tName: %s\n"
-"\tDescription: %s\n"
-"\tDriver: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tOwner Module: %u\n"
-"\tMute: %s\n"
-"\tVolume: %s%s%s\n"
-"\t        balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
-"\tMonitor Source: %s\n"
-"\tLatency: %0.0f usec, configured %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s%s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430
-#, c-format
-msgid "\tPorts:\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437
-#, fuzzy, c-format
-msgid "\tActive Port: %s\n"
-msgstr "pipe misslyckades: %s"
-
-#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443
-#, c-format
-msgid "\tFormats:\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:849
-#, fuzzy, c-format
-msgid "Failed to get source information: %s"
-msgstr "Misslyckades med att få modulinformation: %s\n"
-
-#: ../src/utils/pactl.c:383
-#, c-format
-msgid ""
-"Source #%u\n"
-"\tState: %s\n"
-"\tName: %s\n"
-"\tDescription: %s\n"
-"\tDriver: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tOwner Module: %u\n"
-"\tMute: %s\n"
-"\tVolume: %s%s%s\n"
-"\t        balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
-"\tMonitor of Sink: %s\n"
-"\tLatency: %0.0f usec, configured %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528
-#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:640 ../src/utils/pactl.c:641
-#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:711 ../src/utils/pactl.c:712
-#: ../src/utils/pactl.c:723 ../src/utils/pactl.c:775 ../src/utils/pactl.c:776
-#: ../src/utils/pactl.c:783
-msgid "n/a"
-msgstr ""
-
-#: ../src/utils/pactl.c:454
-#, fuzzy, c-format
-msgid "Failed to get module information: %s"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+"pacat %s\n"
+"Kompilerade med libpulse %s\n"
+"Länkade med libpulse %s\n"
 
-#: ../src/utils/pactl.c:477
+#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1644
 #, c-format
-msgid ""
-"Module #%u\n"
-"\tName: %s\n"
-"\tArgument: %s\n"
-"\tUsage counter: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:496
-#, fuzzy, c-format
-msgid "Failed to get client information: %s"
-msgstr "Misslyckades med att få klientinformation: %s\n"
+msgid "Invalid client name '%s'"
+msgstr "Ogiltigt klientnamn ”%s”"
 
-#: ../src/utils/pactl.c:522
+#: ../src/utils/pacat.c:858
 #, c-format
-msgid ""
-"Client #%u\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:539
-#, fuzzy, c-format
-msgid "Failed to get card information: %s"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+msgid "Invalid stream name '%s'"
+msgstr "Ogiltigt namn på strömmen ”%s”"
 
-#: ../src/utils/pactl.c:562
+#: ../src/utils/pacat.c:895
 #, c-format
-msgid ""
-"Card #%u\n"
-"\tName: %s\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
+msgid "Invalid channel map '%s'"
+msgstr "Ogiltig kanalmappning ”%s”"
 
-#: ../src/utils/pactl.c:576
+#: ../src/utils/pacat.c:924 ../src/utils/pacat.c:938
 #, c-format
-msgid "\tProfiles:\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:582
-#, fuzzy, c-format
-msgid "\tActive Profile: %s\n"
-msgstr "pipe misslyckades: %s"
-
-#: ../src/utils/pactl.c:593 ../src/utils/pactl.c:868
-#, fuzzy, c-format
-msgid "Failed to get sink input information: %s"
-msgstr "Misslyckades med att få klientinformation: %s\n"
+msgid "Invalid latency specification '%s'"
+msgstr "Ogiltig latensangivelse ”%s”"
 
-#: ../src/utils/pactl.c:622
+#: ../src/utils/pacat.c:931 ../src/utils/pacat.c:945
 #, c-format
-msgid ""
-"Sink Input #%u\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tClient: %s\n"
-"\tSink: %u\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tFormat: %s\n"
-"\tMute: %s\n"
-"\tVolume: %s\n"
-"\t        %s\n"
-"\t        balance %0.2f\n"
-"\tBuffer Latency: %0.0f usec\n"
-"\tSink Latency: %0.0f usec\n"
-"\tResample method: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:663 ../src/utils/pactl.c:887
-#, fuzzy, c-format
-msgid "Failed to get source output information: %s"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+msgid "Invalid process time specification '%s'"
+msgstr "Ogiltig angivelse av processtid ”%s”"
 
-#: ../src/utils/pactl.c:693
+#: ../src/utils/pacat.c:957
 #, c-format
-msgid ""
-"Source Output #%u\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tClient: %s\n"
-"\tSource: %u\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tFormat: %s\n"
-"\tMute: %s\n"
-"\tVolume: %s\n"
-"\t        %s\n"
-"\t        balance %0.2f\n"
-"\tBuffer Latency: %0.0f usec\n"
-"\tSource Latency: %0.0f usec\n"
-"\tResample method: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:734
-#, fuzzy, c-format
-msgid "Failed to get sample information: %s"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+msgid "Invalid property '%s'"
+msgstr "Ogiltig egenskap ”%s”"
 
-#: ../src/utils/pactl.c:761
+#: ../src/utils/pacat.c:976
 #, c-format
-msgid ""
-"Sample #%u\n"
-"\tName: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tVolume: %s\n"
-"\t        %s\n"
-"\t        balance %0.2f\n"
-"\tDuration: %0.1fs\n"
-"\tSize: %s\n"
-"\tLazy: %s\n"
-"\tFilename: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
+msgid "Unknown file format %s."
+msgstr "Okänt filformat %s."
 
-#: ../src/utils/pactl.c:791 ../src/utils/pactl.c:801
-#, fuzzy, c-format
-msgid "Failure: %s"
-msgstr "Fel: %s\n"
+#: ../src/utils/pacat.c:991
+msgid "Failed to parse the argument for --monitor-stream"
+msgstr "Misslyckades med att tolka argumentet för --monitor-stream"
 
-#: ../src/utils/pactl.c:915
-#, fuzzy, c-format
-msgid "Failed to set format: invalid format string %s"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+#: ../src/utils/pacat.c:1002
+msgid "Invalid sample specification"
+msgstr "Ogiltig samplingsspecifikation"
 
-#: ../src/utils/pactl.c:954
-#, fuzzy, c-format
-msgid "Failed to upload sample: %s"
-msgstr "Misslyckades med att hitta användaren \"%s\"."
+#: ../src/utils/pacat.c:1012
+#, c-format
+msgid "open(): %s"
+msgstr "open(): %s"
 
-#: ../src/utils/pactl.c:971
-msgid "Premature end of file"
-msgstr ""
+#: ../src/utils/pacat.c:1017
+#, c-format
+msgid "dup2(): %s"
+msgstr "dup2(): %s"
 
-#: ../src/utils/pactl.c:991
-msgid "new"
-msgstr ""
+#: ../src/utils/pacat.c:1024
+msgid "Too many arguments."
+msgstr "För många argument."
 
-#: ../src/utils/pactl.c:994
-msgid "change"
-msgstr ""
+#: ../src/utils/pacat.c:1035
+msgid "Failed to generate sample specification for file."
+msgstr "Misslyckades med att generera samplingsspecifikation för filen."
 
-#: ../src/utils/pactl.c:997
-msgid "remove"
-msgstr ""
+#: ../src/utils/pacat.c:1061
+msgid "Failed to open audio file."
+msgstr "Misslyckades med att öppna ljudfilen."
 
-#: ../src/utils/pactl.c:1000 ../src/utils/pactl.c:1035
-msgid "unknown"
+#: ../src/utils/pacat.c:1067
+msgid ""
+"Warning: specified sample specification will be overwritten with "
+"specification from file."
 msgstr ""
+"Varning: angiven samplingsspecifikation kommer att skrivas över med "
+"specifikation från filen."
 
-#: ../src/utils/pactl.c:1008
-msgid "sink"
-msgstr "sink"
+#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1708
+msgid "Failed to determine sample specification from file."
+msgstr "Misslyckades med att avgöra samplingsspecifikation från filen."
 
-#: ../src/utils/pactl.c:1011
-msgid "source"
-msgstr "källa"
+#: ../src/utils/pacat.c:1079
+msgid "Warning: Failed to determine channel map from file."
+msgstr "Varning: Misslyckades med att avgöra kanalmappningen från filen."
 
-#: ../src/utils/pactl.c:1014
-msgid "sink-input"
-msgstr ""
+#: ../src/utils/pacat.c:1090
+msgid "Channel map doesn't match sample specification"
+msgstr "Kanalmappning stämmer inte överens med samplingsspecifikationen"
 
-#: ../src/utils/pactl.c:1017
-#, fuzzy
-msgid "source-output"
-msgstr "källa"
+#: ../src/utils/pacat.c:1101
+msgid "Warning: failed to write channel map to file."
+msgstr "Varning: Misslyckades med att skriva kanalmappningen till filen."
 
-#: ../src/utils/pactl.c:1020
-msgid "module"
+#: ../src/utils/pacat.c:1116
+#, c-format
+msgid ""
+"Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr ""
+"Öppnar en %s-ström med samplingsspecifikationen ”%s” och kanalmappningen "
+"”%s”."
 
-#: ../src/utils/pactl.c:1023
-msgid "client"
-msgstr ""
+#: ../src/utils/pacat.c:1117
+msgid "recording"
+msgstr "inspelning"
 
-#: ../src/utils/pactl.c:1026
-msgid "sample-cache"
-msgstr ""
+#: ../src/utils/pacat.c:1117
+msgid "playback"
+msgstr "uppspelning"
 
-#: ../src/utils/pactl.c:1029 ../src/utils/pactl.c:1032
-#, fuzzy
-msgid "server"
-msgstr "Ogiltig server"
+#: ../src/utils/pacat.c:1141
+msgid "Failed to set media name."
+msgstr "Misslyckades med att ange medienamn."
 
-#: ../src/utils/pactl.c:1041
-#, c-format
-msgid "Event '%s' on %s #%u\n"
-msgstr ""
+#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2058
+msgid "pa_mainloop_new() failed."
+msgstr "pa_mainloop_new() misslyckades."
 
-#: ../src/utils/pactl.c:1258
-#, fuzzy
-msgid "Got SIGINT, exiting."
-msgstr "Fick signal %s."
+#: ../src/utils/pacat.c:1171
+msgid "io_new() failed."
+msgstr "io_new() misslyckades."
 
-#: ../src/utils/pactl.c:1285
-#, fuzzy
-msgid "Invalid volume specification"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2070
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() misslyckades."
 
-#: ../src/utils/pactl.c:1308
-msgid "Volume outside permissible range.\n"
-msgstr ""
+#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2076
+#, c-format
+msgid "pa_context_connect() failed: %s"
+msgstr "pa_context_connect() misslyckades: %s"
 
-#: ../src/utils/pactl.c:1319 ../src/utils/pactl.c:1320
-#: ../src/utils/pactl.c:1321 ../src/utils/pactl.c:1322
-#: ../src/utils/pactl.c:1323 ../src/utils/pactl.c:1324
-#: ../src/utils/pactl.c:1325 ../src/utils/pactl.c:1326
-#: ../src/utils/pactl.c:1327 ../src/utils/pactl.c:1328
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1330
-#: ../src/utils/pactl.c:1331 ../src/utils/pactl.c:1332
-#: ../src/utils/pactl.c:1333 ../src/utils/pactl.c:1334
-#: ../src/utils/pactl.c:1335 ../src/utils/pactl.c:1336
-#: ../src/utils/pactl.c:1337
-msgid "[options]"
-msgstr ""
+#: ../src/utils/pacat.c:1192
+msgid "pa_context_rttime_new() failed."
+msgstr "pa_context_rttime_new() misslyckades."
 
-#: ../src/utils/pactl.c:1321
-msgid "[TYPE]"
-msgstr ""
+#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2081
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() misslyckades."
 
-#: ../src/utils/pactl.c:1323
-msgid "FILENAME [NAME]"
-msgstr ""
+#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1566
+msgid "NAME [ARGS ...]"
+msgstr "NAMN [ARG …]"
 
-#: ../src/utils/pactl.c:1324
-msgid "NAME [SINK]"
-msgstr ""
+#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1567
+msgid "NAME|#N"
+msgstr "NAMN|#N"
 
-#: ../src/utils/pactl.c:1325
+#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1565
+#: ../src/utils/pactl.c:1571
 msgid "NAME"
-msgstr ""
+msgstr "NAMN"
 
-#: ../src/utils/pactl.c:1326
-msgid "NAME [ARGS ...]"
-msgstr ""
+#: ../src/utils/pacmd.c:56
+msgid "NAME|#N VOLUME"
+msgstr "NAMN|#N VOLYM"
+
+#: ../src/utils/pacmd.c:57
+msgid "#N VOLUME"
+msgstr "#N VOLYM"
+
+#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1569
+msgid "NAME|#N 1|0"
+msgstr "NAMN|#N 1|0"
+
+#: ../src/utils/pacmd.c:59
+msgid "#N 1|0"
+msgstr "#N 1|0"
+
+#: ../src/utils/pacmd.c:60
+msgid "NAME|#N KEY=VALUE"
+msgstr "NAMN|#N NYCKEL=VÄRDE"
 
-#: ../src/utils/pactl.c:1327
+#: ../src/utils/pacmd.c:61
+msgid "#N KEY=VALUE"
+msgstr "#N NYCKEL=VÄRDE"
+
+#: ../src/utils/pacmd.c:63
 msgid "#N"
-msgstr ""
+msgstr "#N"
+
+#: ../src/utils/pacmd.c:64
+msgid "NAME SINK|#N"
+msgstr "NAMN MOTTAGARE|#N"
+
+#: ../src/utils/pacmd.c:66 ../src/utils/pacmd.c:67
+msgid "NAME FILENAME"
+msgstr "NAMN FILNAMN"
+
+#: ../src/utils/pacmd.c:68
+msgid "PATHNAME"
+msgstr "SÖKVÄGSNAMN"
+
+#: ../src/utils/pacmd.c:69
+msgid "FILENAME SINK|#N"
+msgstr "FILNAMN MOTTAGARE|#N"
 
-#: ../src/utils/pactl.c:1328
+#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1568
 msgid "#N SINK|SOURCE"
-msgstr ""
+msgstr "#N MOTTAGARE|KÄLLA"
 
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1334
-msgid "NAME|#N 1|0"
-msgstr ""
+#: ../src/utils/pacmd.c:73 ../src/utils/pacmd.c:79 ../src/utils/pacmd.c:80
+msgid "1|0"
+msgstr "1|0"
 
-#: ../src/utils/pactl.c:1330
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1570
 msgid "CARD PROFILE"
-msgstr ""
+msgstr "KORT PROFIL"
 
-#: ../src/utils/pactl.c:1331
+#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1572
 msgid "NAME|#N PORT"
-msgstr ""
+msgstr "NAMN|#N PORT"
 
-#: ../src/utils/pactl.c:1332
-msgid "NAME|#N VOLUME"
-msgstr ""
+#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1578
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr "KORT-NAMN|KORT-#N PORT OFFSET"
 
-#: ../src/utils/pactl.c:1333
-msgid "#N VOLUME"
-msgstr ""
+#: ../src/utils/pacmd.c:77
+msgid "TARGET"
+msgstr "MÅL"
 
-#: ../src/utils/pactl.c:1335
-msgid "#N 1|0"
-msgstr ""
+#: ../src/utils/pacmd.c:78
+msgid "NUMERIC LEVEL"
+msgstr "NUMERISK NIVÅ"
 
-#: ../src/utils/pactl.c:1336
-msgid "#N FORMATS"
-msgstr ""
+#: ../src/utils/pacmd.c:81
+msgid "FRAMES"
+msgstr "LJUDRUTOR"
 
-#: ../src/utils/pactl.c:1339
+#: ../src/utils/pacmd.c:83
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
-"\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
-"  -n, --client-name=NAME                How to call this client on the "
-"server\n"
+"When no command is given pacmd starts in the interactive mode.\n"
 msgstr ""
+"\n"
+"  -h, --help                            Visa denna hjälp\n"
+"      --version                         Visa version\n"
+"När inget kommando anges startar pacmd i det interaktiva läget.\n"
 
-#: ../src/utils/pactl.c:1380
+#: ../src/utils/pacmd.c:130
 #, c-format
 msgid ""
-"pactl %s\n"
+"pacmd %s\n"
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 msgstr ""
-"pactl %s\n"
+"pacmd %s\n"
 "Kompilerad med libpulse %s\n"
 "Länkad med libpulse %s\n"
 
-#: ../src/utils/pactl.c:1439
-#, c-format
-msgid "Specify nothing, or one of: %s"
-msgstr ""
-
-#: ../src/utils/pactl.c:1449
-msgid "Please specify a sample file to load"
-msgstr ""
-
-#: ../src/utils/pactl.c:1462
-#, fuzzy
-msgid "Failed to open sound file."
-msgstr "Misslyckades med att öppna ljudfil.\n"
-
-#: ../src/utils/pactl.c:1474
-#, fuzzy
-msgid "Warning: Failed to determine sample specification from file."
-msgstr "Misslyckades med att få modulinformation: %s\n"
-
-#: ../src/utils/pactl.c:1484
-msgid "You have to specify a sample name to play"
-msgstr ""
-
-#: ../src/utils/pactl.c:1496
-msgid "You have to specify a sample name to remove"
-msgstr ""
+#: ../src/utils/pacmd.c:144
+msgid "No PulseAudio daemon running, or not running as session daemon."
+msgstr "Ingen PulseAudio-demon körs, eller körs ej som en sessionsdemon."
 
-#: ../src/utils/pactl.c:1505
-msgid "You have to specify a sink input index and a sink"
-msgstr ""
+#: ../src/utils/pacmd.c:149
+#, c-format
+msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
+msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 
-#: ../src/utils/pactl.c:1515
-msgid "You have to specify a source output index and a source"
-msgstr ""
+#: ../src/utils/pacmd.c:166
+#, c-format
+msgid "connect(): %s"
+msgstr "connect(): %s"
 
-#: ../src/utils/pactl.c:1530
-msgid "You have to specify a module name and arguments."
-msgstr ""
+#: ../src/utils/pacmd.c:174
+msgid "Failed to kill PulseAudio daemon."
+msgstr "Misslyckades med att döda PulseAudio-demon."
 
-#: ../src/utils/pactl.c:1550
-msgid "You have to specify a module index"
-msgstr ""
+#: ../src/utils/pacmd.c:182
+msgid "Daemon not responding."
+msgstr "Demon svarar ej."
 
-#: ../src/utils/pactl.c:1560
-msgid ""
-"You may not specify more than one sink. You have to specify a boolean value."
-msgstr ""
+#: ../src/utils/pacmd.c:214 ../src/utils/pacmd.c:323 ../src/utils/pacmd.c:341
+#, c-format
+msgid "write(): %s"
+msgstr "write(): %s"
 
-#: ../src/utils/pactl.c:1573
-msgid ""
-"You may not specify more than one source. You have to specify a boolean "
-"value."
-msgstr ""
+#: ../src/utils/pacmd.c:270
+#, c-format
+msgid "poll(): %s"
+msgstr "poll(): %s"
 
-#: ../src/utils/pactl.c:1585
-msgid "You have to specify a card name/index and a profile name"
-msgstr ""
+#: ../src/utils/pacmd.c:281 ../src/utils/pacmd.c:301
+#, c-format
+msgid "read(): %s"
+msgstr "read(): %s"
 
-#: ../src/utils/pactl.c:1596
-msgid "You have to specify a sink name/index and a port name"
-msgstr ""
+#: ../src/utils/pactl.c:166
+#, c-format
+msgid "Failed to get statistics: %s"
+msgstr "Misslyckades med att hämta statistik: %s"
 
-#: ../src/utils/pactl.c:1607
-msgid "You have to specify a source name/index and a port name"
-msgstr ""
+#: ../src/utils/pactl.c:172
+#, c-format
+msgid "Currently in use: %u blocks containing %s bytes total.\n"
+msgstr "Används för närvarande: %u block innehållande %s byte totalt.\n"
 
-#: ../src/utils/pactl.c:1618
-msgid "You have to specify a sink name/index and a volume"
+#: ../src/utils/pactl.c:175
+#, c-format
+msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr ""
+"Allokerade under hela livstiden: %u block innehållande %s byte totalt.\n"
 
-#: ../src/utils/pactl.c:1631
-msgid "You have to specify a source name/index and a volume"
-msgstr ""
+#: ../src/utils/pactl.c:178
+#, c-format
+msgid "Sample cache size: %s\n"
+msgstr "Samplingscachestorlek: %s\n"
 
-#: ../src/utils/pactl.c:1644
-msgid "You have to specify a sink input index and a volume"
-msgstr ""
+#: ../src/utils/pactl.c:187
+#, c-format
+msgid "Failed to get server information: %s"
+msgstr "Misslyckades med att hämta serverinformation: %s"
 
-#: ../src/utils/pactl.c:1649
-msgid "Invalid sink input index"
+#: ../src/utils/pactl.c:192
+#, c-format
+msgid ""
+"Server String: %s\n"
+"Library Protocol Version: %u\n"
+"Server Protocol Version: %u\n"
+"Is Local: %s\n"
+"Client Index: %u\n"
+"Tile Size: %zu\n"
 msgstr ""
+"Serversträng: %s\n"
+"Biblioteksprotokollversion: %u\n"
+"Serverprotokollversion: %u\n"
+"Lokal: %s\n"
+"Klientindex: %u\n"
+"Blockstorlek: %zu\n"
 
-#: ../src/utils/pactl.c:1660
-msgid "You have to specify a source output index and a volume"
+#: ../src/utils/pactl.c:208
+#, c-format
+msgid ""
+"User Name: %s\n"
+"Host Name: %s\n"
+"Server Name: %s\n"
+"Server Version: %s\n"
+"Default Sample Specification: %s\n"
+"Default Channel Map: %s\n"
+"Default Sink: %s\n"
+"Default Source: %s\n"
+"Cookie: %04x:%04x\n"
 msgstr ""
+"Användarnamn: %s\n"
+"Värdnamn: %s\n"
+"Servernamn: %s\n"
+"Serverversion: %s\n"
+"Förvald samplingsspecifikation: %s\n"
+"Förvald kanalmappning: %s\n"
+"Förvald mottagare: %s\n"
+"Förvald källa: %s\n"
+"Kaka: %04x:%04x\n"
 
-#: ../src/utils/pactl.c:1665
-#, fuzzy
-msgid "Invalid source output index"
-msgstr "källa"
+#: ../src/utils/pactl.c:257 ../src/utils/pactl.c:902 ../src/utils/pactl.c:980
+#, c-format
+msgid "Failed to get sink information: %s"
+msgstr "Misslyckades med att få information om mottagare: %s"
 
-#: ../src/utils/pactl.c:1677
-msgid "You have to specify a sink name/index and a mute boolean"
+#: ../src/utils/pactl.c:283
+#, c-format
+msgid ""
+"Sink #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t        balance %0.2f\n"
+"\tBase Volume: %s\n"
+"\tMonitor Source: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
 msgstr ""
+"Mottagare #%u\n"
+"\tTillstånd: %s\n"
+"\tNamn: %s\n"
+"\tBeskrivning: %s\n"
+"\tDrivrutin: %s\n"
+"\tSamplingsspecifikation: %s\n"
+"\tKanalmappning: %s\n"
+"\tÄgarmodul: %u\n"
+"\tTyst: %s\n"
+"\tVolym: %s\n"
+"\t        balans %0.2f\n"
+"\tBasvolym: %s\n"
+"\tÖvervakarkälla: %s\n"
+"\tLatens: %0.0f µs, anpassad %0.0f µs\n"
+"\tFlaggor: %s%s%s%s%s%s%s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:1682 ../src/utils/pactl.c:1699
-#: ../src/utils/pactl.c:1721 ../src/utils/pactl.c:1742
-#, fuzzy
-msgid "Invalid mute specification"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+#: ../src/utils/pactl.c:327 ../src/utils/pactl.c:433 ../src/utils/pactl.c:594
+#, c-format
+msgid "\tPorts:\n"
+msgstr "\tPortar:\n"
 
-#: ../src/utils/pactl.c:1694
-msgid "You have to specify a source name/index and a mute boolean"
-msgstr ""
+#: ../src/utils/pactl.c:334 ../src/utils/pactl.c:440
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr "\tAktiv port: %s\n"
 
-#: ../src/utils/pactl.c:1711
-msgid "You have to specify a sink input index and a mute boolean"
-msgstr ""
+#: ../src/utils/pactl.c:340 ../src/utils/pactl.c:446
+#, c-format
+msgid "\tFormats:\n"
+msgstr "\tFormat:\n"
 
-#: ../src/utils/pactl.c:1716
-#, fuzzy
-msgid "Invalid sink input index specification"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+#: ../src/utils/pactl.c:364 ../src/utils/pactl.c:922 ../src/utils/pactl.c:995
+#, c-format
+msgid "Failed to get source information: %s"
+msgstr "Misslyckades med att få information om källa: %s"
 
-#: ../src/utils/pactl.c:1732
-msgid "You have to specify a source output index and a mute boolean"
+#: ../src/utils/pactl.c:390
+#, c-format
+msgid ""
+"Source #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t        balance %0.2f\n"
+"\tBase Volume: %s\n"
+"\tMonitor of Sink: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
 msgstr ""
+"Källa nr %u\n"
+"\tTillstånd: %s\n"
+"\tNamn: %s\n"
+"\tBeskrivning: %s\n"
+"\tDrivrutin: %s\n"
+"\tSamplingsspecifikation: %s\n"
+"\tKanalmappning: %s\n"
+"\tÄgarmodul: %u\n"
+"\tTystad: %s\n"
+"\tVolym: %s\n"
+"\t       balans %0.2f\n"
+"\tBasvolym: %s\n"
+"\tÖvervakare för mottagare: %s\n"
+"\tLatens: %0.0f µs, konfigurerad %0.0f µs\n"
+"\tFlaggor: %s%s%s%s%s%s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:1737
-#, fuzzy
-msgid "Invalid source output index specification"
-msgstr "Misslyckades med att få modulinformation: %s\n"
+#: ../src/utils/pactl.c:418 ../src/utils/pactl.c:488 ../src/utils/pactl.c:531
+#: ../src/utils/pactl.c:573 ../src/utils/pactl.c:671 ../src/utils/pactl.c:672
+#: ../src/utils/pactl.c:683 ../src/utils/pactl.c:741 ../src/utils/pactl.c:742
+#: ../src/utils/pactl.c:753 ../src/utils/pactl.c:804 ../src/utils/pactl.c:805
+#: ../src/utils/pactl.c:811
+msgid "n/a"
+msgstr "ej tillämpligt"
 
-#: ../src/utils/pactl.c:1756
+#: ../src/utils/pactl.c:457 ../src/utils/pactl.c:861
+#, c-format
+msgid "Failed to get module information: %s"
+msgstr "Misslyckades med att få modulinformation: %s"
+
+#: ../src/utils/pactl.c:480
+#, c-format
 msgid ""
-"You have to specify a sink index and a semicolon-separated list of supported "
-"formats"
+"Module #%u\n"
+"\tName: %s\n"
+"\tArgument: %s\n"
+"\tUsage counter: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
 msgstr ""
+"Modul nr. %u\n"
+"\tNamn: %s\n"
+"\tArgument: %s\n"
+"\tAnvändningsräknare: %s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:1772
-msgid "No valid command specified."
-msgstr ""
+#: ../src/utils/pactl.c:499
+#, c-format
+msgid "Failed to get client information: %s"
+msgstr "Misslyckades med att få klientinformation: %s"
 
-#: ../src/utils/pax11publish.c:61
+#: ../src/utils/pactl.c:525
 #, c-format
 msgid ""
-"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
-"\n"
-" -d    Show current PulseAudio data attached to X11 display (default)\n"
-" -e    Export local PulseAudio data to X11 display\n"
-" -i    Import PulseAudio data from X11 display to local environment "
-"variables and cookie file.\n"
-" -r    Remove PulseAudio data from X11 display\n"
+"Client #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
 msgstr ""
+"Klient #%u\n"
+"\tDrivrutin: %s\n"
+"\tÄgarmodul: %s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pax11publish.c:94
-#, c-format
-msgid "Failed to parse command line.\n"
-msgstr "Misslyckades med att tolka kommandorad.\n"
-
-#: ../src/utils/pax11publish.c:113
+#: ../src/utils/pactl.c:542
 #, c-format
-msgid "Server: %s\n"
-msgstr "Server: %s\n"
+msgid "Failed to get card information: %s"
+msgstr "Misslyckades med att få kortinformation: %s"
 
-#: ../src/utils/pax11publish.c:115
+#: ../src/utils/pactl.c:565
 #, c-format
-msgid "Source: %s\n"
-msgstr "Källa: %s\n"
+msgid ""
+"Card #%u\n"
+"\tName: %s\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Kort #%u\n"
+"\tNamn: %s\n"
+"\tDrivrutin: %s\n"
+"\tÄgarmodul: %s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pax11publish.c:117
+#: ../src/utils/pactl.c:581
 #, c-format
-msgid "Sink: %s\n"
-msgstr "Sink: %s\n"
+msgid "\tProfiles:\n"
+msgstr "\tProfiler:\n"
 
-#: ../src/utils/pax11publish.c:119
+#: ../src/utils/pactl.c:588
 #, c-format
-msgid "Cookie: %s\n"
-msgstr "Kaka: %s\n"
+msgid "\tActive Profile: %s\n"
+msgstr "\tAktiv profil: %s\n"
 
-#: ../src/utils/pax11publish.c:137
+#: ../src/utils/pactl.c:602
 #, c-format
-msgid "Failed to parse cookie data\n"
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
 msgstr ""
+"\t\t\tEgenskaper:\n"
+"\t\t\t\t%s\n"
 
-#: ../src/utils/pax11publish.c:142
+#: ../src/utils/pactl.c:607
 #, c-format
-msgid "Failed to save cookie data\n"
-msgstr ""
+msgid "\t\t\tPart of profile(s): %s"
+msgstr "\t\t\tDel av profil(er): %s"
 
-#: ../src/utils/pax11publish.c:157
+#: ../src/utils/pactl.c:624 ../src/utils/pactl.c:942 ../src/utils/pactl.c:1010
 #, c-format
-msgid "Failed to load client configuration file.\n"
-msgstr ""
+msgid "Failed to get sink input information: %s"
+msgstr "Misslyckades med att få ingångsinformation för mottagaren: %s"
 
-#: ../src/utils/pax11publish.c:162
+#: ../src/utils/pactl.c:653
 #, c-format
-msgid "Failed to read environment configuration data.\n"
+msgid ""
+"Sink Input #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSink: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tFormat: %s\n"
+"\tCorked: %s\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t        balance %0.2f\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSink Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
 msgstr ""
+"Mottagaringång #%u\n"
+"\tDrivrutin: %s\n"
+"\tÄgarmodul: %s\n"
+"\tKlient: %s\n"
+"\tMottagare: %u\n"
+"\tSamplingsspecifikation: %s\n"
+"\tKanalmappning: %s\n"
+"\tFormat: %s\n"
+"\tKorkad: %s\n"
+"\tTyst: %s\n"
+"\tVolym: %s\n"
+"\t        balans %0.2f\n"
+"\tBuffertlatens: %0.0f µs\n"
+"\tMottagarlatens: %0.0f µs\n"
+"\tOmsamplingsmetod: %s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pax11publish.c:179
+#: ../src/utils/pactl.c:694 ../src/utils/pactl.c:962 ../src/utils/pactl.c:1025
 #, c-format
-msgid "Failed to get FQDN.\n"
-msgstr ""
+msgid "Failed to get source output information: %s"
+msgstr "Misslyckades med att få information om källutgång: %s"
 
-#: ../src/utils/pax11publish.c:199
+#: ../src/utils/pactl.c:723
 #, c-format
-msgid "Failed to load cookie data\n"
+msgid ""
+"Source Output #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSource: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tFormat: %s\n"
+"\tCorked: %s\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t        balance %0.2f\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSource Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
 msgstr ""
+"Källutgång #%u\n"
+"\tDrivrutin: %s\n"
+"\tÄgarmodul: %s\n"
+"\tKlient: %s\n"
+"\tKälla: %u\n"
+"\tSamplingsspecifikation: %s\n"
+"\tKanalmappning: %s\n"
+"\tFormat: %s\n"
+"\tKorkad: %s\n"
+"\tTyst: %s\n"
+"\tVolym: %s\n"
+"\t        balans %0.2f\n"
+"\tBuffertlatens: %0.0f µs\n"
+"\tKällatens: %0.0f µs\n"
+"\tOmsamplingsmetod: %s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pax11publish.c:217
+#: ../src/utils/pactl.c:764
 #, c-format
-msgid "Not yet implemented.\n"
-msgstr "Ännu inte implementerad.\n"
-
-#: ../src/utils/pacmd.c:66
-msgid "No PulseAudio daemon running, or not running as session daemon."
-msgstr ""
+msgid "Failed to get sample information: %s"
+msgstr "Misslyckades med att få samplingsinformation: %s"
 
-#: ../src/utils/pacmd.c:71
+#: ../src/utils/pactl.c:791
 #, c-format
-msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
+msgid ""
+"Sample #%u\n"
+"\tName: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tVolume: %s\n"
+"\t        balance %0.2f\n"
+"\tDuration: %0.1fs\n"
+"\tSize: %s\n"
+"\tLazy: %s\n"
+"\tFilename: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
 msgstr ""
+"Sampling nr. %u\n"
+"\tNamn: %s\n"
+"\tSamplingsspecifikation: %s\n"
+"\tKanalmappning: %s\n"
+"\tVolym: %s\n"
+"\t       balans %0.2f\n"
+"\tVaraktighet: %0.1f s\n"
+"\tStorlek: %s\n"
+"\tLat: %s\n"
+"\tFilnamn: %s\n"
+"\tEgenskaper:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pacmd.c:88
+#: ../src/utils/pactl.c:819 ../src/utils/pactl.c:829
 #, c-format
-msgid "connect(): %s"
-msgstr "connect(): %s"
+msgid "Failure: %s"
+msgstr "Misslyckande: %s"
 
-#: ../src/utils/pacmd.c:96
-msgid "Failed to kill PulseAudio daemon."
-msgstr ""
+#: ../src/utils/pactl.c:868
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "Misslyckades med att stänga modul: Modulen %s är inte aktiv"
 
-#: ../src/utils/pacmd.c:104
-msgid "Daemon not responding."
+#: ../src/utils/pactl.c:886
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel/s supported = %d\n"
 msgstr ""
+"Misslyckades att sätta volym: Du försökte att sätta volymer för %d kanaler, "
+"medan antalet kanaler som stöds = %d\n"
 
-#: ../src/utils/pacmd.c:184
-#, fuzzy, c-format
-msgid "poll(): %s"
-msgstr "fork(): %s"
-
-#: ../src/utils/pacmd.c:195 ../src/utils/pacmd.c:215
+#: ../src/utils/pactl.c:1052
 #, c-format
-msgid "read(): %s"
-msgstr "read(): %s"
+msgid "Failed to set format: invalid format string %s"
+msgstr "Misslyckades med att ange format: ogiltig formatsträng %s"
 
-#: ../src/utils/pacmd.c:237 ../src/utils/pacmd.c:255
+#: ../src/utils/pactl.c:1095
 #, c-format
-msgid "write(): %s"
-msgstr "write(): %s"
+msgid "Failed to upload sample: %s"
+msgstr "Misslyckades med att skicka upp samplingen: %s"
 
-#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:222
-msgid "Cannot access autospawn lock."
-msgstr ""
+#: ../src/utils/pactl.c:1112
+msgid "Premature end of file"
+msgstr "För tidigt filslut"
 
-#: ../src/modules/alsa/alsa-sink.c:560 ../src/modules/alsa/alsa-sink.c:726
-#, c-format
-msgid ""
-"ALSA woke us up to write new data to the device, but there was actually "
-"nothing to write!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
+#: ../src/utils/pactl.c:1132
+msgid "new"
+msgstr "ny"
 
-#: ../src/modules/alsa/alsa-source.c:519 ../src/modules/alsa/alsa-source.c:672
-#, c-format
-msgid ""
-"ALSA woke us up to read new data from the device, but there was actually "
-"nothing to read!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
+#: ../src/utils/pactl.c:1135
+msgid "change"
+msgstr "ändra"
 
-#: ../src/modules/alsa/module-alsa-card.c:167
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2796
-#: ../src/modules/alsa/alsa-mixer.c:3898
-msgid "Off"
-msgstr ""
+#: ../src/utils/pactl.c:1138
+msgid "remove"
+msgstr "ta bort"
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2738
-msgid "High Fidelity Playback (A2DP)"
-msgstr ""
+#: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176
+msgid "unknown"
+msgstr "okänd"
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2752
-msgid "High Fidelity Capture (A2DP)"
-msgstr ""
+#: ../src/utils/pactl.c:1149
+msgid "sink"
+msgstr "mottagare"
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2767
-msgid "Telephony Duplex (HSP/HFP)"
-msgstr ""
+#: ../src/utils/pactl.c:1152
+msgid "source"
+msgstr "källa"
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2781
-msgid "Handsfree Gateway"
-msgstr ""
+#: ../src/utils/pactl.c:1155
+msgid "sink-input"
+msgstr "mottagaringång"
 
-#: ../src/modules/reserve-wrap.c:151
-msgid "PulseAudio Sound Server"
-msgstr ""
+#: ../src/utils/pactl.c:1158
+msgid "source-output"
+msgstr "källutgång"
 
-#: ../src/modules/module-rygel-media-server.c:510
-#: ../src/modules/module-rygel-media-server.c:548
-#: ../src/modules/module-rygel-media-server.c:903
-msgid "Output Devices"
-msgstr ""
+#: ../src/utils/pactl.c:1161
+msgid "module"
+msgstr "modul"
 
-#: ../src/modules/module-rygel-media-server.c:511
-#: ../src/modules/module-rygel-media-server.c:549
-#: ../src/modules/module-rygel-media-server.c:904
-msgid "Input Devices"
-msgstr ""
+#: ../src/utils/pactl.c:1164
+msgid "client"
+msgstr "klient"
 
-#: ../src/modules/module-rygel-media-server.c:1056
-msgid "Audio on @HOSTNAME@"
-msgstr ""
+#: ../src/utils/pactl.c:1167
+msgid "sample-cache"
+msgstr "sample-cache"
 
-#: ../src/modules/alsa/alsa-mixer.c:2219
-msgid "Input"
-msgstr ""
+#: ../src/utils/pactl.c:1170
+msgid "server"
+msgstr "server"
 
-#: ../src/modules/alsa/alsa-mixer.c:2220
-msgid "Docking Station Input"
-msgstr ""
+#: ../src/utils/pactl.c:1173
+msgid "card"
+msgstr "kort"
 
-#: ../src/modules/alsa/alsa-mixer.c:2221
-#, fuzzy
-msgid "Docking Station Microphone"
-msgstr "Internt fel"
+#: ../src/utils/pactl.c:1182
+#, c-format
+msgid "Event '%s' on %s #%u\n"
+msgstr "Händelse '%s' på %s #%u\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:2222
-msgid "Docking Station Line In"
-msgstr ""
+#: ../src/utils/pactl.c:1454
+msgid "Got SIGINT, exiting."
+msgstr "Fick SIGINT, avslutar."
 
-#: ../src/modules/alsa/alsa-mixer.c:2223 ../src/modules/alsa/alsa-mixer.c:2307
-msgid "Line In"
-msgstr ""
+#: ../src/utils/pactl.c:1481
+msgid "Invalid volume specification"
+msgstr "Ogiltig volymangivelse"
 
-#: ../src/modules/alsa/alsa-mixer.c:2224 ../src/modules/alsa/alsa-mixer.c:2302
-msgid "Microphone"
-msgstr ""
+#: ../src/utils/pactl.c:1504
+msgid "Volume outside permissible range.\n"
+msgstr "Volym utanför tillåtet intervall.\n"
+
+#: ../src/utils/pactl.c:1517
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ogiltigt antal volymspecifikationer.\n"
+
+#: ../src/utils/pactl.c:1529
+msgid "Inconsistent volume specification.\n"
+msgstr "Inkonsekvent volymspecifikation.\n"
+
+#: ../src/utils/pactl.c:1559 ../src/utils/pactl.c:1560
+#: ../src/utils/pactl.c:1561 ../src/utils/pactl.c:1562
+#: ../src/utils/pactl.c:1563 ../src/utils/pactl.c:1564
+#: ../src/utils/pactl.c:1565 ../src/utils/pactl.c:1566
+#: ../src/utils/pactl.c:1567 ../src/utils/pactl.c:1568
+#: ../src/utils/pactl.c:1569 ../src/utils/pactl.c:1570
+#: ../src/utils/pactl.c:1571 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1573 ../src/utils/pactl.c:1574
+#: ../src/utils/pactl.c:1575 ../src/utils/pactl.c:1576
+#: ../src/utils/pactl.c:1577 ../src/utils/pactl.c:1578
+#: ../src/utils/pactl.c:1579
+msgid "[options]"
+msgstr "[flaggor]"
 
-#: ../src/modules/alsa/alsa-mixer.c:2225 ../src/modules/alsa/alsa-mixer.c:2303
-#, fuzzy
-msgid "Front Microphone"
-msgstr "Internt fel"
+#: ../src/utils/pactl.c:1561
+msgid "[TYPE]"
+msgstr "[TYP]"
 
-#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304
-#, fuzzy
-msgid "Rear Microphone"
-msgstr "Internt fel"
+#: ../src/utils/pactl.c:1563
+msgid "FILENAME [NAME]"
+msgstr "FILNAMN [NAMN]"
 
-#: ../src/modules/alsa/alsa-mixer.c:2227
-msgid "External Microphone"
-msgstr ""
+#: ../src/utils/pactl.c:1564
+msgid "NAME [SINK]"
+msgstr "NAMN [MOTTAGARE]"
 
-#: ../src/modules/alsa/alsa-mixer.c:2228 ../src/modules/alsa/alsa-mixer.c:2306
-#, fuzzy
-msgid "Internal Microphone"
-msgstr "Internt fel"
+#: ../src/utils/pactl.c:1573
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAMN|#N VOLYM [VOLYM …]"
 
-#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2308
-msgid "Radio"
-msgstr ""
+#: ../src/utils/pactl.c:1574
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLYM [VOLYM …]"
 
-#: ../src/modules/alsa/alsa-mixer.c:2230 ../src/modules/alsa/alsa-mixer.c:2309
-msgid "Video"
-msgstr ""
+#: ../src/utils/pactl.c:1575
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAMN|#N 1|0|växla"
 
-#: ../src/modules/alsa/alsa-mixer.c:2231
-msgid "Automatic Gain Control"
-msgstr ""
+#: ../src/utils/pactl.c:1576
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|växla"
 
-#: ../src/modules/alsa/alsa-mixer.c:2232
-msgid "No Automatic Gain Control"
-msgstr ""
+#: ../src/utils/pactl.c:1577
+msgid "#N FORMATS"
+msgstr "#N FORMAT"
 
-#: ../src/modules/alsa/alsa-mixer.c:2233
-msgid "Boost"
+#: ../src/utils/pactl.c:1580
+#, c-format
+msgid ""
+"\n"
+"The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@\n"
+"can be used to specify the default sink, source and monitor.\n"
 msgstr ""
+"\n"
+"Specialnamnen @DEFAULT_SINK@, @DEFAULT_SOURCE och @DEFAULT_MONITOR@\n"
+"kan användas för att ange standardmottagare, källa och övervakare.\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:2234
-msgid "No Boost"
+#: ../src/utils/pactl.c:1583
+#, c-format
+msgid ""
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"\n"
+"  -s, --server=SERVER                   The name of the server to connect "
+"to\n"
+"  -n, --client-name=NAME                How to call this client on the "
+"server\n"
 msgstr ""
+"\n"
+"  -h, --help                            Visa detta hjälpmeddelande\n"
+"      --version                         Visa version\n"
+"\n"
+"  -s, --server=SERVER                   Namnet på servern att ansluta till\n"
+"  -n, --client-name=NAMN                Vad klienten ska kallas på servern\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:2235
-msgid "Amplifier"
+#: ../src/utils/pactl.c:1624
+#, c-format
+msgid ""
+"pactl %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
 msgstr ""
+"pactl %s\n"
+"Kompilerad med libpulse %s\n"
+"Länkad med libpulse %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:2236
-msgid "No Amplifier"
-msgstr ""
+#: ../src/utils/pactl.c:1680
+#, c-format
+msgid "Specify nothing, or one of: %s"
+msgstr "Specificera inget, eller endera av: %s"
 
-#: ../src/modules/alsa/alsa-mixer.c:2237
-msgid "Bass Boost"
-msgstr ""
+#: ../src/utils/pactl.c:1690
+msgid "Please specify a sample file to load"
+msgstr "Ange en samplingsfil att ladda"
 
-#: ../src/modules/alsa/alsa-mixer.c:2238
-msgid "No Bass Boost"
-msgstr ""
+#: ../src/utils/pactl.c:1703
+msgid "Failed to open sound file."
+msgstr "Misslyckades med att öppna ljudfilen."
 
-#: ../src/modules/alsa/alsa-mixer.c:2239
-msgid "Speaker"
+#: ../src/utils/pactl.c:1715
+msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
+"Varning: Misslyckades med att avgöra samplingsspecifikationen från filen."
 
-#: ../src/modules/alsa/alsa-mixer.c:2240 ../src/modules/alsa/alsa-mixer.c:2311
-msgid "Headphones"
-msgstr ""
+#: ../src/utils/pactl.c:1725
+msgid "You have to specify a sample name to play"
+msgstr "Du måste ange ett samplingsnamn att spela"
 
-#: ../src/modules/alsa/alsa-mixer.c:2301
-msgid "Analog Input"
-msgstr ""
+#: ../src/utils/pactl.c:1737
+msgid "You have to specify a sample name to remove"
+msgstr "Du måste ange ett samplingsnamn att ta bort"
 
-#: ../src/modules/alsa/alsa-mixer.c:2305
-msgid "Dock Microphone"
-msgstr ""
+#: ../src/utils/pactl.c:1746
+msgid "You have to specify a sink input index and a sink"
+msgstr "Du måste ange ett index för en ingångsmottagare och en mottagare"
 
-#: ../src/modules/alsa/alsa-mixer.c:2310
-msgid "Analog Output"
-msgstr ""
+#: ../src/utils/pactl.c:1756
+msgid "You have to specify a source output index and a source"
+msgstr "Du måste ange ett index för en källutgång och en källa"
 
-#: ../src/modules/alsa/alsa-mixer.c:2312
-msgid "LFE on Separate Mono Output"
-msgstr ""
+#: ../src/utils/pactl.c:1771
+msgid "You have to specify a module name and arguments."
+msgstr "Du måste ange ett modulnamn och argument."
 
-#: ../src/modules/alsa/alsa-mixer.c:2313
-msgid "Line Out"
-msgstr ""
+#: ../src/utils/pactl.c:1791
+msgid "You have to specify a module index or name"
+msgstr "Du måste ange ett modulindex eller namn"
 
-#: ../src/modules/alsa/alsa-mixer.c:2314
-msgid "Analog Mono Output"
+#: ../src/utils/pactl.c:1804
+msgid ""
+"You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
+"Du får inte ange fler än en mottagare. Du måste ange ett booleskt värde."
 
-#: ../src/modules/alsa/alsa-mixer.c:2315
-msgid "Speakers"
-msgstr ""
+#: ../src/utils/pactl.c:1809 ../src/utils/pactl.c:1829
+msgid "Invalid suspend specification."
+msgstr "Ogiltig avstängningsspecifikation."
 
-#: ../src/modules/alsa/alsa-mixer.c:2316
-msgid "HDMI / DisplayPort"
-msgstr ""
+#: ../src/utils/pactl.c:1824
+msgid ""
+"You may not specify more than one source. You have to specify a boolean "
+"value."
+msgstr "Du får inte ange fler än en källa. Du måste ange ett booleskt värde."
 
-#: ../src/modules/alsa/alsa-mixer.c:2317
-msgid "Digital Output (S/PDIF)"
-msgstr ""
+#: ../src/utils/pactl.c:1841
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Du måste ange ett kortnamn/-index och ett profilnamn"
 
-#: ../src/modules/alsa/alsa-mixer.c:2318
-msgid "Digital Passthrough (S/PDIF)"
-msgstr ""
+#: ../src/utils/pactl.c:1852
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Du måste ange ett mottagarnamn/-index och ett portnamn"
 
-#: ../src/modules/alsa/alsa-mixer.c:3756
-msgid "Analog Mono"
-msgstr ""
+#: ../src/utils/pactl.c:1863
+msgid "You have to specify a sink name"
+msgstr "Du måste ange namn på en mottagare"
 
-#: ../src/modules/alsa/alsa-mixer.c:3757
-msgid "Analog Stereo"
-msgstr ""
+#: ../src/utils/pactl.c:1873
+msgid "You have to specify a source name/index and a port name"
+msgstr "Du måste ange ett källnamn/-index och ett portnamn"
 
-#: ../src/modules/alsa/alsa-mixer.c:3758
-msgid "Analog Surround 2.1"
-msgstr ""
+#: ../src/utils/pactl.c:1884
+msgid "You have to specify a source name"
+msgstr "Du måste ange namn på en källa"
 
-#: ../src/modules/alsa/alsa-mixer.c:3759
-msgid "Analog Surround 3.0"
-msgstr ""
+#: ../src/utils/pactl.c:1894
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Du måste ange ett mottagarnamn/-index och en volym"
 
-#: ../src/modules/alsa/alsa-mixer.c:3760
-msgid "Analog Surround 3.1"
-msgstr ""
+#: ../src/utils/pactl.c:1907
+msgid "You have to specify a source name/index and a volume"
+msgstr "Du måste ange ett källnamn/-index och en volym"
 
-#: ../src/modules/alsa/alsa-mixer.c:3761
-msgid "Analog Surround 4.0"
-msgstr ""
+#: ../src/utils/pactl.c:1920
+msgid "You have to specify a sink input index and a volume"
+msgstr "Du måste ange ett index för en mottagaringång och en volym"
 
-#: ../src/modules/alsa/alsa-mixer.c:3762
-msgid "Analog Surround 4.1"
-msgstr ""
+#: ../src/utils/pactl.c:1925
+msgid "Invalid sink input index"
+msgstr "Ogiltigt index för mottagaringång"
 
-#: ../src/modules/alsa/alsa-mixer.c:3763
-msgid "Analog Surround 5.0"
-msgstr ""
+#: ../src/utils/pactl.c:1936
+msgid "You have to specify a source output index and a volume"
+msgstr "Du måste ange ett källutgångsindex och en volym"
 
-#: ../src/modules/alsa/alsa-mixer.c:3764
-msgid "Analog Surround 5.1"
-msgstr ""
+#: ../src/utils/pactl.c:1941
+msgid "Invalid source output index"
+msgstr "Ogiltigt källutgångsindex"
 
-#: ../src/modules/alsa/alsa-mixer.c:3765
-msgid "Analog Surround 6.0"
-msgstr ""
+#: ../src/utils/pactl.c:1952
+msgid "You have to specify a sink name/index and a mute boolean"
+msgstr "Du måste ange en mottagarnamn/-index och ett booleskt dämpningsvärde"
 
-#: ../src/modules/alsa/alsa-mixer.c:3766
-msgid "Analog Surround 6.1"
-msgstr ""
+#: ../src/utils/pactl.c:1957 ../src/utils/pactl.c:1972
+#: ../src/utils/pactl.c:1992 ../src/utils/pactl.c:2010
+msgid "Invalid mute specification"
+msgstr "Ogiltig dämpningsspecifikation"
 
-#: ../src/modules/alsa/alsa-mixer.c:3767
-msgid "Analog Surround 7.0"
-msgstr ""
+#: ../src/utils/pactl.c:1967
+msgid "You have to specify a source name/index and a mute boolean"
+msgstr "Du måste ange ett källnamn/-index och ett booleskt dämpningsvärde"
 
-#: ../src/modules/alsa/alsa-mixer.c:3768
-msgid "Analog Surround 7.1"
+#: ../src/utils/pactl.c:1982
+msgid "You have to specify a sink input index and a mute boolean"
 msgstr ""
+"Du måste ange ett index för en mottagaringång och ett booleskt dämpningsvärde"
 
-#: ../src/modules/alsa/alsa-mixer.c:3769
-msgid "Digital Stereo (IEC958)"
-msgstr ""
+#: ../src/utils/pactl.c:1987
+msgid "Invalid sink input index specification"
+msgstr "Ogiltig angivelse av index för mottagaringång"
 
-#: ../src/modules/alsa/alsa-mixer.c:3770
-msgid "Digital Passthrough  (IEC958)"
-msgstr ""
+#: ../src/utils/pactl.c:2000
+msgid "You have to specify a source output index and a mute boolean"
+msgstr "Du måste ange ett källutgångsindex och ett booleskt dämpningsvärde"
 
-#: ../src/modules/alsa/alsa-mixer.c:3771
-msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+#: ../src/utils/pactl.c:2005
+msgid "Invalid source output index specification"
+msgstr "Ogiltig specificering av källutgångsindex"
 
-#: ../src/modules/alsa/alsa-mixer.c:3772
-msgid "Digital Surround 5.1 (IEC958/AC3)"
+#: ../src/utils/pactl.c:2022
+msgid ""
+"You have to specify a sink index and a semicolon-separated list of supported "
+"formats"
 msgstr ""
+"Du måste ange ett mottagarindex och en semikolonavskild lista med format som "
+"stöds"
 
-#: ../src/modules/alsa/alsa-mixer.c:3773
-msgid "Digital Stereo (HDMI)"
-msgstr ""
+#: ../src/utils/pactl.c:2034
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "Du måste ange ett kortnamn/-index, ett portnamn och en latensoffset"
 
-#: ../src/modules/alsa/alsa-mixer.c:3774
-msgid "Digital Surround 5.1 (HDMI)"
-msgstr ""
+#: ../src/utils/pactl.c:2041
+msgid "Could not parse latency offset"
+msgstr "Kunde inte tolka latensoffset"
 
-#: ../src/modules/alsa/alsa-mixer.c:3895
-msgid "Analog Mono Duplex"
-msgstr ""
+#: ../src/utils/pactl.c:2053
+msgid "No valid command specified."
+msgstr "Inget giltigt kommando angett."
 
-#: ../src/modules/alsa/alsa-mixer.c:3896
-msgid "Analog Stereo Duplex"
-msgstr ""
+#: ../src/utils/pasuspender.c:81
+#, c-format
+msgid "fork(): %s\n"
+msgstr "fork(): %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3897
-msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+#: ../src/utils/pasuspender.c:94
+#, c-format
+msgid "execvp(): %s\n"
+msgstr "execvp(): %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3997
+#: ../src/utils/pasuspender.c:113
 #, c-format
-msgid "%s Output"
-msgstr ""
+msgid "Failure to resume: %s\n"
+msgstr "Misslyckades med att återuppta: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:4005
+#: ../src/utils/pasuspender.c:147
 #, c-format
-msgid "%s Input"
-msgstr ""
+msgid "Failure to suspend: %s\n"
+msgstr "Misslyckades med vänteläge: %s\n"
 
-#: ../src/modules/echo-cancel/module-echo-cancel.c:63
-msgid ""
-"source_name=<name for the source> source_properties=<properties for the "
-"source> source_master=<name of source to filter> sink_name=<name for the "
-"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
-"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
-"much drift to readjust after in ms> format=<sample format> rate=<sample "
-"rate> channels=<number of channels> channel_map=<channel map> "
-"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
-"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
-"loaded automatically> use_volume_sharing=<yes or no> "
-msgstr ""
+#: ../src/utils/pasuspender.c:172
+#, c-format
+msgid "WARNING: Sound server is not local, not suspending.\n"
+msgstr "VARNING: Ljudservern är inte lokal, försätter ej i vänteläge.\n"
 
-#: ../src/modules/module-equalizer-sink.c:72
-msgid "General Purpose Equalizer"
-msgstr ""
+#: ../src/utils/pasuspender.c:185
+#, c-format
+msgid "Connection failure: %s\n"
+msgstr "Anslutningsfel: %s\n"
 
-#: ../src/modules/module-equalizer-sink.c:76
-msgid ""
-"sink_name=<name of the sink> sink_properties=<properties for the sink> "
-"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
-"this module is being loaded automatically> use_volume_sharing=<yes or no> "
-msgstr ""
+#: ../src/utils/pasuspender.c:203
+#, c-format
+msgid "Got SIGINT, exiting.\n"
+msgstr "Erhöll SIGINT, avslutar.\n"
 
-#: ../src/modules/module-filter-apply.c:48
-msgid "autoclean=<automatically unload unused filters?>"
-msgstr ""
+#: ../src/utils/pasuspender.c:221
+#, c-format
+msgid "WARNING: Child process terminated by signal %u\n"
+msgstr "VARNING: Underordnad process avslutad av signalen %u\n"
 
-#: ../src/tests/resampler-test.c:257
+#: ../src/utils/pasuspender.c:230
 #, c-format
 msgid ""
-"%s [options]\n"
+"%s [options] ... \n"
 "\n"
-"-h, --help                            Show this help\n"
-"-v, --verbose                         Print debug messages\n"
-"      --from-rate=SAMPLERATE          From sample rate in Hz (defaults to "
-"44100)\n"
-"      --from-format=SAMPLEFORMAT      From sample type (defaults to s16le)\n"
-"      --from-channels=CHANNELS        From number of channels (defaults to "
-"1)\n"
-"      --to-rate=SAMPLERATE            To sample rate in Hz (defaults to "
-"44100)\n"
-"      --to-format=SAMPLEFORMAT        To sample type (defaults to s16le)\n"
-"      --to-channels=CHANNELS          To number of channels (defaults to 1)\n"
-"      --resample-method=METHOD        Resample method (defaults to auto)\n"
-"      --seconds=SECONDS               From stream duration (defaults to 60)\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"  -s, --server=SERVER                   The name of the server to connect "
+"to\n"
 "\n"
-"If the formats are not specified, the test performs all formats "
-"combinations,\n"
-"back and forth.\n"
+msgstr ""
+"%s [flaggor] … \n"
 "\n"
-"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
-"alaw,\n"
-"32le, s32be (defaults to s16ne)\n"
+"  -h, --help                            Visa denna hjälp\n"
+"      --version                         Visa version\n"
+"  -s, --server=SERVER                   Namnet på servern att ansluta till\n"
 "\n"
-"See --dump-resample-methods for possible values of resample methods.\n"
-msgstr ""
-
-#: ../src/tests/resampler-test.c:356
-#, fuzzy, c-format
-msgid "%s %s\n"
-msgstr "Användning: %s\n"
 
-#: ../src/tests/resampler-test.c:419
+#: ../src/utils/pasuspender.c:268
 #, c-format
-msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
+msgid ""
+"pasuspender %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
 msgstr ""
+"pasuspender %s\n"
+"Kompilerad med libpulse %s\n"
+"Länkad med libpulse %s\n"
+
+#: ../src/utils/pasuspender.c:297
+#, c-format
+msgid "pa_mainloop_new() failed.\n"
+msgstr "pa_mainloop_new() misslyckades.\n"
 
-#~ msgid "XOpenDisplay() failed"
-#~ msgstr "XOpenDisplay() misslyckades"
+#: ../src/utils/pasuspender.c:310
+#, c-format
+msgid "pa_context_new() failed.\n"
+msgstr "pa_context_new() misslyckades.\n"
 
-#~ msgid "select(): %s"
-#~ msgstr "select(): %s"
+#: ../src/utils/pasuspender.c:322
+#, c-format
+msgid "pa_mainloop_run() failed.\n"
+msgstr "pa_mainloop_run() misslyckades.\n"
 
-#~ msgid "PolicyKit responded with '%s'"
-#~ msgstr "PolicyKit svarade med \"%s\""
+#: ../src/utils/pax11publish.c:60
+#, c-format
+msgid ""
+"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    Show current PulseAudio data attached to X11 display (default)\n"
+" -e    Export local PulseAudio data to X11 display\n"
+" -i    Import PulseAudio data from X11 display to local environment "
+"variables and cookie file.\n"
+" -r    Remove PulseAudio data from X11 display\n"
+msgstr ""
+"%s [-D display] [-S server] [-O mottagare] [-I källa] [-c fil]  [-d|-e|-i|-"
+"r]\n"
+"\n"
+" -d    Visa aktuell PulseAudio-data som hör till X11-display (standard)\n"
+" -e    Exportera lokal PulseAudio-data till X11-display\n"
+" -i    Importera PulseAudio-data från X11-display till lokala miljövariabler "
+"och kakfil.\n"
+" -r    Ta bort PulseAudio-data från X11-display\n"
 
-#~ msgid "read() failed: %s\n"
-#~ msgstr "read() misslyckades: %s\n"
+#: ../src/utils/pax11publish.c:93
+#, c-format
+msgid "Failed to parse command line.\n"
+msgstr "Misslyckades med att tolka kommandorad.\n"
 
-#, fuzzy
-#~ msgid "pa_context_connect() failed: %s\n"
-#~ msgstr "pa_context_new() misslyckades.\n"
+#: ../src/utils/pax11publish.c:112
+#, c-format
+msgid "Server: %s\n"
+msgstr "Server: %s\n"
 
-#~ msgid "RLIMIT_RTPRIO failed: %s"
-#~ msgstr "RLIMIT_RTPRIO misslyckades: %s"
+#: ../src/utils/pax11publish.c:114
+#, c-format
+msgid "Source: %s\n"
+msgstr "Källa: %s\n"
 
-#~ msgid "time_new() failed.\n"
-#~ msgstr "time_new() misslyckades.\n"
+#: ../src/utils/pax11publish.c:116
+#, c-format
+msgid "Sink: %s\n"
+msgstr "Mottagare: %s\n"
 
-#~ msgid ""
-#~ "paplay %s\n"
-#~ "Compiled with libpulse %s\n"
-#~ "Linked with libpulse %s\n"
-#~ msgstr ""
-#~ "paplay %s\n"
-#~ "Kompilerad med libpulse %s\n"
-#~ "Länkad med libpulse %s\n"
+#: ../src/utils/pax11publish.c:118
+#, c-format
+msgid "Cookie: %s\n"
+msgstr "Kaka: %s\n"
 
-#~ msgid "Failed to open file '%s'\n"
-#~ msgstr "Misslyckades med att öppna filen \"%s\"\n"
+#: ../src/utils/pax11publish.c:136
+#, c-format
+msgid "Failed to parse cookie data\n"
+msgstr "Misslyckades med att tolka kakdata\n"
 
-#, fuzzy
-#~ msgid "--log-time boolean argument"
-#~ msgstr "--disallow-exit booleskt argument"
+#: ../src/utils/pax11publish.c:141
+#, c-format
+msgid "Failed to save cookie data\n"
+msgstr "Misslyckades med att spara kakdata\n"
 
-#~ msgid "pa_stream_drop() failed: %s\n"
-#~ msgstr "pa_stream_drop() misslyckades: %s\n"
+#: ../src/utils/pax11publish.c:170
+#, c-format
+msgid "Failed to get FQDN.\n"
+msgstr "Misslyckades med att hämta FQDN.\n"
 
-#~ msgid "muted"
-#~ msgstr "tystad"
+#: ../src/utils/pax11publish.c:190
+#, c-format
+msgid "Failed to load cookie data\n"
+msgstr "Misslyckades med att läsa in kakdata\n"
 
-#~ msgid "socketpair(): %s"
-#~ msgstr "socketpair(): %s"
+#: ../src/utils/pax11publish.c:208
+#, c-format
+msgid "Not yet implemented.\n"
+msgstr "Ännu inte implementerad.\n"
diff --git a/po/ta.po b/po/ta.po
index d8c8363..fc9716e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -422,15 +422,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "OK, so you are running PA in system mode. Please note that you most likely "
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/te.po b/po/te.po
index dc27706..48e1245 100644
--- a/po/te.po
+++ b/po/te.po
@@ -401,13 +401,15 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "సరే, అయితే మీరు PAను సిస్టమ్ రీతినందు నడుపుతున్నారు. మీరు అలా చేయకూడదని దయచేసి గమనించండి.\n"
 "ఒకవేళ మీరు అలా చేస్తే తరువాత మీరు అనుకొన్నట్లు పనిచేయకపోతే అది యిక మీ తప్పే.\n"
-"సిస్టమ్ రీతి అనునది సరైనటువంటిది యెందుకు కాదో వివరణ కొరకు దయచేసి యిక్కడ చదవండి http://"
-"pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+"సిస్టమ్ రీతి అనునది సరైనటువంటిది యెందుకు కాదో వివరణ కొరకు దయచేసి యిక్కడ చదవండి http://www."
+"freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/pl.po b/po/tr.po
similarity index 59%
copy from po/pl.po
copy to po/tr.po
index e94e908..5af4ee1 100644
--- a/po/pl.po
+++ b/po/tr.po
@@ -1,20 +1,24 @@
-# translation of pl.po to Polish
-# Piotr Drąg <piotrdrag at gmail.com>, 2008, 2012, 2013, 2014.
+# Turkish translation for PulseAudio.
+# Copyright (C) 2014 PulseAudio's COPYRIGHT HOLDER
+# This file is distributed under the same license as the PulseAudio package.
+# Necdet Yücel <necdetyucel at gmail.com>, 2014.
+# Kaan Özdinçer <kaanozdincer at gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-22 20:13+0100\n"
-"PO-Revision-Date: 2014-11-22 20:14+0100\n"
-"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
-"Language-Team: Polish <trans-pl at lists.fedoraproject.org>\n"
-"Language: pl\n"
+"Project-Id-Version: PulseAudio master\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=Puls"
+"eAudio&keywords=I18N+L10N&component=misc\n"
+"POT-Creation-Date: 2014-11-10 11:20+0000\n"
+"PO-Revision-Date: 2015-01-10 20:00+0000\n"
+"Last-Translator: Kaan Özdinçer <kaanozdincer at gmail.com>\n"
+"Language-Team: Turkish <gnome-turk at gnome.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=1; plural=(n > 1);\n"
+"X-Generator: Pootle 2.5.1.1\n"
 
 #: ../src/daemon/cmdline.c:113
 #, c-format
@@ -87,446 +91,445 @@ msgid ""
 "\n"
 "  -n                                    Don't load default script file\n"
 msgstr ""
-"%s [opcje]\n"
+"%s [seçenekler]\n"
 "\n"
-"POLECENIA:\n"
-"  -h, --help                            Wyświetla tę pomoc\n"
-"      --version                         Wyświetla wersję\n"
-"      --dump-conf                       Zrzuca domyślną konfigurację\n"
-"      --dump-modules                    Zrzuca listę dostępnych modułów\n"
-"      --dump-resample-methods           Zrzuca dostępne metody resamplingu\n"
-"      --cleanup-shm                     Czyści stare fragmenty pamięci\n"
-"                                        współdzielonej\n"
-"      --start                           Uruchamia usługi, jeśli nie jest\n"
-"                                        uruchomiona\n"
-"  -k  --kill                            Niszczy uruchomioną usługę\n"
-"      --check                           Sprawdza, czy usługa jest\n"
-"                                        uruchomiona (zwraca tylko kod\n"
-"                                        wyjścia)\n"
+"KOMUTLAR:\n"
+"  -h, --help                            Bu yardımı gösterir\n"
+"      --version                         Versiyon gösterir\n"
+"      --dump-conf                       Öntanımlı yapılandırmayı döker\n"
+"      --dump-modules                    Mevcut modüllerin listesini döker\n"
+"      --dump-resample-methods           Kullanılabilir yeniden örnekleme "
+"yöntemlerini döker\n"
+"      --cleanup-shm                     Eski paylaşımlı bellek segmentlerini "
+"temizler\n"
+"      --start                           Eğer çalışmıyorsa artalan işlemleri "
+"başlatır\n"
+"  -k  --kill                             Çalışan bir artalan işlemi "
+"sonlandırır\n"
+"      --check                         Çalışan bir artalan işlemi kontrol "
+"eder (sadece çıkış kodu döner)\n"
 "\n"
-"OPCJE:\n"
-"      --system[=ZMIENNALOGICZNA]        Uruchamia w trybie systemowym\n"
-"  -D, --daemonize[=ZMIENNALOGICZNA]     Tworzy usługę po uruchomieniu\n"
-"      --fail[=ZMIENNALOGICZNA]          Wyłącza, kiedy uruchomienie się nie\n"
-"                                        powiedzie\n"
-"      --high-priority[=ZMIENNALOGICZNA] Próbuje ustawić wysoki poziom nice\n"
-"                                        (dostępne tylko jako root, na SUID\n"
-"                                        lub z podniesionym RLIMIT_NICE)\n"
-"      --realtime[=ZMIENNALOGICZNA]      Próbuje ustawić szeregowanie w\n"
-"                                        czasie rzeczywistym\n"
-"                                        (dostępne tylko jako root, na SUID\n"
-"                                        lub z podniesionym RLIMIT_RTPRIO)\n"
-"      --disallow-module-loading[=ZMIENNALOGICZNA]  Nie zezwala\n"
-"                                        użytkownikowi modułu na żądanie\n"
-"                                        wczytania/usunięcia modułu po\n"
-"                                        uruchomieniu\n"
-"      --disallow-exit[=ZMIENNALOGICZNA] Nie zezwala użytkownikowi na\n"
-"                                        żądanie wyłączenia\n"
-"      --exit-idle-time=SEKUNDY          Niszczy usługę, kiedy jest zajęta i\n"
-"                                        upłynął podany czas\n"
-"      --scache-idle-time=SEKUNDY        Usuwa automatycznie wczytane\n"
-"                                        próbki, kiedy jest zajęty i upłynął\n"
-"                                        podany czas\n"
-"      --log-level[=POZIOM]              Zwiększa lub ustawia poziom\n"
-"                                        wyświetlanych informacji\n"
-"  -v  --verbose                         Zwiększa poziom wyświetlanych\n"
-"                                        informacji\n"
-"      --log-target={auto,syslog,stderr,file:ŚCIEŻKA,newfile:ŚCIEŻKA}\n"
-"                                        Określa dziennik docelowy\n"
-"      --log-meta[=ZMIENNALOGICZNA]      Dołącza położenie kodu do\n"
-"                                        komunikatów dziennika\n"
-"      --log-time[=ZMIENNALOGICZNA]      Dołącza czas w komunikatach\n"
-"                                        dziennika\n"
-"      --log-backtrace=RAMKI             Dołącza błąd w komunikatach\n"
-"                                        dziennika\n"
-"  -p, --dl-search-path=ŚCIEŻKA          Ustawia ścieżkę wyszukiwania dla\n"
-"                                        dynamicznie współdzielonych\n"
-"                                        obiektów (wtyczek)\n"
-"      --resample-method=METODA          Używa podanej metody resamplingu\n"
-"                                        (zobacz --dump-resample-methods,\n"
-"                                        aby poznać możliwe wartości)\n"
-"      --use-pid-file[=ZMIENNALOGICZNA]  Tworzy plik PID\n"
-"      --no-cpu-limit[=ZMIENNALOGICZNA]  Nie instaluje ograniczenia zasobów\n"
-"                                        procesora na obsługujących je\n"
-"                                        platformach.\n"
-"      --disable-shm[=ZMIENNALOGICZNA]   Wyłącza obsługę pamięci\n"
-"                                        współdzielonej.\n"
+"SEÇENEKLER:\n"
+"      --system[=BOOL]                   Sistem çapında örnek olarak "
+"çalıştırır\n"
+"  -D, --daemonize[=BOOL]                Başladıktan sonra bir artalan işlem "
+"gibi çalıştırır\n"
+"      --fail[=BOOL]                     Başlangıç başarısız olduğunda çıkar\n"
+"      --high-priority[=BOOL]            Yüksek seviye ayarlamayı dener\n"
+"                                        (SUID ya da yüksek RLIMIT_NICE ile\n"
+"                                        sadece root olarak kullanılabilir)\n"
+"      --realtime[=BOOL]                 Gerçek zamanlı zamanlamayı "
+"etkinleştirmeyi dener\n"
+"                                        (SUID ya da yüksek RLIMIT_RTPRIO "
+"ile\n"
+"                                        sadece root olarak kullanılabilir)\n"
+"      --disallow-module-loading[=BOOL]  Başlangıçtan sonra kullanıcının\n"
+"                                        yükleme/kaldırma istediği modüllere "
+"izin vermez\n"
+"      --disallow-exit[=BOOL]            Kullanıcının çıkış isteğine izin "
+"vermez\n"
+"      --exit-idle-time=SECS             Boştayken ve  zamanı geçtiğinde\n"
+"                                        artalan işlemi sonlandırır\n"
+"      --scache-idle-time=SECS           Boştayken ve zamanı geçtiğinde "
+"otomatik\n"
+"                                        yüklenmiş örnekleri kaldırır\n"
+"      --log-level[=LEVEL]               Ayrıntı seviyesini ayarlar ya da "
+"artırır\n"
+"  -v  --verbose                         Ayrıntı seviyesini artırır\n"
+"      --log-target={auto,syslog,stderr,dosya:PATH,yenidosya:PATH}\n"
+"                                        Logların bulunacağı hedefi yolu "
+"belirtir\n"
+"      --log-meta[=BOOL]                 Log iletilerinde kod konumları "
+"bulunur\n"
+"      --log-time[=BOOL]                  Log iletilerinde zaman damgası "
+"bulunur\n"
+"      --log-backtrace=FRAMES            Log iletilerinde bir geri izleme "
+"bulunur\n"
+"  -p, --dl-search-path=PATH             Dinamik paylaşımlı nesneler "
+"(eklentiler)\n"
+"                                        için arama yolu ayarlar\n"
+"      --resample-method=METHOD          Belirtilen yeniden "
+"örneklendirme                                          yöntemini kullanır\n"
+"                                        (Olası değerler için şuna bakın\n"
+"                                         --dump-resample-methods)\n"
+"      --use-pid-file[=BOOL]             Bir PID dosyası oluştur\n"
+"      --no-cpu-limit[=BOOL]             Desteklendiği platformlarda\n"
+"                                        CPU yükü sınırlayıcı kurmaz.\n"
+"      --disable-shm[=BOOL]              Paylaşımlı bellek desteğini devre "
+"dışı bırakır.\n"
 "\n"
-"SKRYPT STARTOWY:\n"
-"  -L, --load=\"PARAMETRY MODUŁU\"       Wczytuje podany moduł wtyczki z\n"
-"                                        podanym parametrem\n"
-"  -F, --file=NAZWAPLIKU                 Wykonuje podany skrypt\n"
-"  -C                                    Otwiera wiersz poleceń na\n"
-"                                        uruchomionym TTY po uruchomieniu\n"
+"BAŞLATMA KOMUT DOSYALARI:\n"
+"  -L, --load=\"MODÜL DEĞİŞKENLERİ\"         Belirtilen değişkenler ile\n"
+"                                        belirtilen eklenti modüllerini "
+"yükler.\n"
+"  -F, --file=DOSYAADI                   Belirtilen betiği çalıştırır\n"
+"  -C                                  Başlangıçtan sonra çalışan TTY "
+"üzerinde\n"
+"                                        bir komut satırı açar\n"
 "\n"
-"  -n                                    Nie wczytuje domyślnego pliku\n"
-"                                        skryptu\n"
+"  -n                                    Öntanımlı betik dosyasını yüklemez\n"
 
 #: ../src/daemon/cmdline.c:245
 msgid "--daemonize expects boolean argument"
-msgstr "--daemonize oczekuje parametru zmiennej logicznej"
+msgstr "--daemonize boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:253
 msgid "--fail expects boolean argument"
-msgstr "--fail oczekuje parametru zmiennej logicznej"
+msgstr "--fail boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:264
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of debug, info, notice, warn, error)."
 msgstr ""
-"--log-level oczekuje parametru poziomu dziennika (numeryczny w zakresie 0..4 "
-"lub jeden z debug, info, notice, warn, error)."
+"--log-level log seviyesi değişkeni bekler (ya 0..4 aralığında sayısal değer "
+"ya da debug, info, notice, warn, error değişkenlerinden birini)."
 
 #: ../src/daemon/cmdline.c:276
 msgid "--high-priority expects boolean argument"
-msgstr "--high-priority oczekuje parametru zmiennej logicznej"
+msgstr "--high-priority boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:284
 msgid "--realtime expects boolean argument"
-msgstr "--realtime oczekuje parametru zmiennej logicznej"
+msgstr "--realtime boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:292
 msgid "--disallow-module-loading expects boolean argument"
-msgstr "--disallow-module-loading oczekuje parametru zmiennej logicznej"
+msgstr "--disallow-module-loading boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:300
 msgid "--disallow-exit expects boolean argument"
-msgstr "--disallow-exit oczekuje parametru zmiennej logicznej"
+msgstr "--disallow-exit boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:308
 msgid "--use-pid-file expects boolean argument"
-msgstr "--use-pid-file oczekuje parametru zmiennej logicznej"
+msgstr "--use-pid-file boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:327
 msgid ""
 "Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
 "valid file name 'file:<path>', 'newfile:<path>'."
 msgstr ""
-"Nieprawidłowy dziennik docelowy: należy użyć \"syslog\", \"journal\", "
-"\"stderr\", \"auto\" lub prawidłowej nazwy pliku \"file:<ścieżka>\", "
-"\"newfile:<ścieżka>\"."
+"Geçersiz log hedefi: ya 'syslog', 'journal', 'stderr', 'auto' ya da geçerli "
+"bir dosya adı 'dosya: <path>','yenidosya:<path>' kullan."
 
 #: ../src/daemon/cmdline.c:329
 msgid ""
 "Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
 "name 'file:<path>', 'newfile:<path>'."
 msgstr ""
-"Nieprawidłowy dziennik docelowy: należy użyć \"syslog\", \"stderr\", \"auto"
-"\" lub prawidłowej nazwy pliku \"file:<ścieżka>\", \"newfile:<ścieżka>\"."
+"Geçersiz log hedefi: ya 'syslog', 'stderr', 'auto' ya da geçerli bir dosya "
+"adı 'dosya: <path>','yenidosya:<path>' kullan."
 
 #: ../src/daemon/cmdline.c:337
 msgid "--log-time expects boolean argument"
-msgstr "--log-time oczekuje parametru zmiennej logicznej"
+msgstr "--log-time boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:345
 msgid "--log-meta expects boolean argument"
-msgstr "--log-meta oczekuje parametru zmiennej logicznej"
+msgstr "--log-meta boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:365
 #, c-format
 msgid "Invalid resample method '%s'."
-msgstr "Nieprawidłowa metoda resamplingu \"%s\"."
+msgstr "Geçersiz yeniden örneklendirme yöntemi '%s'."
 
 #: ../src/daemon/cmdline.c:372
 msgid "--system expects boolean argument"
-msgstr "--system oczekuje parametru zmiennej logicznej"
+msgstr "--system boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:380
 msgid "--no-cpu-limit expects boolean argument"
-msgstr "--no-cpu-limit oczekuje parametru zmiennej logicznej"
+msgstr "--no-cpu-limit boolean değişken bekler"
 
 #: ../src/daemon/cmdline.c:388
 msgid "--disable-shm expects boolean argument"
-msgstr "--disable-shm oczekuje parametru zmiennej logicznej"
+msgstr "--disable-shm boolean değişken bekler"
 
 #: ../src/daemon/daemon-conf.c:260
 #, c-format
 msgid "[%s:%u] Invalid log target '%s'."
-msgstr "[%s:%u] Nieprawidłowy dziennik docelowy \"%s\"."
+msgstr "[%s:%u] Geçersiz log hedefi '%s'."
 
 #: ../src/daemon/daemon-conf.c:275
 #, c-format
 msgid "[%s:%u] Invalid log level '%s'."
-msgstr "[%s:%u] Nieprawidłowy poziom dziennika \"%s\"."
+msgstr "[%s:%u] Geçersiz log seviyesi '%s'."
 
 #: ../src/daemon/daemon-conf.c:290
 #, c-format
 msgid "[%s:%u] Invalid resample method '%s'."
-msgstr "[%s:%u] Nieprawidłowa metoda resamplingu \"%s\"."
+msgstr "[%s:%u] Geçersiz yeniden örneklendirme yöntemi '%s'."
 
 #: ../src/daemon/daemon-conf.c:312
 #, c-format
 msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr "[%s:%u] Nieprawidłowy rlimit \"%s\"."
+msgstr "[%s:%u] Geçersiz rlimit '%s'."
 
 #: ../src/daemon/daemon-conf.c:332
 #, c-format
 msgid "[%s:%u] Invalid sample format '%s'."
-msgstr "[%s:%u] Nieprawidłowy format próbki \"%s\"."
+msgstr "[%s:%u] Geçersiz örnekleme biçimi '%s'."
 
 #: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
 #, c-format
 msgid "[%s:%u] Invalid sample rate '%s'."
-msgstr "[%s:%u] Nieprawidłowa częstotliwość próbki \"%s\"."
+msgstr "[%s:%u] Geçersiz örnekleme oranı '%s'."
 
 #: ../src/daemon/daemon-conf.c:389
 #, c-format
 msgid "[%s:%u] Invalid sample channels '%s'."
-msgstr "[%s:%u] Nieprawidłowe kanały próbki \"%s\"."
+msgstr "[%s:%u] Geçersiz örnekleme kanalları '%s'."
 
 #: ../src/daemon/daemon-conf.c:406
 #, c-format
 msgid "[%s:%u] Invalid channel map '%s'."
-msgstr "[%s:%u] Nieprawidłowa mapa kanałów \"%s\"."
+msgstr "[%s:%u] Geçersiz kanal adresleme '%s'."
 
 #: ../src/daemon/daemon-conf.c:423
 #, c-format
 msgid "[%s:%u] Invalid number of fragments '%s'."
-msgstr "[%s:%u] Nieprawidłowa liczba fragmentów \"%s\"."
+msgstr "[%s:%u] Geçersiz bölümlenme sayısı '%s'."
 
 #: ../src/daemon/daemon-conf.c:440
 #, c-format
 msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr "[%s:%u] Nieprawidłowy rozmiar fragmentu \"%s\"."
+msgstr "[%s:%u] Geçersiz bölümlenme boyutu '%s'."
 
 #: ../src/daemon/daemon-conf.c:457
 #, c-format
 msgid "[%s:%u] Invalid nice level '%s'."
-msgstr "[%s:%u] Nieprawidłowy poziom nice \"%s\"."
+msgstr "[%s:%u] Geçersiz nice seviyesi '%s'."
 
 #: ../src/daemon/daemon-conf.c:500
 #, c-format
 msgid "[%s:%u] Invalid server type '%s'."
-msgstr "[%s:%u] Nieprawidłowy typ serwera \"%s\"."
+msgstr "[%s:%u] Geçersiz sunucu türü '%s'."
 
 #: ../src/daemon/daemon-conf.c:613
 #, c-format
 msgid "Failed to open configuration file: %s"
-msgstr "Otwarcie pliku konfiguracji się nie powiodło: %s"
+msgstr "Yapılandırma dosyası açılamadı: %s"
 
 #: ../src/daemon/daemon-conf.c:629
 msgid ""
 "The specified default channel map has a different number of channels than "
 "the specified default number of channels."
 msgstr ""
-"Podana domyślna mapa kanałów ma inną liczbę kanałów niż podana domyślna "
-"liczba kanałów."
+"Belirtilen öntanımlı kanal adresleme belirtilmiş öntanımlı kanal sayısından "
+"farklı sayıda kanala sahiptir."
 
 #: ../src/daemon/daemon-conf.c:716
 #, c-format
 msgid "### Read from configuration file: %s ###\n"
-msgstr "### Odczytano z pliku konfiguracji: %s ###\n"
+msgstr "### Yapılandırma dosyasından oku: %s ###\n"
 
 #: ../src/daemon/dumpmodules.c:59
 #, c-format
 msgid "Name: %s\n"
-msgstr "Nazwa: %s\n"
+msgstr "Ad: %s\n"
 
 #: ../src/daemon/dumpmodules.c:62
 #, c-format
 msgid "No module information available\n"
-msgstr "Brak dostępnych informacji o module\n"
+msgstr "Hiçbir modül bilgisi bulunamadı\n"
 
 #: ../src/daemon/dumpmodules.c:65
 #, c-format
 msgid "Version: %s\n"
-msgstr "Wersja: %s\n"
+msgstr "Sürüm: %s\n"
 
 #: ../src/daemon/dumpmodules.c:67
 #, c-format
 msgid "Description: %s\n"
-msgstr "Opis: %s\n"
+msgstr "Açıklama: %s\n"
 
 #: ../src/daemon/dumpmodules.c:69
 #, c-format
 msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+msgstr "Yazar: %s\n"
 
 #: ../src/daemon/dumpmodules.c:71
 #, c-format
 msgid "Usage: %s\n"
-msgstr "Użycie: %s\n"
+msgstr "Kullanım: %s\n"
 
 #: ../src/daemon/dumpmodules.c:72
 #, c-format
 msgid "Load Once: %s\n"
-msgstr "Wczytanie jednorazowe: %s\n"
+msgstr "Bir kez Yükle: %s\n"
 
 #: ../src/daemon/dumpmodules.c:74
 #, c-format
 msgid "DEPRECATION WARNING: %s\n"
-msgstr "OSTRZEŻENIE O PRZESTARZAŁOŚCI: %s\n"
+msgstr "UYGUNSUZLUK UYARISI: %s\n"
 
 #: ../src/daemon/dumpmodules.c:78
 #, c-format
 msgid "Path: %s\n"
-msgstr "Ścieżka: %s\n"
+msgstr "Yol: %s\n"
 
 #: ../src/daemon/ltdl-bind-now.c:77
 #, c-format
 msgid "Failed to open module %s: %s"
-msgstr "Otwarcie modułu %s się nie powiodło: %s"
+msgstr "'%s' modülü açılamadı: %s"
 
 #: ../src/daemon/ltdl-bind-now.c:128
 msgid "Failed to find original lt_dlopen loader."
-msgstr ""
-"Odnalezienie pierwotnego programu wczytującego lt_dlopen się nie powiodło."
+msgstr "Orjinal lt_dlopen yükleyicisi bulunamadı."
 
 #: ../src/daemon/ltdl-bind-now.c:133
 msgid "Failed to allocate new dl loader."
-msgstr "Przydzielenie nowego programu wczytującego dl się nie powiodło."
+msgstr "Yeni dl yükleyici ayırma işlemi başarısız oldu."
 
 #: ../src/daemon/ltdl-bind-now.c:146
 msgid "Failed to add bind-now-loader."
-msgstr "Dodanie bind-now-loader się nie powiodło."
+msgstr "Bind-now-loader eklenemedi."
 
 #: ../src/daemon/main.c:162
 #, c-format
 msgid "Failed to find user '%s'."
-msgstr "Odnalezienie użytkownika \"%s\" się nie powiodło."
+msgstr "Kullanıcı '%s' bulunamadı."
 
 #: ../src/daemon/main.c:167
 #, c-format
 msgid "Failed to find group '%s'."
-msgstr "Odnalezienie grupy \"%s\" się nie powiodło."
+msgstr "Grup '%s' bulunamadı."
 
 #: ../src/daemon/main.c:176
 #, c-format
 msgid "GID of user '%s' and of group '%s' don't match."
-msgstr "GID użytkownika \"%s\" i grupy \"%s\" się nie zgadzają."
+msgstr "'%s' kullanıcısı ve '%s' grubunun GID eşleşmiyor."
 
 #: ../src/daemon/main.c:181
 #, c-format
 msgid "Home directory of user '%s' is not '%s', ignoring."
-msgstr "Katalogiem domowym użytkownika \"%s\" nie jest \"%s\", ignorowanie."
+msgstr "Kullanıcı '%s''nin ev dizini '%s' değildir, yoksayılıyor."
 
 #: ../src/daemon/main.c:184 ../src/daemon/main.c:189
 #, c-format
 msgid "Failed to create '%s': %s"
-msgstr "Utworzenie \"%s\" się nie powiodło: %s"
+msgstr "'%s' oluşturulamadı: %s"
 
 #: ../src/daemon/main.c:196
 #, c-format
 msgid "Failed to change group list: %s"
-msgstr "Zmiana listy grup się nie powiodła: %s"
+msgstr "Grup listesi değiştirilemedi: %s"
 
 #: ../src/daemon/main.c:212
 #, c-format
 msgid "Failed to change GID: %s"
-msgstr "Zmiana GID się nie powiodła: %s"
+msgstr "GID değiştirilemedi: %s"
 
 #: ../src/daemon/main.c:228
 #, c-format
 msgid "Failed to change UID: %s"
-msgstr "Zmiana UID się nie powiodła: %s"
+msgstr "UID değiştirilemedi: %s"
 
 #: ../src/daemon/main.c:257
 msgid "System wide mode unsupported on this platform."
-msgstr "Tryb systemowy nie jest obsługiwany na tej platformie."
+msgstr "Sistem geneli kipi bu platformda desteklenmiyor."
 
 #: ../src/daemon/main.c:486
 msgid "Failed to parse command line."
-msgstr "Przetworzenie wiersza poleceń się nie powiodło."
+msgstr "Komut satırı çözümlenemedi."
 
 #: ../src/daemon/main.c:525
 msgid ""
 "System mode refused for non-root user. Only starting the D-Bus server lookup "
 "service."
 msgstr ""
-"Odmówiono trybu systemowego dla użytkownika nie będącego rootem. "
-"Uruchamianie tylko usługi wyszukiwania serwera D-Bus."
+"Sistem kipi root olmayan kullanıcıyı reddetti. Sadece D-Bus sunucu arama "
+"servisi başlatıyor."
 
 #: ../src/daemon/main.c:624
 #, c-format
 msgid "Failed to kill daemon: %s"
-msgstr "Zniszczenie usługi się nie powiodło: %s"
+msgstr "Artalan işlem durdurulamadı: %s"
 
 #: ../src/daemon/main.c:653
 msgid ""
 "This program is not intended to be run as root (unless --system is "
 "specified)."
 msgstr ""
-"Ten program nie powinien być uruchamiany jako root (chyba, że podano --"
-"system)."
+"Bu programın root kullanıcı ile çalıştırılması amaçlanmamıştır (--system "
+"belirtilmediyse)."
 
 #: ../src/daemon/main.c:656
 msgid "Root privileges required."
-msgstr "Wymagane są uprawnienia roota."
+msgstr "Root hakları gereklidir."
 
 #: ../src/daemon/main.c:663
 msgid "--start not supported for system instances."
-msgstr "--start nie jest obsługiwane przy uruchamianiu systemowym."
+msgstr "--start sistem örnekleri için desteklenmiyor."
 
 #: ../src/daemon/main.c:703
 #, c-format
 msgid "User-configured server at %s, refusing to start/autospawn."
 msgstr ""
-"Serwer skonfigurowany przez użytkownika w %s, odmawianie uruchomienia/"
-"automatycznego wznowienia."
+"Kullanıcı tarafından yapılandırılmış şuradaki sunucu: %s, başlamayı/otomatik "
+"başlamayı reddediyor."
 
 #: ../src/daemon/main.c:709
 #, c-format
 msgid ""
 "User-configured server at %s, which appears to be local. Probing deeper."
 msgstr ""
-"Serwer skonfigurowany przez użytkownika w %s, który jest lokalny. Dalsze "
-"wykrywanie."
+"Kullanıcı tarafından yapılandırılmış, yerel olarak görülen şuradaki sunucu: %"
+"s. "
 
 #: ../src/daemon/main.c:714
 msgid "Running in system mode, but --disallow-exit not set!"
-msgstr ""
-"Uruchamianie w trybie systemowym, ale --disallow-exit nie jest ustawione."
+msgstr "Sistem kipinde çalıştırılıyor fakat --disallow-exit ayarlı değil!"
 
 #: ../src/daemon/main.c:717
 msgid "Running in system mode, but --disallow-module-loading not set!"
 msgstr ""
-"Uruchamianie w trybie systemowym, ale --disallow-module-loading nie jest "
-"ustawione."
+"Sistem kipinde çalıştırılıyor fakat --disallow-module-loading ayarlı değil!"
 
 #: ../src/daemon/main.c:720
 msgid "Running in system mode, forcibly disabling SHM mode!"
-msgstr "Uruchamianie w trybie systemowym, wymuszanie wyłączenia trybu SHM."
+msgstr "Sistem kipinde çalıştırılıyor, SHM kipi zorla devre dışı bırakılıyor!"
 
 #: ../src/daemon/main.c:725
 msgid "Running in system mode, forcibly disabling exit idle time!"
 msgstr ""
-"Uruchamianie w trybie systemowym, wymuszanie wyłączenia czasu oczekiwania na "
-"zakończenie."
+"Sistem kipinde çalıştırılıyor, boşta kalma süresi çıkışı zorla devre dışı "
+"bırakılıyor!"
 
 #: ../src/daemon/main.c:758
 msgid "Failed to acquire stdio."
-msgstr "Uzyskanie standardowego wejścia/wyjścia się nie powiodło."
+msgstr "Stdio alınamadı."
 
 #: ../src/daemon/main.c:764 ../src/daemon/main.c:835
 #, c-format
 msgid "pipe() failed: %s"
-msgstr "pipe() się nie powiodło: %s"
+msgstr "pipe() başarısız oldu: %s"
 
 #: ../src/daemon/main.c:769 ../src/daemon/main.c:840
 #, c-format
 msgid "fork() failed: %s"
-msgstr "fork() się nie powiodło: %s"
+msgstr "fork() başarısız oldu: %s"
 
 #: ../src/daemon/main.c:784 ../src/daemon/main.c:855 ../src/utils/pacat.c:569
 #, c-format
 msgid "read() failed: %s"
-msgstr "read() się nie powiodło: %s"
+msgstr "read() başarısız oldu: %s"
 
 #: ../src/daemon/main.c:790
 msgid "Daemon startup failed."
-msgstr "Uruchomienie usługi się nie powiodło."
+msgstr "Artalan işlemleri başlatma başarısız oldu."
 
 #: ../src/daemon/main.c:823
 #, c-format
 msgid "setsid() failed: %s"
-msgstr "setsid() się nie powiodło: %s"
+msgstr "setsid() başarısız oldu: %s"
 
-#: ../src/daemon/main.c:950
+#: ../src/daemon/main.c:946
 msgid "Failed to get machine ID"
-msgstr "Uzyskanie identyfikatora komputera się nie powiodło"
+msgstr "Makine kimliği alınamadı"
 
-#: ../src/daemon/main.c:976
+#: ../src/daemon/main.c:972
 msgid ""
 "OK, so you are running PA in system mode. Please note that you most likely "
 "shouldn't be doing that.\n"
@@ -535,57 +538,56 @@ msgid ""
 "Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
 "explanation why system mode is usually a bad idea."
 msgstr ""
-"OK, więc PA jest uruchomione w trybie systemowym. Proszę zauważyć, że "
-"prawdopodobnie tak nie powinno być.\n"
-"Jeśli mimo to tak jest, to wina użytkownika, jeśli coś nie działa tak jak "
-"powinno.\n"
-"Proszę przeczytać http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode, "
-"gdzie wyjaśniono, dlaczego tryb systemowy jest zwykle złym pomysłem."
-
-#: ../src/daemon/main.c:993
+"TAMAM, sistem kipinde PA çalıştırıyorsunuz. Lütfen bunu yapmamanız "
+"gerektiğini aklınızda bulundurun.\n"
+"Eğer bunu yine de yaparsanız, bir şeyler beklenmedik bir şekilde çalışırsa o "
+"zaman bu sizin suçunuzdur.\n"
+"Lütfen sistem kipinin neden genellikle kötü bir fikir olduğunun açıklamasını "
+"http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode adresinden okuyunuz."
+
+#: ../src/daemon/main.c:989
 msgid "pa_pid_file_create() failed."
-msgstr "pa_pid_file_create() się nie powiodło."
+msgstr "pa_pid_file_create() başarısız oldu."
 
-#: ../src/daemon/main.c:1023
+#: ../src/daemon/main.c:1019
 msgid "pa_core_new() failed."
-msgstr "pa_core_new() się nie powiodło."
+msgstr "pa_core_new() başarısız oldu."
 
-#: ../src/daemon/main.c:1090
+#: ../src/daemon/main.c:1086
 msgid "Failed to initialize daemon."
-msgstr "Zainicjowanie usługi się nie powiodło."
+msgstr "Artalan işlem başlatılamadı."
 
-#: ../src/daemon/main.c:1095
+#: ../src/daemon/main.c:1091
 msgid "Daemon startup without any loaded modules, refusing to work."
-msgstr ""
-"Uruchamianie usługi bez żadnych wczytanych modułów, odmawianie działania."
+msgstr "Hiç yüklü modül olmadan artalan işlemlerin çalışması reddediliyor."
 
 #: ../src/daemon/pulseaudio.desktop.in.h:1
 msgid "PulseAudio Sound System"
-msgstr "System dźwięku PulseAudio"
+msgstr "PulseAudio Ses Sistemi"
 
 #: ../src/daemon/pulseaudio.desktop.in.h:2
 msgid "Start the PulseAudio Sound System"
-msgstr "Uruchomienie systemu dźwięku PulseAudio"
+msgstr "PulseAudio Ses Sistemini Başlat"
 
 #: ../src/modules/alsa/alsa-mixer.c:2293
 msgid "Input"
-msgstr "Wejście"
+msgstr "Giriş"
 
 #: ../src/modules/alsa/alsa-mixer.c:2294
 msgid "Docking Station Input"
-msgstr "Wejście stacji dokującej"
+msgstr "Yerleştirme İstasyonu Girişi"
 
 #: ../src/modules/alsa/alsa-mixer.c:2295
 msgid "Docking Station Microphone"
-msgstr "Mikrofon stacji dokującej"
+msgstr "Yerleştirme İstasyonu Mikrofonu"
 
 #: ../src/modules/alsa/alsa-mixer.c:2296
 msgid "Docking Station Line In"
-msgstr "Wejście liniowe stacji dokującej"
+msgstr "Yerleştirme İstasyonu Hat Girişi"
 
 #: ../src/modules/alsa/alsa-mixer.c:2297 ../src/modules/alsa/alsa-mixer.c:2382
 msgid "Line In"
-msgstr "Wejście liniowe"
+msgstr "Hat girişi"
 
 #: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2376
 #: ../src/modules/bluetooth/module-bluez4-device.c:2104
@@ -595,230 +597,230 @@ msgstr "Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377
 msgid "Front Microphone"
-msgstr "Przedni mikrofon"
+msgstr "Ön Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378
 msgid "Rear Microphone"
-msgstr "Tylny mikrofon"
+msgstr "Arka Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:2301
 msgid "External Microphone"
-msgstr "Zewnętrzny mikrofon"
+msgstr "Harici Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:2302 ../src/modules/alsa/alsa-mixer.c:2380
 msgid "Internal Microphone"
-msgstr "Wewnętrzny mikrofon"
+msgstr "Dahili Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2383
 msgid "Radio"
-msgstr "Radio"
+msgstr "Radyo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2384
 msgid "Video"
-msgstr "Wideo"
+msgstr "Görüntü"
 
 #: ../src/modules/alsa/alsa-mixer.c:2305
 msgid "Automatic Gain Control"
-msgstr "Automatyczna kontrola natężenia"
+msgstr "Otomatik Kazanç Kontrolü"
 
 #: ../src/modules/alsa/alsa-mixer.c:2306
 msgid "No Automatic Gain Control"
-msgstr "Brak automatycznej kontroli natężenia"
+msgstr "Otomatik Kazanç Kontrolü Yok"
 
 #: ../src/modules/alsa/alsa-mixer.c:2307
 msgid "Boost"
-msgstr "Podbicie"
+msgstr "Artır"
 
 #: ../src/modules/alsa/alsa-mixer.c:2308
 msgid "No Boost"
-msgstr "Brak podbicia"
+msgstr "Artırma Yok"
 
 #: ../src/modules/alsa/alsa-mixer.c:2309
 msgid "Amplifier"
-msgstr "Amplituner"
+msgstr "Yükseltici"
 
 #: ../src/modules/alsa/alsa-mixer.c:2310
 msgid "No Amplifier"
-msgstr "Brak amplitunera"
+msgstr "Anfi Yok"
 
 #: ../src/modules/alsa/alsa-mixer.c:2311
 msgid "Bass Boost"
-msgstr "Podbicie basów"
+msgstr "Bas Artır"
 
 #: ../src/modules/alsa/alsa-mixer.c:2312
 msgid "No Bass Boost"
-msgstr "Brak podbicia basów"
+msgstr "Bas Artırma"
 
 #: ../src/modules/alsa/alsa-mixer.c:2313
 #: ../src/modules/bluetooth/module-bluez4-device.c:2109
 #: ../src/modules/bluetooth/module-bluez5-device.c:1719
 msgid "Speaker"
-msgstr "Głośnik"
+msgstr "Hoparlör"
 
 #: ../src/modules/alsa/alsa-mixer.c:2314 ../src/modules/alsa/alsa-mixer.c:2386
 msgid "Headphones"
-msgstr "Słuchawki"
+msgstr "Kulaklıklar"
 
 #: ../src/modules/alsa/alsa-mixer.c:2375
 msgid "Analog Input"
-msgstr "Wejście analogowe"
+msgstr "Analog Giriş"
 
 #: ../src/modules/alsa/alsa-mixer.c:2379
 msgid "Dock Microphone"
-msgstr "Mikrofon stacji dokującej"
+msgstr "Yapışık Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:2381
 msgid "Headset Microphone"
-msgstr "Mikrofon na słuchawkach"
+msgstr "Mikrofonlu Kulaklık"
 
 #: ../src/modules/alsa/alsa-mixer.c:2385
 msgid "Analog Output"
-msgstr "Wyjście analogowe"
+msgstr "Analog Çıkış"
 
 #: ../src/modules/alsa/alsa-mixer.c:2387
 msgid "LFE on Separate Mono Output"
-msgstr "Subwoofer na oddzielnym wyjściu mono"
+msgstr "Ayrı Tekli Çıktılar üzerinde LFE"
 
 #: ../src/modules/alsa/alsa-mixer.c:2388
 msgid "Line Out"
-msgstr "Wyjście liniowe"
+msgstr "Hat Çıkışı"
 
 #: ../src/modules/alsa/alsa-mixer.c:2389
 msgid "Analog Mono Output"
-msgstr "Analogowe wyjście mono"
+msgstr "Analog Tekli Çıkış"
 
 #: ../src/modules/alsa/alsa-mixer.c:2390
 msgid "Speakers"
-msgstr "Głośniki"
+msgstr "Hoparlörler"
 
 #: ../src/modules/alsa/alsa-mixer.c:2391
 msgid "HDMI / DisplayPort"
-msgstr "HDMI/DisplayPort"
+msgstr "HDMI / ÇıkışıNoktası"
 
 #: ../src/modules/alsa/alsa-mixer.c:2392
 msgid "Digital Output (S/PDIF)"
-msgstr "Wyjście cyfrowe (S/PDIF)"
+msgstr "Dijital Çıkış (S/PDIF)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2393
 msgid "Digital Input (S/PDIF)"
-msgstr "Wejście cyfrowe (S/PDIF)"
+msgstr "Dijital Giriş (S/PDIF)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2394
 msgid "Digital Passthrough (S/PDIF)"
-msgstr "Cyfrowe przekazywanie (S/PDIF)"
+msgstr "Sayısal Düzgeçiş (S/PDIF)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3900
+#: ../src/modules/alsa/alsa-mixer.c:3901
 msgid "Analog Mono"
-msgstr "Analogowe mono"
+msgstr "Analog Mono"
 
-#: ../src/modules/alsa/alsa-mixer.c:3901
+#: ../src/modules/alsa/alsa-mixer.c:3902
 msgid "Analog Stereo"
-msgstr "Analogowe stereo"
+msgstr "Analog Stereo"
 
-#: ../src/modules/alsa/alsa-mixer.c:3902
+#: ../src/modules/alsa/alsa-mixer.c:3903
 msgid "Multichannel"
-msgstr "Wielokanałowe"
+msgstr "Çok kanallı"
 
-#: ../src/modules/alsa/alsa-mixer.c:3903
+#: ../src/modules/alsa/alsa-mixer.c:3904
 msgid "Analog Surround 2.1"
-msgstr "Analogowe surround 2.1"
+msgstr "Analog Çevresel Ses 2.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3904
+#: ../src/modules/alsa/alsa-mixer.c:3905
 msgid "Analog Surround 3.0"
-msgstr "Analogowe surround 3.0"
+msgstr "Analog Çevresel Ses 3.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3905
+#: ../src/modules/alsa/alsa-mixer.c:3906
 msgid "Analog Surround 3.1"
-msgstr "Analogowe surround 3.1"
+msgstr "Analog Çevresel Ses 3.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3906
+#: ../src/modules/alsa/alsa-mixer.c:3907
 msgid "Analog Surround 4.0"
-msgstr "Analogowe surround 4.0"
+msgstr "Analog Çevresel Ses 4.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3907
+#: ../src/modules/alsa/alsa-mixer.c:3908
 msgid "Analog Surround 4.1"
-msgstr "Analogowe surround 4.1"
+msgstr "Analog Çevresel Ses 4.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3908
+#: ../src/modules/alsa/alsa-mixer.c:3909
 msgid "Analog Surround 5.0"
-msgstr "Analogowe surround 5.0"
+msgstr "Analog Çevresel Ses 5.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3909
+#: ../src/modules/alsa/alsa-mixer.c:3910
 msgid "Analog Surround 5.1"
-msgstr "Analogowe surround 5.1"
+msgstr "Analog Çevresel Ses 5.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3910
+#: ../src/modules/alsa/alsa-mixer.c:3911
 msgid "Analog Surround 6.0"
-msgstr "Analogowe surround 6.0"
+msgstr "Analog Çevresel Ses 6.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3911
+#: ../src/modules/alsa/alsa-mixer.c:3912
 msgid "Analog Surround 6.1"
-msgstr "Analogowe surround 6.1"
+msgstr "Analog Çevresel Ses 6.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3912
+#: ../src/modules/alsa/alsa-mixer.c:3913
 msgid "Analog Surround 7.0"
-msgstr "Analogowe surround 7.0"
+msgstr "Analog Çevresel Ses 7.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3913
+#: ../src/modules/alsa/alsa-mixer.c:3914
 msgid "Analog Surround 7.1"
-msgstr "Analogowe surround 7.1"
+msgstr "Analog Çevresel Ses 7.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3914
+#: ../src/modules/alsa/alsa-mixer.c:3915
 msgid "Digital Stereo (IEC958)"
-msgstr "Cyfrowe stereo (IEC958)"
+msgstr "Dijital İki Kanallı (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3915
+#: ../src/modules/alsa/alsa-mixer.c:3916
 msgid "Digital Passthrough  (IEC958)"
-msgstr "Cyfrowe przekazywanie (IEC958)"
+msgstr "Sayısal Düzgeçiş  (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3916
+#: ../src/modules/alsa/alsa-mixer.c:3917
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr "Cyfrowe surround 4.0 (IEC958/AC3)"
+msgstr "Dijital Çevresel Ses 4.0 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3917
+#: ../src/modules/alsa/alsa-mixer.c:3918
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr "Cyfrowe surround 5.1 (IEC958/AC3)"
+msgstr "Dijital Çevresel Ses 5.1 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3918
+#: ../src/modules/alsa/alsa-mixer.c:3919
 msgid "Digital Surround 5.1 (IEC958/DTS)"
-msgstr "Cyfrowe surround 5.1 (IEC958/DTS)"
+msgstr "Dijital Çevresel Ses 5.1 (IEC958/DTS)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3919
+#: ../src/modules/alsa/alsa-mixer.c:3920
 msgid "Digital Stereo (HDMI)"
-msgstr "Cyfrowe stereo (HDMI)"
+msgstr "Dijital İki Kanallı (HDMI)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3920
+#: ../src/modules/alsa/alsa-mixer.c:3921
 msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Cyfrowe surround 5.1 (HDMI)"
+msgstr "Dijital Çevresel Ses 5.1 (HDMI)"
 
-#: ../src/modules/alsa/alsa-mixer.c:4051
+#: ../src/modules/alsa/alsa-mixer.c:4052
 msgid "Analog Mono Duplex"
-msgstr "Analogowy dupleks mono"
+msgstr "Analog Tekli İkili"
 
-#: ../src/modules/alsa/alsa-mixer.c:4052
+#: ../src/modules/alsa/alsa-mixer.c:4053
 msgid "Analog Stereo Duplex"
-msgstr "Analogowy dupleks stereo"
+msgstr "Analog İkili Stereo"
 
-#: ../src/modules/alsa/alsa-mixer.c:4053
+#: ../src/modules/alsa/alsa-mixer.c:4054
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Cyfrowy dupleks stereo (IEC958)"
+msgstr "Sayısal İkili Stereo (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:4054
+#: ../src/modules/alsa/alsa-mixer.c:4055
 #: ../src/modules/alsa/module-alsa-card.c:192
 #: ../src/modules/bluetooth/module-bluez4-device.c:2300
 #: ../src/modules/bluetooth/module-bluez5-device.c:1943
 msgid "Off"
-msgstr "Wyłączone"
+msgstr "Kapalı"
 
-#: ../src/modules/alsa/alsa-mixer.c:4153
+#: ../src/modules/alsa/alsa-mixer.c:4154
 #, c-format
 msgid "%s Output"
-msgstr "Wyjście %s"
+msgstr "%s Çıkışı"
 
-#: ../src/modules/alsa/alsa-mixer.c:4161
+#: ../src/modules/alsa/alsa-mixer.c:4162
 #, c-format
 msgid "%s Input"
-msgstr "Wejście %s"
+msgstr "%s Girişi"
 
 #: ../src/modules/alsa/alsa-sink.c:572 ../src/modules/alsa/alsa-sink.c:749
 #, c-format
@@ -830,12 +832,12 @@ msgid ""
 "We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
 "returned 0 or another value < min_avail."
 msgstr ""
-"Usługa ALSA została wybudzona, aby zapisać nowe dane do urządzenia, ale nie "
-"było nic do zapisania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA \"%s\". Proszę zgłosić ten "
-"problem programistom usługi ALSA.\n"
-"Wybudzono za pomocą ustawienia POLLOUT - ale jednoczesne wywołanie "
-"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
+"ALSA aygıta yeni veri yazmamız için bizi uyardı fakat aslında yazılacak "
+"hiçbir şey yok!\n"
+"Büyük ihtimalle bu ALSA '%s' sürücüsünde bir hatadır. Lütfen bu sorunu ALSA "
+"geliştiricilerine bildirin.\n"
+"Biz POLLOUT ayarı ile anladık -- ayrıca sonraki snd_pcm_avail() 0 ya da "
+"min_avail değerinden küçük başka bir değer döndü."
 
 #: ../src/modules/alsa/alsa-source.c:531 ../src/modules/alsa/alsa-source.c:682
 #, c-format
@@ -847,14 +849,14 @@ msgid ""
 "We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
 "returned 0 or another value < min_avail."
 msgstr ""
-"Usługa ALSA została wybudzona, aby odczytać nowe dane z urządzenia, ale nie "
-"było nic do odczytania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA \"%s\". Proszę zgłosić ten "
-"problem programistom usługi ALSA.\n"
-"Wybudzono za pomocą ustawienia POLLIN - ale jednoczesne wywołanie "
-"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
+"ALSA aygıttan yeni veri okumamız için bizi uyardı fakat aslında okunacak "
+"hiçbir şey yok!\n"
+"Büyük ihtimalle bu bir ALSA '%s' sürücüsü hatasıdır. Lütfen bu sorunu ALSA "
+"geliştiricilerine bildirin.\n"
+"Biz POLLIN ayarı ile anladık -- ayrıca sonraki snd_pcm_avail() 0 ya da "
+"min_avail değerinden küçük başka bir değer döndü."
 
-#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1211
+#: ../src/modules/alsa/alsa-util.c:1135 ../src/modules/alsa/alsa-util.c:1210
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
@@ -862,11 +864,11 @@ msgid ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr ""
-"snd_pcm_avail() zwróciło wyjątkowo dużą wartość: %lu bajtów (%lu ms).\n"
-"Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten "
-"problem programistom usługi ALSA."
+"snd_pcm_avail() son derece büyük bir değer döndü: %lu bayt (%lu ms).\n"
+"Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
+"geliştiricilerine bildirin."
 
-#: ../src/modules/alsa/alsa-util.c:1186
+#: ../src/modules/alsa/alsa-util.c:1185
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
@@ -874,11 +876,11 @@ msgid ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr ""
-"snd_pcm_delay() zwróciło wyjątkowo dużą wartość: %li bajtów (%s%lu ms).\n"
-"Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten "
-"problem programistom usługi ALSA."
+"snd_pcm_avail() son derece büyük bir değer döndü: %li bayt (%s%lu ms).\n"
+"Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
+"geliştiricilerine bildirin."
 
-#: ../src/modules/alsa/alsa-util.c:1227
+#: ../src/modules/alsa/alsa-util.c:1226
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -886,12 +888,12 @@ msgid ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr ""
-"snd_pcm_avail_delay() zwróciło dziwne wartości: opóźnienie %lu jest mniejsze "
-"niż korzyść %lu.\n"
-"Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten "
-"problem programistom usługi ALSA."
+"snd_pcm_avail_delay() garip değerler döndü: gecikme %lu kazançtan %lu daha "
+"azdır.\n"
+"Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
+"geliştiricilerine bildirin."
 
-#: ../src/modules/alsa/alsa-util.c:1270
+#: ../src/modules/alsa/alsa-util.c:1269
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
@@ -899,39 +901,39 @@ msgid ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr ""
-"snd_pcm_mmap_begin() zwróciło wyjątkowo dużą wartość: %lu bajtów (%lu ms).\n"
-"Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten "
-"problem programistom usługi ALSA."
+"snd_pcm_mmap_begin() son derece büyük bir değer döndü: %lu bayt (%lu ms).\n"
+"Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
+"geliştiricilerine bildirin."
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2094
 #: ../src/modules/bluetooth/module-bluez5-device.c:1702
 msgid "Headset"
-msgstr "Słuchawki z mikrofonem"
+msgstr "Kulaklık"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2099
 #: ../src/modules/bluetooth/module-bluez5-device.c:1707
 msgid "Handsfree"
-msgstr "Zestaw głośnomówiący"
+msgstr "Ahizesiz"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2114
 #: ../src/modules/bluetooth/module-bluez5-device.c:1725
 msgid "Headphone"
-msgstr "Słuchawki"
+msgstr "Kulaklık"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2119
 #: ../src/modules/bluetooth/module-bluez5-device.c:1730
 msgid "Portable"
-msgstr "Przenośne"
+msgstr "Taşınabilir"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2124
 #: ../src/modules/bluetooth/module-bluez5-device.c:1735
 msgid "Car"
-msgstr "Samochód"
+msgstr "Araba"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2129
 #: ../src/modules/bluetooth/module-bluez5-device.c:1740
 msgid "HiFi"
-msgstr "HiFi"
+msgstr "Yüksek duyarlılık"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2134
 #: ../src/modules/bluetooth/module-bluez5-device.c:1745
@@ -943,7 +945,7 @@ msgstr "Telefon"
 #: ../src/modules/bluetooth/module-bluez5-device.c:1713
 #: ../src/modules/bluetooth/module-bluez5-device.c:1751
 msgid "Bluetooth Output"
-msgstr "Wyjście Bluetooth"
+msgstr "Bluetooth Çıkışı"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2145
 #: ../src/modules/bluetooth/module-bluez5-device.c:1696
@@ -951,39 +953,39 @@ msgstr "Wyjście Bluetooth"
 #: ../src/modules/bluetooth/module-bluez5-device.c:1724
 #: ../src/modules/bluetooth/module-bluez5-device.c:1750
 msgid "Bluetooth Input"
-msgstr "Wejście Bluetooth"
+msgstr "Bluetooth Girişi"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2181
 msgid "High Fidelity Playback (A2DP)"
-msgstr "Odtwarzanie o wysokiej dokładności (A2DP)"
+msgstr "Yüksek Kaliteli Çalma (A2DP)"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2192
 msgid "High Fidelity Capture (A2DP)"
-msgstr "Przechwytywanie o wysokiej dokładności (A2DP)"
+msgstr "Yüksek Kaliteli Yakalama (A2DP)"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2203
 msgid "Telephony Duplex (HSP/HFP)"
-msgstr "Duplex telefoniczny (HSP/HFP)"
+msgstr "Çift yönlü Telefon (HSP/HFP)"
 
 #: ../src/modules/bluetooth/module-bluez4-device.c:2215
 msgid "Handsfree Gateway"
-msgstr "Zestaw głośnomówiący"
+msgstr "Eller Serbest Geçidi"
 
 #: ../src/modules/bluetooth/module-bluez5-device.c:1788
 msgid "High Fidelity Playback (A2DP Sink)"
-msgstr "Odtwarzanie o wysokiej dokładności (odpływ A2DP)"
+msgstr "Yüksek Kaliteli Çalma (A2DP Alıcı)"
 
 #: ../src/modules/bluetooth/module-bluez5-device.c:1799
 msgid "High Fidelity Capture (A2DP Source)"
-msgstr "Przechwytywanie o wysokiej dokładności (źródło A2DP)"
+msgstr "Yüksek Kaliteli Yakalama (A2DP Kaynak)"
 
 #: ../src/modules/bluetooth/module-bluez5-device.c:1810
 msgid "Headset Head Unit (HSP/HFP)"
-msgstr "Jednostka główna słuchawek z mikrofonem (HSP/HFP)"
+msgstr "Kulaklık Ana Birimi (HSP/HFP)"
 
 #: ../src/modules/bluetooth/module-bluez5-device.c:1822
 msgid "Headset Audio Gateway (HSP/HFP)"
-msgstr "Zestaw słuchawek z mikrofonem (HSP/HFP)"
+msgstr "Kulanlık Ses Geçidi (HSP/HFP)"
 
 #: ../src/modules/echo-cancel/module-echo-cancel.c:63
 msgid ""
@@ -997,35 +999,32 @@ msgid ""
 "save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
 "loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
-"source_name=<nazwa źródła> source_properties=<właściwości źródła> "
-"source_master=<nazwa źródła do filtrowania> sink_name=<nazwa odpływu> "
-"sink_properties=<właściwości odpływu> sink_master=<nazwa odpływu do "
-"filtrowania> adjust_time=<jak często odczytywać częstotliwości w sekundach> "
-"adjust_threshold=<jak daleko odchodzić do odczytania w milisekundach> "
-"format=<format próbki> rate=<częstotliwość próbki> channels=<liczba kanałów> "
-"channel_map=<map kanałów> aec_method=<używana implementacja> "
-"aec_args=<parametry dla mechanizmu AEC> save_aec=<zapisywanie danych AEC w /"
-"tmp> autoloaded=<należy ustawić, jeśli moduł jest automatycznie wczytywany> "
-"use_volume_sharing=<yes lub no> "
+"kaynak_adı=<name for the source> kaynak_özellikleri=<properties for the "
+"source> ana_kaynak=<name of source to filter> alıcı_ad=<name for the sink> "
+"alıcı_özellikleri=<properties for the sink> ana_alıcı=<name of sink to "
+"filter> zamanı_ayarla=<how often to readjust rates in s> eşikdeğer_ayarla=<"
+"how much drift to readjust after in ms> biçim=<sample format> hız=<sample "
+"rate> kanallar=<number of channels> kanal_adresleme=<channel map> "
+"aec_yöntemi=<implementation to use> aec_değişkenleri=<parameters for the AEC "
+"engine> aec_kaydet=<save AEC data in /tmp> otomatikyüklenmiş=<set if this "
+"module is being loaded automatically>ses_paylaşım_kullan=<yes or no> "
 
 #. add on profile
 #: ../src/modules/macosx/module-coreaudio-device.c:756
 msgid "On"
-msgstr "Włączone"
+msgstr "Açık"
 
 #: ../src/modules/module-always-sink.c:38
 msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr ""
-"Utrzymywanie zawsze co najmniej jednego wczytanego odpływu nawet, jeśli to "
-"pusty odpływ"
+msgstr "Yüklenen alıcı boş bile olsa her zaman en az bir tanesini korur"
 
 #: ../src/modules/module-always-sink.c:82
 msgid "Dummy Output"
-msgstr "Głuche wyjście"
+msgstr "Sahte Çıkış"
 
 #: ../src/modules/module-equalizer-sink.c:72
 msgid "General Purpose Equalizer"
-msgstr "Korektor graficzny ogólnego przeznaczenia"
+msgstr "Genel Amaçlı Denkleştirici"
 
 #: ../src/modules/module-equalizer-sink.c:76
 msgid ""
@@ -1034,19 +1033,19 @@ msgid ""
 "channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
-"sink_name=<nazwa odpływu> sink_properties=<właściwości odpływu> "
-"sink_master=<nazwa odpływu do filtrowania> format=<format próbki> "
-"rate=<częstotliwość próbki> channels=<liczba kanałów> channel_map=<mapa "
-"kanałów> autoloaded=<należy ustawić, jeśli ten moduł jest automatycznie "
-"uruchamiany> use_volume_sharing=<yes lub no> "
+"alıcı_adı=<name of the sink> alıcı_özellikleri=<properties for the sink> "
+"ana_alıcı=<sink to connect to> biçim=<sample format> hız=<sample rate> "
+"kanallar=<number of channels> kanal_adresleme=<channel map> "
+"otomatikyüklenmiş=<set if this module is being loaded automatically> "
+"ses_paylaşım_kullan=<yes or no> "
 
 #: ../src/modules/module-filter-apply.c:48
 msgid "autoclean=<automatically unload unused filters?>"
-msgstr "autoclean=<automatycznie usuwać nieużywane filtry?>"
+msgstr "otomatik temizle=<automatically unload unused filters?>"
 
 #: ../src/modules/module-ladspa-sink.c:53
 msgid "Virtual LADSPA sink"
-msgstr "Wirtualny odpływ LADSPA"
+msgstr "Sanal LADSPA alıcısı"
 
 #: ../src/modules/module-ladspa-sink.c:57
 msgid ""
@@ -1058,38 +1057,37 @@ msgid ""
 "LADSPA port names> output_ladspaport_map=<comma separated list of output "
 "LADSPA port names> "
 msgstr ""
-"sink_name=<nazwa odpływu> sink_properties=<właściwości odpływu> "
-"master=<nazwa odpływu do filtrowania> format=<format próbki> "
-"rate=<częstotliwość próbki> channels=<liczba kanałów> channel_map=<mapa "
-"kanałów> plugin=<nazwa wtyczki ladspa> label=<etykieta wtyczki ladspa> "
-"control=<lista wartości kontroli wejścia oddzielona przecinkami> "
-"input_ladspaport_map=<lista nazw wejściowych portów LADSPA oddzielona "
-"przecinkami> output_ladspaport_map=<lista nazw wyjściowych portów LADSPA "
-"oddzielona przecinkami> "
+"alıcı_adı=<name for the sink> alıcı_özellikleri=<properties for the sink> "
+"ana=<name of sink to filter> biçim=<sample format> hız=<sample rate> "
+"kanallar=<number of channels> kanal_adresleme=<input channel map> eklenti=<"
+"ladspa plugin name> etiket=<ladspa plugin label> kontrol=<comma separated "
+"list of input control values> ladspaport_giriş_listesi=<comma separated list "
+"of input LADSPA port names> ladspaport_çıkış_listesi=<comma separated list "
+"of output LADSPA port names> "
 
 #: ../src/modules/module-null-sink.c:49
 msgid "Clocked NULL sink"
-msgstr "Zegarowy PUSTY odpływ"
+msgstr "Zamanlanmış BOŞ alıcı"
 
 #: ../src/modules/module-null-sink.c:280
 msgid "Null Output"
-msgstr "Puste wyjście"
+msgstr "Boş Çıkış"
 
 #: ../src/modules/module-rygel-media-server.c:510
 #: ../src/modules/module-rygel-media-server.c:548
 #: ../src/modules/module-rygel-media-server.c:907
 msgid "Output Devices"
-msgstr "Urządzenia wyjściowe"
+msgstr "Çıkış Aygıtları"
 
 #: ../src/modules/module-rygel-media-server.c:511
 #: ../src/modules/module-rygel-media-server.c:549
 #: ../src/modules/module-rygel-media-server.c:908
 msgid "Input Devices"
-msgstr "Urządzenia wejściowe"
+msgstr "Girdi Aygıtları"
 
 #: ../src/modules/module-rygel-media-server.c:1065
 msgid "Audio on @HOSTNAME@"
-msgstr "Dźwięk na @HOSTNAME@"
+msgstr "@HOSTNAME@ üzerindeki SES"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
@@ -1097,17 +1095,17 @@ msgstr "Dźwięk na @HOSTNAME@"
 #: ../src/modules/module-tunnel-source-new.c:307
 #, c-format
 msgid "Tunnel for %s@%s"
-msgstr "Tunel dla %s@%s"
+msgstr "s@%s için tünel"
 
 #: ../src/modules/module-tunnel-sink-new.c:510
 #: ../src/modules/module-tunnel-source-new.c:518
 #, c-format
 msgid "Tunnel to %s/%s"
-msgstr "Tunel do %s/%s"
+msgstr "%s/%s tünel"
 
 #: ../src/modules/module-virtual-surround-sink.c:49
 msgid "Virtual surround sink"
-msgstr "Wirtualny odpływ Surround"
+msgstr "Sanal çevresel ses alıcısı"
 
 #: ../src/modules/module-virtual-surround-sink.c:53
 msgid ""
@@ -1117,219 +1115,219 @@ msgid ""
 "use_volume_sharing=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
 "left_hrir.wav "
 msgstr ""
-"sink_name=<nazwa odpływu> sink_properties=<właściwości odpływu> "
-"sink_master=<nazwa odpływu do filtrowania> format=<format próbki> "
-"rate=<częstotliwość próbki> channels=<liczba kanałów> channel_map=<mapa "
-"kanałów> use_volume_sharing=<yes lub no> force_flat_volume=<yes lub no> "
-"hrir=/ścieżka/do/pliku/left_hrir.wav"
+"alıcı_adı=<name for the sink> alıcı_özellikleri=<properties for the sink> "
+"ana=<name of sink to filter> biçim=<sample format> hız=<sample rate> "
+"kanallar=<number of channels> kanal_adresleme=<channel map> "
+"ses_paylaşımı_kullan=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
+"left_hrir.wav "
 
 #: ../src/modules/reserve-wrap.c:151
 msgid "PulseAudio Sound Server"
-msgstr "Serwer dźwięku PulseAudio"
+msgstr "PulseAudio Ses Sunucusu"
 
 #: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:760
 msgid "Mono"
-msgstr "Mono"
+msgstr "Tek Kanallı"
 
 #: ../src/pulse/channelmap.c:107
 msgid "Front Center"
-msgstr "Przedni środkowy"
+msgstr "Ön Orta"
 
 #: ../src/pulse/channelmap.c:108
 msgid "Front Left"
-msgstr "Przedni lewy"
+msgstr "Ön Sol"
 
 #: ../src/pulse/channelmap.c:109
 msgid "Front Right"
-msgstr "Przedni prawy"
+msgstr "Ön Sağ"
 
 #: ../src/pulse/channelmap.c:111
 msgid "Rear Center"
-msgstr "Tylny środkowy"
+msgstr "Arka Orta"
 
 #: ../src/pulse/channelmap.c:112
 msgid "Rear Left"
-msgstr "Tylny lewy"
+msgstr "Arka Sol"
 
 #: ../src/pulse/channelmap.c:113
 msgid "Rear Right"
-msgstr "Tylny prawy"
+msgstr "Arka Sağ"
 
 #: ../src/pulse/channelmap.c:115
 msgid "Subwoofer"
-msgstr "Subwoofer"
+msgstr "Derin Bas Hoparlör"
 
 #: ../src/pulse/channelmap.c:117
 msgid "Front Left-of-center"
-msgstr "Przedni lewy po środku"
+msgstr "Ön Ortanın Solu"
 
 #: ../src/pulse/channelmap.c:118
 msgid "Front Right-of-center"
-msgstr "Przedni prawy po środku"
+msgstr "Ön Ortanın Sağı"
 
 #: ../src/pulse/channelmap.c:120
 msgid "Side Left"
-msgstr "Boczny lewy"
+msgstr "Sol Yan"
 
 #: ../src/pulse/channelmap.c:121
 msgid "Side Right"
-msgstr "Boczny prawy"
+msgstr "Sağ Yan"
 
 #: ../src/pulse/channelmap.c:123
 msgid "Auxiliary 0"
-msgstr "Pomocniczy 0"
+msgstr "Harici 0"
 
 #: ../src/pulse/channelmap.c:124
 msgid "Auxiliary 1"
-msgstr "Pomocniczy 1"
+msgstr "Harici 1"
 
 #: ../src/pulse/channelmap.c:125
 msgid "Auxiliary 2"
-msgstr "Pomocniczy 2"
+msgstr "Harici 2"
 
 #: ../src/pulse/channelmap.c:126
 msgid "Auxiliary 3"
-msgstr "Pomocniczy 3"
+msgstr "Harici 3"
 
 #: ../src/pulse/channelmap.c:127
 msgid "Auxiliary 4"
-msgstr "Pomocniczy 4"
+msgstr "Harici 4"
 
 #: ../src/pulse/channelmap.c:128
 msgid "Auxiliary 5"
-msgstr "Pomocniczy 5"
+msgstr "Harici 5"
 
 #: ../src/pulse/channelmap.c:129
 msgid "Auxiliary 6"
-msgstr "Pomocniczy 6"
+msgstr "Harici 6"
 
 #: ../src/pulse/channelmap.c:130
 msgid "Auxiliary 7"
-msgstr "Pomocniczy 7"
+msgstr "Harici 7"
 
 #: ../src/pulse/channelmap.c:131
 msgid "Auxiliary 8"
-msgstr "Pomocniczy 8"
+msgstr "Harici 8"
 
 #: ../src/pulse/channelmap.c:132
 msgid "Auxiliary 9"
-msgstr "Pomocniczy 9"
+msgstr "Harici 9"
 
 #: ../src/pulse/channelmap.c:133
 msgid "Auxiliary 10"
-msgstr "Pomocniczy 10"
+msgstr "Harici 10"
 
 #: ../src/pulse/channelmap.c:134
 msgid "Auxiliary 11"
-msgstr "Pomocniczy 11"
+msgstr "Harici 11"
 
 #: ../src/pulse/channelmap.c:135
 msgid "Auxiliary 12"
-msgstr "Pomocniczy 12"
+msgstr "Harici 12"
 
 #: ../src/pulse/channelmap.c:136
 msgid "Auxiliary 13"
-msgstr "Pomocniczy 13"
+msgstr "Harici 13"
 
 #: ../src/pulse/channelmap.c:137
 msgid "Auxiliary 14"
-msgstr "Pomocniczy 14"
+msgstr "Harici 14"
 
 #: ../src/pulse/channelmap.c:138
 msgid "Auxiliary 15"
-msgstr "Pomocniczy 15"
+msgstr "Harici 15"
 
 #: ../src/pulse/channelmap.c:139
 msgid "Auxiliary 16"
-msgstr "Pomocniczy 16"
+msgstr "Harici 16"
 
 #: ../src/pulse/channelmap.c:140
 msgid "Auxiliary 17"
-msgstr "Pomocniczy 17"
+msgstr "Harici 17"
 
 #: ../src/pulse/channelmap.c:141
 msgid "Auxiliary 18"
-msgstr "Pomocniczy 18"
+msgstr "Harici 18"
 
 #: ../src/pulse/channelmap.c:142
 msgid "Auxiliary 19"
-msgstr "Pomocniczy 19"
+msgstr "Harici 19"
 
 #: ../src/pulse/channelmap.c:143
 msgid "Auxiliary 20"
-msgstr "Pomocniczy 20"
+msgstr "Harici 20"
 
 #: ../src/pulse/channelmap.c:144
 msgid "Auxiliary 21"
-msgstr "Pomocniczy 21"
+msgstr "Harici 21"
 
 #: ../src/pulse/channelmap.c:145
 msgid "Auxiliary 22"
-msgstr "Pomocniczy 22"
+msgstr "Harici 22"
 
 #: ../src/pulse/channelmap.c:146
 msgid "Auxiliary 23"
-msgstr "Pomocniczy 23"
+msgstr "Harici 23"
 
 #: ../src/pulse/channelmap.c:147
 msgid "Auxiliary 24"
-msgstr "Pomocniczy 24"
+msgstr "Harici 24"
 
 #: ../src/pulse/channelmap.c:148
 msgid "Auxiliary 25"
-msgstr "Pomocniczy 25"
+msgstr "Harici 25"
 
 #: ../src/pulse/channelmap.c:149
 msgid "Auxiliary 26"
-msgstr "Pomocniczy 26"
+msgstr "Harici 26"
 
 #: ../src/pulse/channelmap.c:150
 msgid "Auxiliary 27"
-msgstr "Pomocniczy 27"
+msgstr "Harici 27"
 
 #: ../src/pulse/channelmap.c:151
 msgid "Auxiliary 28"
-msgstr "Pomocniczy 28"
+msgstr "Harici 28"
 
 #: ../src/pulse/channelmap.c:152
 msgid "Auxiliary 29"
-msgstr "Pomocniczy 29"
+msgstr "Harici 29"
 
 #: ../src/pulse/channelmap.c:153
 msgid "Auxiliary 30"
-msgstr "Pomocniczy 30"
+msgstr "Harici 30"
 
 #: ../src/pulse/channelmap.c:154
 msgid "Auxiliary 31"
-msgstr "Pomocniczy 31"
+msgstr "Harici 31"
 
 #: ../src/pulse/channelmap.c:156
 msgid "Top Center"
-msgstr "Górny środkowy"
+msgstr "Üst Orta"
 
 #: ../src/pulse/channelmap.c:158
 msgid "Top Front Center"
-msgstr "Górny przedni środkowy"
+msgstr "Üst Ön Orta"
 
 #: ../src/pulse/channelmap.c:159
 msgid "Top Front Left"
-msgstr "Górny przedni lewy"
+msgstr "Üst Ön Sol"
 
 #: ../src/pulse/channelmap.c:160
 msgid "Top Front Right"
-msgstr "Górny przedni prawy"
+msgstr "Üst Ön Sağ"
 
 #: ../src/pulse/channelmap.c:162
 msgid "Top Rear Center"
-msgstr "Górny tylny środkowy"
+msgstr "Üst Arka Orta"
 
 #: ../src/pulse/channelmap.c:163
 msgid "Top Rear Left"
-msgstr "Górny tylny lewy"
+msgstr "Üst Arka Sol"
 
 #: ../src/pulse/channelmap.c:164
 msgid "Top Rear Right"
-msgstr "Górny tylny prawy"
+msgstr "Üst Arka Sağ"
 
 #: ../src/pulse/channelmap.c:481 ../src/pulse/format.c:123
 #: ../src/pulse/sample.c:177 ../src/pulse/volume.c:296
@@ -1337,7 +1335,7 @@ msgstr "Górny tylny prawy"
 #: ../src/pulse/volume.c:374 ../src/pulse/volume.c:414
 #: ../src/pulse/volume.c:433
 msgid "(invalid)"
-msgstr "(nieprawidłowe)"
+msgstr "(geçersiz)"
 
 #: ../src/pulse/channelmap.c:764
 msgid "Stereo"
@@ -1345,35 +1343,35 @@ msgstr "Stereo"
 
 #: ../src/pulse/channelmap.c:769
 msgid "Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "Çevresel Ses 4.0"
 
 #: ../src/pulse/channelmap.c:775
 msgid "Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "Çevresel Ses 4.1"
 
 #: ../src/pulse/channelmap.c:781
 msgid "Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "Çevresel Ses 5.0"
 
 #: ../src/pulse/channelmap.c:787
 msgid "Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "Çevresel Ses 5.1"
 
 #: ../src/pulse/channelmap.c:794
 msgid "Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "Çevresel Ses 7.1"
 
 #: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:99
 msgid "xcb_connect() failed"
-msgstr "xcb_connect() się nie powiodło: %s"
+msgstr "xcb_connect() başarısız oldu"
 
 #: ../src/pulse/client-conf-x11.c:60 ../src/utils/pax11publish.c:104
 msgid "xcb_connection_has_error() returned true"
-msgstr "xcb_connection_has_error() zwróciło wartość \"true\""
+msgstr "xcb_connection_has_error() doğru değer döndü"
 
 #: ../src/pulse/client-conf-x11.c:96
 msgid "Failed to parse cookie data"
-msgstr "Przetworzenie danych ciasteczka się nie powiodło"
+msgstr "Çerez veri ayrıştırılamadı"
 
 #: ../src/pulse/context.c:658
 #, c-format
@@ -1388,23 +1386,23 @@ msgstr "waitpid(): %s"
 #: ../src/pulse/context.c:1414
 #, c-format
 msgid "Received message for unknown extension '%s'"
-msgstr "Otrzymano komunikat dla nieznanego rozszerzenia \"%s\""
+msgstr "Bilinmeyen eklenti '%s' için ileti alındı"
 
 #: ../src/pulse/direction.c:39
 msgid "input"
-msgstr "wejście"
+msgstr "girdi"
 
 #: ../src/pulse/direction.c:41
 msgid "output"
-msgstr "wyjście"
+msgstr "çıktı"
 
 #: ../src/pulse/direction.c:43
 msgid "bidirectional"
-msgstr "dwukierunkowe"
+msgstr "çift yönlü"
 
 #: ../src/pulse/direction.c:45
 msgid "invalid"
-msgstr "nieprawidłowe"
+msgstr "geçersiz"
 
 #: ../src/pulsecore/core-util.c:1821
 #, c-format
@@ -1413,42 +1411,42 @@ msgid ""
 "e g happen if you try to connect to a non-root PulseAudio as a root user, "
 "over the native protocol. Don't do that.)"
 msgstr ""
-"Właścicielem XDG_RUNTIME_DIR (%s) nie jest UID %d, ale UID %d (może to być "
-"spowodowane próbą połączenia do kopii PulseAudio niebędącej rootem jako "
-"użytkownik root przez natywny protokół, czego nie należy robić)."
+"XDG_RUNTIME_DIR (%s) bize ait değil (uid %d), ancak şunun uid %d! (Eğer bir "
+"root kullanıcısı olarak root olmayan bir PulseAudio ya bağlanmaya "
+"çalışırsanız, doğal protokol üstüne bu bir örnek olabilirdi. Bunu yapmayın.)"
 
 #: ../src/pulsecore/core-util.h:95
 msgid "yes"
-msgstr "tak"
+msgstr "evet"
 
 #: ../src/pulsecore/core-util.h:95
 msgid "no"
-msgstr "nie"
+msgstr "hayır"
 
 #: ../src/pulsecore/lock-autospawn.c:143 ../src/pulsecore/lock-autospawn.c:229
 msgid "Cannot access autospawn lock."
-msgstr "Nie można uzyskać dostępu do blokady automatycznego wznawiania."
+msgstr "Otomatik oluşturma kilidine erişim yok."
 
 #: ../src/pulsecore/log.c:155
 #, c-format
 msgid "Failed to open target file '%s'."
-msgstr "Otwarcie pliku docelowego \"%s\" się nie powiodło."
+msgstr "Hedef dosya '%s' açılamadı."
 
 #: ../src/pulsecore/log.c:178
 #, c-format
 msgid ""
 "Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
 msgstr ""
-"Próbowano otworzyć plik docelowy \"%s\", \"%s.1', \"%s.2\" ... \"%s.%d\", "
-"ale wszystkie się nie powiodły."
+"Hedef dosyaları '%s', '%s.1', '%s.2' ... '%s.%d' açmayı denedi fakat hiçbiri "
+"açılamadı."
 
 #: ../src/pulsecore/log.c:633
 msgid "Invalid log target."
-msgstr "Nieprawidłowy dziennik docelowy."
+msgstr "Geçersiz log hedefi."
 
 #: ../src/pulsecore/sink.c:3429
 msgid "Built-in Audio"
-msgstr "Wbudowany dźwięk"
+msgstr "Dahili Ses"
 
 #: ../src/pulsecore/sink.c:3434
 msgid "Modem"
@@ -1456,111 +1454,111 @@ msgstr "Modem"
 
 #: ../src/pulse/error.c:40
 msgid "OK"
-msgstr "OK"
+msgstr "TAMAM"
 
 #: ../src/pulse/error.c:41
 msgid "Access denied"
-msgstr "Odmowa dostępu"
+msgstr "Erişim engellendi"
 
 #: ../src/pulse/error.c:42
 msgid "Unknown command"
-msgstr "Nieznane polecenie"
+msgstr "Bilinmeyen komut"
 
 #: ../src/pulse/error.c:43
 msgid "Invalid argument"
-msgstr "Nieprawidłowy parametr"
+msgstr "Geçersiz değişken"
 
 #: ../src/pulse/error.c:44
 msgid "Entity exists"
-msgstr "Jednostka istnieje"
+msgstr "Giriş var"
 
 #: ../src/pulse/error.c:45
 msgid "No such entity"
-msgstr "Brak jednostki"
+msgstr "Hiçbir giriş yok"
 
 #: ../src/pulse/error.c:46
 msgid "Connection refused"
-msgstr "Odrzucono połączenie"
+msgstr "Bağlantı reddedildi"
 
 #: ../src/pulse/error.c:47
 msgid "Protocol error"
-msgstr "Błąd protokołu"
+msgstr "Protokol hatası"
 
 #: ../src/pulse/error.c:48
 msgid "Timeout"
-msgstr "Przekroczono czas oczekiwania"
+msgstr "Zaman aşımı"
 
 #: ../src/pulse/error.c:49
 msgid "No authentication key"
-msgstr "Brak klucza uwierzytelnienia"
+msgstr "Kimlik doğrulama anahtarı yok"
 
 #: ../src/pulse/error.c:50
 msgid "Internal error"
-msgstr "Wewnętrzny błąd"
+msgstr "İç hata"
 
 #: ../src/pulse/error.c:51
 msgid "Connection terminated"
-msgstr "Zniszczono połączenie"
+msgstr "Bağlantı sonlandırıldı"
 
 #: ../src/pulse/error.c:52
 msgid "Entity killed"
-msgstr "Zniszczono jednostkę"
+msgstr "Giriş durduruldu"
 
 #: ../src/pulse/error.c:53
 msgid "Invalid server"
-msgstr "Nieprawidłowy serwer"
+msgstr "Geçersiz sunucu"
 
 #: ../src/pulse/error.c:54
 msgid "Module initialization failed"
-msgstr "Zainicjowanie modułu się nie powiodło"
+msgstr "Modül başlatma başarısız oldu"
 
 #: ../src/pulse/error.c:55
 msgid "Bad state"
-msgstr "Błędny stan"
+msgstr "Kötü durum"
 
 #: ../src/pulse/error.c:56
 msgid "No data"
-msgstr "Brak danych"
+msgstr "Veri yok"
 
 #: ../src/pulse/error.c:57
 msgid "Incompatible protocol version"
-msgstr "Niezgodna wersja protokołu"
+msgstr "Uyumsuz protokol sürümü"
 
 #: ../src/pulse/error.c:58
 msgid "Too large"
-msgstr "Za duże"
+msgstr "Çok büyük"
 
 #: ../src/pulse/error.c:59
 msgid "Not supported"
-msgstr "Nieobsługiwane"
+msgstr "Desteklenmeyen"
 
 #: ../src/pulse/error.c:60
 msgid "Unknown error code"
-msgstr "Nieznany kod błędu"
+msgstr "Bilinmeyen hata kodu"
 
 #: ../src/pulse/error.c:61
 msgid "No such extension"
-msgstr "Nie ma takiego rozszerzenia"
+msgstr "Böyle bir uzantı yok"
 
 #: ../src/pulse/error.c:62
 msgid "Obsolete functionality"
-msgstr "Przestarzała funkcjonalność"
+msgstr "Kullanılmayan işlev"
 
 #: ../src/pulse/error.c:63
 msgid "Missing implementation"
-msgstr "Brak implementacji"
+msgstr "Eksik uygulama"
 
 #: ../src/pulse/error.c:64
 msgid "Client forked"
-msgstr "Rozdzielono klienta"
+msgstr "Müşteri çatallandı"
 
 #: ../src/pulse/error.c:65
 msgid "Input/Output error"
-msgstr "Błąd wejścia/wyjścia"
+msgstr "Giriş/Çıkış hatası"
 
 #: ../src/pulse/error.c:66
 msgid "Device or resource busy"
-msgstr "Urządzenie lub zasób jest zajęty"
+msgstr "Aygıt ya da kaynak meşgul"
 
 #: ../src/pulse/sample.c:179
 #, c-format
@@ -1616,29 +1614,33 @@ msgid ""
 "\n"
 "See --dump-resample-methods for possible values of resample methods.\n"
 msgstr ""
-"%s [opcje]\n"
+"%s [seçenekler]\n"
 "\n"
-"-h, --help                            Wyświetla tę pomoc\n"
-"-v, --verbose                         Wyświetla komunikaty debugowania\n"
-"      --from-rate=CZĘSTOTLIWOŚĆPRÓBKI Z częstotliwości próbki w Hz\n"
-"                                      (domyślnie 44100)\n"
-"      --from-format=FORMATPRÓBKI      Z typu próbki (domyślnie s16le)\n"
-"      --from-channels=KANAŁY          Z liczby kanałów (domyślnie 1)\n"
-"      --to-rate=CZĘSTOTLIWOŚĆPRÓBKI   Do częstotliwości próbki w Hz\n"
-"                                      (domyślnie 44100)\n"
-"      --to-format=FORMATPRÓBKI        Do typu próbki (domyślnie s16le)\n"
-"      --to-channels=KANAŁY            Do liczby kanałów (domyślnie 1)\n"
-"      --resample-method=METODA        Metoda resamplingu\n"
-"                                      (domyślnie automatyczna)\n"
-"      --seconds=SEKUNDY               Z długości strumienia (domyślnie 60)\n"
+"-h, --help                            Yardımı gösterir\n"
+"-v, --verbose                         Hata ayıklama iletilerini yazdırır\n"
+"      --from-rate=ÖRNEKLEMEHIZ          Hz cinsinde örnekleme hızından ("
+"varsayılan - 44100)\n"
+"      --from-format=ÖRNEKLEMEBİÇİMİ      Örnekleme türünden (varsayılan - "
+"s16le)\n"
+"      --from-channels=KANALLAR        Kanal sayılarından (varsayılan - 1)\n"
+"      --to-rate=ÖRNEKLEMEHIZI            Hz cinsinde örnekleme hızına ("
+"varsayılan - 44100)\n"
+"      --to-format=ÖRNEKLEMEBİÇİMİ        Örnekleme türüne (varsayılan - "
+"s16le)\n"
+"      --to-channels=KANALLAR          Kanal sayılarına (varsayılan - 1)\n"
+"      --resample-method=YÖNTEM        Yöntemi yeniden örnekleme (varsayılan "
+"otomatik)\n"
+"      --seconds=SANİYE               Akış süresinden (varsayılan - 60)\n"
 "\n"
-"Jeśli nie podano formatu, to test wykona wszystkie kombinacje formatów.\n"
+"Eğer biçimler belirtilmezse, test bütün biçimlerin birleşiminde ileri geri\n"
+"gerçekleştirilir.\n"
 "\n"
-"Typ próbki musi być jednym z s16le, s16be, u8, float32le, float32be, ulaw,\n"
-"alaw, s24le, s24be, s24-32le, s24-32be, s32le, s32be (domyślnie s16ne)\n"
+"Örnek tür şunlardan biri olmalıdır; s16le, s16be, u8, float32le, float32be, "
+"ulaw, alaw,\n"
+"s24le, s24be, s24-32le, s24-32be, s32le, s32be (defaults to s16ne)\n"
 "\n"
-"Proszę zobaczyć --dump-resample-methods, aby uzyskać możliwe\n"
-"wartości metody resamplingu.\n"
+"Yeniden örnekleme yöntemlerinin olası değerlerini --dump-resample-methods "
+"gösterir.\n"
 
 #: ../src/tests/resampler-test.c:356
 #, c-format
@@ -1648,15 +1650,15 @@ msgstr "%s %s\n"
 #: ../src/utils/pacat.c:118
 #, c-format
 msgid "Failed to drain stream: %s"
-msgstr "Opróżnienie strumienia się nie powiodło: %s"
+msgstr "Akış boşaltma başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:123
 msgid "Playback stream drained."
-msgstr "Opróżniono strumień odtwarzania."
+msgstr "Playback akışı boşaltıldı."
 
 #: ../src/utils/pacat.c:134
 msgid "Draining connection to server."
-msgstr "Opróżnianie połączenia z serwerem."
+msgstr "Sunucuya akış bağlantısı."
 
 #: ../src/utils/pacat.c:147
 #, c-format
@@ -1666,160 +1668,160 @@ msgstr "pa_stream_drain(): %s"
 #: ../src/utils/pacat.c:170
 #, c-format
 msgid "pa_stream_write() failed: %s"
-msgstr "pa_stream_write() się nie powiodło: %s"
+msgstr "pa_stream_write() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:211
 #, c-format
 msgid "pa_stream_begin_write() failed: %s"
-msgstr "pa_stream_begin_write() się nie powiodło: %s"
+msgstr "pa_stream_begin_write() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:261 ../src/utils/pacat.c:291
 #, c-format
 msgid "pa_stream_peek() failed: %s"
-msgstr "pa_stream_peek() się nie powiodło: %s"
+msgstr "pa_stream_peek() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:341
 msgid "Stream successfully created."
-msgstr "Pomyślnie utworzono strumień."
+msgstr "Akış başarılı bir şekilde oluşturuldu."
 
 #: ../src/utils/pacat.c:344
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s"
-msgstr "pa_stream_get_buffer_attr() się nie powiodło: %s"
+msgstr "pa_stream_get_buffer_attr() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:348
 #, c-format
 msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
-msgstr "Metryka bufora: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
+msgstr "Tampon ölçüleri: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 
 #: ../src/utils/pacat.c:351
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u"
-msgstr "Metryka bufora: maxlength=%u, fragsize=%u"
+msgstr "Tampon ölçüleri: maxlength=%u, fragsize=%u"
 
 #: ../src/utils/pacat.c:355
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'."
-msgstr "Używanie przykładowego określenia \"%s\", mapa kanałów \"%s\"."
+msgstr "Örnekleme tanımı '%s', kanal listesi '%s' kullanma."
 
 #: ../src/utils/pacat.c:359
 #, c-format
 msgid "Connected to device %s (index: %u, suspended: %s)."
-msgstr "Połączono z urządzeniem %s (indeks: %u, wstrzymane: %s)."
+msgstr "Aygıta %s bağlanıldı (dizin: %u, askıda kalan: %s)."
 
 #: ../src/utils/pacat.c:369
 #, c-format
 msgid "Stream error: %s"
-msgstr "Błąd strumienia: %s"
+msgstr "Akış hatası: %s"
 
 #: ../src/utils/pacat.c:379
 #, c-format
 msgid "Stream device suspended.%s"
-msgstr "Wstrzymano urządzenie strumienia.%s"
+msgstr "Akış aygıtı askıda. %s"
 
 #: ../src/utils/pacat.c:381
 #, c-format
 msgid "Stream device resumed.%s"
-msgstr "Wznowiono urządzenie strumienia.%s"
+msgstr "Akış aygıtı devam ettirildi.%s"
 
 #: ../src/utils/pacat.c:389
 #, c-format
 msgid "Stream underrun.%s"
-msgstr "Niedopełniony strumień.%s"
+msgstr "Akış yetersiz.%s"
 
 #: ../src/utils/pacat.c:396
 #, c-format
 msgid "Stream overrun.%s"
-msgstr "Przepełniony strumień.%s"
+msgstr "Akış taşması.%s"
 
 #: ../src/utils/pacat.c:403
 #, c-format
 msgid "Stream started.%s"
-msgstr "Utworzono strumień.%s"
+msgstr "Akış başladı. %s"
 
 #: ../src/utils/pacat.c:410
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
-msgstr "Strumień został przeniesiony do urządzenia %s (%u, %swstrzymane).%s"
+msgstr "Akış %s aygıtına taşındı (%u, %sertelenmiş).%s"
 
 #: ../src/utils/pacat.c:410
 msgid "not "
-msgstr "nie "
+msgstr "değil "
 
 #: ../src/utils/pacat.c:417
 #, c-format
 msgid "Stream buffer attributes changed.%s"
-msgstr "Zmieniono atrybuty bufora strumienia.%s"
+msgstr "Akış tampon bellek özellikleri değişti. %s"
 
 #: ../src/utils/pacat.c:432
 msgid "Cork request stack is empty: corking stream"
-msgstr "Stos żądań korka jest pusty: zatykanie strumienia"
+msgstr "Durdurma isteği yığını boş: akış durduruluyor"
 
 #: ../src/utils/pacat.c:438
 msgid "Cork request stack is empty: uncorking stream"
-msgstr "Stos żądań korka jest pusty: odtykanie strumienia"
+msgstr "Durdurma isteği yığını boş: akış durdurma sonlandırılıyor"
 
 #: ../src/utils/pacat.c:442
 msgid "Warning: Received more uncork requests than cork requests!"
-msgstr "Ostrzeżenie: otrzymano więcej żądań odetkania niż żądań zatkania."
+msgstr "Uyarı: Durdurma isteğinden daha fazla devam ettirme isteği alındı!"
 
 #: ../src/utils/pacat.c:467
 #, c-format
 msgid "Connection established.%s"
-msgstr "Ustanowiono połączenie.%s"
+msgstr "Bağlantı kuruldu.%s"
 
 #: ../src/utils/pacat.c:470
 #, c-format
 msgid "pa_stream_new() failed: %s"
-msgstr "pa_stream_new() się nie powiodło: %s"
+msgstr "pa_stream_new() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:508
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s"
-msgstr "pa_stream_connect_playback() się nie powiodło: %s"
+msgstr "pa_stream_connect_playback() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:514
 #, c-format
 msgid "Failed to set monitor stream: %s"
-msgstr "Ustawienie strumienia monitora się nie powiodło: %s"
+msgstr "Akış izleme ayarlanamadı: %s"
 
 #: ../src/utils/pacat.c:518
 #, c-format
 msgid "pa_stream_connect_record() failed: %s"
-msgstr "pa_stream_connect_record() się nie powiodło: %s"
+msgstr "pa_stream_connect_record() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1448
 #, c-format
 msgid "Connection failure: %s"
-msgstr "Połączenie się nie powiodło: %s"
+msgstr "Bağlantı hatası: %s"
 
 #: ../src/utils/pacat.c:564
 msgid "Got EOF."
-msgstr "Otrzymano EOF."
+msgstr "EOF Al."
 
 #: ../src/utils/pacat.c:601
 #, c-format
 msgid "write() failed: %s"
-msgstr "write() się nie powiodło: %s"
+msgstr "write() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:622
 msgid "Got signal, exiting."
-msgstr "Otrzymano sygnał, kończenie działania."
+msgstr "Sinyal alındı, çıkılıyor."
 
 #: ../src/utils/pacat.c:636
 #, c-format
 msgid "Failed to get latency: %s"
-msgstr "Uzyskanie opóźnienia się nie powiodło: %s"
+msgstr "Gecikme alınamadı: %s"
 
 #: ../src/utils/pacat.c:641
 #, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Czas: %0.3f sekundy; opóźnienie: %0.0f usekundy."
+msgstr "Zaman: %0.3f saniye; Gecikme: %0.0f usec."
 
 #: ../src/utils/pacat.c:662
 #, c-format
 msgid "pa_stream_update_timing_info() failed: %s"
-msgstr "pa_stream_update_timing_info() się nie powiodło: %s"
+msgstr "pa_stream_update_timing_info() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:672
 #, c-format
@@ -1887,69 +1889,70 @@ msgid ""
 "      --monitor-stream=INDEX            Record from the sink input with "
 "index INDEX.\n"
 msgstr ""
-"%s [opcje]\n"
+"%s [seçenekler]\n"
 "\n"
-"  -h, --help                            Wyświetla tę pomoc\n"
-"      --version                         Wyświetla wersję\n"
+"  -h, --help                            Yardımı gösterir\n"
+"      --version                         Sürümü gösterir\n"
 "\n"
-"  -r, --record                          Tworzy połączenie do nagrywania\n"
-"  -p, --playback                        Tworzy połączenie do odtwarzania\n"
+"  -r, --record                          Kayıt için bir bağlantı oluşturur\n"
+"  -p, --playback                        Çalmak için bir bağlantı oluşturur\n"
 "\n"
-"  -v, --verbose                         Wyświetla więcej informacji o\n"
-"                                        działaniu\n"
+"  -v, --verbose                         Ayrıntılı işlemleri etkinleştirir\n"
 "\n"
-"  -s, --server=SERWER                   Nazwa serwera do połączenia się\n"
-"  -d, --device=URZĄDZENIE               Nazwa odpływu/źródła do połączenia\n"
-"                                        się\n"
-"  -n, --client-name=NAZWA               Jak nazywać tego klienta na\n"
-"                                        serwerze\n"
-"      --stream-name=NAZWA               Jak nazwać ten strumień na serwerze\n"
-"      --volume=POZIOMGŁOŚNOŚCI          Określa początkowy (liniowy)\n"
-"                                        poziom głośności z zakresie\n"
-"                                        0...65536\n"
-"      --rate=CZĘSTOTLIWOŚĆPRÓBKI        Częstotliwość próbki w Hz\n"
-"                                        (domyślnie 44100)\n"
-"      --format=FORMATPRÓBKI             Typ próbki, jeden z s16le, s16be,\n"
-"                                        u8, float32le, float32be, ulaw,\n"
-"                                        alaw, s32le, s32be, s24le, s24be,\n"
-"                                        s24-32le, s24-32be (domyślnie\n"
-"                                        s16ne)\n"
-"      --channels=KANAŁY                 Liczba kanałów, 1 dla mono, 2 dla\n"
-"                                        stereo\n"
-"                                        (domyślnie 2)\n"
-"      --channel-map=MAPAKANAŁÓW         Mapa kanałów używa zamiast\n"
-"                                        domyślnej\n"
-"      --fix-format                      Pobiera format próbki z odpływu/\n"
-"                                        źródła, z jakim połączony jest\n"
-"                                        strumień.\n"
-"      --fix-rate                        Pobiera częstotliwość sampli z\n"
-"                                        odpływu/źródła, z jakim połączony\n"
-"                                        jest strumień.\n"
-"      --fix-channels                    Pobiera liczbę kanałów i mapę\n"
-"                                        kanałów z odpływu/źródła, z jakim\n"
-"                                        połączony jest strumień.\n"
-"      --no-remix                        Nie miesza kanałów w górę lub w\n"
-"                                        dół.\n"
-"      --no-remap                        Mapuje kanały przez indeks zamiast\n"
-"                                        przez nazwę.\n"
-"      --latency=BAJTY                   Żąda określonego opóźnienia w\n"
-"                                        bajtach.\n"
-"      --process-time=BAJTY              Żąda określonego czasu procesu na\n"
-"                                        żądanie w bajtach.\n"
-"      --latency-msec=MSEKUNDY           Żąda określonego opóźnienia w\n"
-"                                        milisekundach.\n"
-"      --process-time-msec=MSEKUNDY      Żąda określonego czasu procesu na\n"
-"                                        żądanie w milisekundach.\n"
-"      --property=WŁASNOŚĆ=WARTOŚĆ       Ustawia podaną własność na podaną\n"
-"                                        wartość.\n"
-"      --raw                             Nagrywa/odtwarza surowe dane PCM.\n"
-"      --passthrough                     Przekazuje dane.\n"
-"      --file-format=[=FFORMAT]          Nagrywa/odtwarza sformatowane dane\n"
-"                                        PCM.\n"
-"      --list-file-formats               Wyświetla listę dostępnych formatów\n"
-"                                        plików.\n"
-"      --monitor-stream=INDEKS           Nagrywa z odpływu wejścia\n"
-"                                        o INDEKSIE.\n"
+"  -s, --server=SUNUCU                   Bağlanılacak sunucunun adı\n"
+"  -d, --device=AYGIT                   Bağlanılacak alıcı/kaynak adı\n"
+"  -n, --client-name=AD                Sunucu üzerindeki istemci nasıl "
+"çağrılacağı bilgisi\n"
+"      --stream-name=AD                Sunucu üzerindeki bu akışın nasıl "
+"çağrılacağı bilgisi\n"
+"      --volume=HACİM                   0...65536 aralığında başlangıç "
+"(doğrusal) hacmi belirtir\n"
+"      --rate=ÖRNEKLEMEHIZI                 Hz cinsinde örnekleme oranı ("
+"varsayılan - 44100)\n"
+"      --format=ÖRNEKLEMEBİÇİMİ             s16le, s16be, u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, "
+"s24le, s24be,\n"
+"                                        s24-32le, s24-32be (defaults to "
+"s16ne)\n"
+"                                        biçimlerinden biri örnekleme "
+"türü       --channels=KANALLAR               Kanal sayısı, tek için 1, çift "
+"için 2\n"
+"                                        (varsayılan - 2)\n"
+"      --channel-map=KANALADRESLEME          Varsayılan yerine kullanmak için "
+"kanal adresleme\n"
+"      --fix-format                      Alıcı/kaynaktan bağlı olunan akışın "
+"örnekleme türünü alır.\n"
+"      --fix-rate                        Alıcı/kaynaktan bağlı olunan akışın "
+"örnekleme türünü alır.\n"
+"      --fix-channels                    Alıcı/kaynaktan bağlı olunan akışın "
+"kanal eşlemesini\n"
+"                                                        ve kanal sayısını "
+"alır.\n"
+"      --no-remix                        Kanalları indirgemez ya da "
+"çoğaltamaz.\n"
+"      --no-remap                        Ad yerine dizin ile kanalları eşler."
+"\n"
+"      --latency=BAYT                   Bayt cinsinden belirtilen gecikmeyi "
+"ister.\n"
+"      --process-time=BAYT              Bayt cinsinden her talep başına "
+"belirtilen işlem\n"
+"                                                                   zamanını "
+"ister.\n"
+"      --latency-msec=MİLİSANİYE               Milisaniye cinsinde belirtilen "
+"gecikmeyi ister.\n"
+"      --process-time-msec=MİLİSANİYE          Milisaniye cinsinde her talep "
+"başına belirtilen\n"
+"                                                                             "
+"işlem zamanını ister.\n"
+"      --property=ÖZELLİK=DEĞER         Belirtilen değere belirtilen "
+"özellikleri ayarlar.\n"
+"      --raw                             Ham PCM veri kaydeder/çalar.\n"
+"      --passthrough                     Doğrudan veri geçişi.\n"
+"      --file-format[=FFORMAT]           Biçimlendirilmiş PCM verilerini "
+"kaydeder/çalar.\n"
+"      --list-file-formats               Mevcut dosya biçimlerini listeler.\n"
+"      --monitor-stream=INDEX            Alıcı girdisinden INDEX indeksi ile "
+"kaydeder.\n"
 
 #: ../src/utils/pacat.c:810
 #, c-format
@@ -1959,51 +1962,51 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 "pacat %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"Libpulse %s ile derlendi\n"
+"Libpulse %s ile bağlantılı\n"
 
 #: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1644
 #, c-format
 msgid "Invalid client name '%s'"
-msgstr "Nieprawidłowa nazwa klienta \"%s\""
+msgstr "Geçersiz istemci adı '%s'"
 
 #: ../src/utils/pacat.c:858
 #, c-format
 msgid "Invalid stream name '%s'"
-msgstr "Nieprawidłowa nazwa strumienia \"%s\""
+msgstr "Geçersiz akış adı '%s'"
 
 #: ../src/utils/pacat.c:895
 #, c-format
 msgid "Invalid channel map '%s'"
-msgstr "Nieprawidłowa mapa kanałów \"%s\""
+msgstr "Geçersiz kanal adresleme '%s'"
 
 #: ../src/utils/pacat.c:924 ../src/utils/pacat.c:938
 #, c-format
 msgid "Invalid latency specification '%s'"
-msgstr "Nieprawidłowe określenie opóźnienia \"%s\""
+msgstr "Geçersiz gecikme tanımı '%s'"
 
 #: ../src/utils/pacat.c:931 ../src/utils/pacat.c:945
 #, c-format
 msgid "Invalid process time specification '%s'"
-msgstr "Nieprawidłowe określenie czasu procesu \"%s\""
+msgstr "Geçersiz işlem zaman tanımı '%s'"
 
 #: ../src/utils/pacat.c:957
 #, c-format
 msgid "Invalid property '%s'"
-msgstr "Nieprawidłowa własność \"%s\""
+msgstr "Geçersiz özellik '%s'"
 
 #: ../src/utils/pacat.c:976
 #, c-format
 msgid "Unknown file format %s."
-msgstr "Nieznany format pliku %s."
+msgstr "Bilinmeyen dosya biçimi %s."
 
 #: ../src/utils/pacat.c:991
 msgid "Failed to parse the argument for --monitor-stream"
-msgstr "Przetworzenie parametru dla --monitor-stream się nie powiodło"
+msgstr "--monitor-stream için değişken ayrıştırılamadı"
 
 #: ../src/utils/pacat.c:1002
 msgid "Invalid sample specification"
-msgstr "Nieprawidłowe określenie próbki"
+msgstr "Geçersiz örnekleme tanımı"
 
 #: ../src/utils/pacat.c:1012
 #, c-format
@@ -2017,145 +2020,144 @@ msgstr "dup2(): %s"
 
 #: ../src/utils/pacat.c:1024
 msgid "Too many arguments."
-msgstr "Za dużo parametrów."
+msgstr "Çok fazla değişken."
 
 #: ../src/utils/pacat.c:1035
 msgid "Failed to generate sample specification for file."
-msgstr "Utworzenie określenia próbki dla pliku się nie powiodło."
+msgstr "Dosya için örnekleme tanımı oluşturulamadı."
 
 #: ../src/utils/pacat.c:1061
 msgid "Failed to open audio file."
-msgstr "Otwarcie pliku dźwiękowego się nie powiodło."
+msgstr "Ses dosyası açılamadı."
 
 #: ../src/utils/pacat.c:1067
 msgid ""
 "Warning: specified sample specification will be overwritten with "
 "specification from file."
 msgstr ""
-"Ostrzeżenie: podane określenie próbki zostanie zastąpione przez określenie z "
-"pliku."
+"Uyarı: belirtilmiş örnek tanımlama, dosyadan alınacak başka bir tanımlama "
+"ile üzerine yazılacak."
 
 #: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1708
 msgid "Failed to determine sample specification from file."
-msgstr "Ustalenie określenia próbki z pliku nie się nie powiodło."
+msgstr "Dosyadan örnekleme tanımı belirlenemedi."
 
 #: ../src/utils/pacat.c:1079
 msgid "Warning: Failed to determine channel map from file."
-msgstr "Ostrzeżenie: ustalenie mapy kanałów z pliku się nie powiodło."
+msgstr "Uyarı: Dosyadan kanal adresleme belirlenemedi."
 
 #: ../src/utils/pacat.c:1090
 msgid "Channel map doesn't match sample specification"
-msgstr "Mapa kanałów nie zgadza się z określeniem próbki"
+msgstr "Kanal adresleme örnekleme tanımı ile eşleşmiyor"
 
 #: ../src/utils/pacat.c:1101
 msgid "Warning: failed to write channel map to file."
-msgstr "Ostrzeżenie: zapisanie mapy kanałów do pliku się nie powiodło."
+msgstr "Uyarı: kanal adresleme dosyaya yazılamadı."
 
 #: ../src/utils/pacat.c:1116
 #, c-format
 msgid ""
 "Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr ""
-"Otwieranie strumienia %s za pomocą określenie próbki \"%s\" i mapy kanałów "
-"\"%s\"."
+"Örnekleme tanımı '%s' ve kanal adresleme '%s' ile bir %s akışı açılıyor."
 
 #: ../src/utils/pacat.c:1117
 msgid "recording"
-msgstr "nagrywanie"
+msgstr "kaydediliyor"
 
 #: ../src/utils/pacat.c:1117
 msgid "playback"
-msgstr "odtwarzanie"
+msgstr "çal"
 
 #: ../src/utils/pacat.c:1141
 msgid "Failed to set media name."
-msgstr "Ustawienie nazwy nośnika się nie powiodło."
+msgstr "Ortam adı ayarlanamadı."
 
 #: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2058
 msgid "pa_mainloop_new() failed."
-msgstr "pa_mainloop_new() się nie powiodło."
+msgstr "pa_mainloop_new() başarısız oldu."
 
 #: ../src/utils/pacat.c:1171
 msgid "io_new() failed."
-msgstr "io_new() się nie powiodło."
+msgstr "io_new() başarısız oldu."
 
 #: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2070
 msgid "pa_context_new() failed."
-msgstr "pa_context_new() się nie powiodło."
+msgstr "pa_context_new() başarısız oldu."
 
 #: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2076
 #, c-format
 msgid "pa_context_connect() failed: %s"
-msgstr "pa_context_connect() się nie powiodło: %s"
+msgstr "pa_context_connect() başarısız oldu: %s"
 
 #: ../src/utils/pacat.c:1192
 msgid "pa_context_rttime_new() failed."
-msgstr "pa_context_rttime_new() się nie powiodło."
+msgstr "pa_context_rttime_new() başarısız oldu."
 
 #: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2081
 msgid "pa_mainloop_run() failed."
-msgstr "pa_mainloop_run() się nie powiodło."
+msgstr "pa_mainloop_run() başarısız oldu."
 
 #: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1566
 msgid "NAME [ARGS ...]"
-msgstr "NAZWA [PARAMETRY...]"
+msgstr "AD [DEĞİŞKENLER ...]"
 
 #: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1567
 msgid "NAME|#N"
-msgstr "NAZWA|#N"
+msgstr "AD|#A"
 
 #: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1565
 #: ../src/utils/pactl.c:1571
 msgid "NAME"
-msgstr "NAZWA"
+msgstr "AD"
 
 #: ../src/utils/pacmd.c:56
 msgid "NAME|#N VOLUME"
-msgstr "NAZWA|#N GŁOŚNOŚĆ"
+msgstr "AD|#A SES"
 
 #: ../src/utils/pacmd.c:57
 msgid "#N VOLUME"
-msgstr "#N GŁOŚNOŚĆ"
+msgstr "#N SES"
 
 #: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1569
 msgid "NAME|#N 1|0"
-msgstr "NAZWA|#N 1|0"
+msgstr "AD|#A 1|0"
 
 #: ../src/utils/pacmd.c:59
 msgid "#N 1|0"
-msgstr "#N 1|0"
+msgstr "#A 1|0"
 
 #: ../src/utils/pacmd.c:60
 msgid "NAME|#N KEY=VALUE"
-msgstr "NAZWA|#N KLUCZ=WARTOŚĆ"
+msgstr "AD|#A ANAHTAR=DEĞER"
 
 #: ../src/utils/pacmd.c:61
 msgid "#N KEY=VALUE"
-msgstr "#N KLUCZ=WARTOŚĆ"
+msgstr "#A ANAHTAR=DEĞER"
 
 #: ../src/utils/pacmd.c:63
 msgid "#N"
-msgstr "#N"
+msgstr "#A"
 
 #: ../src/utils/pacmd.c:64
 msgid "NAME SINK|#N"
-msgstr "NAZWA ODPŁYW|#N"
+msgstr "AD ALICI|#A"
 
 #: ../src/utils/pacmd.c:66 ../src/utils/pacmd.c:67
 msgid "NAME FILENAME"
-msgstr "NAZWA NAZWA-PLIKU"
+msgstr "AD DOSYAADI"
 
 #: ../src/utils/pacmd.c:68
 msgid "PATHNAME"
-msgstr "NAZWA-ŚCIEŻKI"
+msgstr "YOLADI"
 
 #: ../src/utils/pacmd.c:69
 msgid "FILENAME SINK|#N"
-msgstr "NAZWA-PLIKU ODPŁYW|#N"
+msgstr "DOSYAADI ALICI|#A"
 
 #: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1568
 msgid "#N SINK|SOURCE"
-msgstr "#N ODPŁYW|ŹRÓDŁO"
+msgstr "#A ALICI|KAYNAK"
 
 #: ../src/utils/pacmd.c:73 ../src/utils/pacmd.c:79 ../src/utils/pacmd.c:80
 msgid "1|0"
@@ -2163,27 +2165,27 @@ msgstr "1|0"
 
 #: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1570
 msgid "CARD PROFILE"
-msgstr "PROFIL KARTY"
+msgstr "KART PROFİLİ"
 
 #: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1572
 msgid "NAME|#N PORT"
-msgstr "NAZWA|#N PORT"
+msgstr "AD|#A BAĞLANTI NOKTASI"
 
 #: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1578
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
-msgstr "NAZWA-KARTY|KARTA-#N PORT OFFSET"
+msgstr "KART-ADI|KART-#N PORT UZAKLIK"
 
 #: ../src/utils/pacmd.c:77
 msgid "TARGET"
-msgstr "CEL"
+msgstr "HEDEF"
 
 #: ../src/utils/pacmd.c:78
 msgid "NUMERIC LEVEL"
-msgstr "NUMERYCZNY POZIOM"
+msgstr "SAYISAL SEVİYE"
 
 #: ../src/utils/pacmd.c:81
 msgid "FRAMES"
-msgstr "RAMKI"
+msgstr "KARELER"
 
 #: ../src/utils/pacmd.c:83
 #, c-format
@@ -2194,10 +2196,9 @@ msgid ""
 "When no command is given pacmd starts in the interactive mode.\n"
 msgstr ""
 "\n"
-"  -h, --help                            Wyświetla tę pomoc\n"
-"      --version                         Wyświetla wersję\n"
-"Jeśli nie podano polecenia, to program pacmd zostaje uruchomiony w trybie "
-"interaktywnym.\n"
+"  -h, --help                            Yardım gösterir\n"
+"      --version                         Sürüm gösterir\n"
+"pacmd için komut verilmediğinde karşılıklı konuşma kipinde başlar.\n"
 
 #: ../src/utils/pacmd.c:130
 #, c-format
@@ -2207,19 +2208,19 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 "pacmd %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"libpulse %s ile derlendi\n"
+"libpulse %s ile bağlantılı\n"
 
 #: ../src/utils/pacmd.c:144
 msgid "No PulseAudio daemon running, or not running as session daemon."
 msgstr ""
-"Usługa PulseAudio nie jest uruchomiona, lub nie jest uruchomiona jako usługa "
-"sesji."
+"Hiçbir PulseAudio artalan işlemi çalıştırılmıyor ya da bir artalan işlem "
+"oturumu olarak çalıştırılmıyor."
 
 #: ../src/utils/pacmd.c:149
 #, c-format
 msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
-msgstr "gniazdo(PF_UNIX, SOCK_STREAM, 0): %s"
+msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 
 #: ../src/utils/pacmd.c:166
 #, c-format
@@ -2228,11 +2229,11 @@ msgstr "connect(): %s"
 
 #: ../src/utils/pacmd.c:174
 msgid "Failed to kill PulseAudio daemon."
-msgstr "Zniszczenie usługi PulseAudio się nie powiodło."
+msgstr "PulseAudio artalan işlemi durdurulamadı."
 
 #: ../src/utils/pacmd.c:182
 msgid "Daemon not responding."
-msgstr "Usługa nie odpowiada."
+msgstr "Artalan işlem yanıt vermiyor."
 
 #: ../src/utils/pacmd.c:214 ../src/utils/pacmd.c:323 ../src/utils/pacmd.c:341
 #, c-format
@@ -2252,29 +2253,27 @@ msgstr "read(): %s"
 #: ../src/utils/pactl.c:166
 #, c-format
 msgid "Failed to get statistics: %s"
-msgstr "Uzyskanie statystyk się nie powiodło: %s"
+msgstr "İstatistikler alınamadı: %s"
 
 #: ../src/utils/pactl.c:172
 #, c-format
 msgid "Currently in use: %u blocks containing %s bytes total.\n"
-msgstr "Obecnie używane: %u bloków zawierających razem %s bajtów.\n"
+msgstr "Şu anda kullanımda: %u bloklar toplamda %s bayt içeriyor.\n"
 
 #: ../src/utils/pactl.c:175
 #, c-format
 msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
-msgstr ""
-"Przydzielono podczas całego czasu uruchomienia: %u bloków zawierających "
-"razem %s bajtów.\n"
+msgstr "Tüm ömrü boyunca ayrılmış: %u blokları toplamda %s bayt içeriyor.\n"
 
 #: ../src/utils/pactl.c:178
 #, c-format
 msgid "Sample cache size: %s\n"
-msgstr "Rozmiar pamięci podręcznej próbek: %s\n"
+msgstr "Örnekleme ön bellek boyutu: %s\n"
 
 #: ../src/utils/pactl.c:187
 #, c-format
 msgid "Failed to get server information: %s"
-msgstr "Uzyskanie informacji o serwerze się nie powiodło: %s"
+msgstr "Sunucu bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:192
 #, c-format
@@ -2286,12 +2285,12 @@ msgid ""
 "Client Index: %u\n"
 "Tile Size: %zu\n"
 msgstr ""
-"Ciąg serwera: %s\n"
-"Wersja protokołu biblioteki: %u\n"
-"Wersja protokołu serwera: %u\n"
-"Czy jest lokalny: %s\n"
-"Indeks klienta: %u\n"
-"Rozmiar kafla: %zu\n"
+"Sunucu Karakter Dizisi: %s\n"
+"Kütüphane Protokol Sürümü: %u\n"
+"Sunucu Protokol Sürümü: %u\n"
+"Yerelde Mi: %s\n"
+"İstemci Dizini: %u\n"
+"Desen Boyutu: %zu\n"
 
 #: ../src/utils/pactl.c:208
 #, c-format
@@ -2306,20 +2305,20 @@ msgid ""
 "Default Source: %s\n"
 "Cookie: %04x:%04x\n"
 msgstr ""
-"Nazwa użytkownika: %s\n"
-"Nazwa komputera: %s\n"
-"Nazwa serwera: %s\n"
-"Wersja serwera: %s\n"
-"Domyślne określenie próbki: %s\n"
-"Domyślna mapa kanałów: %s\n"
-"Domyślny odpływ: %s\n"
-"Domyślne źródło: %s\n"
-"Ciasteczko: %04x:%04x\n"
+"Kullanıcı Adı: %s\n"
+"Makine Adı: %s\n"
+"Sunucu Adı: %s\n"
+"Sunucu Sürümü: %s\n"
+"Varsayılan Örnekleme Tanımı: %s\n"
+"Varsayılan Kanal Adresleme: %s\n"
+"Varsayılan Alıcı: %s\n"
+"Varsayılan Kaynak: %s\n"
+"Çerez: %04x:%04x\n"
 
 #: ../src/utils/pactl.c:257 ../src/utils/pactl.c:902 ../src/utils/pactl.c:980
 #, c-format
 msgid "Failed to get sink information: %s"
-msgstr "Uzyskanie informacji o odpływie się nie powiodło: %s"
+msgstr "Alıcı bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:283
 #, c-format
@@ -2342,43 +2341,43 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Odpływ #%u\n"
-"\tStan: %s\n"
-"\tNazwa: %s\n"
-"\tOpis: %s\n"
-"\tSterownik: %s\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tWłaściciel modułu: %u\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t                  balans %0.2f\n"
-"\tGłośność podstawowa: %s\n"
-"\tŹródło monitora: %s\n"
-"\tOpóźnienie: %0.0f usekundy, skonfigurowano %0.0f usekundy\n"
-"\tFlagi: %s%s%s%s%s%s%s\n"
-"\tWłaściwości:\n"
+"Alıcı #%u\n"
+"\tDurum: %s\n"
+"\tAd: %s\n"
+"\tAçıklama: %s\n"
+"\tSürücü: %s\n"
+"\tÖrnekleme Tanımı: %s\n"
+"\tKanal Adresleme: %s\n"
+"\tModül Sahibi: %u\n"
+"\tSessiz: %s\n"
+"\tSes: %s\n"
+"\t        denge %0.2f\n"
+"\tTemel Ses: %s\n"
+"\tİzleme Kaynağı: %s\n"
+"\tGecikme: %0.0f usec, yapılandırılmış %0.0f usec\n"
+"\tBayraklar: %s%s%s%s%s%s%s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:327 ../src/utils/pactl.c:433 ../src/utils/pactl.c:594
 #, c-format
 msgid "\tPorts:\n"
-msgstr "\tPorty:\n"
+msgstr "\tBağlantı Noktaları:\n"
 
 #: ../src/utils/pactl.c:334 ../src/utils/pactl.c:440
 #, c-format
 msgid "\tActive Port: %s\n"
-msgstr "\tAktywny port: %s\n"
+msgstr "\tEtkin Bağlantı Noktası: %s\n"
 
 #: ../src/utils/pactl.c:340 ../src/utils/pactl.c:446
 #, c-format
 msgid "\tFormats:\n"
-msgstr "\tFormaty:\n"
+msgstr "\tBiçimler:\n"
 
 #: ../src/utils/pactl.c:364 ../src/utils/pactl.c:922 ../src/utils/pactl.c:995
 #, c-format
 msgid "Failed to get source information: %s"
-msgstr "Uzyskanie informacji o źródle się nie powiodło: %s"
+msgstr "Kaynak bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:390
 #, c-format
@@ -2401,22 +2400,22 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Źródło #%u\n"
-"\tStan: %s\n"
-"\tNazwa: %s\n"
-"\tOpis: %s\n"
-"\tSterownik: %s\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tWłaściciel modułu: %u\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t                  balans %0.2f\n"
-"\tGłośność podstawowa: %s\n"
-"\tMonitor odpływu: %s\n"
-"\tOpóźnienie: %0.0f usekundy, skonfigurowano %0.0f usekundy\n"
-"\tFlagi: %s%s%s%s%s%s\n"
-"\tWłaściwości:\n"
+"Kaynak #%u\n"
+"\tDurum: %s\n"
+"\tAd: %s\n"
+"\tAçıklama: %s\n"
+"\tSürücü: %s\n"
+"\tÖrnekleme Tanımı: %s\n"
+"\tKanal Adresleme: %s\n"
+"\tModül Sahibi: %u\n"
+"\tSessiz: %s\n"
+"\tSes: %s\n"
+"\t        denge %0.2f\n"
+"\tTemel Ses: %s\n"
+"\tAlıcı İzleme: %s\n"
+"\tGecikme: %0.0f usec, yapılandırılmış %0.0f usec\n"
+"\tBayraklar: %s%s%s%s%s%s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:418 ../src/utils/pactl.c:488 ../src/utils/pactl.c:531
@@ -2425,12 +2424,12 @@ msgstr ""
 #: ../src/utils/pactl.c:753 ../src/utils/pactl.c:804 ../src/utils/pactl.c:805
 #: ../src/utils/pactl.c:811
 msgid "n/a"
-msgstr "nie dotyczy"
+msgstr "yok"
 
 #: ../src/utils/pactl.c:457 ../src/utils/pactl.c:861
 #, c-format
 msgid "Failed to get module information: %s"
-msgstr "Uzyskanie informacji o module się nie powiodło: %s"
+msgstr "Modül bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:480
 #, c-format
@@ -2442,17 +2441,17 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Moduł #%u\n"
-"\tNazwa: %s\n"
-"\tParametr: %s\n"
-"\tLicznik użycia: %s\n"
-"\tWłaściwości:\n"
+"Modül #%u\n"
+"\tAdı: %s\n"
+"\tDeğişken: %s\n"
+"\tKullanım Sayacı: %s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:499
 #, c-format
 msgid "Failed to get client information: %s"
-msgstr "Uzyskanie informacji o kliencie się nie powiodło: %s"
+msgstr "İstemci bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:525
 #, c-format
@@ -2463,16 +2462,16 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Klient #%u\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tWłaściwości:\n"
+"İstemci #%u\n"
+"\tSürücü: %s\n"
+"\tModül Sahibi: %s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:542
 #, c-format
 msgid "Failed to get card information: %s"
-msgstr "Uzyskanie informacji o karcie się nie powiodło: %s"
+msgstr "Kart bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:565
 #, c-format
@@ -2484,22 +2483,22 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Karta #%u\n"
-"\tNazwa: %s\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tWłaściwości:\n"
+"Kart #%u\n"
+"\tAdı: %s\n"
+"\tSürücü: %s\n"
+"\tModül Sahibi: %s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:581
 #, c-format
 msgid "\tProfiles:\n"
-msgstr "\tProfile:\n"
+msgstr "\tProfiller:\n"
 
 #: ../src/utils/pactl.c:588
 #, c-format
 msgid "\tActive Profile: %s\n"
-msgstr "\tAktywny profil: %s\n"
+msgstr "\tEtkin Profil: %s\n"
 
 #: ../src/utils/pactl.c:602
 #, c-format
@@ -2507,18 +2506,18 @@ msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
-"\t\t\tWłaściwości:\n"
+"\t\t\tÖzellikler:\n"
 "\t\t\t\t%s\n"
 
 #: ../src/utils/pactl.c:607
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
-msgstr "\t\t\tCzęść profilu: %s"
+msgstr "\t\t\\Profil(ler)in parçası: %s"
 
 #: ../src/utils/pactl.c:624 ../src/utils/pactl.c:942 ../src/utils/pactl.c:1010
 #, c-format
 msgid "Failed to get sink input information: %s"
-msgstr "Uzyskanie informacji o odpływie wejścia się nie powiodło: %s"
+msgstr "Alıcı giriş bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:653
 #, c-format
@@ -2541,28 +2540,28 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Odpływ wejścia #%u\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tKlient: %s\n"
-"\tOdpływ: %u\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tFormat: %s\n"
-"\tZakorkowane: %s\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t                  balans %0.2f\n"
-"\tOpóźnienie bufora: %0.0f usekundy\n"
-"\tOpóźnienie odpływu: %0.0f usekundy\n"
-"\tMetoda resamplingu: %s\n"
-"\tWłaściwości:\n"
+"Alıcı Girişi #%u\n"
+"\tSürücü: %s\n"
+"\tModül Sahibi: %s\n"
+"\tİstemci: %s\n"
+"\tAlıcı: %u\n"
+"\tÖrnekleme Tanımı: %s\n"
+"\tKanal Adresleme: %s\n"
+"\tBiçim: %s\n"
+"\tDurduruldu: %s\n"
+"\tSessiz: %s\n"
+"\tSes: %s\n"
+"\t        denge %0.2f\n"
+"\tTampon Bellek Gecikmesi: %0.0f usec\n"
+"\tAlıcı Gecikmesi: %0.0f usec\n"
+"\tÖrnekleme Yöntemi: %s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:694 ../src/utils/pactl.c:962 ../src/utils/pactl.c:1025
 #, c-format
 msgid "Failed to get source output information: %s"
-msgstr "Uzyskanie informacji o wyjściu źródła się nie powiodło: %s"
+msgstr "Kaynak çıktı bilgileri alınamadı: %s"
 
 #: ../src/utils/pactl.c:723
 #, c-format
@@ -2585,28 +2584,28 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Odpływ wejścia #%u\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tKlient: %s\n"
-"\tOdpływ: %u\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tFormat: %s\n"
-"\tZakorkowane: %s\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t                  balans %0.2f\n"
-"\tOpóźnienie bufora: %0.0f usekundy\n"
-"\tOpóźnienie odpływu: %0.0f usekundy\n"
-"\tMetoda resamplingu: %s\n"
-"\tWłaściwości:\n"
+"Kaynak Çıktısı #%u\n"
+"\tSürücü: %s\n"
+"\tModül Sahibi: %s\n"
+"\tİstemci: %s\n"
+"\tKaynak: %u\n"
+"\tÖrnekleme Tanımı: %s\n"
+"\tKanal Adresleme: %s\n"
+"\tBiçim: %s\n"
+"\tVeri Akışı Durduruldu: %s\n"
+"\tSessiz: %s\n"
+"\tSes: %s\n"
+"\t        denge %0.2f\n"
+"\tTampon Bellek Gecikmesi: %0.0f usec\n"
+"\tKaynak Gecikmesi: %0.0f usec\n"
+"\tYeniden Örnekleme yöntemi: %s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:764
 #, c-format
 msgid "Failed to get sample information: %s"
-msgstr "Uzyskanie informacji o próbce się nie powiodło: %s"
+msgstr "Örnekleme bilgisi alınamadı: %s"
 
 #: ../src/utils/pactl.c:791
 #, c-format
@@ -2624,29 +2623,28 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Próbka #%u\n"
-"\tNazwa: %s\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tPoziom głośności: %s\n"
-"\t                  balans %0.2f\n"
-"\tCzas trwania: %0.1fs\n"
-"\tRozmiar: %s\n"
-"\tLazy: %s\n"
-"\tNazwa pliku: %s\n"
-"\tWłaściwości:\n"
+"Örnekleme #%u\n"
+"\tAd: %s\n"
+"\tÖrnekleme Tanımı: %s\n"
+"\tKanal Adresleme: %s\n"
+"\tSes: %s\n"
+"\t        denge %0.2f\n"
+"\tSüre: %0.1fs\n"
+"\tBoyut: %s\n"
+"\tYavaş: %s\n"
+"\tDosya adı: %s\n"
+"\tÖzellikler:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:819 ../src/utils/pactl.c:829
 #, c-format
 msgid "Failure: %s"
-msgstr "Niepowodzenie: %s"
+msgstr "Hata: %s"
 
 #: ../src/utils/pactl.c:868
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
-msgstr ""
-"Usunięcie modułu z pamięci się nie powiodło: moduł %s nie jest wczytany"
+msgstr "Modül kaldırılamadı: Modül %s yüklenemedi"
 
 #: ../src/utils/pactl.c:886
 #, c-format
@@ -2654,99 +2652,99 @@ msgid ""
 "Failed to set volume: You tried to set volumes for %d channels, whereas "
 "channel/s supported = %d\n"
 msgstr ""
-"Uzyskanie głośności się nie powiodło: próbowano ustawić głośność dla %d "
-"kanałów, kiedy obsługiwane kanały = %d\n"
+"Ses ayarlanamadı: Halbuki desteklenen %d kanalları için sesleri ayarlamayı "
+"denediniz\n"
 
 #: ../src/utils/pactl.c:1052
 #, c-format
 msgid "Failed to set format: invalid format string %s"
-msgstr "Ustawienie formatu się nie powiodło: nieprawidłowy ciąg formatu %s"
+msgstr "Biçim ayarlanamadı: geçersiz biçim dizisi %s"
 
 #: ../src/utils/pactl.c:1095
 #, c-format
 msgid "Failed to upload sample: %s"
-msgstr "Wysłanie próbki się nie powiodło: %s"
+msgstr "Örnekleme yüklenemedi: %s"
 
 #: ../src/utils/pactl.c:1112
 msgid "Premature end of file"
-msgstr "Przedwczesny koniec pliku"
+msgstr "Dosyanın erken bitişi"
 
 #: ../src/utils/pactl.c:1132
 msgid "new"
-msgstr "nowy"
+msgstr "yeni"
 
 #: ../src/utils/pactl.c:1135
 msgid "change"
-msgstr "zmień"
+msgstr "değiştir"
 
 #: ../src/utils/pactl.c:1138
 msgid "remove"
-msgstr "usuń"
+msgstr "kaldır"
 
 #: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176
 msgid "unknown"
-msgstr "nieznany"
+msgstr "bilinmeyen"
 
 #: ../src/utils/pactl.c:1149
 msgid "sink"
-msgstr "odpływ"
+msgstr "alıcı"
 
 #: ../src/utils/pactl.c:1152
 msgid "source"
-msgstr "źródło"
+msgstr "kaynak"
 
 #: ../src/utils/pactl.c:1155
 msgid "sink-input"
-msgstr "wejście-odpływu"
+msgstr "alıcı-girişi"
 
 #: ../src/utils/pactl.c:1158
 msgid "source-output"
-msgstr "wyjście-źródła"
+msgstr "alıcı-çıkışı"
 
 #: ../src/utils/pactl.c:1161
 msgid "module"
-msgstr "moduł"
+msgstr "modül"
 
 #: ../src/utils/pactl.c:1164
 msgid "client"
-msgstr "klient"
+msgstr "istemci"
 
 #: ../src/utils/pactl.c:1167
 msgid "sample-cache"
-msgstr "bufor-próbki"
+msgstr "örnek-önbellek"
 
 #: ../src/utils/pactl.c:1170
 msgid "server"
-msgstr "serwer"
+msgstr "sunucu"
 
 #: ../src/utils/pactl.c:1173
 msgid "card"
-msgstr "karta"
+msgstr "kart"
 
 #: ../src/utils/pactl.c:1182
 #, c-format
 msgid "Event '%s' on %s #%u\n"
-msgstr "Zdarzenie \"%s\" w %s #%u\n"
+msgstr "%s #%u üzerinde '%s' olayı\n"
 
 #: ../src/utils/pactl.c:1454
 msgid "Got SIGINT, exiting."
-msgstr "Otrzymano SIGINT, kończenie działania."
+msgstr "SIGINT alındı, çıkılıyor."
 
 #: ../src/utils/pactl.c:1481
 msgid "Invalid volume specification"
-msgstr "Nieprawidłowe określenie głośności"
+msgstr "Geçersiz ses tanımı"
 
 #: ../src/utils/pactl.c:1504
 msgid "Volume outside permissible range.\n"
-msgstr "Głośność jest poza dozwolonym zakresem.\n"
+msgstr "İzin verilebilir aralık dışındaki ses.\n"
 
 #: ../src/utils/pactl.c:1517
 msgid "Invalid number of volume specifications.\n"
-msgstr "Nieprawidłowa liczba określeń głośności.\n"
+msgstr "Geçersiz ses tanımı numarası.\n"
 
 #: ../src/utils/pactl.c:1529
 msgid "Inconsistent volume specification.\n"
-msgstr "Niespójne określenie głośności.\n"
+msgstr "Tutarsız ses tanımı.\n"
 
 #: ../src/utils/pactl.c:1559 ../src/utils/pactl.c:1560
 #: ../src/utils/pactl.c:1561 ../src/utils/pactl.c:1562
@@ -2760,39 +2758,39 @@ msgstr "Niespójne określenie głośności.\n"
 #: ../src/utils/pactl.c:1577 ../src/utils/pactl.c:1578
 #: ../src/utils/pactl.c:1579
 msgid "[options]"
-msgstr "[opcje]"
+msgstr "[seçenekler]"
 
 #: ../src/utils/pactl.c:1561
 msgid "[TYPE]"
-msgstr "[TYP]"
+msgstr "[TÜR]"
 
 #: ../src/utils/pactl.c:1563
 msgid "FILENAME [NAME]"
-msgstr "NAZWA-PLIKU [NAZWA]"
+msgstr "DOSYAADI [AD]"
 
 #: ../src/utils/pactl.c:1564
 msgid "NAME [SINK]"
-msgstr "NAZWA [ODPŁYW]"
+msgstr "AD [ALICI]"
 
 #: ../src/utils/pactl.c:1573
 msgid "NAME|#N VOLUME [VOLUME ...]"
-msgstr "NAZWA|#N GŁOŚNOŚĆ [GŁOŚNOŚĆ...]"
+msgstr "AD|#A SES [SES ...]"
 
 #: ../src/utils/pactl.c:1574
 msgid "#N VOLUME [VOLUME ...]"
-msgstr "#N GŁOŚNOŚĆ [GŁOŚNOŚĆ...]"
+msgstr "#A SES [SES ...]"
 
 #: ../src/utils/pactl.c:1575
 msgid "NAME|#N 1|0|toggle"
-msgstr "NAZWA|#N 1|0|przełącznik"
+msgstr "İSİM|#N 1|0|geçiş"
 
 #: ../src/utils/pactl.c:1576
 msgid "#N 1|0|toggle"
-msgstr "#N 1|0|przełącznik"
+msgstr "#N 1|0|geçiş"
 
 #: ../src/utils/pactl.c:1577
 msgid "#N FORMATS"
-msgstr "#N FORMATY"
+msgstr "#A BİÇİMLER"
 
 #: ../src/utils/pactl.c:1580
 #, c-format
@@ -2802,8 +2800,8 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 "\n"
-"Specjalne nazwy @DEFAULT_SINK@, @DEFAULT_SOURCE@ i @DEFAULT_MONITOR@\n"
-"mogą być używane do podania domyślnego odpływu, źródła i monitora.\n"
+"Özel isimler @DEFAULT_SINK@, @DEFAULT_SOURCE@ ve @DEFAULT_MONITOR@\n"
+"varsayılan alıcıyı, kaynağı ve ekranı belirtmek için kullanılabilir.\n"
 
 #: ../src/utils/pactl.c:1583
 #, c-format
@@ -2818,11 +2816,12 @@ msgid ""
 "server\n"
 msgstr ""
 "\n"
-"  -h, --help                            Wyświetla tę pomoc\n"
-"      --version                         Wyświetla wersję\n"
+"  -h, --help                            Yardım gösterir\n"
+"      --version                         Sürüm gösterir\n"
 "\n"
-"  -s, --server=SERWER                   Nazwa serwera do połączenia się\n"
-"  -n, --client-name=NAZWA               Jak nazwać tego klienta w serwerze\n"
+"  -s, --server=SUNUCU                   Bağlantı kurulacak sunucu adı\n"
+"  -n, --client-name=AD                Sunucu üzerinde bu istemci nasıl "
+"çağrılacak\n"
 
 #: ../src/utils/pactl.c:1624
 #, c-format
@@ -2832,159 +2831,166 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 "pactl %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"Libpulse %s ile derlendi\n"
+"Libpulse %s ile bağlantılı\n"
 
 #: ../src/utils/pactl.c:1680
 #, c-format
 msgid "Specify nothing, or one of: %s"
-msgstr "Należy podać nic lub jedno z: %s"
+msgstr "Şunlardan birini belirtin ya da hiçbir şey belirtmeyin: %s"
 
 #: ../src/utils/pactl.c:1690
 msgid "Please specify a sample file to load"
-msgstr "Proszę podać plik próbki do wczytania"
+msgstr "Lütfen yüklemek için bir örnekleme dosyası belirtin"
 
 #: ../src/utils/pactl.c:1703
 msgid "Failed to open sound file."
-msgstr "Otwarcie pliku dźwiękowego się nie powiodło."
+msgstr "Ses dosyası açılamadı."
 
 #: ../src/utils/pactl.c:1715
 msgid "Warning: Failed to determine sample specification from file."
-msgstr "Ostrzeżenie: ustalenie określenia próbki z pliku się nie powiodło."
+msgstr "Uyarı: Dosyadan örnekleme tanımı belirlenemedi."
 
 #: ../src/utils/pactl.c:1725
 msgid "You have to specify a sample name to play"
-msgstr "Należy podać nazwę próbki do odtworzenia"
+msgstr "Çalmak için örnek ad belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1737
 msgid "You have to specify a sample name to remove"
-msgstr "Należy podać nazwę próbki do usunięcia"
+msgstr "Kaldırmak için örnek ad belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1746
 msgid "You have to specify a sink input index and a sink"
-msgstr "Należy podać indeks odpływu wejścia i odpływ"
+msgstr "Bir alıcı giriş göstergesi ve alıcı belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1756
 msgid "You have to specify a source output index and a source"
-msgstr "Należy podać indeks źródła wyjścia i źródło"
+msgstr "Bir kaynak çıkış indeksi ve kaynak belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1771
 msgid "You have to specify a module name and arguments."
-msgstr "Należy podać nazwę modułu i parametry."
+msgstr "Bir modül adı ve değişken belirtmelisiniz."
 
 #: ../src/utils/pactl.c:1791
 msgid "You have to specify a module index or name"
-msgstr "Należy podać indeks lub nazwę modułu"
+msgstr "Bir modül dizini ya da adı belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1804
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
-"Nie można podać więcej niż jednego odpływu. Należy podać wartość logiczną."
+"Birden daha fazla alıcı belirtemezsiniz. Bir boolean değer belirtmelisiniz."
 
 #: ../src/utils/pactl.c:1809 ../src/utils/pactl.c:1829
 msgid "Invalid suspend specification."
-msgstr "Nieprawidłowe określenie uśpienia."
+msgstr "Geçersiz bekletme tanımlaması"
 
 #: ../src/utils/pactl.c:1824
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
-"Nie można podać więcej niż jednego źródła. Należy podać wartość logiczną."
+"Bir kaynaktan daha fazlasını belirtemezsiniz. Bir boolean değer "
+"belirtmelisiniz."
 
 #: ../src/utils/pactl.c:1841
 msgid "You have to specify a card name/index and a profile name"
-msgstr "Należy podać nazwę karty/indeks i nazwę profilu"
+msgstr "Bir kart adı/dizin ve bir profil adı belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1852
 msgid "You have to specify a sink name/index and a port name"
-msgstr "Należy podać nazwę odpływu/indeks i nazwę portu"
+msgstr "Bir alıcı adı/indeksi ve bağlantı noktası adı belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1863
 msgid "You have to specify a sink name"
-msgstr "Należy podać nazwę odpływu"
+msgstr "Bir alıcı adı belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1873
 msgid "You have to specify a source name/index and a port name"
-msgstr "Należy podać nazwę źródła/indeks i nazwę portu"
+msgstr "Bir kaynak adı/dizini ve bir bağlantı noktası adı belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1884
 msgid "You have to specify a source name"
-msgstr "Należy podać nazwę źródła"
+msgstr "Bir kaynak adı belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1894
 msgid "You have to specify a sink name/index and a volume"
-msgstr "Należy podać nazwę odpływu/indeks i głośność"
+msgstr "Bir alıcı adı/indeksi ve ses belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1907
 msgid "You have to specify a source name/index and a volume"
-msgstr "Należy podać nazwę źródła/indeks i głośność"
+msgstr "Bir kaynak adı/dizini ve bir ses belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1920
 msgid "You have to specify a sink input index and a volume"
-msgstr "Należy podać indeks odpływu wejścia i głośność"
+msgstr "Bir alıcı girdisi indeksi ve bir ses belirtmek zorundasınız"
 
 #: ../src/utils/pactl.c:1925
 msgid "Invalid sink input index"
-msgstr "Nieprawidłowy indeks odpływ wejścia"
+msgstr "Geçersiz alıcı giriş indeksi"
 
 #: ../src/utils/pactl.c:1936
 msgid "You have to specify a source output index and a volume"
-msgstr "Należy podać indeks źródła wyjścia i głośność"
+msgstr "Bir kaynak çıktı dizini ve bir ses belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1941
 msgid "Invalid source output index"
-msgstr "Nieprawidłowy indeks wejścia źródła"
+msgstr "Geçersiz kaynak çıktı dizini"
 
 #: ../src/utils/pactl.c:1952
 msgid "You have to specify a sink name/index and a mute boolean"
-msgstr "Należy podać nazwę odpływu/indeks i zmienną logiczną wyciszenia"
+msgstr ""
+"Bir alıcı adı/indeksi ve bir sessizlik boole değeri belirtmek zorundasınız"
 
 #: ../src/utils/pactl.c:1957 ../src/utils/pactl.c:1972
 #: ../src/utils/pactl.c:1992 ../src/utils/pactl.c:2010
 msgid "Invalid mute specification"
-msgstr "Nieprawidłowe określenie wyciszenia"
+msgstr "Geçersiz sessiz tanımı"
 
 #: ../src/utils/pactl.c:1967
 msgid "You have to specify a source name/index and a mute boolean"
-msgstr "Należy podać nazwę źródła/indeks i zmienną logiczną wyciszenia"
+msgstr "Bir kaynak adı/dizini ve bir sessiz mantıksal değer belirtmelisiniz"
 
 #: ../src/utils/pactl.c:1982
 msgid "You have to specify a sink input index and a mute boolean"
-msgstr "Należy podać indeks odpływu wejścia i zmienną logiczną wyciszenia"
+msgstr ""
+"Bir alıcı girdi indeksi ve bir sessizlik boole değeri belirtmek zorundasınız"
 
 #: ../src/utils/pactl.c:1987
 msgid "Invalid sink input index specification"
-msgstr "Nieprawidłowe określenie indeksu odpływu wejścia"
+msgstr "Geçersiz alıcı girişi indeks tanımı"
 
 #: ../src/utils/pactl.c:2000
 msgid "You have to specify a source output index and a mute boolean"
-msgstr "Należy podać nazwę indeks wyjścia źródła i zmienną logiczną wyciszenia"
+msgstr ""
+"Bir çıktı kaynağı indeksi ve bir sessizlik boole değeri belirtmek "
+"zorundasınız"
 
 #: ../src/utils/pactl.c:2005
 msgid "Invalid source output index specification"
-msgstr "Nieprawidłowe określenie indeksu wyjścia źródła"
+msgstr "Geçersiz kaynak çıktısı indeksi tanımlaması"
 
 #: ../src/utils/pactl.c:2022
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
-"Należy podać nazwę indeks odpływu listę obsługiwanych formatów oddzielonych "
-"średnikami"
+"Bir alıcı indeksi ve desteklenen biçimlerin, noktalı virgülle ayrılmış "
+"listesini belirtmek zorundasınız"
 
 #: ../src/utils/pactl.c:2034
 msgid "You have to specify a card name/index, a port name and a latency offset"
-msgstr "Należy podać nazwę karty/indeks, nazwę portu i offset opóźnienia"
+msgstr ""
+"Bir kart adı/indeksi, bir bağlantı noktası adı ve bir gecikme uzaklığı "
+"belirtmek zorundasınız"
 
 #: ../src/utils/pactl.c:2041
 msgid "Could not parse latency offset"
-msgstr "Nie można przetworzyć offsetu opóźnienia"
+msgstr "Gecikme uzaklığı ayrıştırılamadı"
 
 #: ../src/utils/pactl.c:2053
 msgid "No valid command specified."
-msgstr "Nie podano prawidłowego polecenia."
+msgstr "Belirtilen geçerli komut yok."
 
 #: ../src/utils/pasuspender.c:81
 #, c-format
@@ -2999,33 +3005,32 @@ msgstr "execvp(): %s\n"
 #: ../src/utils/pasuspender.c:113
 #, c-format
 msgid "Failure to resume: %s\n"
-msgstr "Wznowienie się nie powiodło: %s\n"
+msgstr "Devam edilemedi: %s\n"
 
 #: ../src/utils/pasuspender.c:147
 #, c-format
 msgid "Failure to suspend: %s\n"
-msgstr "Wstrzymanie się nie powiodło: %s\n"
+msgstr "Bekletilemedi: %s\n"
 
 #: ../src/utils/pasuspender.c:172
 #, c-format
 msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr ""
-"OSTRZEŻENIE: serwer dźwięku nie jest lokalny, nie zostanie wstrzymany.\n"
+msgstr "UYARI: Ses sunucusu yerel değil, askıya alınamıyor.\n"
 
 #: ../src/utils/pasuspender.c:185
 #, c-format
 msgid "Connection failure: %s\n"
-msgstr "Połączenie się nie powiodło: %s\n"
+msgstr "Bağlantı hatası: %s\n"
 
 #: ../src/utils/pasuspender.c:203
 #, c-format
 msgid "Got SIGINT, exiting.\n"
-msgstr "Otrzymano SIGINT, kończenie działania.\n"
+msgstr "SIGINT sinyali alındı, çıkılıyor.\n"
 
 #: ../src/utils/pasuspender.c:221
 #, c-format
 msgid "WARNING: Child process terminated by signal %u\n"
-msgstr "OSTRZEŻENIE: proces potomny został zniszczony przez sygnał %u\n"
+msgstr "UYARI: Alt işlem %u sinyali ile sonlandırıldı\n"
 
 #: ../src/utils/pasuspender.c:230
 #, c-format
@@ -3038,11 +3043,11 @@ msgid ""
 "to\n"
 "\n"
 msgstr ""
-"%s [opcje] ... \n"
+"%s [seçenekler] ... \n"
 "\n"
-"  -h, --help                            Wyświetla tę pomoc\n"
-"      --version                         Wyświetla wersję\n"
-"  -s, --server=SERWER                   Nazwa serwera do połączenia się\n"
+"  -h, --help                            Yardımı gösterir\n"
+"      --version                         Sürüm gösterir\n"
+"  -s, --server=SUNUCU                   Bağlanılacak sunucunun adı\n"
 "\n"
 
 #: ../src/utils/pasuspender.c:268
@@ -3053,23 +3058,23 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 "pasuspender %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"Libpulse %s ile derlendi\n"
+"Libpulse %s ile bağlantılı\n"
 
 #: ../src/utils/pasuspender.c:297
 #, c-format
 msgid "pa_mainloop_new() failed.\n"
-msgstr "pa_mainloop_new() się nie powiodło.\n"
+msgstr "pa_mainloop_new() başarısız oldu.\n"
 
 #: ../src/utils/pasuspender.c:310
 #, c-format
 msgid "pa_context_new() failed.\n"
-msgstr "pa_context_new() się nie powiodło.\n"
+msgstr "pa_context_new() başarısız oldu.\n"
 
 #: ../src/utils/pasuspender.c:322
 #, c-format
 msgid "pa_mainloop_run() failed.\n"
-msgstr "pa_mainloop_run() się nie powiodło.\n"
+msgstr "pa_mainloop_run() başarısız oldu.\n"
 
 #: ../src/utils/pax11publish.c:60
 #, c-format
@@ -3082,60 +3087,61 @@ msgid ""
 "variables and cookie file.\n"
 " -r    Remove PulseAudio data from X11 display\n"
 msgstr ""
-"%s [-D ekran] [-S serwer] [-O odpływ] [-I źródło] [-c plik]  [-d|-e|-i|-r]\n"
+"%s [-D ekran] [-S sunucu] [-O alıcı] [-I kaynak] [-c dosya]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    X11 ekranına bağlı mevcut PulseAudio verilerini gösterir (varsayılan)"
 "\n"
-" -d    Wyświetla dane PulseAudio dołączone do ekranu X11 (domyślne)\n"
-" -e    Eksportuje lokalne dane PulseAudio na ekran X11\n"
-" -i    Importuje dane PulseAudio z ekranu X11 do lokalnych zmiennych\n"
-"       środowiskowych i pliku ciasteczka.\n"
-" -r    Usuwa dane PulseAudio z ekranu X11\n"
+" -e    X11 ekranına bağlı yerel PulseAudio verilerini dışa aktarır\n"
+" -i    X11 ekranından PulseAudio verilerini yerel çevresel değişkenlere ve "
+"çerez dosyalarına aktarır.\n"
+" -r    X11 ekranından PulseAudio verilerini kaldırır\n"
 
 #: ../src/utils/pax11publish.c:93
 #, c-format
 msgid "Failed to parse command line.\n"
-msgstr "Przetworzenie wiersza poleceń się nie powiodło.\n"
+msgstr "Komut satırı ayrıştırılamadı.\n"
 
 #: ../src/utils/pax11publish.c:112
 #, c-format
 msgid "Server: %s\n"
-msgstr "Serwer: %s\n"
+msgstr "Sunucu: %s\n"
 
 #: ../src/utils/pax11publish.c:114
 #, c-format
 msgid "Source: %s\n"
-msgstr "Źródło: %s\n"
+msgstr "Kaynak: %s\n"
 
 #: ../src/utils/pax11publish.c:116
 #, c-format
 msgid "Sink: %s\n"
-msgstr "Odpływ: %s\n"
+msgstr "Alıcı: %s\n"
 
 #: ../src/utils/pax11publish.c:118
 #, c-format
 msgid "Cookie: %s\n"
-msgstr "Ciasteczko: %s\n"
+msgstr "Çerez: %s\n"
 
 #: ../src/utils/pax11publish.c:136
 #, c-format
 msgid "Failed to parse cookie data\n"
-msgstr "Przetworzenie danych ciasteczka się nie powiodło\n"
+msgstr "Çerez veriler çözümlenemedi\n"
 
 #: ../src/utils/pax11publish.c:141
 #, c-format
 msgid "Failed to save cookie data\n"
-msgstr "Zapisanie danych ciasteczka się nie powiodło\n"
+msgstr "Çerez veriler kaydedilemedi\n"
 
 #: ../src/utils/pax11publish.c:170
 #, c-format
 msgid "Failed to get FQDN.\n"
-msgstr "Uzyskanie FQDN się nie powiodło.\n"
+msgstr "FQDN alınamadı.\n"
 
 #: ../src/utils/pax11publish.c:190
 #, c-format
 msgid "Failed to load cookie data\n"
-msgstr "Wczytanie danych ciasteczka się nie powiodło\n"
+msgstr "Çerez veriler yüklenemedi\n"
 
 #: ../src/utils/pax11publish.c:208
 #, c-format
 msgid "Not yet implemented.\n"
-msgstr "Niezaimplementowane.\n"
+msgstr "Henüz uygulanmadı.\n"
diff --git a/po/uk.po b/po/uk.po
index 8d31367..d9f87e4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -547,16 +547,17 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "Гаразд, ви запустили PA у системному режимі. Будь ласка, зауважте, що "
 "здебільшого у цьому немає потреби.\n"
 "Якщо ви все ж це зробили, відповідальність за всі негаразди лягає саме на "
 "вас.\n"
-"Будь ласка, ознайомтеся зі статтею http://pulseaudio.org/wiki/"
-"WhatIsWrongWithSystemMode, щоб дізнатися про те, чому не варто "
-"використовувати системний режим."
+"Будь ласка, ознайомтеся зі статтею http://www.freedesktop.org/wiki/Software/"
+"PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ , щоб дізнатися про "
+"те, чому не варто використовувати системний режим."
 
 #: ../src/daemon/main.c:969
 msgid "pa_pid_file_create() failed."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2971a35..0ad658e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -395,13 +395,14 @@ msgid ""
 "shouldn't be doing that.\n"
 "If you do it nonetheless then it's your own fault if things don't work as "
 "expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "确定,那么您正在系统模式中运行 PA。请注意:您很可能不应该这样做。\n"
 "如果您无论如何都这样做了,那么出现意外情况就是您的问题。\n"
-"在文章 http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode 中解释了为什么系"
-"统模式通常不是个好主意。"
+"在文章 http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/"
+"User/WhatIsWrongWithSystemWide/ 中解释了为什么系统模式通常不是个好主意。"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 82a7eef..2a0a0ec 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -360,13 +360,18 @@ msgstr "以系統模式執行中:%s"
 
 #: ../src/daemon/main.c:964
 msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an explanation why system mode is usually a bad idea."
+"OK, so you are running PA in system mode. Please note that you most likely "
+"shouldn't be doing that.\n"
+"If you do it nonetheless then it's your own fault if things don't work as "
+"expected.\n"
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
 msgstr ""
 "好的,所以您正以系統模式執行 PA。請注意,您很不應該那麼做。\n"
 "若您仍執意這樣做,那麼當事情的進展非如您所願時是您自己的過錯。\n"
-"請閱讀 http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode 來瞭解為何採用系統模式是個壞主意。"
+"請閱讀 http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/"
+"User/WhatIsWrongWithSystemWide/ 來瞭解為何採用系統模式是個壞主意。"
 
 #: ../src/daemon/main.c:981
 msgid "pa_pid_file_create() failed."
diff --git a/src/Makefile.am b/src/Makefile.am
index 88a824e..e37a22a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,9 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ###################################
 #       Extra directories         #
diff --git a/src/Makefile.in b/src/Makefile.in
index 8c55521..76aed02 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,9 +31,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ###################################
 #       Extra directories         #
diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 9471d3b..fd135c0 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/daemon/caps.h b/src/daemon/caps.h
index e9cd7cb..9b88241 100644
--- a/src/daemon/caps.h
+++ b/src/daemon/caps.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 2ffc61f..a2fb6d5 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/daemon/cmdline.h b/src/daemon/cmdline.h
index 4f02804..771c14d 100644
--- a/src/daemon/cmdline.h
+++ b/src/daemon/cmdline.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include "daemon-conf.h"
diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c
index 7c75397..a3deaf2 100644
--- a/src/daemon/cpulimit.c
+++ b/src/daemon/cpulimit.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/daemon/cpulimit.h b/src/daemon/cpulimit.h
index ce78d48..460f8c5 100644
--- a/src/daemon/cpulimit.h
+++ b/src/daemon/cpulimit.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index b7a85aa..6e9d377 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h
index 20225c0..62587b2 100644
--- a/src/daemon/daemon-conf.h
+++ b/src/daemon/daemon-conf.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 5b20130..067738d 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -11,9 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
 ## more information. Default values are commented out.  Use either ; or # for
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 536c405..5ec4641 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -13,8 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 # This startup script is used only if PulseAudio is started per-user
 # (i.e. not in system mode)
diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c
index 0529e04..8410bbc 100644
--- a/src/daemon/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/daemon/dumpmodules.h b/src/daemon/dumpmodules.h
index c3595e5..289f35d 100644
--- a/src/daemon/dumpmodules.h
+++ b/src/daemon/dumpmodules.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include "daemon-conf.h"
diff --git a/src/daemon/esdcompat.in b/src/daemon/esdcompat.in
index 41a12a0..361ca63 100755
--- a/src/daemon/esdcompat.in
+++ b/src/daemon/esdcompat.in
@@ -13,9 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 VERSION_STRING="@PACKAGE_NAME@ esd wrapper @PACKAGE_VERSION@"
 
diff --git a/src/daemon/ltdl-bind-now.c b/src/daemon/ltdl-bind-now.c
index 9c67a7d..3492571 100644
--- a/src/daemon/ltdl-bind-now.c
+++ b/src/daemon/ltdl-bind-now.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/daemon/ltdl-bind-now.h b/src/daemon/ltdl-bind-now.h
index 332aad6..bb6d83f 100644
--- a/src/daemon/ltdl-bind-now.h
+++ b/src/daemon/ltdl-bind-now.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 void pa_ltdl_init(void);
diff --git a/src/daemon/main.c b/src/daemon/main.c
index d41554f..68ed383 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -975,7 +973,7 @@ int main(int argc, char *argv[]) {
     if (pa_in_system_mode())
         pa_log_warn(_("OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
                       "If you do it nonetheless then it's your own fault if things don't work as expected.\n"
-                      "Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an explanation why system mode is usually a bad idea."));
+                      "Please read http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system mode is usually a bad idea."));
 
     if (conf->use_pid_file) {
         int z;
diff --git a/src/daemon/pulseaudio-system.conf b/src/daemon/pulseaudio-system.conf
index 1eee879..2eb342e 100644
--- a/src/daemon/pulseaudio-system.conf
+++ b/src/daemon/pulseaudio-system.conf
@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
 Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
+License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <busconfig>
diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
index c281530..ca390c7 100644
--- a/src/daemon/server-lookup.c
+++ b/src/daemon/server-lookup.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -49,7 +47,7 @@ static const char introspection[] =
     DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
     "<node>"
     " <!-- If you are looking for documentation make sure to check out\n"
-    "      http://pulseaudio.org/wiki/DBusInterface -->\n"
+    "      http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/ -->\n"
     " <interface name=\"" INTERFACE "\">\n"
     "  <property name=\"Address\" type=\"s\" access=\"read\"/>\n"
     " </interface>\n"
diff --git a/src/daemon/server-lookup.h b/src/daemon/server-lookup.h
index c930d5b..935baf6 100644
--- a/src/daemon/server-lookup.h
+++ b/src/daemon/server-lookup.h
@@ -17,17 +17,15 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus object at path
  * /org/pulseaudio/server_lookup. Implemented interfaces
  * are org.pulseaudio.ServerLookup and org.freedesktop.DBus.Introspectable.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the ServerLookup interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/ConnectingToServer/
+ * for the ServerLookup interface documentation.
  */
 
 #include <pulsecore/core.h>
diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
index 63ed740..16e46b1 100755
--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
@@ -13,9 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 set -e
 
diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index 6da880e..01cea10 100755
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -13,8 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 # This startup script is used only if PulseAudio is started in system
 # mode.
diff --git a/src/depmod.py b/src/depmod.py
index 6cb3cb2..39b50ce 100755
--- a/src/depmod.py
+++ b/src/depmod.py
@@ -13,9 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 import sys, os, string
 
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index b5d6276..2fe2ae4 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
index 7e6300e..ec39fab 100644
--- a/src/modules/alsa/alsa-mixer.h
+++ b/src/modules/alsa/alsa-mixer.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <asoundlib.h>
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index e256bbd..fbf74aa 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/alsa/alsa-sink.h b/src/modules/alsa/alsa-sink.h
index e640b62..78a2cb2 100644
--- a/src/modules/alsa/alsa-sink.h
+++ b/src/modules/alsa/alsa-sink.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/module.h>
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 111c517..564a8fe 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/alsa/alsa-source.h b/src/modules/alsa/alsa-source.h
index 5d9409e..ecbdfcd 100644
--- a/src/modules/alsa/alsa-source.h
+++ b/src/modules/alsa/alsa-source.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/module.h>
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 6c848a9..aa2d601 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -16,9 +16,7 @@
  General Public License for more details.
 
  You should have received a copy of the GNU Lesser General Public License
- along with PulseAudio; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA.
+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ***/
 
diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
index 2fae6c4..20dc999 100644
--- a/src/modules/alsa/alsa-ucm.h
+++ b/src/modules/alsa/alsa-ucm.h
@@ -19,9 +19,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_ALSA_UCM
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 4131cff..46990fe 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -443,7 +441,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min, bool peri
 
     snd_pcm_sw_params_alloca(&swparams);
 
-    if ((err = snd_pcm_sw_params_current(pcm, swparams) < 0)) {
+    if ((err = snd_pcm_sw_params_current(pcm, swparams)) < 0) {
         pa_log_warn("Unable to determine current swparams: %s\n", pa_alsa_strerror(err));
         return err;
     }
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
index fb47940..8345a0b 100644
--- a/src/modules/alsa/alsa-util.h
+++ b/src/modules/alsa/alsa-util.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <asoundlib.h>
diff --git a/src/modules/alsa/mixer/paths/analog-input-aux.conf b/src/modules/alsa/mixer/paths/analog-input-aux.conf
index a5a4baa..47e22c5 100644
--- a/src/modules/alsa/mixer/paths/analog-input-aux.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-aux.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where an 'Aux' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
index 85a8658..96861e7 100644
--- a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Dock Mic' or 'Dock Mic Boost' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-fm.conf b/src/modules/alsa/mixer/paths/analog-input-fm.conf
index dfadb00..d3501a8 100644
--- a/src/modules/alsa/mixer/paths/analog-input-fm.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-fm.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where an 'FM' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
index 5265e5b..6e7775c 100644
--- a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Front Mic' or 'Front Mic Boost' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-headphone-mic.conf b/src/modules/alsa/mixer/paths/analog-input-headphone-mic.conf
index 3a19e01..eb5740a 100644
--- a/src/modules/alsa/mixer/paths/analog-input-headphone-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-headphone-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For some ASUS netbooks that have one jack that can be either a Headphone
 ; *or* a mic. This path will be active only when it is used as a mic.
diff --git a/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf b/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
index aeb2cec..a67e1db 100644
--- a/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Headset Mic' or 'Headset Mic Boost' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-internal-mic-always.conf b/src/modules/alsa/mixer/paths/analog-input-internal-mic-always.conf
index e9c288e..9e22008 100644
--- a/src/modules/alsa/mixer/paths/analog-input-internal-mic-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-internal-mic-always.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Internal Mic' or 'Internal Mic Boost' element exists
 ; 'Int Mic' and 'Int Mic Boost' are for compatibility with kernels < 2.6.38
diff --git a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
index 5424a1b..898410a 100644
--- a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Internal Mic' or 'Internal Mic Boost' element exists
 ; 'Int Mic' and 'Int Mic Boost' are for compatibility with kernels < 2.6.38
diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf
index 3a8c2a0..5577ea6 100644
--- a/src/modules/alsa/mixer/paths/analog-input-linein.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Line' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-mic-line.conf b/src/modules/alsa/mixer/paths/analog-input-mic-line.conf
index 13db33b..7147d20 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic-line.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-mic-line.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Mic/Line' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf
index 2ce6dd3..a4d1c65 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Mic' or 'Mic Boost' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
index 27bbccb..e5ced21 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Common element for all microphone inputs
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
index eed4f83..7136193 100644
--- a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Rear Mic' or 'Rear Mic Boost' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf b/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
index 446446a..99d1d79 100644
--- a/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'TV Tuner' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input-video.conf b/src/modules/alsa/mixer/paths/analog-input-video.conf
index 19f1809..50c999e 100644
--- a/src/modules/alsa/mixer/paths/analog-input-video.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-video.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; For devices where a 'Video' element exists
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf
index 356b07c..27ca74c 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf
+++ b/src/modules/alsa/mixer/paths/analog-input.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; A fallback for devices that lack separate Mic/Line/Aux/Video/TV
 ; Tuner/FM elements
diff --git a/src/modules/alsa/mixer/paths/analog-input.conf.common b/src/modules/alsa/mixer/paths/analog-input.conf.common
index 77d46bf..17aa581 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input.conf.common
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Mixer path for PulseAudio's ALSA backend, common elements for all
 ; input paths. If multiple options by the same id are discovered they
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
index e29331b..ddabf77 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Path for mixers that have a 'Headphone2' control
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 1ef17cf..b6ee70b 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Path for mixers that have a 'Headphone' control
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index a110c26..53ee2f4 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 [General]
 priority = 99
@@ -102,23 +101,22 @@ volume = off
 switch = off
 required-any = any
 
-; This profile path is intended to control the default output, not the
-; headphones. But it should not hurt if we leave the headphone jack
-; enabled nonetheless.
+; This profile path is intended to control line out, let's mute headphones
+; else there will be a spike when plugging in headphones
 [Element Headphone]
-switch = mute
-volume = zero
+switch = off
+volume = off
 
 [Element Headphone2]
-switch = mute
-volume = zero
+switch = off
+volume = off
 
 [Element Speaker]
-switch = mute
+switch = off
 volume = off
 
 [Element Desktop Speaker]
-switch = mute
+switch = off
 volume = off
 
 [Element Front]
diff --git a/src/modules/alsa/mixer/paths/analog-output-mono.conf b/src/modules/alsa/mixer/paths/analog-output-mono.conf
index 589d4ce..9896543 100644
--- a/src/modules/alsa/mixer/paths/analog-output-mono.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-mono.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Intended for usage on boards that have a separate Mono output plug.
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index 645d05b..a8e5d05 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Path for mixers that don't have a 'Speaker' control, but where we
 ; force enable the speaker paths nonetheless.
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index a5bf452..2c51f6c 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Path for mixers that have a 'Speaker' control
 ;
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
index 4f9cc53..e6ba983 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf
+++ b/src/modules/alsa/mixer/paths/analog-output.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Intended for the 'default' output. Note that a-o-speaker.conf has a
 ; higher priority than this
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common
index 727b776..17b4527 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-output.conf.common
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Common part of all paths
 
diff --git a/src/modules/alsa/mixer/paths/iec958-stereo-output.conf b/src/modules/alsa/mixer/paths/iec958-stereo-output.conf
index 8506a58..d47e5eb 100644
--- a/src/modules/alsa/mixer/paths/iec958-stereo-output.conf
+++ b/src/modules/alsa/mixer/paths/iec958-stereo-output.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 
 [Element IEC958]
diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
index b34b90b..eeb6ac4 100644
--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
@@ -13,8 +13,7 @@
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 SUBSYSTEM!="sound", GOTO="pulseaudio_end"
 ACTION!="change", GOTO="pulseaudio_end"
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index 2d2ced7..bfb54c9 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Default profile definitions for the ALSA backend of PulseAudio. This
 ; is used as fallback for all cards that have no special mapping
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
index b9bb44f..9c57a20 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; This profile forces speaker and internal mic ports even if we have no way
 ; of identifying those.
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
index cbcaff1..8e5d429 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; This profile forces a speaker port even if we have no way of identifying it.
 ; See default.conf for explanations.
diff --git a/src/modules/alsa/mixer/profile-sets/kinect-audio.conf b/src/modules/alsa/mixer/profile-sets/kinect-audio.conf
index a66730a..d51fd17 100644
--- a/src/modules/alsa/mixer/profile-sets/kinect-audio.conf
+++ b/src/modules/alsa/mixer/profile-sets/kinect-audio.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Audio profile for the Microsoft Kinect Sensor device in UAC mode.
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf b/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf
index c8025fd..5122907 100644
--- a/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf
+++ b/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; M-Audio FastTrack Pro
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf
index 2b83530..f7cbc15 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Native Instruments Audio 4 DJ
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
index d2990de..dc1b780 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Native Instruments Audio 8 DJ
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf
index 904357d..35b3d06 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Native Instruments Kore Controller
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio10.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio10.conf
index 4deb65d..c210297 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio10.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio10.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Native Instruments Audio 10 DJ
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio2.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio2.conf
index 8564358..145dace 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio2.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio2.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Native Instruments Traktor Audio 2
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio6.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio6.conf
index 48d9058..a08e9fc 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio6.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-traktor-audio6.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Native Instruments Audio 6 DJ
 ;
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
index 1da843a..934965f 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
@@ -11,8 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ; Native Instruments Traktor Kontrol S4
 ;
diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index fc9a772..df04155 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/alsa/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c
index fdcb5cf..854d080 100644
--- a/src/modules/alsa/module-alsa-sink.c
+++ b/src/modules/alsa/module-alsa-sink.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index 7c8ace4..45fb1ac 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/a2dp-codecs.h b/src/modules/bluetooth/a2dp-codecs.h
index 51c796a..8afcfcb 100644
--- a/src/modules/bluetooth/a2dp-codecs.h
+++ b/src/modules/bluetooth/a2dp-codecs.h
@@ -17,8 +17,7 @@
  *  Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *  License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c
index e15db3d..8d9d95c 100644
--- a/src/modules/bluetooth/backend-native.c
+++ b/src/modules/bluetooth/backend-native.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/backend-ofono.c b/src/modules/bluetooth/backend-ofono.c
index 1f0c80f..755df9e 100644
--- a/src/modules/bluetooth/backend-ofono.c
+++ b/src/modules/bluetooth/backend-ofono.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/bluez4-util.c b/src/modules/bluetooth/bluez4-util.c
index f047b73..97b5ab0 100644
--- a/src/modules/bluetooth/bluez4-util.c
+++ b/src/modules/bluetooth/bluez4-util.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/bluez4-util.h b/src/modules/bluetooth/bluez4-util.h
index 9667975..7c76aac 100644
--- a/src/modules/bluetooth/bluez4-util.h
+++ b/src/modules/bluetooth/bluez4-util.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <dbus/dbus.h>
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 0b234ae..03c76bf 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez5-util.h
index 9a6488d..d66e8a3 100644
--- a/src/modules/bluetooth/bluez5-util.h
+++ b/src/modules/bluetooth/bluez5-util.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index b54d573..fe8aec9 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/module-bluetooth-policy.c b/src/modules/bluetooth/module-bluetooth-policy.c
index 860868f..fc709ec 100644
--- a/src/modules/bluetooth/module-bluetooth-policy.c
+++ b/src/modules/bluetooth/module-bluetooth-policy.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c
index aa0e037..db69d34 100644
--- a/src/modules/bluetooth/module-bluez4-device.c
+++ b/src/modules/bluetooth/module-bluez4-device.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/module-bluez4-discover.c b/src/modules/bluetooth/module-bluez4-discover.c
index 7673ba7..e09ecba 100644
--- a/src/modules/bluetooth/module-bluez4-discover.c
+++ b/src/modules/bluetooth/module-bluez4-discover.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
index 995e550..7238e6f 100644
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluez5-device.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/module-bluez5-discover.c b/src/modules/bluetooth/module-bluez5-discover.c
index 570cdba..1ccc1d1 100644
--- a/src/modules/bluetooth/module-bluez5-discover.c
+++ b/src/modules/bluetooth/module-bluez5-discover.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/bluetooth/rtp.h b/src/modules/bluetooth/rtp.h
index 45fddcf..20694c1 100644
--- a/src/modules/bluetooth/rtp.h
+++ b/src/modules/bluetooth/rtp.h
@@ -16,9 +16,7 @@
  *  Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ *  License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/src/modules/dbus/iface-card-profile.c b/src/modules/dbus/iface-card-profile.c
index 2cfac7b..e39c24d 100644
--- a/src/modules/dbus/iface-card-profile.c
+++ b/src/modules/dbus/iface-card-profile.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-card-profile.h b/src/modules/dbus/iface-card-profile.h
index dc616d3..443d790 100644
--- a/src/modules/dbus/iface-card-profile.h
+++ b/src/modules/dbus/iface-card-profile.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.CardProfile.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the CardProfile interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/CardProfile/
+ * for the CardProfile interface documentation.
  */
 
 #include <pulsecore/protocol-dbus.h>
diff --git a/src/modules/dbus/iface-card.c b/src/modules/dbus/iface-card.c
index 2d46154..da975c8 100644
--- a/src/modules/dbus/iface-card.c
+++ b/src/modules/dbus/iface-card.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-card.h b/src/modules/dbus/iface-card.h
index e2c08a3..5896724 100644
--- a/src/modules/dbus/iface-card.h
+++ b/src/modules/dbus/iface-card.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.Card.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the Card interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Card/
+ * for the Card interface documentation.
  */
 
 #include <pulsecore/card.h>
diff --git a/src/modules/dbus/iface-client.c b/src/modules/dbus/iface-client.c
index 1264acd..76ad427 100644
--- a/src/modules/dbus/iface-client.c
+++ b/src/modules/dbus/iface-client.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-client.h b/src/modules/dbus/iface-client.h
index e8f151c..7fef3f5 100644
--- a/src/modules/dbus/iface-client.h
+++ b/src/modules/dbus/iface-client.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.Client.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the Client interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Client/
+ * for the Client interface documentation.
  */
 
 #include <pulsecore/client.h>
diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c
index 90f862e..4563b3f 100644
--- a/src/modules/dbus/iface-core.c
+++ b/src/modules/dbus/iface-core.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-core.h b/src/modules/dbus/iface-core.h
index 900b6d1..2959fc8 100644
--- a/src/modules/dbus/iface-core.h
+++ b/src/modules/dbus/iface-core.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the Core interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Core/
+ * for the Core interface documentation.
  */
 
 #include <pulsecore/core.h>
diff --git a/src/modules/dbus/iface-device-port.c b/src/modules/dbus/iface-device-port.c
index d403b6a..1b26756 100644
--- a/src/modules/dbus/iface-device-port.c
+++ b/src/modules/dbus/iface-device-port.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-device-port.h b/src/modules/dbus/iface-device-port.h
index 0461e2f..f362d47 100644
--- a/src/modules/dbus/iface-device-port.h
+++ b/src/modules/dbus/iface-device-port.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.DevicePort.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the DevicePort interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/DevicePort/
+ * for the DevicePort interface documentation.
  */
 
 #include <pulsecore/protocol-dbus.h>
diff --git a/src/modules/dbus/iface-device.c b/src/modules/dbus/iface-device.c
index 4469b78..efa4141 100644
--- a/src/modules/dbus/iface-device.c
+++ b/src/modules/dbus/iface-device.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-device.h b/src/modules/dbus/iface-device.h
index 62e05e9..97ecd7a 100644
--- a/src/modules/dbus/iface-device.h
+++ b/src/modules/dbus/iface-device.h
@@ -17,16 +17,14 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interfaces org.PulseAudio.Core1.Device,
  * org.PulseAudio.Core1.Sink and org.PulseAudio.Core1.Source.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Device/
+ * for the interface documentation.
  */
 
 #include <pulsecore/protocol-dbus.h>
diff --git a/src/modules/dbus/iface-memstats.c b/src/modules/dbus/iface-memstats.c
index 4cd692d..cd1d7ea 100644
--- a/src/modules/dbus/iface-memstats.c
+++ b/src/modules/dbus/iface-memstats.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-memstats.h b/src/modules/dbus/iface-memstats.h
index 0820e8f..482d6be 100644
--- a/src/modules/dbus/iface-memstats.h
+++ b/src/modules/dbus/iface-memstats.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.Memstats.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the Memstats interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Memstats/
+ * for the Memstats interface documentation.
  */
 
 #include <pulsecore/core.h>
diff --git a/src/modules/dbus/iface-module.c b/src/modules/dbus/iface-module.c
index fb1d588..95a465c 100644
--- a/src/modules/dbus/iface-module.c
+++ b/src/modules/dbus/iface-module.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-module.h b/src/modules/dbus/iface-module.h
index 68ca1de..f4192d0 100644
--- a/src/modules/dbus/iface-module.h
+++ b/src/modules/dbus/iface-module.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.Module.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the Module interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Module/
+ * for the Module interface documentation.
  */
 
 #include <pulsecore/module.h>
diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c
index 4287f2e..319c18e 100644
--- a/src/modules/dbus/iface-sample.c
+++ b/src/modules/dbus/iface-sample.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-sample.h b/src/modules/dbus/iface-sample.h
index f1947ce..443b764 100644
--- a/src/modules/dbus/iface-sample.h
+++ b/src/modules/dbus/iface-sample.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.Sample.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the Sample interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Sample/
+ * for the Sample interface documentation.
  */
 
 #include <pulsecore/core-scache.h>
diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index 4cbcd74..144817d 100644
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/dbus/iface-stream.h b/src/modules/dbus/iface-stream.h
index 036b4e7..155cd7d 100644
--- a/src/modules/dbus/iface-stream.h
+++ b/src/modules/dbus/iface-stream.h
@@ -17,15 +17,13 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This object implements the D-Bus interface org.PulseAudio.Core1.Stream.
  *
- * See http://pulseaudio.org/wiki/DBusInterface for the Stream interface
- * documentation.
+ * See http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/DBus/Stream/
+ * for the Stream interface documentation.
  */
 
 #include <pulsecore/protocol-dbus.h>
diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c
index e5f1221..53b90f5 100644
--- a/src/modules/dbus/module-dbus-protocol.c
+++ b/src/modules/dbus/module-dbus-protocol.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c
index 7ca098f..60a2b66 100644
--- a/src/modules/echo-cancel/adrian.c
+++ b/src/modules/echo-cancel/adrian.c
@@ -20,9 +20,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/echo-cancel/adrian.h b/src/modules/echo-cancel/adrian.h
index 4ace392..a5e0444 100644
--- a/src/modules/echo-cancel/adrian.h
+++ b/src/modules/echo-cancel/adrian.h
@@ -18,9 +18,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* Forward declarations */
diff --git a/src/modules/echo-cancel/echo-cancel.h b/src/modules/echo-cancel/echo-cancel.h
index 750e229..29d1574 100644
--- a/src/modules/echo-cancel/echo-cancel.h
+++ b/src/modules/echo-cancel/echo-cancel.h
@@ -14,9 +14,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifndef fooechocancelhfoo
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index eed4830..b95a965 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -21,9 +21,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/echo-cancel/speex.c b/src/modules/echo-cancel/speex.c
index 10fdac8..11e53b3 100644
--- a/src/modules/echo-cancel/speex.c
+++ b/src/modules/echo-cancel/speex.c
@@ -16,9 +16,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc
index b1a7891..511c7ee 100644
--- a/src/modules/echo-cancel/webrtc.cc
+++ b/src/modules/echo-cancel/webrtc.cc
@@ -16,9 +16,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/gconf/gconf-helper.c b/src/modules/gconf/gconf-helper.c
index 3c1180c..eccd073 100644
--- a/src/modules/gconf/gconf-helper.c
+++ b/src/modules/gconf/gconf-helper.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index d791b00..fa5788c 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
index 3c8e201..38ba9ba 100644
--- a/src/modules/jack/module-jack-sink.c
+++ b/src/modules/jack/module-jack-sink.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/jack/module-jack-source.c b/src/modules/jack/module-jack-source.c
index 1352d43..1130947 100644
--- a/src/modules/jack/module-jack-source.c
+++ b/src/modules/jack/module-jack-source.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index 160794b..26910b4 100644
--- a/src/modules/jack/module-jackdbus-detect.c
+++ b/src/modules/jack/module-jackdbus-detect.c
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/ladspa.h b/src/modules/ladspa.h
index b1a9c4e..a5fd464 100644
--- a/src/modules/ladspa.h
+++ b/src/modules/ladspa.h
@@ -15,9 +15,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-   USA. */
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef LADSPA_INCLUDED
 #define LADSPA_INCLUDED
diff --git a/src/modules/macosx/module-bonjour-publish.c b/src/modules/macosx/module-bonjour-publish.c
index ac88545..b28d74e 100644
--- a/src/modules/macosx/module-bonjour-publish.c
+++ b/src/modules/macosx/module-bonjour-publish.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/macosx/module-coreaudio-detect.c b/src/modules/macosx/module-coreaudio-detect.c
index 81cd94c..d9c09da 100644
--- a/src/modules/macosx/module-coreaudio-detect.c
+++ b/src/modules/macosx/module-coreaudio-detect.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/macosx/module-coreaudio-device.c b/src/modules/macosx/module-coreaudio-device.c
index d100acd..4bbb5d5 100644
--- a/src/modules/macosx/module-coreaudio-device.c
+++ b/src/modules/macosx/module-coreaudio-device.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* TODO:
diff --git a/src/modules/module-always-sink.c b/src/modules/module-always-sink.c
index e0a6451..d2edf12 100644
--- a/src/modules/module-always-sink.c
+++ b/src/modules/module-always-sink.c
@@ -14,9 +14,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-augment-properties.c b/src/modules/module-augment-properties.c
index 9d42a2b..42b6fd9 100644
--- a/src/modules/module-augment-properties.c
+++ b/src/modules/module-augment-properties.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-card-restore.c b/src/modules/module-card-restore.c
index beb748e..baa2f4f 100644
--- a/src/modules/module-card-restore.c
+++ b/src/modules/module-card-restore.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-cli.c b/src/modules/module-cli.c
index 4e893d1..a69ad4a 100644
--- a/src/modules/module-cli.c
+++ b/src/modules/module-cli.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
index 4ebbc3f..602fa87 100644
--- a/src/modules/module-combine-sink.c
+++ b/src/modules/module-combine-sink.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index bd48bf4..5a12a13 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
index c8a35d4..7997c4f 100644
--- a/src/modules/module-console-kit.c
+++ b/src/modules/module-console-kit.c
@@ -14,9 +14,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-default-device-restore.c b/src/modules/module-default-device-restore.c
index fb18750..d76e28e 100644
--- a/src/modules/module-default-device-restore.c
+++ b/src/modules/module-default-device-restore.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 7b42d1a..70bdaca 100644
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index 9621f3e..46a6955 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
index cb42207..09ba60a 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
index 70c30f5..96a19b6 100644
--- a/src/modules/module-equalizer-sink.c
+++ b/src/modules/module-equalizer-sink.c
@@ -21,9 +21,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-esound-compat-spawnfd.c b/src/modules/module-esound-compat-spawnfd.c
index 30776d7..61c91a2 100644
--- a/src/modules/module-esound-compat-spawnfd.c
+++ b/src/modules/module-esound-compat-spawnfd.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-esound-compat-spawnpid.c b/src/modules/module-esound-compat-spawnpid.c
index 9d4249d..9aad2d0 100644
--- a/src/modules/module-esound-compat-spawnpid.c
+++ b/src/modules/module-esound-compat-spawnpid.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 2410062..76e380e 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-filter-apply.c b/src/modules/module-filter-apply.c
index 8345894..c7c7367 100644
--- a/src/modules/module-filter-apply.c
+++ b/src/modules/module-filter-apply.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-filter-heuristics.c b/src/modules/module-filter-heuristics.c
index 885b02e..1b1aae1 100644
--- a/src/modules/module-filter-heuristics.c
+++ b/src/modules/module-filter-heuristics.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-hal-detect-compat.c b/src/modules/module-hal-detect-compat.c
index 3d674cf..719e357 100644
--- a/src/modules/module-hal-detect-compat.c
+++ b/src/modules/module-hal-detect-compat.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-intended-roles.c b/src/modules/module-intended-roles.c
index a9704d1..60ec7e9 100644
--- a/src/modules/module-intended-roles.c
+++ b/src/modules/module-intended-roles.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c
index cbb1aea..38b94e3 100644
--- a/src/modules/module-ladspa-sink.c
+++ b/src/modules/module-ladspa-sink.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* TODO: Some plugins cause latency, and some even report it by using a control
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c
index d4d2b26..d63fdbd 100644
--- a/src/modules/module-lirc.c
+++ b/src/modules/module-lirc.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index b3b9557..e17051a 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -15,9 +15,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 8ce3f00..559687c 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index 0b04f0f..6c9cf34 100644
--- a/src/modules/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-native-protocol-fd.c b/src/modules/module-native-protocol-fd.c
index 5b082c3..5fd7f6a 100644
--- a/src/modules/module-native-protocol-fd.c
+++ b/src/modules/module-native-protocol-fd.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index c6493a7..0270ba2 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-null-source.c b/src/modules/module-null-source.c
index b852f37..0c590bd 100644
--- a/src/modules/module-null-source.c
+++ b/src/modules/module-null-source.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 3404022..0a3a4fc 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index d8d9443..1218674 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-position-event-sounds.c b/src/modules/module-position-event-sounds.c
index 3bcad6a..fb9f5b3 100644
--- a/src/modules/module-position-event-sounds.c
+++ b/src/modules/module-position-event-sounds.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 118351e..5a183c8 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-remap-sink.c b/src/modules/module-remap-sink.c
index 274f9f2..8a21c3c 100644
--- a/src/modules/module-remap-sink.c
+++ b/src/modules/module-remap-sink.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-remap-source.c b/src/modules/module-remap-source.c
index 5fa6465..9b62c51 100644
--- a/src/modules/module-remap-source.c
+++ b/src/modules/module-remap-source.c
@@ -15,9 +15,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
index f456be0..e20fdf8 100644
--- a/src/modules/module-rescue-streams.c
+++ b/src/modules/module-rescue-streams.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-role-cork.c b/src/modules/module-role-cork.c
index 8ca2109..7c0f59f 100644
--- a/src/modules/module-role-cork.c
+++ b/src/modules/module-role-cork.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-role-ducking.c b/src/modules/module-role-ducking.c
index 9947871..4f9be10 100644
--- a/src/modules/module-role-ducking.c
+++ b/src/modules/module-role-ducking.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
index e7736ef..0baf3c8 100644
--- a/src/modules/module-rygel-media-server.c
+++ b/src/modules/module-rygel-media-server.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c
index 1d755f1..55d70c7 100644
--- a/src/modules/module-sine-source.c
+++ b/src/modules/module-sine-source.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c
index 6bf395e..d56fae5 100644
--- a/src/modules/module-sine.c
+++ b/src/modules/module-sine.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index e5df90b..c79918a 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 06ab543..30c9717 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index 6fbe640..0a27a70 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-switch-on-connect.c b/src/modules/module-switch-on-connect.c
index 559db9f..540afd4 100644
--- a/src/modules/module-switch-on-connect.c
+++ b/src/modules/module-switch-on-connect.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c
index 7397bcc..5a6b401 100644
--- a/src/modules/module-switch-on-port-available.c
+++ b/src/modules/module-switch-on-port-available.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-systemd-login.c b/src/modules/module-systemd-login.c
index 8cd5fb0..d15bee5 100644
--- a/src/modules/module-systemd-login.c
+++ b/src/modules/module-systemd-login.c
@@ -14,9 +14,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-tunnel-sink-new.c b/src/modules/module-tunnel-sink-new.c
index 7d3bd99..7f83543 100644
--- a/src/modules/module-tunnel-sink-new.c
+++ b/src/modules/module-tunnel-sink-new.c
@@ -14,9 +14,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -109,6 +107,15 @@ static void cork_stream(struct userdata *u, bool cork) {
     pa_assert(u);
     pa_assert(u->stream);
 
+    if (cork) {
+        /* When the sink becomes suspended (which is the only case where we
+         * cork the stream), we don't want to keep any old data around, because
+         * the old data is most likely unrelated to the audio that will be
+         * played at the time when the sink starts running again. */
+        if ((operation = pa_stream_flush(u->stream, NULL, NULL)))
+            pa_operation_unref(operation);
+    }
+
     if ((operation = pa_stream_cork(u->stream, cork, NULL, NULL)))
         pa_operation_unref(operation);
 }
diff --git a/src/modules/module-tunnel-source-new.c b/src/modules/module-tunnel-source-new.c
index c6580eb..0f72dbf 100644
--- a/src/modules/module-tunnel-source-new.c
+++ b/src/modules/module-tunnel-source-new.c
@@ -14,9 +14,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index bef6ae8..7c233c9 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -691,7 +689,7 @@ static int source_set_state(pa_source *s, pa_source_state_t state) {
 
         case PA_SOURCE_UNLINKED:
         case PA_SOURCE_INIT:
-        case PA_SINK_INVALID_STATE:
+        case PA_SOURCE_INVALID_STATE:
             ;
     }
 
diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
index c28c867..df0d187 100644
--- a/src/modules/module-udev-detect.c
+++ b/src/modules/module-udev-detect.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c
index 66fd8a9..02cc1ac 100644
--- a/src/modules/module-virtual-sink.c
+++ b/src/modules/module-virtual-sink.c
@@ -15,9 +15,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c
index 6864a5c..36edf78 100644
--- a/src/modules/module-virtual-source.c
+++ b/src/modules/module-virtual-source.c
@@ -15,9 +15,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-virtual-surround-sink.c b/src/modules/module-virtual-surround-sink.c
index 34f23fd..8f05f53 100644
--- a/src/modules/module-virtual-surround-sink.c
+++ b/src/modules/module-virtual-surround-sink.c
@@ -16,9 +16,7 @@
     General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
-    along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-volume-restore.c b/src/modules/module-volume-restore.c
index cd397e2..e7dbe94 100644
--- a/src/modules/module-volume-restore.c
+++ b/src/modules/module-volume-restore.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index c420d4a..ab3ea74 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index 2720103..a165579 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index aa9e891..ac139e9 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index 2926f67..1a2f0b1 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* General power management rules:
diff --git a/src/modules/oss/oss-util.c b/src/modules/oss/oss-util.c
index 4527b63..42ee7f5 100644
--- a/src/modules/oss/oss-util.c
+++ b/src/modules/oss/oss-util.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/oss/oss-util.h b/src/modules/oss/oss-util.h
index 845b0c8..8af27de 100644
--- a/src/modules/oss/oss-util.h
+++ b/src/modules/oss/oss-util.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/modules/raop/base64.c b/src/modules/raop/base64.c
index 37e4762..cdf52a6 100644
--- a/src/modules/raop/base64.c
+++ b/src/modules/raop/base64.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /*
diff --git a/src/modules/raop/base64.h b/src/modules/raop/base64.h
index 7a973b6..352ab96 100644
--- a/src/modules/raop/base64.h
+++ b/src/modules/raop/base64.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /*
diff --git a/src/modules/raop/module-raop-discover.c b/src/modules/raop/module-raop-discover.c
index fda5e29..f083044 100644
--- a/src/modules/raop/module-raop-discover.c
+++ b/src/modules/raop/module-raop-discover.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c
index c510efd..6037038 100644
--- a/src/modules/raop/module-raop-sink.c
+++ b/src/modules/raop/module-raop-sink.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c
index 7a6d009..3b6c36e 100644
--- a/src/modules/raop/raop_client.c
+++ b/src/modules/raop/raop_client.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/raop/raop_client.h b/src/modules/raop/raop_client.h
index ce81f39..b349a54 100644
--- a/src/modules/raop/raop_client.h
+++ b/src/modules/raop/raop_client.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/modules/reserve-wrap.c b/src/modules/reserve-wrap.c
index 9c69d59..202311a 100644
--- a/src/modules/reserve-wrap.c
+++ b/src/modules/reserve-wrap.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/reserve-wrap.h b/src/modules/reserve-wrap.h
index 6c52ed8..772cc37 100644
--- a/src/modules/reserve-wrap.h
+++ b/src/modules/reserve-wrap.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/modules/rtp/headerlist.c b/src/modules/rtp/headerlist.c
index 3ed4062..2ea7226 100644
--- a/src/modules/rtp/headerlist.c
+++ b/src/modules/rtp/headerlist.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/rtp/headerlist.h b/src/modules/rtp/headerlist.h
index 4b9c643..f38fb78 100644
--- a/src/modules/rtp/headerlist.h
+++ b/src/modules/rtp/headerlist.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index e1b6929..dc42f7c 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 7347f78..15a7436 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index 7b75e0e..17c8d3c 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/rtp/rtp.h b/src/modules/rtp/rtp.h
index e975e75..bbd4278 100644
--- a/src/modules/rtp/rtp.h
+++ b/src/modules/rtp/rtp.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c
index 6edb0e4..a279aee 100644
--- a/src/modules/rtp/rtsp_client.c
+++ b/src/modules/rtp/rtsp_client.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/rtp/rtsp_client.h b/src/modules/rtp/rtsp_client.h
index a56b932..f0ff95a 100644
--- a/src/modules/rtp/rtsp_client.h
+++ b/src/modules/rtp/rtsp_client.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c
index 80a4a5d..7fb1a38 100644
--- a/src/modules/rtp/sap.c
+++ b/src/modules/rtp/sap.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/rtp/sap.h b/src/modules/rtp/sap.h
index e7f7182..becb4ec 100644
--- a/src/modules/rtp/sap.h
+++ b/src/modules/rtp/sap.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
index e47a41b..f35d689 100644
--- a/src/modules/rtp/sdp.c
+++ b/src/modules/rtp/sdp.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/rtp/sdp.h b/src/modules/rtp/sdp.h
index 4cb3b20..5e9b8fe 100644
--- a/src/modules/rtp/sdp.h
+++ b/src/modules/rtp/sdp.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c
index b0bb17d..49fc701 100644
--- a/src/modules/udev-util.c
+++ b/src/modules/udev-util.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/udev-util.h b/src/modules/udev-util.h
index 251575b..48ab9f6 100644
--- a/src/modules/udev-util.h
+++ b/src/modules/udev-util.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/proplist.h>
diff --git a/src/modules/x11/module-x11-bell.c b/src/modules/x11/module-x11-bell.c
index 001732b..6c9f580 100644
--- a/src/modules/x11/module-x11-bell.c
+++ b/src/modules/x11/module-x11-bell.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/x11/module-x11-cork-request.c b/src/modules/x11/module-x11-cork-request.c
index 5bd3c6c..5c76711 100644
--- a/src/modules/x11/module-x11-cork-request.c
+++ b/src/modules/x11/module-x11-cork-request.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/x11/module-x11-publish.c b/src/modules/x11/module-x11-publish.c
index cae8e3a..418c6c9 100644
--- a/src/modules/x11/module-x11-publish.c
+++ b/src/modules/x11/module-x11-publish.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
index 63401e5..7c6fb23 100644
--- a/src/modules/x11/module-x11-xsmp.c
+++ b/src/modules/x11/module-x11-xsmp.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
index aa8c417..b87f811 100644
--- a/src/modules/xen/module-xenpv-sink.c
+++ b/src/modules/xen/module-xenpv-sink.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/cdecl.h b/src/pulse/cdecl.h
index dd0d14f..ac817d5 100644
--- a/src/pulse/cdecl.h
+++ b/src/pulse/cdecl.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /** \file
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index e1b173a..c342ef6 100644
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h
index 47d2514..30904ef 100644
--- a/src/pulse/channelmap.h
+++ b/src/pulse/channelmap.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c
index 0036e4a..60c645e 100644
--- a/src/pulse/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13071
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/client-conf-x11.h b/src/pulse/client-conf-x11.h
index 3d1dea0..4f82041 100644
--- a/src/pulse/client-conf-x11.h
+++ b/src/pulse/client-conf-x11.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include "client-conf.h"
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index e0acc23..83331f8 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index 3c7fd7d..eac705a 100644
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in
index 17753b0..26b7790 100644
--- a/src/pulse/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -11,9 +11,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 ## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
 ## more information. Default values are commented out.  Use either ; or # for
diff --git a/src/pulse/context.c b/src/pulse/context.c
index d5da9b8..4bc445f 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/context.h b/src/pulse/context.h
index 68516a2..ae2a068 100644
--- a/src/pulse/context.h
+++ b/src/pulse/context.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/pulse/def.h b/src/pulse/def.h
index ee7404d..680bdc9 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulse/direction.c b/src/pulse/direction.c
index 95f5e00..ab64f49 100644
--- a/src/pulse/direction.c
+++ b/src/pulse/direction.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include "direction.h"
diff --git a/src/pulse/direction.h b/src/pulse/direction.h
index 127f07a..65ece69 100644
--- a/src/pulse/direction.h
+++ b/src/pulse/direction.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/def.h>
diff --git a/src/pulse/error.c b/src/pulse/error.c
index 27b8ec4..2760928 100644
--- a/src/pulse/error.c
+++ b/src/pulse/error.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/error.h b/src/pulse/error.h
index 788db84..7b9b84a 100644
--- a/src/pulse/error.h
+++ b/src/pulse/error.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/ext-device-manager.c b/src/pulse/ext-device-manager.c
index 9158068..38f96da 100644
--- a/src/pulse/ext-device-manager.c
+++ b/src/pulse/ext-device-manager.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/ext-device-manager.h b/src/pulse/ext-device-manager.h
index 1ee6830..8c05e1c 100644
--- a/src/pulse/ext-device-manager.h
+++ b/src/pulse/ext-device-manager.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/ext-device-restore.c b/src/pulse/ext-device-restore.c
index e40ea88..5c6d88b 100644
--- a/src/pulse/ext-device-restore.c
+++ b/src/pulse/ext-device-restore.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/ext-device-restore.h b/src/pulse/ext-device-restore.h
index e6857f4..246b060 100644
--- a/src/pulse/ext-device-restore.h
+++ b/src/pulse/ext-device-restore.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/context.h>
diff --git a/src/pulse/ext-stream-restore.c b/src/pulse/ext-stream-restore.c
index 3362a5f..a250d24 100644
--- a/src/pulse/ext-stream-restore.c
+++ b/src/pulse/ext-stream-restore.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/ext-stream-restore.h b/src/pulse/ext-stream-restore.h
index acb16a8..dd7f4ae 100644
--- a/src/pulse/ext-stream-restore.h
+++ b/src/pulse/ext-stream-restore.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/fork-detect.c b/src/pulse/fork-detect.c
index 0ebc386..9299304 100644
--- a/src/pulse/fork-detect.c
+++ b/src/pulse/fork-detect.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/fork-detect.h b/src/pulse/fork-detect.h
index 649d981..d455e5d 100644
--- a/src/pulse/fork-detect.h
+++ b/src/pulse/fork-detect.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 int pa_detect_fork(void);
diff --git a/src/pulse/format.c b/src/pulse/format.c
index 1aa3377..c2a1552 100644
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/format.h b/src/pulse/format.h
index 7284642..f606b3b 100644
--- a/src/pulse/format.h
+++ b/src/pulse/format.h
@@ -19,9 +19,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/gccmacro.h b/src/pulse/gccmacro.h
index e906f59..e5ba5bd 100644
--- a/src/pulse/gccmacro.h
+++ b/src/pulse/gccmacro.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /** \file
diff --git a/src/pulse/glib-mainloop.c b/src/pulse/glib-mainloop.c
index 34f3556..268894a 100644
--- a/src/pulse/glib-mainloop.c
+++ b/src/pulse/glib-mainloop.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/glib-mainloop.h b/src/pulse/glib-mainloop.h
index 805d746..52d9a75 100644
--- a/src/pulse/glib-mainloop.h
+++ b/src/pulse/glib-mainloop.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <glib.h>
diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index fc2b702..eefd181 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index d7696df..510d784 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h
index 689e231..43389b7 100644
--- a/src/pulse/introspect.h
+++ b/src/pulse/introspect.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulse/mainloop-api.c b/src/pulse/mainloop-api.c
index 45539cc..4ea0061 100644
--- a/src/pulse/mainloop-api.c
+++ b/src/pulse/mainloop-api.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/mainloop-api.h b/src/pulse/mainloop-api.h
index d03e0e6..4d84731 100644
--- a/src/pulse/mainloop-api.h
+++ b/src/pulse/mainloop-api.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/time.h>
diff --git a/src/pulse/mainloop-signal.c b/src/pulse/mainloop-signal.c
index 89aafcb..f196ad3 100644
--- a/src/pulse/mainloop-signal.c
+++ b/src/pulse/mainloop-signal.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/mainloop-signal.h b/src/pulse/mainloop-signal.h
index fdb1f9d..0a7bdeb 100644
--- a/src/pulse/mainloop-signal.h
+++ b/src/pulse/mainloop-signal.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index c7a5236..aeb55d9 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/mainloop.h b/src/pulse/mainloop.h
index 19b17fa..a110541 100644
--- a/src/pulse/mainloop.h
+++ b/src/pulse/mainloop.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/pulse/operation.c b/src/pulse/operation.c
index 917a8a9..3ed3143 100644
--- a/src/pulse/operation.c
+++ b/src/pulse/operation.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/operation.h b/src/pulse/operation.h
index 82e97c9..edd7d76 100644
--- a/src/pulse/operation.h
+++ b/src/pulse/operation.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c
index a5ab7d2..6111661 100644
--- a/src/pulse/proplist.c
+++ b/src/pulse/proplist.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h
index e55a479..bc9e8f8 100644
--- a/src/pulse/proplist.h
+++ b/src/pulse/proplist.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulse/pulseaudio.h b/src/pulse/pulseaudio.h
index 2e270dd..215ba6d 100644
--- a/src/pulse/pulseaudio.h
+++ b/src/pulse/pulseaudio.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/direction.h>
diff --git a/src/pulse/rtclock.c b/src/pulse/rtclock.c
index dd1b600..56cacf7 100644
--- a/src/pulse/rtclock.c
+++ b/src/pulse/rtclock.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/rtclock.h b/src/pulse/rtclock.h
index cba20e3..da65076 100644
--- a/src/pulse/rtclock.h
+++ b/src/pulse/rtclock.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/sample.c b/src/pulse/sample.c
index 82c1b01..1331c72 100644
--- a/src/pulse/sample.c
+++ b/src/pulse/sample.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/sample.h b/src/pulse/sample.h
index 86973d4..7cf50d6 100644
--- a/src/pulse/sample.h
+++ b/src/pulse/sample.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulse/scache.c b/src/pulse/scache.c
index 6a26ce5..de7b411 100644
--- a/src/pulse/scache.c
+++ b/src/pulse/scache.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/scache.h b/src/pulse/scache.h
index b4fcbd0..e799b1d 100644
--- a/src/pulse/scache.h
+++ b/src/pulse/scache.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulse/simple.c b/src/pulse/simple.c
index f005cf8..614f4f7 100644
--- a/src/pulse/simple.c
+++ b/src/pulse/simple.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/simple.h b/src/pulse/simple.h
index 54003ff..7b84f71 100644
--- a/src/pulse/simple.h
+++ b/src/pulse/simple.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index f549036..d4ad505 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index bc17143..70fa415 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulse/subscribe.c b/src/pulse/subscribe.c
index a6ad238..e7cce2e 100644
--- a/src/pulse/subscribe.c
+++ b/src/pulse/subscribe.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/subscribe.h b/src/pulse/subscribe.h
index 64f663d..b43c8ea 100644
--- a/src/pulse/subscribe.h
+++ b/src/pulse/subscribe.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index 631b6ae..afd0581 100644
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/thread-mainloop.h b/src/pulse/thread-mainloop.h
index 6a786fc..40278b4 100644
--- a/src/pulse/thread-mainloop.h
+++ b/src/pulse/thread-mainloop.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/pulse/timeval.c b/src/pulse/timeval.c
index a394dbe..e991c33 100644
--- a/src/pulse/timeval.c
+++ b/src/pulse/timeval.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/timeval.h b/src/pulse/timeval.h
index 8f255f9..9ecf791 100644
--- a/src/pulse/timeval.h
+++ b/src/pulse/timeval.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/utf8.c b/src/pulse/utf8.c
index afefe80..31a61a0 100644
--- a/src/pulse/utf8.c
+++ b/src/pulse/utf8.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* This file is based on the GLIB utf8 validation functions. The
@@ -39,9 +37,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/utf8.h b/src/pulse/utf8.h
index 2b5bd28..a72097a 100644
--- a/src/pulse/utf8.h
+++ b/src/pulse/utf8.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulse/util.c b/src/pulse/util.c
index d672f53..305673f 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/util.h b/src/pulse/util.h
index e490d56..e4a62da 100644
--- a/src/pulse/util.h
+++ b/src/pulse/util.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <stddef.h>
diff --git a/src/pulse/version.h b/src/pulse/version.h
index d386794..e437e4b 100644
--- a/src/pulse/version.h
+++ b/src/pulse/version.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* WARNING: Make sure to edit the real source file version.h.in! */
diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
index 1be4c75..e8c1e6d 100644
--- a/src/pulse/version.h.in
+++ b/src/pulse/version.h.in
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* WARNING: Make sure to edit the real source file version.h.in! */
diff --git a/src/pulse/volume.c b/src/pulse/volume.c
index 6927392..69bef4f 100644
--- a/src/pulse/volume.c
+++ b/src/pulse/volume.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/volume.h b/src/pulse/volume.h
index 97fc10b..ec777b2 100644
--- a/src/pulse/volume.h
+++ b/src/pulse/volume.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulse/xmalloc.c b/src/pulse/xmalloc.c
index e17a354..1a535b3 100644
--- a/src/pulse/xmalloc.c
+++ b/src/pulse/xmalloc.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulse/xmalloc.h b/src/pulse/xmalloc.h
index f720d83..d1d6968 100644
--- a/src/pulse/xmalloc.h
+++ b/src/pulse/xmalloc.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/arpa-inet.c b/src/pulsecore/arpa-inet.c
index 09570bb..afea397 100644
--- a/src/pulsecore/arpa-inet.c
+++ b/src/pulsecore/arpa-inet.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/asyncmsgq.c b/src/pulsecore/asyncmsgq.c
index 2ed550a..dd33e30 100644
--- a/src/pulsecore/asyncmsgq.c
+++ b/src/pulsecore/asyncmsgq.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/asyncmsgq.h b/src/pulsecore/asyncmsgq.h
index 1251c73..367ccac 100644
--- a/src/pulsecore/asyncmsgq.h
+++ b/src/pulsecore/asyncmsgq.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/asyncq.c b/src/pulsecore/asyncq.c
index 559b577..53bfe4f 100644
--- a/src/pulsecore/asyncq.c
+++ b/src/pulsecore/asyncq.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/asyncq.h b/src/pulsecore/asyncq.h
index 026379f..8c86762 100644
--- a/src/pulsecore/asyncq.h
+++ b/src/pulsecore/asyncq.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
index bcc0bb3..4758c84 100644
--- a/src/pulsecore/atomic.h
+++ b/src/pulsecore/atomic.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/aupdate.c b/src/pulsecore/aupdate.c
index 2b2fa87..04d5a57 100644
--- a/src/pulsecore/aupdate.c
+++ b/src/pulsecore/aupdate.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/aupdate.h b/src/pulsecore/aupdate.h
index 4f543ab..347b853 100644
--- a/src/pulsecore/aupdate.h
+++ b/src/pulsecore/aupdate.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_aupdate pa_aupdate;
diff --git a/src/pulsecore/auth-cookie.c b/src/pulsecore/auth-cookie.c
index 09e73ab..248d9bf 100644
--- a/src/pulsecore/auth-cookie.c
+++ b/src/pulsecore/auth-cookie.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/auth-cookie.h b/src/pulsecore/auth-cookie.h
index e4a3504..01f5244 100644
--- a/src/pulsecore/auth-cookie.h
+++ b/src/pulsecore/auth-cookie.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/authkey.c b/src/pulsecore/authkey.c
index 7f91f16..71a9833 100644
--- a/src/pulsecore/authkey.c
+++ b/src/pulsecore/authkey.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/authkey.h b/src/pulsecore/authkey.h
index cadf89d..7af9253 100644
--- a/src/pulsecore/authkey.h
+++ b/src/pulsecore/authkey.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/avahi-wrap.c b/src/pulsecore/avahi-wrap.c
index 997d81f..dc586cb 100644
--- a/src/pulsecore/avahi-wrap.c
+++ b/src/pulsecore/avahi-wrap.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/avahi-wrap.h b/src/pulsecore/avahi-wrap.h
index 5a0c2ef..c7a9719 100644
--- a/src/pulsecore/avahi-wrap.h
+++ b/src/pulsecore/avahi-wrap.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <avahi-client/client.h>
diff --git a/src/pulsecore/bitset.c b/src/pulsecore/bitset.c
index bcfd693..5c146ca 100644
--- a/src/pulsecore/bitset.c
+++ b/src/pulsecore/bitset.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/bitset.h b/src/pulsecore/bitset.h
index ae31afe..32fa82d 100644
--- a/src/pulsecore/bitset.h
+++ b/src/pulsecore/bitset.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index eca1e60..6f9391e 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/card.h b/src/pulsecore/card.h
index 5318150..3e2c004 100644
--- a/src/pulsecore/card.h
+++ b/src/pulsecore/card.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_card pa_card;
diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
index 8c956ac..9a73605 100644
--- a/src/pulsecore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/cli-command.h b/src/pulsecore/cli-command.h
index a2b35d4..3513341 100644
--- a/src/pulsecore/cli-command.h
+++ b/src/pulsecore/cli-command.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/strbuf.h>
diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
index 2992ae8..d296692 100644
--- a/src/pulsecore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/cli-text.h b/src/pulsecore/cli-text.h
index a5dd10e..b89be50 100644
--- a/src/pulsecore/cli-text.h
+++ b/src/pulsecore/cli-text.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c
index 407173a..d72642f 100644
--- a/src/pulsecore/cli.c
+++ b/src/pulsecore/cli.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/cli.h b/src/pulsecore/cli.h
index ebab6c2..37d5ff9 100644
--- a/src/pulsecore/cli.h
+++ b/src/pulsecore/cli.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/iochannel.h>
diff --git a/src/pulsecore/client.c b/src/pulsecore/client.c
index a8fde9f..003bcf8 100644
--- a/src/pulsecore/client.c
+++ b/src/pulsecore/client.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/client.h b/src/pulsecore/client.h
index 18b62da..cd55348 100644
--- a/src/pulsecore/client.h
+++ b/src/pulsecore/client.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c
index 1683d46..2dcd45a 100644
--- a/src/pulsecore/conf-parser.c
+++ b/src/pulsecore/conf-parser.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/conf-parser.h b/src/pulsecore/conf-parser.h
index 30ff4e3..dbb6f5c 100644
--- a/src/pulsecore/conf-parser.h
+++ b/src/pulsecore/conf-parser.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <stdio.h>
diff --git a/src/pulsecore/core-error.c b/src/pulsecore/core-error.c
index a1aee0e..446de6c 100644
--- a/src/pulsecore/core-error.c
+++ b/src/pulsecore/core-error.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/core-error.h b/src/pulsecore/core-error.h
index e295091..f4af5d5 100644
--- a/src/pulsecore/core-error.h
+++ b/src/pulsecore/core-error.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulsecore/core-format.c b/src/pulsecore/core-format.c
index 2c03c47..9d3c8d6 100644
--- a/src/pulsecore/core-format.c
+++ b/src/pulsecore/core-format.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/core-format.h b/src/pulsecore/core-format.h
index f2fa12e..3750304 100644
--- a/src/pulsecore/core-format.h
+++ b/src/pulsecore/core-format.h
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/format.h>
diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c
index ee04554..2c2e286 100644
--- a/src/pulsecore/core-rtclock.c
+++ b/src/pulsecore/core-rtclock.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/core-rtclock.h b/src/pulsecore/core-rtclock.h
index 74d5e03..11bfcc9 100644
--- a/src/pulsecore/core-rtclock.h
+++ b/src/pulsecore/core-rtclock.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c
index a622616..3e12b34 100644
--- a/src/pulsecore/core-scache.c
+++ b/src/pulsecore/core-scache.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/core-scache.h b/src/pulsecore/core-scache.h
index 1b67d0d..f0eacaa 100644
--- a/src/pulsecore/core-scache.h
+++ b/src/pulsecore/core-scache.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/core-subscribe.c b/src/pulsecore/core-subscribe.c
index 134761d..61c779b 100644
--- a/src/pulsecore/core-subscribe.c
+++ b/src/pulsecore/core-subscribe.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/core-subscribe.h b/src/pulsecore/core-subscribe.h
index dd748d3..6032dc3 100644
--- a/src/pulsecore/core-subscribe.h
+++ b/src/pulsecore/core-subscribe.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_subscription pa_subscription;
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index bf7f3d8..9b16936 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -16,9 +16,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index 8db56c5..dcdc40e 100644
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index c6fa8d7..0e67005 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index b0d1211..7d896bb 100644
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c
index ad09c87..4c447b8 100644
--- a/src/pulsecore/cpu-arm.c
+++ b/src/pulsecore/cpu-arm.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/cpu-arm.h b/src/pulsecore/cpu-arm.h
index 4ee7dff..dfdda32 100644
--- a/src/pulsecore/cpu-arm.h
+++ b/src/pulsecore/cpu-arm.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <stdint.h>
diff --git a/src/pulsecore/cpu-orc.c b/src/pulsecore/cpu-orc.c
index 343e004..5caf6b6 100644
--- a/src/pulsecore/cpu-orc.c
+++ b/src/pulsecore/cpu-orc.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/cpu-orc.h b/src/pulsecore/cpu-orc.h
index 4671361..edfacea 100644
--- a/src/pulsecore/cpu-orc.h
+++ b/src/pulsecore/cpu-orc.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/cpu.h>
diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c
index 8ca6b74..a86c26d 100644
--- a/src/pulsecore/cpu-x86.c
+++ b/src/pulsecore/cpu-x86.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/cpu-x86.h b/src/pulsecore/cpu-x86.h
index 15726b0..30bbc80 100644
--- a/src/pulsecore/cpu-x86.h
+++ b/src/pulsecore/cpu-x86.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <stdint.h>
diff --git a/src/pulsecore/cpu.h b/src/pulsecore/cpu.h
index 03507de..e65c4fb 100644
--- a/src/pulsecore/cpu.h
+++ b/src/pulsecore/cpu.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/cpu-x86.h>
diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h
index 43f6166..64d8387 100644
--- a/src/pulsecore/creds.h
+++ b/src/pulsecore/creds.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/database-gdbm.c b/src/pulsecore/database-gdbm.c
index 183dcf1..b1da9df 100644
--- a/src/pulsecore/database-gdbm.c
+++ b/src/pulsecore/database-gdbm.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/database-simple.c b/src/pulsecore/database-simple.c
index 155a5fa..3876487 100644
--- a/src/pulsecore/database-simple.c
+++ b/src/pulsecore/database-simple.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/database-tdb.c b/src/pulsecore/database-tdb.c
index 3e3e85a..282f580 100644
--- a/src/pulsecore/database-tdb.c
+++ b/src/pulsecore/database-tdb.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/database.h b/src/pulsecore/database.h
index 90d37a3..3a1c7ce 100644
--- a/src/pulsecore/database.h
+++ b/src/pulsecore/database.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/dbus-shared.c b/src/pulsecore/dbus-shared.c
index 2a5c517..935b068 100644
--- a/src/pulsecore/dbus-shared.c
+++ b/src/pulsecore/dbus-shared.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/dbus-shared.h b/src/pulsecore/dbus-shared.h
index 4c15455..3d552e9 100644
--- a/src/pulsecore/dbus-shared.h
+++ b/src/pulsecore/dbus-shared.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <dbus/dbus.h>
diff --git a/src/pulsecore/dbus-util.c b/src/pulsecore/dbus-util.c
index 66c4749..d786af4 100644
--- a/src/pulsecore/dbus-util.c
+++ b/src/pulsecore/dbus-util.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/dbus-util.h b/src/pulsecore/dbus-util.h
index 090a73f..cc3abda 100644
--- a/src/pulsecore/dbus-util.h
+++ b/src/pulsecore/dbus-util.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <dbus/dbus.h>
diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c
index 8cfb117..cfe2a80 100644
--- a/src/pulsecore/device-port.c
+++ b/src/pulsecore/device-port.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include "device-port.h"
diff --git a/src/pulsecore/device-port.h b/src/pulsecore/device-port.h
index ef700ac..f35d07c 100644
--- a/src/pulsecore/device-port.h
+++ b/src/pulsecore/device-port.h
@@ -19,9 +19,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_device_port pa_device_port;
diff --git a/src/pulsecore/dllmain.c b/src/pulsecore/dllmain.c
index d2de73d..e594ae5 100644
--- a/src/pulsecore/dllmain.c
+++ b/src/pulsecore/dllmain.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/dynarray.c b/src/pulsecore/dynarray.c
index b207eca..7d7c09c 100644
--- a/src/pulsecore/dynarray.c
+++ b/src/pulsecore/dynarray.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/dynarray.h b/src/pulsecore/dynarray.h
index 04dd2d2..0ca6ed3 100644
--- a/src/pulsecore/dynarray.h
+++ b/src/pulsecore/dynarray.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/def.h>
diff --git a/src/pulsecore/endianmacros.h b/src/pulsecore/endianmacros.h
index 2e73136..c4cb8a2 100644
--- a/src/pulsecore/endianmacros.h
+++ b/src/pulsecore/endianmacros.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/esound.h b/src/pulsecore/esound.h
index 5fc91db..4ca0e04 100644
--- a/src/pulsecore/esound.h
+++ b/src/pulsecore/esound.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* Most of the following is blatantly stolen from esound. */
diff --git a/src/pulsecore/fdsem.c b/src/pulsecore/fdsem.c
index b153ddd..a7fbf95 100644
--- a/src/pulsecore/fdsem.c
+++ b/src/pulsecore/fdsem.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/fdsem.h b/src/pulsecore/fdsem.h
index 1b1a5a5..ae1bbe9 100644
--- a/src/pulsecore/fdsem.h
+++ b/src/pulsecore/fdsem.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/ffmpeg/avcodec.h b/src/pulsecore/ffmpeg/avcodec.h
index 696fc98..079c252 100644
--- a/src/pulsecore/ffmpeg/avcodec.h
+++ b/src/pulsecore/ffmpeg/avcodec.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with FFmpeg; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AVCODEC_H
diff --git a/src/pulsecore/ffmpeg/resample2.c b/src/pulsecore/ffmpeg/resample2.c
index ac9db73..a18f96e 100644
--- a/src/pulsecore/ffmpeg/resample2.c
+++ b/src/pulsecore/ffmpeg/resample2.c
@@ -15,8 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with FFmpeg; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/pulsecore/flist.c b/src/pulsecore/flist.c
index b110e1e..8d2e643 100644
--- a/src/pulsecore/flist.c
+++ b/src/pulsecore/flist.c
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/flist.h b/src/pulsecore/flist.h
index 2ce88cc..0341208 100644
--- a/src/pulsecore/flist.h
+++ b/src/pulsecore/flist.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/def.h>
diff --git a/src/pulsecore/hashmap.c b/src/pulsecore/hashmap.c
index 2cc03cb..2385c55 100644
--- a/src/pulsecore/hashmap.c
+++ b/src/pulsecore/hashmap.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/hashmap.h b/src/pulsecore/hashmap.h
index 8042f7b..b1027e7 100644
--- a/src/pulsecore/hashmap.h
+++ b/src/pulsecore/hashmap.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/def.h>
diff --git a/src/pulsecore/hook-list.c b/src/pulsecore/hook-list.c
index ed07cea..e59dcba 100644
--- a/src/pulsecore/hook-list.c
+++ b/src/pulsecore/hook-list.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/hook-list.h b/src/pulsecore/hook-list.h
index deaa171..63037e7 100644
--- a/src/pulsecore/hook-list.h
+++ b/src/pulsecore/hook-list.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/llist.h>
diff --git a/src/pulsecore/i18n.c b/src/pulsecore/i18n.c
index b4f0a66..1cd74c0 100644
--- a/src/pulsecore/i18n.c
+++ b/src/pulsecore/i18n.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/i18n.h b/src/pulsecore/i18n.h
index b206867..2423db3 100644
--- a/src/pulsecore/i18n.h
+++ b/src/pulsecore/i18n.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulsecore/idxset.c b/src/pulsecore/idxset.c
index eec73c6..5175ca2 100644
--- a/src/pulsecore/idxset.c
+++ b/src/pulsecore/idxset.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/idxset.h b/src/pulsecore/idxset.h
index 53ac402..7acb202 100644
--- a/src/pulsecore/idxset.h
+++ b/src/pulsecore/idxset.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c
index 93cd0fd..d1bb109 100644
--- a/src/pulsecore/iochannel.c
+++ b/src/pulsecore/iochannel.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/iochannel.h b/src/pulsecore/iochannel.h
index 959ee88..c81c5e3 100644
--- a/src/pulsecore/iochannel.h
+++ b/src/pulsecore/iochannel.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifndef PACKAGE
diff --git a/src/pulsecore/ioline.c b/src/pulsecore/ioline.c
index ead9ebd..dfc5a73 100644
--- a/src/pulsecore/ioline.c
+++ b/src/pulsecore/ioline.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/ioline.h b/src/pulsecore/ioline.h
index 28428eb..7b6dff3 100644
--- a/src/pulsecore/ioline.h
+++ b/src/pulsecore/ioline.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/gccmacro.h>
diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c
index 5455d0e..e83d8a0 100644
--- a/src/pulsecore/ipacl.c
+++ b/src/pulsecore/ipacl.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/ipacl.h b/src/pulsecore/ipacl.h
index a366139..034248a 100644
--- a/src/pulsecore/ipacl.h
+++ b/src/pulsecore/ipacl.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_ip_acl pa_ip_acl;
diff --git a/src/pulsecore/llist.h b/src/pulsecore/llist.h
index 27f174a..a9412fa 100644
--- a/src/pulsecore/llist.h
+++ b/src/pulsecore/llist.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/lock-autospawn.c b/src/pulsecore/lock-autospawn.c
index 82518db..955fd23 100644
--- a/src/pulsecore/lock-autospawn.c
+++ b/src/pulsecore/lock-autospawn.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/lock-autospawn.h b/src/pulsecore/lock-autospawn.h
index 6f18550..9fc0ab1 100644
--- a/src/pulsecore/lock-autospawn.h
+++ b/src/pulsecore/lock-autospawn.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c
index 9e29c78..552d416 100644
--- a/src/pulsecore/log.c
+++ b/src/pulsecore/log.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/log.h b/src/pulsecore/log.h
index 65abed9..803ed5a 100644
--- a/src/pulsecore/log.h
+++ b/src/pulsecore/log.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <stdarg.h>
diff --git a/src/pulsecore/ltdl-helper.c b/src/pulsecore/ltdl-helper.c
index bdb5a5d..4e003c9 100644
--- a/src/pulsecore/ltdl-helper.c
+++ b/src/pulsecore/ltdl-helper.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/ltdl-helper.h b/src/pulsecore/ltdl-helper.h
index 9f34696..d3219ba 100644
--- a/src/pulsecore/ltdl-helper.h
+++ b/src/pulsecore/ltdl-helper.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <ltdl.h>
diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h
index 21c3e6c..1716f81 100644
--- a/src/pulsecore/macro.h
+++ b/src/pulsecore/macro.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/mcalign.c b/src/pulsecore/mcalign.c
index f5363eb..df885c2 100644
--- a/src/pulsecore/mcalign.c
+++ b/src/pulsecore/mcalign.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/mcalign.h b/src/pulsecore/mcalign.h
index e897643..e29d82e 100644
--- a/src/pulsecore/mcalign.h
+++ b/src/pulsecore/mcalign.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/memblock.h>
diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c
index b781312..9b6810d 100644
--- a/src/pulsecore/memblock.c
+++ b/src/pulsecore/memblock.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -151,7 +149,6 @@ struct pa_mempool {
     size_t block_size;
     unsigned n_blocks;
     bool is_remote_writable;
-    unsigned export_baseidx;
 
     pa_atomic_t n_init;
 
@@ -1088,6 +1085,8 @@ finish:
 pa_memexport* pa_memexport_new(pa_mempool *p, pa_memexport_revoke_cb_t cb, void *userdata) {
     pa_memexport *e;
 
+    static pa_atomic_t export_baseidx = PA_ATOMIC_INIT(0);
+
     pa_assert(p);
     pa_assert(cb);
 
@@ -1106,8 +1105,7 @@ pa_memexport* pa_memexport_new(pa_mempool *p, pa_memexport_revoke_cb_t cb, void
     pa_mutex_lock(p->mutex);
 
     PA_LLIST_PREPEND(pa_memexport, p->exports, e);
-    e->baseidx = p->export_baseidx;
-    p->export_baseidx += PA_MEMEXPORT_SLOTS_MAX;
+    e->baseidx = (uint32_t) pa_atomic_add(&export_baseidx, PA_MEMEXPORT_SLOTS_MAX);
 
     pa_mutex_unlock(p->mutex);
     return e;
diff --git a/src/pulsecore/memblock.h b/src/pulsecore/memblock.h
index 9ce88ca..dbea213 100644
--- a/src/pulsecore/memblock.h
+++ b/src/pulsecore/memblock.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_memblock pa_memblock;
diff --git a/src/pulsecore/memblockq.c b/src/pulsecore/memblockq.c
index 16a62da..d314d4e 100644
--- a/src/pulsecore/memblockq.c
+++ b/src/pulsecore/memblockq.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/memblockq.h b/src/pulsecore/memblockq.h
index 24f4d47..301bb21 100644
--- a/src/pulsecore/memblockq.h
+++ b/src/pulsecore/memblockq.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/memchunk.c b/src/pulsecore/memchunk.c
index 792b4c7..eb5917c 100644
--- a/src/pulsecore/memchunk.c
+++ b/src/pulsecore/memchunk.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/memchunk.h b/src/pulsecore/memchunk.h
index 6dccaed..2b19712 100644
--- a/src/pulsecore/memchunk.h
+++ b/src/pulsecore/memchunk.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_memchunk pa_memchunk;
diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index d04f278..e7b511c 100644
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/memtrap.h b/src/pulsecore/memtrap.h
index 9af30e9..cf3e99e 100644
--- a/src/pulsecore/memtrap.h
+++ b/src/pulsecore/memtrap.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/mime-type.c b/src/pulsecore/mime-type.c
index 60e42e7..b7157b4 100644
--- a/src/pulsecore/mime-type.c
+++ b/src/pulsecore/mime-type.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/mime-type.h b/src/pulsecore/mime-type.h
index 789d7c2..f07f455 100644
--- a/src/pulsecore/mime-type.h
+++ b/src/pulsecore/mime-type.h
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c
index c66a2ec..59622d7 100644
--- a/src/pulsecore/mix.c
+++ b/src/pulsecore/mix.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/mix.h b/src/pulsecore/mix.h
index a4cde01..8102bcd 100644
--- a/src/pulsecore/mix.h
+++ b/src/pulsecore/mix.h
@@ -19,9 +19,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c
index 01ba5e4..7b68346 100644
--- a/src/pulsecore/modargs.c
+++ b/src/pulsecore/modargs.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/modargs.h b/src/pulsecore/modargs.h
index 6d6b477..776a1e6 100644
--- a/src/pulsecore/modargs.h
+++ b/src/pulsecore/modargs.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/modinfo.c b/src/pulsecore/modinfo.c
index 73dd3b6..e1a814f 100644
--- a/src/pulsecore/modinfo.c
+++ b/src/pulsecore/modinfo.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/modinfo.h b/src/pulsecore/modinfo.h
index f02a04c..5b99b77 100644
--- a/src/pulsecore/modinfo.h
+++ b/src/pulsecore/modinfo.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /* Some functions for reading module meta data from PulseAudio modules */
diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c
index 4974034..1081ad3 100644
--- a/src/pulsecore/module.c
+++ b/src/pulsecore/module.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/module.h b/src/pulsecore/module.h
index af4e9d2..96a6315 100644
--- a/src/pulsecore/module.h
+++ b/src/pulsecore/module.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/msgobject.c b/src/pulsecore/msgobject.c
index d7927c8..e1d0fff 100644
--- a/src/pulsecore/msgobject.c
+++ b/src/pulsecore/msgobject.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/msgobject.h b/src/pulsecore/msgobject.h
index 163c7d7..dfb519d 100644
--- a/src/pulsecore/msgobject.h
+++ b/src/pulsecore/msgobject.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/mutex-posix.c b/src/pulsecore/mutex-posix.c
index 36c2787..a835be1 100644
--- a/src/pulsecore/mutex-posix.c
+++ b/src/pulsecore/mutex-posix.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/mutex-win32.c b/src/pulsecore/mutex-win32.c
index 46935a7..370f443 100644
--- a/src/pulsecore/mutex-win32.c
+++ b/src/pulsecore/mutex-win32.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/mutex.h b/src/pulsecore/mutex.h
index e3d4ec7..9cdd857 100644
--- a/src/pulsecore/mutex.h
+++ b/src/pulsecore/mutex.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
index 7704abe..b2320c0 100644
--- a/src/pulsecore/namereg.c
+++ b/src/pulsecore/namereg.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/namereg.h b/src/pulsecore/namereg.h
index afb3532..467db5d 100644
--- a/src/pulsecore/namereg.h
+++ b/src/pulsecore/namereg.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/native-common.h b/src/pulsecore/native-common.h
index ca1b430..dc62895 100644
--- a/src/pulsecore/native-common.h
+++ b/src/pulsecore/native-common.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/cdecl.h>
diff --git a/src/pulsecore/object.c b/src/pulsecore/object.c
index bc1aaf7..cb0328f 100644
--- a/src/pulsecore/object.c
+++ b/src/pulsecore/object.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/object.h b/src/pulsecore/object.h
index a6da0fe..b3d500e 100644
--- a/src/pulsecore/object.h
+++ b/src/pulsecore/object.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/once.c b/src/pulsecore/once.c
index 16059c3..6e52801 100644
--- a/src/pulsecore/once.c
+++ b/src/pulsecore/once.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/once.h b/src/pulsecore/once.h
index 460a700..8cd7894 100644
--- a/src/pulsecore/once.h
+++ b/src/pulsecore/once.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/atomic.h>
diff --git a/src/pulsecore/packet.c b/src/pulsecore/packet.c
index cee468b..8fea4e2 100644
--- a/src/pulsecore/packet.c
+++ b/src/pulsecore/packet.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/packet.h b/src/pulsecore/packet.h
index 5989b1f..c49ca06 100644
--- a/src/pulsecore/packet.h
+++ b/src/pulsecore/packet.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c
index d31e68c..7f72e79 100644
--- a/src/pulsecore/parseaddr.c
+++ b/src/pulsecore/parseaddr.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/parseaddr.h b/src/pulsecore/parseaddr.h
index 9c9745b..5d2c358 100644
--- a/src/pulsecore/parseaddr.h
+++ b/src/pulsecore/parseaddr.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/pdispatch.c b/src/pulsecore/pdispatch.c
index 53284ee..c258c0b 100644
--- a/src/pulsecore/pdispatch.c
+++ b/src/pulsecore/pdispatch.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/pdispatch.h b/src/pulsecore/pdispatch.h
index df2e2fd..9cb3419 100644
--- a/src/pulsecore/pdispatch.h
+++ b/src/pulsecore/pdispatch.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/pid.c b/src/pulsecore/pid.c
index c70b989..8749b42 100644
--- a/src/pulsecore/pid.c
+++ b/src/pulsecore/pid.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/pid.h b/src/pulsecore/pid.h
index d8458bf..ff0356b 100644
--- a/src/pulsecore/pid.h
+++ b/src/pulsecore/pid.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 int pa_pid_file_create(const char *procname);
diff --git a/src/pulsecore/pipe.c b/src/pulsecore/pipe.c
index 6ca1626..9f86a48 100644
--- a/src/pulsecore/pipe.c
+++ b/src/pulsecore/pipe.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/pipe.h b/src/pulsecore/pipe.h
index 597d5e5..54e9819 100644
--- a/src/pulsecore/pipe.h
+++ b/src/pulsecore/pipe.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifndef HAVE_PIPE
diff --git a/src/pulsecore/play-memblockq.c b/src/pulsecore/play-memblockq.c
index ff0c52b..e087047 100644
--- a/src/pulsecore/play-memblockq.c
+++ b/src/pulsecore/play-memblockq.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/play-memblockq.h b/src/pulsecore/play-memblockq.h
index a55fed0..c13aced 100644
--- a/src/pulsecore/play-memblockq.h
+++ b/src/pulsecore/play-memblockq.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/sink.h>
diff --git a/src/pulsecore/play-memchunk.c b/src/pulsecore/play-memchunk.c
index 26a2bcc..cc0bc16 100644
--- a/src/pulsecore/play-memchunk.c
+++ b/src/pulsecore/play-memchunk.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/play-memchunk.h b/src/pulsecore/play-memchunk.h
index 068add1..7c56fe3 100644
--- a/src/pulsecore/play-memchunk.h
+++ b/src/pulsecore/play-memchunk.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/sink.h>
diff --git a/src/pulsecore/poll-posix.c b/src/pulsecore/poll-posix.c
index cd888b5..e232295 100644
--- a/src/pulsecore/poll-posix.c
+++ b/src/pulsecore/poll-posix.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /***
diff --git a/src/pulsecore/poll.h b/src/pulsecore/poll.h
index 8905dd2..4af1b99 100644
--- a/src/pulsecore/poll.h
+++ b/src/pulsecore/poll.h
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 /***
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index 473290f..baf683d 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/proplist-util.h b/src/pulsecore/proplist-util.h
index 3d08776..17f231f 100644
--- a/src/pulsecore/proplist-util.h
+++ b/src/pulsecore/proplist-util.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/proplist.h>
diff --git a/src/pulsecore/protocol-cli.c b/src/pulsecore/protocol-cli.c
index cc6eeee..522a829 100644
--- a/src/pulsecore/protocol-cli.c
+++ b/src/pulsecore/protocol-cli.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/protocol-cli.h b/src/pulsecore/protocol-cli.h
index 906b13f..fde6e38 100644
--- a/src/pulsecore/protocol-cli.h
+++ b/src/pulsecore/protocol-cli.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/protocol-dbus.c b/src/pulsecore/protocol-dbus.c
index cf4b9fc..d07d067 100644
--- a/src/pulsecore/protocol-dbus.c
+++ b/src/pulsecore/protocol-dbus.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/protocol-dbus.h b/src/pulsecore/protocol-dbus.h
index aac7423..fdc1ae9 100644
--- a/src/pulsecore/protocol-dbus.h
+++ b/src/pulsecore/protocol-dbus.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <dbus/dbus.h>
diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
index a4e0028..4f83ac4 100644
--- a/src/pulsecore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/protocol-esound.h b/src/pulsecore/protocol-esound.h
index e4b65e7..6208640 100644
--- a/src/pulsecore/protocol-esound.h
+++ b/src/pulsecore/protocol-esound.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c
index ced03a1..da8e220 100644
--- a/src/pulsecore/protocol-http.c
+++ b/src/pulsecore/protocol-http.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/protocol-http.h b/src/pulsecore/protocol-http.h
index f7517e8..89a6518 100644
--- a/src/pulsecore/protocol-http.h
+++ b/src/pulsecore/protocol-http.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index c0cd0e0..f54f2a4 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -2593,7 +2591,7 @@ static void setup_srbchannel(pa_native_connection *c) {
     int fdlist[2];
 
     if (!c->options->srbchannel) {
-        pa_log_debug("Disabling srbchannel, reason: Disabled by module parameter");
+        pa_log_debug("Disabling srbchannel, reason: Must be enabled by module parameter");
         return;
     }
 
@@ -5327,7 +5325,7 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) {
     pa_assert(PA_REFCNT_VALUE(o) >= 1);
     pa_assert(ma);
 
-    o->srbchannel = true;
+    o->srbchannel = false;
     if (pa_modargs_get_value_boolean(ma, "srbchannel", &o->srbchannel) < 0) {
         pa_log("srbchannel= expects a boolean argument.");
         return -1;
diff --git a/src/pulsecore/protocol-native.h b/src/pulsecore/protocol-native.h
index df30d44..0347fdf 100644
--- a/src/pulsecore/protocol-native.h
+++ b/src/pulsecore/protocol-native.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/protocol-simple.c b/src/pulsecore/protocol-simple.c
index fc36880..923ec87 100644
--- a/src/pulsecore/protocol-simple.c
+++ b/src/pulsecore/protocol-simple.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/protocol-simple.h b/src/pulsecore/protocol-simple.h
index f0723db..0a72cd7 100644
--- a/src/pulsecore/protocol-simple.h
+++ b/src/pulsecore/protocol-simple.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/socket-server.h>
diff --git a/src/pulsecore/pstream-util.c b/src/pulsecore/pstream-util.c
index 9ccd5a4..356d28c 100644
--- a/src/pulsecore/pstream-util.c
+++ b/src/pulsecore/pstream-util.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/pstream-util.h b/src/pulsecore/pstream-util.h
index 7ea89ba..1366314 100644
--- a/src/pulsecore/pstream-util.h
+++ b/src/pulsecore/pstream-util.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index 5b15b10..ad8eef1 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/pstream.h b/src/pulsecore/pstream.h
index cbea237..f4e1462 100644
--- a/src/pulsecore/pstream.h
+++ b/src/pulsecore/pstream.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/queue.c b/src/pulsecore/queue.c
index f4216ee..2b952b6 100644
--- a/src/pulsecore/queue.c
+++ b/src/pulsecore/queue.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/queue.h b/src/pulsecore/queue.h
index 1b95ec8..14cc555 100644
--- a/src/pulsecore/queue.h
+++ b/src/pulsecore/queue.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/def.h>
diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c
index acfbc31..508a6f8 100644
--- a/src/pulsecore/random.c
+++ b/src/pulsecore/random.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/random.h b/src/pulsecore/random.h
index 36d7f9d..7c7755d 100644
--- a/src/pulsecore/random.h
+++ b/src/pulsecore/random.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/ratelimit.c b/src/pulsecore/ratelimit.c
index 37e46c8..0bfc956 100644
--- a/src/pulsecore/ratelimit.c
+++ b/src/pulsecore/ratelimit.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/ratelimit.h b/src/pulsecore/ratelimit.h
index 0366462..d1e2f22 100644
--- a/src/pulsecore/ratelimit.h
+++ b/src/pulsecore/ratelimit.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/pulsecore/refcnt.h b/src/pulsecore/refcnt.h
index d52cac8..2e818ab 100644
--- a/src/pulsecore/refcnt.h
+++ b/src/pulsecore/refcnt.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/atomic.h>
diff --git a/src/pulsecore/remap.c b/src/pulsecore/remap.c
index d9b121e..09e2c8f 100644
--- a/src/pulsecore/remap.c
+++ b/src/pulsecore/remap.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/remap.h b/src/pulsecore/remap.h
index 66ab7bc..4bad3ea 100644
--- a/src/pulsecore/remap.h
+++ b/src/pulsecore/remap.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/pulsecore/remap_mmx.c b/src/pulsecore/remap_mmx.c
index 51a6da7..688da6c 100644
--- a/src/pulsecore/remap_mmx.c
+++ b/src/pulsecore/remap_mmx.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/remap_sse.c b/src/pulsecore/remap_sse.c
index d502ece..73e1cc8 100644
--- a/src/pulsecore/remap_sse.c
+++ b/src/pulsecore/remap_sse.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index 183d05f..b4e84f2 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/resampler.h b/src/pulsecore/resampler.h
index 5a84cf0..0580f85 100644
--- a/src/pulsecore/resampler.h
+++ b/src/pulsecore/resampler.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/pulsecore/resampler/ffmpeg.c b/src/pulsecore/resampler/ffmpeg.c
index cc1e3e4..691bdd4 100644
--- a/src/pulsecore/resampler/ffmpeg.c
+++ b/src/pulsecore/resampler/ffmpeg.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/resampler/libsamplerate.c b/src/pulsecore/resampler/libsamplerate.c
index 34a9ba4..06704fe 100644
--- a/src/pulsecore/resampler/libsamplerate.c
+++ b/src/pulsecore/resampler/libsamplerate.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/resampler/peaks.c b/src/pulsecore/resampler/peaks.c
index d0b7cd0..c9b808e 100644
--- a/src/pulsecore/resampler/peaks.c
+++ b/src/pulsecore/resampler/peaks.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/resampler/speex.c b/src/pulsecore/resampler/speex.c
index e989c3a..66387e5 100644
--- a/src/pulsecore/resampler/speex.c
+++ b/src/pulsecore/resampler/speex.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/resampler/trivial.c b/src/pulsecore/resampler/trivial.c
index be15295..14e7ef3 100644
--- a/src/pulsecore/resampler/trivial.c
+++ b/src/pulsecore/resampler/trivial.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index 5f3ca8b..f427ef3 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -15,9 +15,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/rtpoll.h b/src/pulsecore/rtpoll.h
index c0a4dda..4f09ab8 100644
--- a/src/pulsecore/rtpoll.h
+++ b/src/pulsecore/rtpoll.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index 539f3b8..8ae5db9 100644
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sample-util.h b/src/pulsecore/sample-util.h
index 7e7fb92..95671f1 100644
--- a/src/pulsecore/sample-util.h
+++ b/src/pulsecore/sample-util.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/sconv-s16be.c b/src/pulsecore/sconv-s16be.c
index bf4f717..6228c74 100644
--- a/src/pulsecore/sconv-s16be.c
+++ b/src/pulsecore/sconv-s16be.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sconv-s16be.h b/src/pulsecore/sconv-s16be.h
index ae9e231..4e0e03d 100644
--- a/src/pulsecore/sconv-s16be.h
+++ b/src/pulsecore/sconv-s16be.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/sconv-s16le.c b/src/pulsecore/sconv-s16le.c
index 0c1d16c..c503e0e 100644
--- a/src/pulsecore/sconv-s16le.c
+++ b/src/pulsecore/sconv-s16le.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sconv-s16le.h b/src/pulsecore/sconv-s16le.h
index 609fa04..5301373 100644
--- a/src/pulsecore/sconv-s16le.h
+++ b/src/pulsecore/sconv-s16le.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/sconv.c b/src/pulsecore/sconv.c
index 7e4f6bf..0781b6e 100644
--- a/src/pulsecore/sconv.c
+++ b/src/pulsecore/sconv.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sconv.h b/src/pulsecore/sconv.h
index 204887f..c457429 100644
--- a/src/pulsecore/sconv.h
+++ b/src/pulsecore/sconv.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/gccmacro.h>
diff --git a/src/pulsecore/sconv_sse.c b/src/pulsecore/sconv_sse.c
index ab2e9f4..1b097b8 100644
--- a/src/pulsecore/sconv_sse.c
+++ b/src/pulsecore/sconv_sse.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/semaphore-osx.c b/src/pulsecore/semaphore-osx.c
index 835c4cf..c957f26 100644
--- a/src/pulsecore/semaphore-osx.c
+++ b/src/pulsecore/semaphore-osx.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/semaphore-posix.c b/src/pulsecore/semaphore-posix.c
index 2aa1bce..7907c19 100644
--- a/src/pulsecore/semaphore-posix.c
+++ b/src/pulsecore/semaphore-posix.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/semaphore-win32.c b/src/pulsecore/semaphore-win32.c
index c2e00c6..660d4bd 100644
--- a/src/pulsecore/semaphore-win32.c
+++ b/src/pulsecore/semaphore-win32.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/semaphore.h b/src/pulsecore/semaphore.h
index 2bf8149..4c746f1 100644
--- a/src/pulsecore/semaphore.h
+++ b/src/pulsecore/semaphore.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/shared.c b/src/pulsecore/shared.c
index 368a6c3..1b5eea9 100644
--- a/src/pulsecore/shared.c
+++ b/src/pulsecore/shared.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/shared.h b/src/pulsecore/shared.h
index 82819f0..49e8738 100644
--- a/src/pulsecore/shared.h
+++ b/src/pulsecore/shared.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/core.h>
diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
index 075c8bd..eefd7ba 100644
--- a/src/pulsecore/shm.c
+++ b/src/pulsecore/shm.c
@@ -15,9 +15,7 @@
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/shm.h b/src/pulsecore/shm.h
index 2238239..d438961 100644
--- a/src/pulsecore/shm.h
+++ b/src/pulsecore/shm.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 8e773ec..d95a93e 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h
index 15f9315..457f018 100644
--- a/src/pulsecore/sink-input.h
+++ b/src/pulsecore/sink-input.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
@@ -96,7 +94,7 @@ struct pa_sink_input {
 
     pa_sink_input *sync_prev, *sync_next;
 
-    /* Also see http://pulseaudio.org/wiki/InternalVolumes */
+    /* Also see http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Volumes/ */
     pa_cvolume volume;             /* The volume clients are informed about */
     pa_cvolume reference_ratio;    /* The ratio of the stream's volume to the sink's reference volume */
     pa_cvolume real_ratio;         /* The ratio of the stream's volume to the sink's real volume */
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 8e2b5c8..dafd1cc 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index d18e0be..ed0f9ee 100644
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_sink pa_sink;
@@ -90,7 +88,7 @@ struct pa_sink {
     pa_volume_t base_volume; /* shall be constant */
     unsigned n_volume_steps; /* shall be constant */
 
-    /* Also see http://pulseaudio.org/wiki/InternalVolumes */
+    /* Also see http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Volumes/ */
     pa_cvolume reference_volume; /* The volume exported and taken as reference base for relative sink input volumes */
     pa_cvolume real_volume;      /* The volume that the hardware is configured to  */
     pa_cvolume soft_volume;      /* The internal software volume we apply to all PCM data while it passes through */
diff --git a/src/pulsecore/sioman.c b/src/pulsecore/sioman.c
index 24c046c..315f10a 100644
--- a/src/pulsecore/sioman.c
+++ b/src/pulsecore/sioman.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sioman.h b/src/pulsecore/sioman.h
index 88ff92a..10ad382 100644
--- a/src/pulsecore/sioman.h
+++ b/src/pulsecore/sioman.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 int pa_stdio_acquire(void);
diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index a951c01..b6cc65e 100644
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sndfile-util.h b/src/pulsecore/sndfile-util.h
index 74021da..1f67ac3 100644
--- a/src/pulsecore/sndfile-util.h
+++ b/src/pulsecore/sndfile-util.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sndfile.h>
diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c
index 564a366..b4067f0 100644
--- a/src/pulsecore/socket-client.c
+++ b/src/pulsecore/socket-client.c
@@ -15,9 +15,7 @@
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with PulseAudio; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-    USA.
+    License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/socket-client.h b/src/pulsecore/socket-client.h
index 235d449..9d22072 100644
--- a/src/pulsecore/socket-client.h
+++ b/src/pulsecore/socket-client.h
@@ -18,9 +18,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c
index 2138cbc..d1f83f4 100644
--- a/src/pulsecore/socket-server.c
+++ b/src/pulsecore/socket-server.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/socket-server.h b/src/pulsecore/socket-server.h
index a72bd9e..1944e23 100644
--- a/src/pulsecore/socket-server.h
+++ b/src/pulsecore/socket-server.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c
index ccb9442..e389ef2 100644
--- a/src/pulsecore/socket-util.c
+++ b/src/pulsecore/socket-util.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/socket-util.h b/src/pulsecore/socket-util.h
index 93c28b2..f120769 100644
--- a/src/pulsecore/socket-util.h
+++ b/src/pulsecore/socket-util.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c
index 33f7337..ddda456 100644
--- a/src/pulsecore/sound-file-stream.c
+++ b/src/pulsecore/sound-file-stream.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sound-file-stream.h b/src/pulsecore/sound-file-stream.h
index a788c34..de55c6d 100644
--- a/src/pulsecore/sound-file-stream.h
+++ b/src/pulsecore/sound-file-stream.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/sink.h>
diff --git a/src/pulsecore/sound-file.c b/src/pulsecore/sound-file.c
index 3db0981..f678430 100644
--- a/src/pulsecore/sound-file.c
+++ b/src/pulsecore/sound-file.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/sound-file.h b/src/pulsecore/sound-file.h
index 4dc0c7e..01afa4e 100644
--- a/src/pulsecore/sound-file.h
+++ b/src/pulsecore/sound-file.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/sample.h>
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 65b2d80..c8090f7 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/source-output.h b/src/pulsecore/source-output.h
index 3ed950b..24555e4 100644
--- a/src/pulsecore/source-output.h
+++ b/src/pulsecore/source-output.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
@@ -87,7 +85,7 @@ struct pa_source_output {
     pa_channel_map channel_map;
     pa_format_info *format;
 
-    /* Also see http://pulseaudio.org/wiki/InternalVolumes */
+    /* Also see http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Volumes/ */
     pa_cvolume volume;             /* The volume clients are informed about */
     pa_cvolume reference_ratio;    /* The ratio of the stream's volume to the source's reference volume */
     pa_cvolume real_ratio;         /* The ratio of the stream's volume to the source's real volume */
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index ab3a0d2..eb27621 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h
index 1c9ecec..e7fc3e2 100644
--- a/src/pulsecore/source.h
+++ b/src/pulsecore/source.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_source pa_source;
@@ -90,7 +88,7 @@ struct pa_source {
     pa_volume_t base_volume; /* shall be constant */
     unsigned n_volume_steps; /* shall be constant */
 
-    /* Also see http://pulseaudio.org/wiki/InternalVolumes */
+    /* Also see http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Volumes/ */
     pa_cvolume reference_volume; /* The volume exported and taken as reference base for relative source output volumes */
     pa_cvolume real_volume;      /* The volume that the hardware is configured to  */
     pa_cvolume soft_volume;      /* The internal software volume we apply to all PCM data while it passes through */
diff --git a/src/pulsecore/srbchannel.c b/src/pulsecore/srbchannel.c
index 8872a89..4cdfaa7 100644
--- a/src/pulsecore/srbchannel.c
+++ b/src/pulsecore/srbchannel.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/srbchannel.h b/src/pulsecore/srbchannel.h
index c96877e..09193e0 100644
--- a/src/pulsecore/srbchannel.h
+++ b/src/pulsecore/srbchannel.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/pulsecore/start-child.c b/src/pulsecore/start-child.c
index 8318b9b..7f0719c 100644
--- a/src/pulsecore/start-child.c
+++ b/src/pulsecore/start-child.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/start-child.h b/src/pulsecore/start-child.h
index 0b5ff66..6222f45 100644
--- a/src/pulsecore/start-child.h
+++ b/src/pulsecore/start-child.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/strbuf.c b/src/pulsecore/strbuf.c
index 7c15fa7..adcd3eb 100644
--- a/src/pulsecore/strbuf.c
+++ b/src/pulsecore/strbuf.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/strbuf.h b/src/pulsecore/strbuf.h
index 6e52576..562fe38 100644
--- a/src/pulsecore/strbuf.h
+++ b/src/pulsecore/strbuf.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/gccmacro.h>
diff --git a/src/pulsecore/stream-util.c b/src/pulsecore/stream-util.c
index bed8da0..2574501 100644
--- a/src/pulsecore/stream-util.c
+++ b/src/pulsecore/stream-util.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/stream-util.h b/src/pulsecore/stream-util.h
index fd22ab3..b2e47fe 100644
--- a/src/pulsecore/stream-util.h
+++ b/src/pulsecore/stream-util.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/format.h>
diff --git a/src/pulsecore/strlist.c b/src/pulsecore/strlist.c
index 4c06fee..37e4847 100644
--- a/src/pulsecore/strlist.c
+++ b/src/pulsecore/strlist.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/strlist.h b/src/pulsecore/strlist.h
index 0434bde..84a5777 100644
--- a/src/pulsecore/strlist.h
+++ b/src/pulsecore/strlist.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_strlist pa_strlist;
diff --git a/src/pulsecore/svolume.orc b/src/pulsecore/svolume.orc
index 0edbefb..26f618e 100644
--- a/src/pulsecore/svolume.orc
+++ b/src/pulsecore/svolume.orc
@@ -15,9 +15,7 @@
 #  General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public License
-#  along with PulseAudio; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-#  USA.
+#  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 # S16NE 1- and 2-channel volume scaling work as follows:
 #
@@ -45,13 +43,15 @@
 
 .function pa_volume_s16ne_orc_1ch
 .dest 2 samples int16_t
-.param 4 v int32_t
+.param 4 vols int32_t
+.temp 4 v
 .temp 2 vh
 .temp 4 s
 .temp 4 mh
 .temp 4 ml
 .temp 4 signc
 
+loadpl v, vols
 convuwl s, samples
 x2 cmpgtsw signc, 0, s
 x2 andw signc, signc, v
diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c
index f325d77..fdef313 100644
--- a/src/pulsecore/svolume_arm.c
+++ b/src/pulsecore/svolume_arm.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/svolume_c.c b/src/pulsecore/svolume_c.c
index 2e2db12..659b337 100644
--- a/src/pulsecore/svolume_c.c
+++ b/src/pulsecore/svolume_c.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c
index 411e62c..1bf70be 100644
--- a/src/pulsecore/svolume_mmx.c
+++ b/src/pulsecore/svolume_mmx.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/svolume_orc.c b/src/pulsecore/svolume_orc.c
index f610566..730f817 100644
--- a/src/pulsecore/svolume_orc.c
+++ b/src/pulsecore/svolume_orc.c
@@ -16,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
index abd8fa5..9b9663a 100644
--- a/src/pulsecore/svolume_sse.c
+++ b/src/pulsecore/svolume_sse.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/tagstruct.c b/src/pulsecore/tagstruct.c
index e51fcf2..63134f9 100644
--- a/src/pulsecore/tagstruct.c
+++ b/src/pulsecore/tagstruct.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/tagstruct.h b/src/pulsecore/tagstruct.h
index 9fef255..6319ee9 100644
--- a/src/pulsecore/tagstruct.h
+++ b/src/pulsecore/tagstruct.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <inttypes.h>
diff --git a/src/pulsecore/thread-mq.c b/src/pulsecore/thread-mq.c
index d34b22b..d00641d 100644
--- a/src/pulsecore/thread-mq.c
+++ b/src/pulsecore/thread-mq.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/thread-mq.h b/src/pulsecore/thread-mq.h
index 79af364..b3a4a69 100644
--- a/src/pulsecore/thread-mq.h
+++ b/src/pulsecore/thread-mq.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/mainloop-api.h>
diff --git a/src/pulsecore/thread-posix.c b/src/pulsecore/thread-posix.c
index 5c19b43..62b0ec4 100644
--- a/src/pulsecore/thread-posix.c
+++ b/src/pulsecore/thread-posix.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/thread-win32.c b/src/pulsecore/thread-win32.c
index 0fa3b91..310c04e 100644
--- a/src/pulsecore/thread-win32.c
+++ b/src/pulsecore/thread-win32.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/thread.h b/src/pulsecore/thread.h
index a6e5f42..8a14558 100644
--- a/src/pulsecore/thread.h
+++ b/src/pulsecore/thread.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulse/def.h>
diff --git a/src/pulsecore/time-smoother.c b/src/pulsecore/time-smoother.c
index 0bae4de..2c82ff6 100644
--- a/src/pulsecore/time-smoother.c
+++ b/src/pulsecore/time-smoother.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/time-smoother.h b/src/pulsecore/time-smoother.h
index 3cb5661..49ae08c 100644
--- a/src/pulsecore/time-smoother.h
+++ b/src/pulsecore/time-smoother.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <pulsecore/macro.h>
diff --git a/src/pulsecore/tokenizer.c b/src/pulsecore/tokenizer.c
index 4c610e8..d889fe6 100644
--- a/src/pulsecore/tokenizer.c
+++ b/src/pulsecore/tokenizer.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/tokenizer.h b/src/pulsecore/tokenizer.h
index a47c07e..806d40c 100644
--- a/src/pulsecore/tokenizer.h
+++ b/src/pulsecore/tokenizer.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 typedef struct pa_tokenizer pa_tokenizer;
diff --git a/src/pulsecore/usergroup.c b/src/pulsecore/usergroup.c
index c244865..40dad28 100644
--- a/src/pulsecore/usergroup.c
+++ b/src/pulsecore/usergroup.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/usergroup.h b/src/pulsecore/usergroup.h
index 1c09163..0945059 100644
--- a/src/pulsecore/usergroup.h
+++ b/src/pulsecore/usergroup.h
@@ -17,9 +17,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/x11prop.c b/src/pulsecore/x11prop.c
index 0fa30a3..f3f7737 100644
--- a/src/pulsecore/x11prop.c
+++ b/src/pulsecore/x11prop.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/x11prop.h b/src/pulsecore/x11prop.h
index 5a12114..2b9d3f1 100644
--- a/src/pulsecore/x11prop.h
+++ b/src/pulsecore/x11prop.h
@@ -18,9 +18,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <sys/types.h>
diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c
index 454507a..0c040cf 100644
--- a/src/pulsecore/x11wrap.c
+++ b/src/pulsecore/x11wrap.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/pulsecore/x11wrap.h b/src/pulsecore/x11wrap.h
index e632ecc..0539303 100644
--- a/src/pulsecore/x11wrap.h
+++ b/src/pulsecore/x11wrap.h
@@ -17,9 +17,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <X11/Xlib.h>
diff --git a/src/tests/asyncmsgq-test.c b/src/tests/asyncmsgq-test.c
index 3bba753..219c020 100644
--- a/src/tests/asyncmsgq-test.c
+++ b/src/tests/asyncmsgq-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/asyncq-test.c b/src/tests/asyncq-test.c
index 22738e1..51a557a 100644
--- a/src/tests/asyncq-test.c
+++ b/src/tests/asyncq-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/connect-stress.c b/src/tests/connect-stress.c
index 48d015b..7c755e9 100644
--- a/src/tests/connect-stress.c
+++ b/src/tests/connect-stress.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/cpu-mix-test.c b/src/tests/cpu-mix-test.c
index 181a767..f3bc0cc 100644
--- a/src/tests/cpu-mix-test.c
+++ b/src/tests/cpu-mix-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/cpu-remap-test.c b/src/tests/cpu-remap-test.c
index 4ee5e00..cfe8647 100644
--- a/src/tests/cpu-remap-test.c
+++ b/src/tests/cpu-remap-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/cpu-sconv-test.c b/src/tests/cpu-sconv-test.c
index 428ebe0..2eb51de 100644
--- a/src/tests/cpu-sconv-test.c
+++ b/src/tests/cpu-sconv-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/cpu-volume-test.c b/src/tests/cpu-volume-test.c
index 659136e..01ac2fc 100644
--- a/src/tests/cpu-volume-test.c
+++ b/src/tests/cpu-volume-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/cpulimit-test.c b/src/tests/cpulimit-test.c
index 8988c1a..3a8124f 100644
--- a/src/tests/cpulimit-test.c
+++ b/src/tests/cpulimit-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/extended-test.c b/src/tests/extended-test.c
index ce8a6b0..6c7f991 100644
--- a/src/tests/extended-test.c
+++ b/src/tests/extended-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/flist-test.c b/src/tests/flist-test.c
index d8c227a..3abc123 100644
--- a/src/tests/flist-test.c
+++ b/src/tests/flist-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/format-test.c b/src/tests/format-test.c
index e9e9622..20869da 100644
--- a/src/tests/format-test.c
+++ b/src/tests/format-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/get-binary-name-test.c b/src/tests/get-binary-name-test.c
index 5d781c9..4c855bb 100644
--- a/src/tests/get-binary-name-test.c
+++ b/src/tests/get-binary-name-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/gtk-test.c b/src/tests/gtk-test.c
index 6470e48..8edc5f2 100644
--- a/src/tests/gtk-test.c
+++ b/src/tests/gtk-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c
index 1d1e52a..7a7bffc 100644
--- a/src/tests/interpol-test.c
+++ b/src/tests/interpol-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/lo-latency-test.c b/src/tests/lo-latency-test.c
index ad5e7a5..813b337 100644
--- a/src/tests/lo-latency-test.c
+++ b/src/tests/lo-latency-test.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/lo-test-util.c b/src/tests/lo-test-util.c
index 84e8af3..2ff8cf8 100644
--- a/src/tests/lo-test-util.c
+++ b/src/tests/lo-test-util.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/lo-test-util.h b/src/tests/lo-test-util.h
index d0de609..a6b0cde 100644
--- a/src/tests/lo-test-util.h
+++ b/src/tests/lo-test-util.h
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/lock-autospawn-test.c b/src/tests/lock-autospawn-test.c
index 89d402e..d475d2d 100644
--- a/src/tests/lock-autospawn-test.c
+++ b/src/tests/lock-autospawn-test.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/mainloop-test.c b/src/tests/mainloop-test.c
index 2fa16d9..3a3e9bb 100644
--- a/src/tests/mainloop-test.c
+++ b/src/tests/mainloop-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index 455e18c..0d27dfd 100644
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -12,9 +12,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/memblock-test.c b/src/tests/memblock-test.c
index 9581daa..2b51108 100644
--- a/src/tests/memblock-test.c
+++ b/src/tests/memblock-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/memblockq-test.c b/src/tests/memblockq-test.c
index a00182a..a65b097 100644
--- a/src/tests/memblockq-test.c
+++ b/src/tests/memblockq-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/mix-test.c b/src/tests/mix-test.c
index e95607d..c8af600 100644
--- a/src/tests/mix-test.c
+++ b/src/tests/mix-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/mult-s16-test.c b/src/tests/mult-s16-test.c
index 931866a..d2a351c 100644
--- a/src/tests/mult-s16-test.c
+++ b/src/tests/mult-s16-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/once-test.c b/src/tests/once-test.c
index 5744eca..cb56187 100644
--- a/src/tests/once-test.c
+++ b/src/tests/once-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/pacat-simple.c b/src/tests/pacat-simple.c
index 7d119c4..113ff95 100644
--- a/src/tests/pacat-simple.c
+++ b/src/tests/pacat-simple.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/parec-simple.c b/src/tests/parec-simple.c
index dfa43f0..338a0e8 100644
--- a/src/tests/parec-simple.c
+++ b/src/tests/parec-simple.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/proplist-test.c b/src/tests/proplist-test.c
index 6aac03c..a0074f8 100644
--- a/src/tests/proplist-test.c
+++ b/src/tests/proplist-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/queue-test.c b/src/tests/queue-test.c
index 814645e..dfdac63 100644
--- a/src/tests/queue-test.c
+++ b/src/tests/queue-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/remix-test.c b/src/tests/remix-test.c
index b628011..5193187 100644
--- a/src/tests/remix-test.c
+++ b/src/tests/remix-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/resampler-test.c b/src/tests/resampler-test.c
index f547770..96110fb 100644
--- a/src/tests/resampler-test.c
+++ b/src/tests/resampler-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
index 2cf8125..7db7177 100644
--- a/src/tests/rtpoll-test.c
+++ b/src/tests/rtpoll-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c
index 8096ada..7bd8808 100644
--- a/src/tests/rtstutter.c
+++ b/src/tests/rtstutter.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/sig2str-test.c b/src/tests/sig2str-test.c
index 72cd224..f1d82d8 100644
--- a/src/tests/sig2str-test.c
+++ b/src/tests/sig2str-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/sigbus-test.c b/src/tests/sigbus-test.c
index 6acac04..8a660ee 100644
--- a/src/tests/sigbus-test.c
+++ b/src/tests/sigbus-test.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/smoother-test.c b/src/tests/smoother-test.c
index 85d9d89..5e12f11 100644
--- a/src/tests/smoother-test.c
+++ b/src/tests/smoother-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/srbchannel-test.c b/src/tests/srbchannel-test.c
index ce5930b..ba7b8ef 100644
--- a/src/tests/srbchannel-test.c
+++ b/src/tests/srbchannel-test.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/stripnul.c b/src/tests/stripnul.c
index e68c7bb..75390bd 100644
--- a/src/tests/stripnul.c
+++ b/src/tests/stripnul.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/sync-playback.c b/src/tests/sync-playback.c
index 0a758d1..205383d 100644
--- a/src/tests/sync-playback.c
+++ b/src/tests/sync-playback.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
index e62f66b..af366a5 100644
--- a/src/tests/thread-mainloop-test.c
+++ b/src/tests/thread-mainloop-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/thread-test.c b/src/tests/thread-test.c
index 330181d..72f2177 100644
--- a/src/tests/thread-test.c
+++ b/src/tests/thread-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/tests/usergroup-test.c b/src/tests/usergroup-test.c
index 13ee48c..3525e5a 100644
--- a/src/tests/usergroup-test.c
+++ b/src/tests/usergroup-test.c
@@ -14,9 +14,7 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <config.h>
diff --git a/src/tests/volume-test.c b/src/tests/volume-test.c
index 1ab0b5c..bd0b01c 100644
--- a/src/tests/volume-test.c
+++ b/src/tests/volume-test.c
@@ -12,9 +12,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index e60dfca..1db88fb 100644
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index 61b87a0..ef3b84b 100644
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -333,7 +331,7 @@ int main(int argc, char*argv[]) {
             if (watch_socket->revents & POLLHUP) {
                 ibuf_eof = true;
                 ibuf_length = 0;
-            } if (watch_socket->revents & POLLOUT) {
+            } else if (watch_socket->revents & POLLOUT) {
                 ssize_t r;
                 pa_assert(ibuf_length > 0);
 
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index f6555b9..1dc8c3f 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
@@ -1897,7 +1895,7 @@ int main(int argc, char *argv[]) {
 
             sink_name = pa_xstrdup(argv[optind+1]);
 
-            if (parse_volumes(argv+optind+2, argc-3) < 0)
+            if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-source-volume")) {
@@ -1910,7 +1908,7 @@ int main(int argc, char *argv[]) {
 
             source_name = pa_xstrdup(argv[optind+1]);
 
-            if (parse_volumes(argv+optind+2, argc-3) < 0)
+            if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-sink-input-volume")) {
@@ -1926,7 +1924,7 @@ int main(int argc, char *argv[]) {
                 goto quit;
             }
 
-            if (parse_volumes(argv+optind+2, argc-3) < 0)
+            if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-source-output-volume")) {
@@ -1942,7 +1940,7 @@ int main(int argc, char *argv[]) {
                 goto quit;
             }
 
-            if (parse_volumes(argv+optind+2, argc-3) < 0)
+            if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-sink-mute")) {
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index b5250b3..e61373c 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/utils/padsp.in b/src/utils/padsp.in
index 4ecce8c..3430a65 100644
--- a/src/utils/padsp.in
+++ b/src/utils/padsp.in
@@ -16,9 +16,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 while getopts 'hs:n:m:MSDd' param ; do
 	case $param in
diff --git a/src/utils/pasuspender.c b/src/utils/pasuspender.c
index 5ede7f4..f1f39b2 100644
--- a/src/utils/pasuspender.c
+++ b/src/utils/pasuspender.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 86336d0..a91dbf7 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
diff --git a/vala/libpulse-simple.vapi b/vala/libpulse-simple.vapi
index 11b6e0f..c7ece05 100644
--- a/vala/libpulse-simple.vapi
+++ b/vala/libpulse-simple.vapi
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 namespace PulseAudio {
diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi
index ea66c41..345e284 100644
--- a/vala/libpulse.vapi
+++ b/vala/libpulse.vapi
@@ -14,9 +14,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 using GLib;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git



More information about the pkg-pulseaudio-devel mailing list