merged

po/LINGUAS

@@ -1,13 +1,28 @@
+as
+bn_IN
 ca
 cs
+de_CH
 de
 el
 es
 fi
 fr
+gu
+hi
 it
+kn
+mr
+nl
+or
 pa
 pl
 pt_BR
+pt
+sr@latin
+sr
 sv
+ta
+te
+uk
 zh_CN

po/POTFILES.in

@@ -5,7 +5,7 @@ src/modules/module-zeroconf-discover.c
 src/modules/alsa/module-alsa-source.c
 src/modules/module-device-restore.c
 src/modules/module-match.c
-src/modules/dbus-util.c
+src/pulsecore/dbus-util.c
 src/modules/module-console-kit.c
 src/modules/oss/module-oss.c
 src/modules/oss/oss-util.c
@@ -15,7 +15,7 @@ src/modules/alsa/alsa-util.c
 src/modules/module-pipe-source.c
 src/modules/module-solaris.c
 src/modules/module-default-device-restore.c
-src/modules/module-x11-xsmp.c
+src/modules/x11/module-x11-xsmp.c
 src/modules/module-remap-sink.c
 src/modules/bluetooth/module-bluetooth-proximity.c
 src/modules/module-detect.c
@@ -24,23 +24,23 @@ src/modules/module-lirc.c
 src/modules/module-hal-detect.c
 src/modules/module-sine.c
 src/modules/module-zeroconf-publish.c
-src/modules/module-jack-source.c
+src/modules/jack/module-jack-source.c
 src/modules/module-cli.c
 src/modules/gconf/module-gconf.c
 src/modules/gconf/gconf-helper.c
 src/modules/module-esound-sink.c
 src/modules/alsa/module-alsa-sink.c
 src/modules/module-volume-restore.c
-src/modules/module-x11-bell.c
+src/modules/x11/module-x11-bell.c
 src/modules/module-protocol-stub.c
 src/modules/module-stream-restore.c
-src/modules/module-jack-sink.c
+src/modules/jack/module-jack-sink.c
 src/modules/module-esound-compat-spawnfd.c
 src/modules/module-esound-compat-spawnpid.c
 #src/modules/module-waveout.c
 src/modules/module-combine.c
 src/modules/bluetooth/proximity-helper.c
-src/modules/module-x11-publish.c
+src/modules/x11/module-x11-publish.c
 src/modules/rtp/module-rtp-recv.c
 src/modules/rtp/sdp.c
 src/modules/rtp/rtp.c
@@ -190,5 +190,9 @@ src/utils/pactl.c
 src/utils/padsp.c
 src/utils/pax11publish.c
 src/utils/pacmd.c
-src/utils/paplay.c
 src/pulsecore/lock-autospawn.c
+src/modules/alsa/alsa-sink.c
+src/modules/alsa/alsa-source.c
+src/modules/alsa/module-alsa-card.c
+src/modules/bluetooth/module-bluetooth-device.c
+src/modules/reserve-wrap.c